diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..a084f73 --- /dev/null +++ b/pom.xml @@ -0,0 +1,34 @@ + + 4.0.0 + app + app + jar + 1 + + + org.springframework.boot + spring-boot-starter-parent + 1.5.2.RELEASE + + + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-test + 1.5.2.RELEASE + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + diff --git a/src/main/java/sten/Rakendus.java b/src/main/java/sten/Rakendus.java new file mode 100644 index 0000000..de594c8 --- /dev/null +++ b/src/main/java/sten/Rakendus.java @@ -0,0 +1,20 @@ +package sten; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.web.bind.annotation.*; + +@SpringBootApplication +@RestController +public class Rakendus{ + + @RequestMapping("/SilindriRuumala") + public String SilindriRuumala(double k6rgus, double raadius) { + Silinder s1 = new Silinder(raadius, k6rgus); + return "Pyramiidi ruumala on " + s1.silindriRuumala(); + } + + public static void main(String[] arg) { + SpringApplication.run(Rakendus.class, arg); + } +} diff --git a/src/main/java/sten/Silinder.java b/src/main/java/sten/Silinder.java new file mode 100644 index 0000000..aee3d4d --- /dev/null +++ b/src/main/java/sten/Silinder.java @@ -0,0 +1,17 @@ +package sten; + +public class Silinder extends SilindriRuumala { + double r; + public Silinder(double raadius, double k6rgus) { + super(k6rgus); + r=raadius; + + + } + + @Override + public double Ringipindala(){ + return Math.pow(r, 2) ; + } + +} diff --git a/src/main/java/sten/SilindriRuumala.java b/src/main/java/sten/SilindriRuumala.java new file mode 100644 index 0000000..ef51e81 --- /dev/null +++ b/src/main/java/sten/SilindriRuumala.java @@ -0,0 +1,13 @@ +package sten; + +public abstract class SilindriRuumala { + double h; + public SilindriRuumala(double k6rgus) { + h=k6rgus; + } + + public abstract double Ringipindala(); + public double silindriRuumala() { + return 3.14*h*Ringipindala(); + } +} \ No newline at end of file diff --git a/src/test/java/sten/SilindriTest.java b/src/test/java/sten/SilindriTest.java new file mode 100644 index 0000000..0190b0c --- /dev/null +++ b/src/test/java/sten/SilindriTest.java @@ -0,0 +1,18 @@ +package sten; + +import org.junit.*; +import static org.junit.Assert.*; + +public class SilindriTest { + + Silinder s1=new Silinder(4, 6); + @Test + public void RingiPindala() { + assertEquals(16, s1.Ringipindala(), 1); + } + + @Test + public void ruumala() { + assertEquals(301.44, s1.silindriRuumala(), 1); + } +} diff --git a/target/app-1.jar b/target/app-1.jar new file mode 100644 index 0000000..e306075 Binary files /dev/null and b/target/app-1.jar differ diff --git a/target/app-1.jar.original b/target/app-1.jar.original new file mode 100644 index 0000000..57dbcce Binary files /dev/null and b/target/app-1.jar.original differ diff --git a/target/classes/sten/Rakendus.class b/target/classes/sten/Rakendus.class new file mode 100644 index 0000000..613777e Binary files /dev/null and b/target/classes/sten/Rakendus.class differ diff --git a/target/classes/sten/Silinder.class b/target/classes/sten/Silinder.class new file mode 100644 index 0000000..73dc181 Binary files /dev/null and b/target/classes/sten/Silinder.class differ diff --git a/target/classes/sten/SilindriRuumala.class b/target/classes/sten/SilindriRuumala.class new file mode 100644 index 0000000..2c6b2d9 Binary files /dev/null and b/target/classes/sten/SilindriRuumala.class differ diff --git a/target/maven-archiver/pom.properties b/target/maven-archiver/pom.properties new file mode 100644 index 0000000..e24b0a1 --- /dev/null +++ b/target/maven-archiver/pom.properties @@ -0,0 +1,5 @@ +#Generated by Apache Maven +#Thu Apr 27 22:40:36 EEST 2017 +version=1 +groupId=app +artifactId=app 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..dc90560 --- /dev/null +++ b/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst @@ -0,0 +1,3 @@ +sten/Rakendus.class +sten/Silinder.class +sten/SilindriRuumala.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..5633028 --- /dev/null +++ b/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst @@ -0,0 +1,3 @@ +/home/stentool/public_html/Kodutööd/T09/t09tervikveeb/src/main/java/sten/SilindriRuumala.java +/home/stentool/public_html/Kodutööd/T09/t09tervikveeb/src/main/java/sten/Silinder.java +/home/stentool/public_html/Kodutööd/T09/t09tervikveeb/src/main/java/sten/Rakendus.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..70a433a --- /dev/null +++ b/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst @@ -0,0 +1 @@ +sten/SilindriTest.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..6319e8b --- /dev/null +++ b/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst @@ -0,0 +1 @@ +/home/kirke/public_html/JAVA/t09tervikveeb/src/test/java/kirke/KujundiTest.java diff --git a/target/surefire-reports/TEST-sten.SilindriTest.xml b/target/surefire-reports/TEST-sten.SilindriTest.xml new file mode 100644 index 0000000..2e5b3c5 --- /dev/null +++ b/target/surefire-reports/TEST-sten.SilindriTest.xml @@ -0,0 +1,62 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/target/surefire-reports/sten.SilindriTest.txt b/target/surefire-reports/sten.SilindriTest.txt new file mode 100644 index 0000000..4e9f02a --- /dev/null +++ b/target/surefire-reports/sten.SilindriTest.txt @@ -0,0 +1,4 @@ +------------------------------------------------------------------------------- +Test set: sten.SilindriTest +------------------------------------------------------------------------------- +Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.008 sec - in sten.SilindriTest diff --git a/target/test-classes/sten/SilindriTest.class b/target/test-classes/sten/SilindriTest.class new file mode 100644 index 0000000..5ce4bac Binary files /dev/null and b/target/test-classes/sten/SilindriTest.class differ