Skip to content

Kodutöö #44

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Toolsten wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Kodutöö #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 34 additions & 0 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
<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>app</groupId>
<artifactId>app</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>
<version>1.5.2.RELEASE</version>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
</project>
20 changes: 20 additions & 0 deletions src/main/java/sten/Rakendus.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
package sten;

import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.web.bind.annotation.*;

@SpringBootApplication
@RestController
public class Rakendus{

@RequestMapping("/SilindriRuumala")
public String SilindriRuumala(double k6rgus, double raadius) {
Silinder s1 = new Silinder(raadius, k6rgus);
return "Pyramiidi ruumala on " + s1.silindriRuumala();
}

public static void main(String[] arg) {
SpringApplication.run(Rakendus.class, arg);
}
}
17 changes: 17 additions & 0 deletions src/main/java/sten/Silinder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
package sten;

public class Silinder extends SilindriRuumala {
double r;
public Silinder(double raadius, double k6rgus) {
super(k6rgus);
r=raadius;


}

@Override
public double Ringipindala(){
return Math.pow(r, 2) ;
}

}
13 changes: 13 additions & 0 deletions src/main/java/sten/SilindriRuumala.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
package sten;

public abstract class SilindriRuumala {
double h;
public SilindriRuumala(double k6rgus) {
h=k6rgus;
}

public abstract double Ringipindala();
public double silindriRuumala() {
return 3.14*h*Ringipindala();
}
}
18 changes: 18 additions & 0 deletions src/test/java/sten/SilindriTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
package sten;

import org.junit.*;
import static org.junit.Assert.*;

public class SilindriTest {

Silinder s1=new Silinder(4, 6);
@Test
public void RingiPindala() {
assertEquals(16, s1.Ringipindala(), 1);
}

@Test
public void ruumala() {
assertEquals(301.44, s1.silindriRuumala(), 1);
}
}
Binary file added target/app-1.jar
View file
Open in desktop
Binary file not shown.
Binary file added target/app-1.jar.original
View file
Open in desktop
Binary file not shown.
Binary file added target/classes/sten/Rakendus.class
View file
Open in desktop
Binary file not shown.
Binary file added target/classes/sten/Silinder.class
View file
Open in desktop
Binary file not shown.
Binary file added target/classes/sten/SilindriRuumala.class
View file
Open in desktop
Binary file not shown.
5 changes: 5 additions & 0 deletions target/maven-archiver/pom.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#Generated by Apache Maven
#Thu Apr 27 22:40:36 EEST 2017
version=1
groupId=app
artifactId=app
3 changes: 3 additions & 0 deletions target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
sten/Rakendus.class
sten/Silinder.class
sten/SilindriRuumala.class
3 changes: 3 additions & 0 deletions target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
/home/stentool/public_html/Kodutööd/T09/t09tervikveeb/src/main/java/sten/SilindriRuumala.java
/home/stentool/public_html/Kodutööd/T09/t09tervikveeb/src/main/java/sten/Silinder.java
/home/stentool/public_html/Kodutööd/T09/t09tervikveeb/src/main/java/sten/Rakendus.java
1 change: 1 addition & 0 deletions target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
sten/SilindriTest.class
1 change: 1 addition & 0 deletions target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/home/kirke/public_html/JAVA/t09tervikveeb/src/test/java/kirke/KujundiTest.java
62 changes: 62 additions & 0 deletions target/surefire-reports/TEST-sten.SilindriTest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
<?xml version="1.0" encoding="UTF-8"?>
<testsuite name="sten.SilindriTest" time="0.001" tests="2" 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/stentool/public_html/Kodutööd/T09/t09tervikveeb"/>
<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/stentool/public_html/Kodutööd/T09/t09tervikveeb"/>
<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/stentool"/>
<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="stentool"/>
<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="RingiPindala" classname="sten.SilindriTest" time="0.001"/>
<testcase name="ruumala" classname="sten.SilindriTest" time="0"/>
</testsuite>
4 changes: 4 additions & 0 deletions target/surefire-reports/sten.SilindriTest.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
-------------------------------------------------------------------------------
Test set: sten.SilindriTest
-------------------------------------------------------------------------------
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.008 sec - in sten.SilindriTest
Binary file added target/test-classes/sten/SilindriTest.class
View file
Open in desktop
Binary file not shown.