diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..35d12eb --- /dev/null +++ b/pom.xml @@ -0,0 +1,33 @@ + + 4.0.0 + ingomagi + boot1 + 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 + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + \ No newline at end of file diff --git a/src/main/java/ingomagi/Rakendus.java b/src/main/java/ingomagi/Rakendus.java new file mode 100644 index 0000000..ce58e5b --- /dev/null +++ b/src/main/java/ingomagi/Rakendus.java @@ -0,0 +1,56 @@ +package ingomagi; +import java.util.Arrays; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +@RestController +@SpringBootApplication +public class Rakendus { + + @RequestMapping("/ruut") + String ruut(String ruut){ + try{ + double Arv = Double.parseDouble(ruut); + return "Arvu ruut on: "+String.valueOf(Math.pow(Arv, 2)); + } catch (Exception e){ + return "Viga: "+e.getMessage(); + } + } + @RequestMapping("/ringpindala") + String proov(Double raadius){ + try{ + klass ring1=new ring(raadius); + System.out.println("ringi pindala : "+Math.round(ring1.pindala())); + return "ringi pindala on: "+String.valueOf(Math.round(ring1.pindala())); + }catch (Exception e){ + return "Viga: "+e.getMessage();} + } + @RequestMapping("/ringumbermoot") + String proov2(Double raadius){ + try{ + klass ring1=new ring(raadius); + System.out.println("ümbermõõt on: "+ Math.round(ring1.umbermoot())); + return "ringi ümbermõõt on: "+String.valueOf(Math.round(ring1.umbermoot())); + }catch (Exception e){ + return "Viga: "+e.getMessage();} + } + @RequestMapping("/ruuduubermoot") + String proov3(Double kylg){ + try{ + klass ruut1=new ruut(kylg); + System.out.println("ruudu ümbermõõt on "+ruut1.umbermoot()+ " ja pindala on: "+ruut1.pindala()); + return "Ruudu ümbermõõt on: "+String.valueOf(Math.round(ruut1.umbermoot())); + }catch (Exception e){ + return "Viga: "+e.getMessage();} + } + + public static void main(String[] args) { + System.getProperties().put("server.port", 5501); + SpringApplication.run(Rakendus.class, args); + } +} + +//scl enable rh-maven33 bash +//mvn package +//java -jar target/boot3-1.0-SNAPSHOT.jar \ No newline at end of file diff --git a/src/main/java/ingomagi/klass.java b/src/main/java/ingomagi/klass.java new file mode 100644 index 0000000..a0c5bf8 --- /dev/null +++ b/src/main/java/ingomagi/klass.java @@ -0,0 +1,7 @@ +package ingomagi; +import java.util.*; +public abstract class klass{ + public double pindala(){return 0;} + public double umbermoot(){return 0;} + +} \ No newline at end of file diff --git a/src/main/java/ingomagi/ring.java b/src/main/java/ingomagi/ring.java new file mode 100644 index 0000000..33cbd1c --- /dev/null +++ b/src/main/java/ingomagi/ring.java @@ -0,0 +1,21 @@ +package ingomagi; +import java.util.*; +public class ring extends klass{ + double raadius; + + public ring(double raadius){ + this.raadius=raadius; + } + +@Override + public double pindala(){ + return Math.PI * Math.pow(raadius, 2); + + } +@Override + public double umbermoot(){ + return 2*Math.PI*raadius; + + } + +} \ No newline at end of file diff --git a/src/main/java/ingomagi/ruut.java b/src/main/java/ingomagi/ruut.java new file mode 100644 index 0000000..f8c8e12 --- /dev/null +++ b/src/main/java/ingomagi/ruut.java @@ -0,0 +1,21 @@ +package ingomagi; +import java.util.*; +public class ruut extends klass{ + double kylg; + + public ruut(double kylg){ + this.kylg=kylg; + } + +@Override + public double pindala(){ + return Math.pow(kylg, 2); + + } +@Override + public double umbermoot(){ + return 4*kylg; + + } + +} \ No newline at end of file diff --git a/src/test/java/ingomagi/RakendusTest.java b/src/test/java/ingomagi/RakendusTest.java new file mode 100644 index 0000000..ca64656 --- /dev/null +++ b/src/test/java/ingomagi/RakendusTest.java @@ -0,0 +1,37 @@ +package ingomagi; + + + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringRunner; +import static org.junit.Assert.*; + +@RunWith(SpringRunner.class) +@SpringBootTest +public class RakendusTest{ + + @Test + public void katse0(){ + assertEquals(3, 2+1); + } + + @Test + public void katse1(){ + Rakendus r=new Rakendus(); + assertEquals("Arvu ruut on: "+String.valueOf(16.0), r.ruut("4")); + } + + @Test + public void katse2(){ + Rakendus r=new Rakendus(); + assertEquals("ringi pindala on: "+String.valueOf(314), r.proov(10.0)); + } + @Test + public void katse3(){ + Rakendus r=new Rakendus(); + assertEquals("Ruudu ümbermõõt on: "+String.valueOf(20), r.proov3(5.0)); + } + +} \ No newline at end of file diff --git a/target/boot1-1.0-SNAPSHOT.jar b/target/boot1-1.0-SNAPSHOT.jar new file mode 100644 index 0000000..56c46a7 Binary files /dev/null and b/target/boot1-1.0-SNAPSHOT.jar differ diff --git a/target/boot1-1.0-SNAPSHOT.jar.original b/target/boot1-1.0-SNAPSHOT.jar.original new file mode 100644 index 0000000..4bab968 Binary files /dev/null and b/target/boot1-1.0-SNAPSHOT.jar.original differ diff --git a/target/boot1-1.jar b/target/boot1-1.jar new file mode 100644 index 0000000..11b3894 Binary files /dev/null and b/target/boot1-1.jar differ diff --git a/target/boot1-1.jar.original b/target/boot1-1.jar.original new file mode 100644 index 0000000..09df191 Binary files /dev/null and b/target/boot1-1.jar.original differ diff --git a/target/classes/ingomagi/Rakendus.class b/target/classes/ingomagi/Rakendus.class new file mode 100644 index 0000000..3130fdb Binary files /dev/null and b/target/classes/ingomagi/Rakendus.class differ diff --git a/target/classes/ingomagi/klass.class b/target/classes/ingomagi/klass.class new file mode 100644 index 0000000..cee750c Binary files /dev/null and b/target/classes/ingomagi/klass.class differ diff --git a/target/classes/ingomagi/ring.class b/target/classes/ingomagi/ring.class new file mode 100644 index 0000000..1529cee Binary files /dev/null and b/target/classes/ingomagi/ring.class differ diff --git a/target/classes/ingomagi/ruut.class b/target/classes/ingomagi/ruut.class new file mode 100644 index 0000000..ca77b42 Binary files /dev/null and b/target/classes/ingomagi/ruut.class differ diff --git a/target/maven-archiver/pom.properties b/target/maven-archiver/pom.properties new file mode 100644 index 0000000..f9ecb80 --- /dev/null +++ b/target/maven-archiver/pom.properties @@ -0,0 +1,5 @@ +#Generated by Maven +#Wed May 17 12:36:40 EEST 2017 +version=1 +groupId=ingomagi +artifactId=boot1 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..37ff53b --- /dev/null +++ b/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst @@ -0,0 +1,4 @@ +ingomagi/klass.class +ingomagi/Rakendus.class +ingomagi/ruut.class +ingomagi/ring.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..a939442 --- /dev/null +++ b/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst @@ -0,0 +1,4 @@ +/home/ingomagi/hidden/kodused/t05/src/main/java/ingomagi/klass.java +/home/ingomagi/hidden/kodused/t05/src/main/java/ingomagi/ring.java +/home/ingomagi/hidden/kodused/t05/src/main/java/ingomagi/Rakendus.java +/home/ingomagi/hidden/kodused/t05/src/main/java/ingomagi/ruut.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..a20243c --- /dev/null +++ b/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst @@ -0,0 +1 @@ +ingomagi/RakendusTest.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..46b2c3f --- /dev/null +++ b/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst @@ -0,0 +1 @@ +/home/ingomagi/hidden/kodused/t05/src/test/java/ingomagi/RakendusTest.java diff --git a/target/surefire-reports/TEST-ingomagi.RakendusTest.xml b/target/surefire-reports/TEST-ingomagi.RakendusTest.xml new file mode 100644 index 0000000..6f3298c --- /dev/null +++ b/target/surefire-reports/TEST-ingomagi.RakendusTest.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/target/surefire-reports/ingomagi.RakendusTest.txt b/target/surefire-reports/ingomagi.RakendusTest.txt new file mode 100644 index 0000000..599d853 --- /dev/null +++ b/target/surefire-reports/ingomagi.RakendusTest.txt @@ -0,0 +1,4 @@ +------------------------------------------------------------------------------- +Test set: ingomagi.RakendusTest +------------------------------------------------------------------------------- +Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 2.604 sec - in ingomagi.RakendusTest diff --git a/target/test-classes/ingomagi/RakendusTest.class b/target/test-classes/ingomagi/RakendusTest.class new file mode 100644 index 0000000..450d676 Binary files /dev/null and b/target/test-classes/ingomagi/RakendusTest.class differ