Ingo Mägi kodutöö

pom.xml

@@ -0,0 +1,33 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>ingomagi</groupId>
+  <artifactId>boot1</artifactId>
+  <packaging>jar</packaging>
+  <version>1</version>
+
+    <parent>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-parent</artifactId>
+        <version>1.5.2.RELEASE</version>
+    </parent>
+
+    <dependencies>
+	 <dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-web</artifactId>
+	 </dependency>
+   <dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-test</artifactId>
+	 </dependency>
+    </dependencies>
+      <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+</project>

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

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;}
+
+}

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;
+
+	}
+
+}

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;
+
+	}
+
+}

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));
+	}    
+
+}

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

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

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

target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst

@@ -0,0 +1 @@
+ingomagi/RakendusTest.class

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

target/surefire-reports/TEST-ingomagi.RakendusTest.xml

@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testsuite name="ingomagi.RakendusTest" time="0.16" tests="4" errors="0" skipped="0" failures="0">
+  <properties>
+    <property name="java.runtime.name" value="OpenJDK Runtime Environment"/>
+    <property name="sun.boot.library.path" value="/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.121-0.b13.el6_8.x86_64/jre/lib/amd64"/>
+    <property name="java.vm.version" value="25.121-b13"/>
+    <property name="java.vm.vendor" value="Oracle Corporation"/>
+    <property name="maven.multiModuleProjectDirectory" value="/home/ingomagi/hidden/kodused/t05"/>
+    <property name="java.vendor.url" value="http://java.oracle.com/"/>
+    <property name="path.separator" value=":"/>
+    <property name="guice.disable.misplaced.annotation.check" value="true"/>
+    <property name="java.vm.name" value="OpenJDK 64-Bit Server VM"/>
+    <property name="file.encoding.pkg" value="sun.io"/>
+    <property name="user.country" value="US"/>
+    <property name="sun.java.launcher" value="SUN_STANDARD"/>
+    <property name="sun.os.patch.level" value="unknown"/>
+    <property name="java.vm.specification.name" value="Java Virtual Machine Specification"/>
+    <property name="user.dir" value="/home/ingomagi/hidden/kodused/t05"/>
+    <property name="java.runtime.version" value="1.8.0_121-b13"/>
+    <property name="java.awt.graphicsenv" value="sun.awt.X11GraphicsEnvironment"/>
+    <property name="java.endorsed.dirs" value="/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.121-0.b13.el6_8.x86_64/jre/lib/endorsed"/>
+    <property name="os.arch" value="amd64"/>
+    <property name="java.io.tmpdir" value="/tmp"/>
+    <property name="line.separator" value="&#10;"/>
+    <property name="java.vm.specification.vendor" value="Oracle Corporation"/>
+    <property name="os.name" value="Linux"/>
+    <property name="classworlds.conf" value="/opt/rh/rh-maven33/root/usr/share/maven/bin/m2.conf"/>
+    <property name="sun.jnu.encoding" value="UTF-8"/>
+    <property name="java.library.path" value="/usr/java/packages/lib/amd64:/usr/lib64:/lib64:/lib:/usr/lib"/>
+    <property name="java.specification.name" value="Java Platform API Specification"/>
+    <property name="java.class.version" value="52.0"/>
+    <property name="sun.management.compiler" value="HotSpot 64-Bit Tiered Compilers"/>
+    <property name="os.version" value="2.6.32-642.11.1.el6.x86_64"/>
+    <property name="user.home" value="/home/ingomagi"/>
+    <property name="user.timezone" value="Europe/Tallinn"/>
+    <property name="java.awt.printerjob" value="sun.print.PSPrinterJob"/>
+    <property name="file.encoding" value="UTF-8"/>
+    <property name="java.specification.version" value="1.8"/>
+    <property name="user.name" value="ingomagi"/>
+    <property name="java.class.path" value="/opt/rh/rh-maven33/root/usr/share/maven/boot/plexus-classworlds.jar"/>
+    <property name="java.vm.specification.version" value="1.8"/>
+    <property name="sun.arch.data.model" value="64"/>
+    <property name="java.home" value="/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.121-0.b13.el6_8.x86_64/jre"/>
+    <property name="sun.java.command" value="org.codehaus.plexus.classworlds.launcher.Launcher package"/>
+    <property name="java.specification.vendor" value="Oracle Corporation"/>
+    <property name="user.language" value="en"/>
+    <property name="awt.toolkit" value="sun.awt.X11.XToolkit"/>
+    <property name="java.vm.info" value="mixed mode"/>
+    <property name="java.version" value="1.8.0_121"/>
+    <property name="java.ext.dirs" value="/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.121-0.b13.el6_8.x86_64/jre/lib/ext:/usr/java/packages/lib/ext"/>
+    <property name="sun.boot.class.path" value="/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.121-0.b13.el6_8.x86_64/jre/lib/resources.jar:/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.121-0.b13.el6_8.x86_64/jre/lib/rt.jar:/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.121-0.b13.el6_8.x86_64/jre/lib/sunrsasign.jar:/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.121-0.b13.el6_8.x86_64/jre/lib/jsse.jar:/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.121-0.b13.el6_8.x86_64/jre/lib/jce.jar:/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.121-0.b13.el6_8.x86_64/jre/lib/charsets.jar:/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.121-0.b13.el6_8.x86_64/jre/lib/jfr.jar:/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.121-0.b13.el6_8.x86_64/jre/classes"/>
+    <property name="java.vendor" value="Oracle Corporation"/>
+    <property name="maven.home" value="/opt/rh/rh-maven33/root/usr/share/maven"/>
+    <property name="file.separator" value="/"/>
+    <property name="java.vendor.url.bug" value="http://bugreport.sun.com/bugreport/"/>
+    <property name="sun.cpu.endian" value="little"/>
+    <property name="sun.io.unicode.encoding" value="UnicodeLittle"/>
+    <property name="sun.cpu.isalist" value=""/>
+  </properties>
+  <testcase name="katse0" classname="ingomagi.RakendusTest" time="0.153"/>
+  <testcase name="katse1" classname="ingomagi.RakendusTest" time="0.001"/>
+  <testcase name="katse2" classname="ingomagi.RakendusTest" time="0.004"/>
+  <testcase name="katse3" classname="ingomagi.RakendusTest" time="0.002"/>
+</testsuite>

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