Skip to content

t09tervikveeb #42

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
henrivajak wants to merge 1 commit into
base: master
Choose a base branch
from
Open

t09tervikveeb #42

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>henri</groupId>
<artifactId>henri</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>
14 changes: 14 additions & 0 deletions src/main/java/henri/pindala.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
}
}
11 changes: 11 additions & 0 deletions src/main/java/henri/proov.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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());

}
}
31 changes: 31 additions & 0 deletions src/main/java/henri/rakendus.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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);
}
}
7 changes: 7 additions & 0 deletions src/main/java/henri/ristkulik.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
package henri;
import java.util.*;

public abstract class ristkulik{
public double ristkulikuPindala(){return 0;}
public double ristkulikuUmbermoot(){return 0;}
}
16 changes: 16 additions & 0 deletions src/main/java/henri/umbermoot.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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);
}
}
31 changes: 31 additions & 0 deletions src/main/resources/public/arvutus.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
<!DOCTYPE HTML>
<html>
<head>
<script>
var yhendus=new XMLHttpRequest();
yhendus.onreadystatechange=andmedSaabusid;
function vajutus(){
var a1=document.getElementById("kast1").value;
var a2=document.getElementById("kast2").value;
yhendus.open("GET","/umbermoot?esimenekulg="+a1+"&teinekulg="+a2, true);
yhendus.send();
}


function andmedSaabusid(){
document.getElementById("vastus").innerHTML=yhendus.responseText;
}



</script>
</head>
<body>
<h1>Umbermoodu arvutamine</h1>
<input type="text" id="kast1" placeholder="a"/>
<input type="text" id="kast2" placeholder="b"/>
<input type="button" value="Arvuta" onclick="vajutus()"/>
<br><br>
<div id="vastus">Vastuse koht</div>
</body>
</html>
35 changes: 35 additions & 0 deletions src/main/resources/public/tervitus.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
<!DOCTYPE HTML>
<html>
<head>
<script>
var yhendus=new XMLHttpRequest();
yhendus.onreadystatechange=andmedSaabusid;
function vajutus(){
var a1=document.getElementById("kast1").value;
var a2=document.getElementById("kast2").value;
yhendus.open("GET","/pindala?esimenekulg="+a1+"&teinekulg="+a2, true);
yhendus.send();
}


function andmedSaabusid(){
document.getElementById("vastus").innerHTML=yhendus.responseText;
}



</script>
</head>
<body>
<h1>Ristkuliku pindala arvutamine</h1>
<br><br>
Sisesta uks kulg<br>
<input type="text" id="kast1" placeholder="a"/><br>
Sisesta teine kulg<br>
<input type="text" id="kast2" placeholder="b"/>
<br>
<input type="button" value="Arvuta" onclick="vajutus()"/>
<br><br>
<div id="vastus">Vastus: </div>
</body>
</html>
27 changes: 27 additions & 0 deletions src/test/java/henri/pindalaTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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);
}
}
Binary file added target/classes/henri/pindala.class
View file
Open in desktop
Binary file not shown.
Binary file added target/classes/henri/proov.class
View file
Open in desktop
Binary file not shown.
Binary file added target/classes/henri/rakendus.class
View file
Open in desktop
Binary file not shown.
Binary file added target/classes/henri/ristkulik.class
View file
Open in desktop
Binary file not shown.
Binary file added target/classes/henri/umbermoot.class
View file
Open in desktop
Binary file not shown.
31 changes: 31 additions & 0 deletions target/classes/public/arvutus.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
<!DOCTYPE HTML>
<html>
<head>
<script>
var yhendus=new XMLHttpRequest();
yhendus.onreadystatechange=andmedSaabusid;
function vajutus(){
var a1=document.getElementById("kast1").value;
var a2=document.getElementById("kast2").value;
yhendus.open("GET","/umbermoot?esimenekulg="+a1+"&teinekulg="+a2, true);
yhendus.send();
}


function andmedSaabusid(){
document.getElementById("vastus").innerHTML=yhendus.responseText;
}



