diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..ddf9aab --- /dev/null +++ b/pom.xml @@ -0,0 +1,34 @@ + + 4.0.0 + henri + henri + 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/henri/pindala.java b/src/main/java/henri/pindala.java new file mode 100644 index 0000000..9e2be59 --- /dev/null +++ b/src/main/java/henri/pindala.java @@ -0,0 +1,14 @@ +package henri; + public class pindala extends ristkulik{ + double esimenekulg; + double teinekulg; + public pindala(double esimenekulg, double teinekulg){ + this.esimenekulg = esimenekulg; + this.teinekulg = teinekulg; + } + + @Override + public double ristkulikuPindala(){ + return esimenekulg*teinekulg; + } + } \ No newline at end of file diff --git a/src/main/java/henri/proov.java b/src/main/java/henri/proov.java new file mode 100644 index 0000000..ffd04ee --- /dev/null +++ b/src/main/java/henri/proov.java @@ -0,0 +1,11 @@ +package henri; + import java.util.*; + + public class proov{ + public static void main(String[] arg){ + ristkulik ristkulik = new pindala(5,4); + System.out.println("Ristkuliku pindala on: "+ ristkulik.ristkulikuPindala()); + System.out.println("Ristkuliku Ümbermõõt on: "+ ristkulik.ristkulikuUmbermoot()); + + } + } \ No newline at end of file diff --git a/src/main/java/henri/rakendus.java b/src/main/java/henri/rakendus.java new file mode 100644 index 0000000..b2ef7e2 --- /dev/null +++ b/src/main/java/henri/rakendus.java @@ -0,0 +1,31 @@ +package henri; + + import org.springframework.boot.SpringApplication; + import org.springframework.boot.autoconfigure.SpringBootApplication; + import org.springframework.web.bind.annotation.*; + + @SpringBootApplication + @RestController + + public class rakendus{ + + @RequestMapping("/pindala") + public String pindala(double esimenekulg, double teinekulg){ + pindala p1 = new pindala(esimenekulg, teinekulg); + return "Pindala on "+ p1.ristkulikuPindala(); + + } + + @RequestMapping("/umbermoot") + public String umbermoot(double esimenekulg, double teinekulg){ + umbermoot u1 = new umbermoot(esimenekulg, teinekulg); + return "Umbermoot on "+ u1.ristkulikuUmbermoot(); + + } + + + public static void main(String[] arg){ + System.getProperties().put("server.port", 4222); + SpringApplication.run(rakendus.class, arg); + } + } \ No newline at end of file diff --git a/src/main/java/henri/ristkulik.java b/src/main/java/henri/ristkulik.java new file mode 100644 index 0000000..c6e7c5f --- /dev/null +++ b/src/main/java/henri/ristkulik.java @@ -0,0 +1,7 @@ +package henri; + import java.util.*; + + public abstract class ristkulik{ + public double ristkulikuPindala(){return 0;} + public double ristkulikuUmbermoot(){return 0;} + } \ No newline at end of file diff --git a/src/main/java/henri/umbermoot.java b/src/main/java/henri/umbermoot.java new file mode 100644 index 0000000..32608de --- /dev/null +++ b/src/main/java/henri/umbermoot.java @@ -0,0 +1,16 @@ +package henri; + public class umbermoot extends ristkulik{ + double esimenekulg; + double teinekulg; + + + public umbermoot(double esimenekulg, double teinekulg){ + this.esimenekulg = esimenekulg; + this.teinekulg = teinekulg; + } + + @Override + public double ristkulikuUmbermoot(){ + return 2*(esimenekulg*teinekulg); + } + } \ No newline at end of file diff --git a/src/main/resources/public/arvutus.html b/src/main/resources/public/arvutus.html new file mode 100644 index 0000000..d0fdd7b --- /dev/null +++ b/src/main/resources/public/arvutus.html @@ -0,0 +1,31 @@ + + + + + + +

Umbermoodu arvutamine

+ + + +

+
Vastuse koht
+ + \ No newline at end of file diff --git a/src/main/resources/public/tervitus.html b/src/main/resources/public/tervitus.html new file mode 100644 index 0000000..4c8b45e --- /dev/null +++ b/src/main/resources/public/tervitus.html @@ -0,0 +1,35 @@ + + + + + + +

Ristkuliku pindala arvutamine

+

+ Sisesta uks kulg
+
+ Sisesta teine kulg
+ +
+ +

