09tervikveeb - KK

pom.xml

@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+	<groupId>baas</groupId>
+	<artifactId>baas</artifactId>
+	<version>1</version>
+	<packaging>jar</packaging>
+
+	<name>kriskand</name>
+	<description>Demo project for Spring Boot</description>
+
+	<parent>
+		<groupId>org.springframework.boot</groupId>
+		<artifactId>spring-boot-starter-parent</artifactId>
+		<version>1.5.2.RELEASE</version>
+		<relativePath/> <!-- lookup parent from repository -->
+	</parent>
+
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+		<java.version>1.8</java.version>
+	</properties>
+
+	<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>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.springframework.boot</groupId>
+				<artifactId>spring-boot-maven-plugin</artifactId>
+			</plugin>
+		</plugins>
+	</build>
+
+
+</project>

src/main/java/baas/Koonus.java

@@ -0,0 +1,21 @@
+package baas;
+
+public class Koonus extends Ring{
+
+	double korgus;
+	double radius;
+
+	public Koonus(double korgus, double radius){
+
+		super(radius);
+		this.korgus = korgus;
+
+	}
+
+	public double kujundiRuumala(){
+
+		return kujundiPindala()/3 * korgus;
+
+	}
+
+}

src/main/java/baas/Kujundid.java

@@ -0,0 +1,11 @@
+package baas;
+
+import java.util.*;
+
+public abstract class Kujundid{
+
+	public double kujundiPindala(){return 0;}
+	public double kujundiUmbermoot(){return 0;}
+	public double kujundiRuumala(){return 0;}
+
+}

src/main/java/baas/Rakendus.java

@@ -0,0 +1,38 @@
+package baas;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.web.bind.annotation.*;
+
+@SpringBootApplication
+@RestController
+
+public class Rakendus{
+
+  @RequestMapping("/ringipindala")
+  public String ring(double radius){
+    Kujundid r1 = new Ring(radius);
+    return "Ringi pindala on "+ r1.kujundiPindala();
+
+  }
+
+  @RequestMapping("/koonus")
+  public String ring(double radius, double height){
+    Koonus s1 = new Koonus(radius, height);
+    return "Koonuse ruumala on "+ s1.kujundiPindala();
+
+  }
+
+
+  public static void main(String[] arg){
+	System.getProperties().put("server.port", 1719);
+    SpringApplication.run(Rakendus.class, arg);
+  }
+}
+
+
+/*
+scl enable rh-maven33 bash
+mvn package
+java -jar target/baas-1.jar
+*/

src/main/java/baas/Ring.java

@@ -0,0 +1,27 @@
+package baas;
+
+public class Ring extends Kujundid{
+
+	double radius;
+
+	public Ring(double radius){
+
+		this.radius = radius;
+
+	}
+
+
+	@Override
+	public double kujundiPindala(){
+
+		return Math.PI * radius * radius;
+
+	}
+
+	@Override
+	public double kujundiUmbermoot(){
+
+		return 2 * Math.PI * radius;
+
+	}
+}

src/test/java/baas/RingiTest.java

@@ -0,0 +1,26 @@
+package baas;
+
+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 RingiTest{
+    @Autowired
+    private TestRestTemplate restTemplate;
+
+    @Test
+    public void perimeter(){
+        String answer = this.restTemplate.getForObject("/ringipindala?radius=4",String.class);
+
+        assertEquals("Ringi pindala on ",answer.substring(0, 17));
+        assertEquals(50.2, Double.parseDouble(answer.substring(17)),0.1);
+    }
+}

target/maven-archiver/pom.properties

@@ -0,0 +1,5 @@
+#Generated by Apache Maven
+#Mon May 29 21:04:10 EEST 2017
+version=1
+groupId=baas
+artifactId=baas

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

@@ -0,0 +1,4 @@
+baas/Kujundid.class
+baas/Rakendus.class
+baas/Ring.class
+baas/Koonus.class

target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -0,0 +1,5 @@
+/home/kriskand/public_html/Java/09tervik/src/main/java/baas/Kujundid.java
+/home/kriskand/public_html/Java/09tervik/src/main/java/baas/Kera.java
+/home/kriskand/public_html/Java/09tervik/src/main/java/baas/Ring.java
+/home/kriskand/public_html/Java/09tervik/src/main/java/baas/Rakendus.java
+/home/kriskand/public_html/Java/09tervik/src/main/java/baas/Silinder.java

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

@@ -0,0 +1 @@
+baas/RingiTest.class

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

@@ -0,0 +1 @@
+/home/kriskand/public_html/Java/09tervik/src/test/java/baas/RingiTest.java

target/surefire-reports/TEST-baas.RingiTest.xml

@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testsuite name="baas.RingiTest" time="0.189" tests="1" 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/kriskand/public_html/Java/09tervik"/>
+    <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/kriskand/public_html/Java/09tervik"/>
+    <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/kriskand"/>
+    <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="kriskand"/>
+    <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="perimeter" classname="baas.RingiTest" time="0.189"/>
+</testsuite>

target/surefire-reports/baas.RingiTest.txt

@@ -0,0 +1,4 @@
+-------------------------------------------------------------------------------
+Test set: baas.RingiTest
+-------------------------------------------------------------------------------
+Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 2.742 sec - in baas.RingiTest