</script>
</head>
<body>
<h1>Umbermoodu arvutamine</h1>
<input type="text" id="kast1" placeholder="a"/>
<input type="text" id="kast2" placeholder="b"/>
<input type="button" value="Arvuta" onclick="vajutus()"/>
<br><br>
<div id="vastus">Vastuse koht</div>
</body>
</html>
35 changes: 35 additions & 0 deletions target/classes/public/pindala.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
<!DOCTYPE HTML>
<html>
<head>
<script>
var yhendus=new XMLHttpRequest();
yhendus.onreadystatechange=andmedSaabusid;
function vajutus(){
var a1=document.getElementById("kast1").value;
var a2=document.getElementById("kast2").value;
yhendus.open("GET","/pindala?esimenekulg="+a1+"&teinekulg="+a2, true);
yhendus.send();
}


function andmedSaabusid(){
document.getElementById("vastus").innerHTML=yhendus.responseText;
}



</script>
</head>
<body>
<h1>Ristkuliku pindala arvutamine</h1>
<br><br>
Sisesta uks kulg<br>
<input type="text" id="kast1" placeholder="a"/><br>
Sisesta teine kulg<br>
<input type="text" id="kast2" placeholder="b"/>
<br>
<input type="button" value="Arvuta" onclick="vajutus()"/>
<br><br>
<div id="vastus">Vastus: </div>
</body>
</html>
35 changes: 35 additions & 0 deletions target/classes/public/tervitus.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
<!DOCTYPE HTML>
<html>
<head>
<script>
var yhendus=new XMLHttpRequest();
yhendus.onreadystatechange=andmedSaabusid;
function vajutus(){
var a1=document.getElementById("kast1").value;
var a2=document.getElementById("kast2").value;
yhendus.open("GET","/pindala?esimenekulg="+a1+"&teinekulg="+a2, true);
yhendus.send();
}


function andmedSaabusid(){
document.getElementById("vastus").innerHTML=yhendus.responseText;
}



</script>
</head>
<body>
<h1>Ristkuliku pindala arvutamine</h1>
<br><br>
Sisesta uks kulg<br>
<input type="text" id="kast1" placeholder="a"/><br>
Sisesta teine kulg<br>
<input type="text" id="kast2" placeholder="b"/>
<br>
<input type="button" value="Arvuta" onclick="vajutus()"/>
<br><br>
<div id="vastus">Vastus: </div>
</body>
</html>
31 changes: 31 additions & 0 deletions target/classes/public/umbermoot.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
<!DOCTYPE HTML>
<html>
<head>
<script>
var yhendus=new XMLHttpRequest();
yhendus.onreadystatechange=andmedSaabusid;
function vajutus(){
var a1=document.getElementById("kast1").value;
var a2=document.getElementById("kast2").value;
yhendus.open("GET","/umbermoot?2*(esimenekulg="+a1+"&teinekulg="+a2), true);
yhendus.send();
}


function andmedSaabusid(){
document.getElementById("vastus").innerHTML=yhendus.responseText;
}



</script>
</head>
<body>
<h1>Umbermoodu rvutamine</h1>
<input type="text" id="kast1" placeholder="a"/>
<input type="text" id="kast2" placeholder="b"/>
<input type="button" value="Arvuta" onclick="vajutus()"/>
<br><br>
<div id="vastus">Vastuse koht</div>
</body>
</html>
Binary file added target/henri-1.jar
View file
Open in desktop
Binary file not shown.
Binary file added target/henri-1.jar.original
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
#Mon May 29 18:17:10 EEST 2017
version=1
groupId=henri
artifactId=henri
5 changes: 5 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,5 @@
henri/umbermoot.class
henri/ristkulik.class
henri/pindala.class
henri/proov.class
henri/rakendus.class
5 changes: 5 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,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
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 @@
henri/pindalaTest.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/henrvaja/Java/t09tervikveeb/src/test/java/henri/pindalaTest.java
Loading