diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..ba5106b --- /dev/null +++ b/pom.xml @@ -0,0 +1,50 @@ + + + 4.0.0 + + baas + baas + 1 + jar + + kriskand + Demo project for Spring Boot + + + org.springframework.boot + spring-boot-starter-parent + 1.5.2.RELEASE + + + + + UTF-8 + UTF-8 + 1.8 + + + + + org.springframework.boot + spring-boot-starter-web + + + + org.springframework.boot + spring-boot-starter-test + test + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + + \ No newline at end of file diff --git a/src/main/java/baas/Koonus.java b/src/main/java/baas/Koonus.java new file mode 100644 index 0000000..857f74b --- /dev/null +++ b/src/main/java/baas/Koonus.java @@ -0,0 +1,21 @@ +package baas; + +public class Koonus extends Ring{ + + double korgus; + double radius; + + public Koonus(double korgus, double radius){ + + super(radius); + this.korgus = korgus; + + } + + public double kujundiRuumala(){ + + return kujundiPindala()/3 * korgus; + + } + +} diff --git a/src/main/java/baas/Kujundid.java b/src/main/java/baas/Kujundid.java new file mode 100644 index 0000000..3f730a0 --- /dev/null +++ b/src/main/java/baas/Kujundid.java @@ -0,0 +1,11 @@ +package baas; + +import java.util.*; + +public abstract class Kujundid{ + + public double kujundiPindala(){return 0;} + public double kujundiUmbermoot(){return 0;} + public double kujundiRuumala(){return 0;} + +} \ No newline at end of file diff --git a/src/main/java/baas/Rakendus.java b/src/main/java/baas/Rakendus.java new file mode 100644 index 0000000..69bbaaf --- /dev/null +++ b/src/main/java/baas/Rakendus.java @@ -0,0 +1,38 @@ +package baas; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.web.bind.annotation.*; + +@SpringBootApplication +@RestController + +public class Rakendus{ + + @RequestMapping("/ringipindala") + public String ring(double radius){ + Kujundid r1 = new Ring(radius); + return "Ringi pindala on "+ r1.kujundiPindala(); + + } + + @RequestMapping("/koonus") + public String ring(double radius, double height){ + Koonus s1 = new Koonus(radius, height); + return "Koonuse ruumala on "+ s1.kujundiPindala(); + + } + + + public static void main(String[] arg){ + System.getProperties().put("server.port", 1719); + SpringApplication.run(Rakendus.class, arg); + } +} + + +/* +scl enable rh-maven33 bash +mvn package +java -jar target/baas-1.jar +*/ \ No newline at end of file diff --git a/src/main/java/baas/Ring.java b/src/main/java/baas/Ring.java new file mode 100644 index 0000000..2146515 --- /dev/null +++ b/src/main/java/baas/Ring.java @@ -0,0 +1,27 @@ +package baas; + +public class Ring extends Kujundid{ + + double radius; + + public Ring(double radius){ + + this.radius = radius; + + } + + + @Override + public double kujundiPindala(){ + + return Math.PI * radius * radius; + + } + + @Override + public double kujundiUmbermoot(){ + + return 2 * Math.PI * radius; + + } +} \ No newline at end of file diff --git a/src/test/java/baas/RingiTest.java b/src/test/java/baas/RingiTest.java new file mode 100644 index 0000000..c528fb0 --- /dev/null +++ b/src/test/java/baas/RingiTest.java @@ -0,0 +1,26 @@ +package baas; + +import org.junit.*; +import static org.junit.Assert.*; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.test.context.junit4.SpringRunner; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.test.context.SpringBootTest.WebEnvironment; +import org.springframework.boot.test.web.client.TestRestTemplate; + + +@RunWith(SpringRunner.class) +@SpringBootTest(webEnvironment=WebEnvironment.RANDOM_PORT) +public class RingiTest{ + @Autowired + private TestRestTemplate restTemplate; + + @Test + public void perimeter(){ + String answer = this.restTemplate.getForObject("/ringipindala?radius=4",String.class); + + assertEquals("Ringi pindala on ",answer.substring(0, 17)); + assertEquals(50.2, Double.parseDouble(answer.substring(17)),0.1); + } +} \ No newline at end of file diff --git a/target/baas-1.jar b/target/baas-1.jar new file mode 100644 index 0000000..0b973d8 Binary files /dev/null and b/target/baas-1.jar differ diff --git a/target/baas-1.jar.original b/target/baas-1.jar.original new file mode 100644 index 0000000..871dd81 Binary files /dev/null and b/target/baas-1.jar.original differ diff --git a/target/classes/baas/Koonus.class b/target/classes/baas/Koonus.class new file mode 100644 index 0000000..973a3eb Binary files /dev/null and b/target/classes/baas/Koonus.class differ diff --git a/target/classes/baas/Kujundid.class b/target/classes/baas/Kujundid.class new file mode 100644 index 0000000..5afd7f4 Binary files /dev/null and b/target/classes/baas/Kujundid.class differ diff --git a/target/classes/baas/Rakendus.class b/target/classes/baas/Rakendus.class new file mode 100644 index 0000000..0897a94 Binary files /dev/null and b/target/classes/baas/Rakendus.class differ diff --git a/target/classes/baas/Ring.class b/target/classes/baas/Ring.class new file mode 100644 index 0000000..bcf3531 Binary files /dev/null and b/target/classes/baas/Ring.class differ diff --git a/target/kriskand-1.jar b/target/kriskand-1.jar new file mode 100644 index 0000000..bed03ce Binary files /dev/null and b/target/kriskand-1.jar differ diff --git a/target/kriskand-1.jar.original b/target/kriskand-1.jar.original new file mode 100644 index 0000000..4db198c Binary files /dev/null and b/target/kriskand-1.jar.original differ diff --git a/target/maven-archiver/pom.properties b/target/maven-archiver/pom.properties new file mode 100644 index 0000000..d9ff7ca --- /dev/null +++ b/target/maven-archiver/pom.properties @@ -0,0 +1,5 @@ +#Generated by Apache Maven +#Mon May 29 21:04:10 EEST 2017 +version=1 +groupId=baas +artifactId=baas diff --git a/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst new file mode 100644 index 0000000..b348958 --- /dev/null +++ b/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst @@ -0,0 +1,4 @@ +baas/Kujundid.class +baas/Rakendus.class +baas/Ring.class +baas/Koonus.class diff --git a/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst new file mode 100644 index 0000000..fb0dbed --- /dev/null +++ b/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst @@ -0,0 +1,5 @@ +/home/kriskand/public_html/Java/09tervik/src/main/java/baas/Kujundid.java +/home/kriskand/public_html/Java/09tervik/src/main/java/baas/Kera.java +/home/kriskand/public_html/Java/09tervik/src/main/java/baas/Ring.java +/home/kriskand/public_html/Java/09tervik/src/main/java/baas/Rakendus.java +/home/kriskand/public_html/Java/09tervik/src/main/java/baas/Silinder.java diff --git a/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst b/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst new file mode 100644 index 0000000..424d9d1 --- /dev/null +++ b/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst @@ -0,0 +1 @@ +baas/RingiTest.class diff --git a/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst b/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst new file mode 100644 index 0000000..b8a968e --- /dev/null +++ b/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst @@ -0,0 +1 @@ +/home/kriskand/public_html/Java/09tervik/src/test/java/baas/RingiTest.java diff --git a/target/surefire-reports/TEST-baas.RingiTest.xml b/target/surefire-reports/TEST-baas.RingiTest.xml new file mode 100644 index 0000000..48f5e38 --- /dev/null +++ b/target/surefire-reports/TEST-baas.RingiTest.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/target/surefire-reports/baas.RingiTest.txt b/target/surefire-reports/baas.RingiTest.txt new file mode 100644 index 0000000..6bdbdd0 --- /dev/null +++ b/target/surefire-reports/baas.RingiTest.txt @@ -0,0 +1,4 @@ +------------------------------------------------------------------------------- +Test set: baas.RingiTest +------------------------------------------------------------------------------- +Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 2.742 sec - in baas.RingiTest diff --git a/target/test-classes/baas/RingiTest.class b/target/test-classes/baas/RingiTest.class new file mode 100644 index 0000000..06059e9 Binary files /dev/null and b/target/test-classes/baas/RingiTest.class differ