diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..b69a60f --- /dev/null +++ b/pom.xml @@ -0,0 +1,33 @@ + + 4.0.0 + paul + paul + jar + 1 + + + org.springframework.boot + spring-boot-starter-parent + 1.3.6.RELEASE + + + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-test + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + \ No newline at end of file diff --git a/src/main/java/paul/Pyramiid.java b/src/main/java/paul/Pyramiid.java new file mode 100644 index 0000000..dcc1ba9 --- /dev/null +++ b/src/main/java/paul/Pyramiid.java @@ -0,0 +1,15 @@ +package paul; + +public class Pyramiid extends PyramiidiRuumala { + double a; + public Pyramiid(double alus, double k6rgus) { + super(k6rgus); + a=alus; + + + } + @Override + public double pyramiidip6hjaPindala() /*Ruut on p6hjaks*/{ + return Math.pow(a, 2) ; + } +} \ No newline at end of file diff --git a/src/main/java/paul/PyramiidiRuumala.java b/src/main/java/paul/PyramiidiRuumala.java new file mode 100644 index 0000000..ac2ad2b --- /dev/null +++ b/src/main/java/paul/PyramiidiRuumala.java @@ -0,0 +1,12 @@ +package paul; + +public abstract class PyramiidiRuumala { + double h; + public PyramiidiRuumala(double k6rgus) { + h=k6rgus; + } + public abstract double pyramiidip6hjaPindala(); + public double pyramiidiRuumala() { + return 0.33333*h*pyramiidip6hjaPindala(); + } +} \ No newline at end of file diff --git a/src/main/java/paul/Rakendus.java b/src/main/java/paul/Rakendus.java new file mode 100644 index 0000000..734d173 --- /dev/null +++ b/src/main/java/paul/Rakendus.java @@ -0,0 +1,20 @@ +package paul; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.web.bind.annotation.*; + +@SpringBootApplication +@RestController +public class Rakendus{ + + @RequestMapping("/PyramiidiRuumala") + public String PyramiidiRuumala(double k6rgus, double alus) { + Pyramiid s1 = new Pyramiid(alus, k6rgus); + return "Pyramiidi ruumala on " + s1.pyramiidiRuumala(); + } + + public static void main(String[] arg) { + SpringApplication.run(Rakendus.class, arg); + } +} \ No newline at end of file diff --git a/src/test/java/paul/KujundiTest.java b/src/test/java/paul/KujundiTest.java new file mode 100644 index 0000000..e9ffd05 --- /dev/null +++ b/src/test/java/paul/KujundiTest.java @@ -0,0 +1,18 @@ +package paul; + +import org.junit.*; +import static org.junit.Assert.*; + +public class KujundiTest { + + Pyramiid s1=new Pyramiid(4, 6); + @Test + public void p6hjapindala() { + assertEquals(16, s1.pyramiidip6hjaPindala(), 1); + } + + @Test + public void ruumala() { + assertEquals(32, s1.pyramiidiRuumala(), 1); + } +} \ No newline at end of file diff --git a/target/classes/paul/Pyramiid.class b/target/classes/paul/Pyramiid.class new file mode 100644 index 0000000..703bc72 Binary files /dev/null and b/target/classes/paul/Pyramiid.class differ diff --git a/target/classes/paul/PyramiidiRuumala.class b/target/classes/paul/PyramiidiRuumala.class new file mode 100644 index 0000000..bb61dfd Binary files /dev/null and b/target/classes/paul/PyramiidiRuumala.class differ diff --git a/target/classes/paul/Rakendus.class b/target/classes/paul/Rakendus.class new file mode 100644 index 0000000..e9409e7 Binary files /dev/null and b/target/classes/paul/Rakendus.class differ diff --git a/target/maven-archiver/pom.properties b/target/maven-archiver/pom.properties new file mode 100644 index 0000000..693e711 --- /dev/null +++ b/target/maven-archiver/pom.properties @@ -0,0 +1,5 @@ +#Generated by Maven +#Mon May 29 22:30:24 EEST 2017 +version=1 +groupId=paul +artifactId=paul 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..1cbd3ab --- /dev/null +++ b/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst @@ -0,0 +1,3 @@ +paul\Pyramiid.class +paul\Rakendus.class +paul\PyramiidiRuumala.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..12c84ff --- /dev/null +++ b/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst @@ -0,0 +1,3 @@ +C:\Users\Pablo\Desktop\java\java9\src\main\java\paul\Rakendus.java +C:\Users\Pablo\Desktop\java\java9\src\main\java\paul\PyramiidiRuumala.java +C:\Users\Pablo\Desktop\java\java9\src\main\java\paul\Pyramiid.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..3cd9e4e --- /dev/null +++ b/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst @@ -0,0 +1 @@ +paul\KujundiTest.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..09550e1 --- /dev/null +++ b/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst @@ -0,0 +1 @@ +C:\Users\Pablo\Desktop\java\java9\src\test\java\paul\KujundiTest.java diff --git a/target/paul-1.jar b/target/paul-1.jar new file mode 100644 index 0000000..ad82dac Binary files /dev/null and b/target/paul-1.jar differ diff --git a/target/paul-1.jar.original b/target/paul-1.jar.original new file mode 100644 index 0000000..e92f9e4 Binary files /dev/null and b/target/paul-1.jar.original differ diff --git a/target/surefire-reports/TEST-paul.KujundiTest.xml b/target/surefire-reports/TEST-paul.KujundiTest.xml new file mode 100644 index 0000000..2834adf --- /dev/null +++ b/target/surefire-reports/TEST-paul.KujundiTest.xml @@ -0,0 +1,69 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/target/surefire-reports/paul.KujundiTest.txt b/target/surefire-reports/paul.KujundiTest.txt new file mode 100644 index 0000000..5582665 --- /dev/null +++ b/target/surefire-reports/paul.KujundiTest.txt @@ -0,0 +1,4 @@ +------------------------------------------------------------------------------- +Test set: paul.KujundiTest +------------------------------------------------------------------------------- +Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0 sec - in paul.KujundiTest diff --git a/target/test-classes/paul/KujundiTest.class b/target/test-classes/paul/KujundiTest.class new file mode 100644 index 0000000..7f26d70 Binary files /dev/null and b/target/test-classes/paul/KujundiTest.class differ