+
Vastus:
+ + \ No newline at end of file diff --git a/src/test/java/henri/pindalaTest.java b/src/test/java/henri/pindalaTest.java new file mode 100644 index 0000000..f30c616 --- /dev/null +++ b/src/test/java/henri/pindalaTest.java @@ -0,0 +1,27 @@ +package henri; + + 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 pindalaTest{ + @Autowired + private TestRestTemplate restTemplate; + + @Test + public void pindala1(){ + String vastus = this.restTemplate.getForObject("/pindala?esimenekulg=5&teinekulg=4",String.class); + + assertEquals("Pindala on ",vastus.substring(0, 11)); + assertEquals(20, Double.parseDouble(vastus.substring(11)),0.1); + } + } \ No newline at end of file diff --git a/target/classes/henri/pindala.class b/target/classes/henri/pindala.class new file mode 100644 index 0000000..8e0887e Binary files /dev/null and b/target/classes/henri/pindala.class differ diff --git a/target/classes/henri/proov.class b/target/classes/henri/proov.class new file mode 100644 index 0000000..a2f19e6 Binary files /dev/null and b/target/classes/henri/proov.class differ diff --git a/target/classes/henri/rakendus.class b/target/classes/henri/rakendus.class new file mode 100644 index 0000000..af9548b Binary files /dev/null and b/target/classes/henri/rakendus.class differ diff --git a/target/classes/henri/ristkulik.class b/target/classes/henri/ristkulik.class new file mode 100644 index 0000000..b7b7bed Binary files /dev/null and b/target/classes/henri/ristkulik.class differ diff --git a/target/classes/henri/umbermoot.class b/target/classes/henri/umbermoot.class new file mode 100644 index 0000000..4b20fa3 Binary files /dev/null and b/target/classes/henri/umbermoot.class differ diff --git a/target/classes/public/arvutus.html b/target/classes/public/arvutus.html new file mode 100644 index 0000000..d0fdd7b --- /dev/null +++ b/target/classes/public/arvutus.html @@ -0,0 +1,31 @@ + + + + + + +

Umbermoodu arvutamine

+ + + +

+
Vastuse koht
+ + \ No newline at end of file diff --git a/target/classes/public/pindala.html b/target/classes/public/pindala.html new file mode 100644 index 0000000..4c8b45e --- /dev/null +++ b/target/classes/public/pindala.html @@ -0,0 +1,35 @@ + + + + + + +

Ristkuliku pindala arvutamine

+

+ Sisesta uks kulg
+
+ Sisesta teine kulg
+ +
+ +

+
Vastus:
+ + \ No newline at end of file diff --git a/target/classes/public/tervitus.html b/target/classes/public/tervitus.html new file mode 100644 index 0000000..4c8b45e --- /dev/null +++ b/target/classes/public/tervitus.html @@ -0,0 +1,35 @@ + + + + + + +

Ristkuliku pindala arvutamine

+

+ Sisesta uks kulg
+
+ Sisesta teine kulg
+ +
+ +

+
Vastus:
+ + \ No newline at end of file diff --git a/target/classes/public/umbermoot.html b/target/classes/public/umbermoot.html new file mode 100644 index 0000000..4add661 --- /dev/null +++ b/target/classes/public/umbermoot.html @@ -0,0 +1,31 @@ + + + + + + +

Umbermoodu rvutamine

+ + + +

+
Vastuse koht
+ + \ No newline at end of file diff --git a/target/henri-1.jar b/target/henri-1.jar new file mode 100644 index 0000000..88fa9a0 Binary files /dev/null and b/target/henri-1.jar differ diff --git a/target/henri-1.jar.original b/target/henri-1.jar.original new file mode 100644 index 0000000..18fc6d1 Binary files /dev/null and b/target/henri-1.jar.original differ diff --git a/target/maven-archiver/pom.properties b/target/maven-archiver/pom.properties new file mode 100644 index 0000000..fc799d8 --- /dev/null +++ b/target/maven-archiver/pom.properties @@ -0,0 +1,5 @@ +#Generated by Apache Maven +#Mon May 29 18:17:10 EEST 2017 +version=1 +groupId=henri +artifactId=henri 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..2628876 --- /dev/null +++ b/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst @@ -0,0 +1,5 @@ +henri/umbermoot.class +henri/ristkulik.class +henri/pindala.class +henri/proov.class +henri/rakendus.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..2580774 --- /dev/null +++ b/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst @@ -0,0 +1,5 @@ +/home/henrvaja/Java/t09tervikveeb/src/main/java/henri/proov.java +/home/henrvaja/Java/t09tervikveeb/src/main/java/henri/pindala.java +/home/henrvaja/Java/t09tervikveeb/src/main/java/henri/rakendus.java +/home/henrvaja/Java/t09tervikveeb/src/main/java/henri/umbermoot.java +/home/henrvaja/Java/t09tervikveeb/src/main/java/henri/ristkulik.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..7f2d934 --- /dev/null +++ b/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst @@ -0,0 +1 @@ +henri/pindalaTest.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..59e8122 --- /dev/null +++ b/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst @@ -0,0 +1 @@ +/home/henrvaja/Java/t09tervikveeb/src/test/java/henri/pindalaTest.java diff --git a/target/surefire-reports/TEST-henri.pindalaTest.xml b/target/surefire-reports/TEST-henri.pindalaTest.xml new file mode 100644 index 0000000..15b7dc8 --- /dev/null +++ b/target/surefire-reports/TEST-henri.pindalaTest.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/target/surefire-reports/henri.pindalaTest.txt b/target/surefire-reports/henri.pindalaTest.txt new file mode 100644 index 0000000..aaf54c0 --- /dev/null +++ b/target/surefire-reports/henri.pindalaTest.txt @@ -0,0 +1,4 @@ +------------------------------------------------------------------------------- +Test set: henri.pindalaTest +------------------------------------------------------------------------------- +Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 4.696 sec - in henri.pindalaTest diff --git a/target/test-classes/henri/pindalaTest.class b/target/test-classes/henri/pindalaTest.class new file mode 100644 index 0000000..808847e Binary files /dev/null and b/target/test-classes/henri/pindalaTest.class differ