Rait Keernik

pom.xml

@@ -0,0 +1,42 @@
+<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>Rait</groupId>
+  <artifactId>t06</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>
+	    <dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-data-jpa</artifactId>
+		</dependency>
+	    <dependency>
+			<groupId>mysql</groupId>
+			<artifactId>mysql-connector-java</artifactId>
+		</dependency>
+    </dependencies>  
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+</project>

src/main/java/Rait/Filmid.java

@@ -0,0 +1,15 @@
+package Rait;
+
+import javax.persistence.*;
+
+@Entity
+@Table(name="filmid")
+
+public class Filmid {
+	@Id
+	public String nimi;
+	public int aasta;
+	public String seis;
+	public int pikkus;
+
+}

src/main/java/Rait/FilmidDao.java

@@ -0,0 +1,7 @@
+package Rait;
+
+import javax.transaction.Transactional;
+import org.springframework.data.repository.CrudRepository;
+
+@Transactional
+public interface FilmidDao extends CrudRepository<Filmid, String> {}

src/main/java/Rait/Rakendus.java

@@ -0,0 +1,98 @@
+package Rait;
+
+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;
+import org.springframework.beans.factory.annotation.Autowired;
+
+@RestController
+@SpringBootApplication
+public class Rakendus {
+	@Autowired
+    private FilmidDao filmid;
+
+	@RequestMapping("/algus")
+    String tervitusfunktsioon() {
+        return "Ahoi! t06veebirakendus2";
+    }
+
+	@RequestMapping("/loetelu")
+	public Iterable<Filmid> loetelu(){
+		return filmid.findAll();
+	}
+
+	@RequestMapping("/vaadatud")
+	String vaadatud(){
+		StringBuffer sb=new StringBuffer();
+		for(Filmid film: filmid.findAll()){
+			if(film.seis.equals("vaadatud")){
+				sb.append(film.nimi + "(" + film.aasta + ")" + "<br>");
+			}
+		}
+		return "Vaadatud filmid: " + "<br>" + sb.toString();
+	}
+
+	@RequestMapping("/vaatamata")
+	String vaatamata(){
+		StringBuffer sb=new StringBuffer();
+		for(Filmid film: filmid.findAll()){
+			if(film.seis.equals("vaatamata")){
+				sb.append(film.nimi + "(" + film.aasta + ")" + "<br>");
+			}
+		}
+		return "Vaatamata filmid: " + "<br>" + sb.toString();
+	}
+
+	@RequestMapping("/pooleli")
+	String pooleli(){
+		StringBuffer sb=new StringBuffer();
+		for(Filmid film: filmid.findAll()){
+			if(film.seis.equals("pooleli")){
+				sb.append(film.nimi + "(" + film.aasta + ")" + "<br>");
+			}
+		}
+		return "Pooleliolevad filmid: " + "<br>" + sb.toString();
+	}
+
+	@RequestMapping("/lisa")
+	String lisa(String nimi, int aasta, String seis, int pikkus){
+		Filmid film=new Filmid();
+
+		if(nimi==null || aasta==0 || seis==null || pikkus==0){return "Andmed puudulikud!";}
+		else{
+			film.nimi=nimi;
+			film.aasta=aasta;
+			film.seis=seis;
+			film.pikkus=pikkus;
+			filmid.save(film);
+			return "Lisatud: "+nimi+"("+aasta+") "+pikkus+" min - "+seis;
+		}
+	}
+
+	@RequestMapping("/muuda")
+	String muuda(String nimi, String seis){
+
+		if(nimi==null || "".equals(nimi)){return "Filmi nimi sisestamata!";}
+		if("vaatamata".equals(seis) || "vaadatud".equals(seis) || "pooleli".equals(seis) ){
+			Filmid film=filmid.findOne(nimi);
+
+			if(film==null){return "Sellist filmi ei ole andmebaasis!";}
+			else{
+				film.seis=seis;
+				filmid.save(film);
+				return "Muudetud: "+film.nimi+"("+film.aasta+") "+film.pikkus+" min - "+film.seis;
+			}
+		}else{return "Ebasobiv või puuduv seis!";}
+	}
+
+    public static void main(String[] args) {
+		System.getProperties().put("server.port", 4218);
+        SpringApplication.run(Rakendus.class, args);
+    }
+}
+
+
+
+
+

src/main/resources/application.properties

@@ -0,0 +1,4 @@
+spring.datasource.url = jdbc:mysql://localhost/if16_raitkeer
+
+spring.datasource.username = if16
+spring.datasource.password = ifikad16

src/test/java/Rait/RakenduseTest.java

@@ -0,0 +1,81 @@
+package Rait;
+
+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 RakenduseTest{
+
+	@Autowired
+	private TestRestTemplate restTemplate;
+
+	@Test
+	public void katse1(){
+		assertEquals(3, 2+1);
+	}
+
+	@Test
+	public void muutmine1(){
+		String vastus=this.restTemplate.getForObject(
+		  "/muuda", String.class);
+		assertEquals("Filmi nimi sisestamata!", vastus);
+	}
+
+	@Test
+	public void muutmine2(){
+		String vastus=this.restTemplate.getForObject(
+		  "/muuda?nimi=Split", String.class);
+		assertEquals("Ebasobiv või puuduv seis!", vastus);
+	}
+
+	@Test
+	public void muutmine3(){
+		String vastus=this.restTemplate.getForObject(
+		  "/muuda?nimi=Thor&seis=vaatamata", String.class);
+		assertEquals("Sellist filmi ei ole andmebaasis!", vastus);
+	}
+
+	@Test
+	public void muutmine4(){
+		String vastus=this.restTemplate.getForObject(
+		  "/muuda?nimi=Split&seis=ei mäleta", String.class);
+		assertEquals("Ebasobiv või puuduv seis!", vastus);
+	}
+
+	@Test
+	public void muutmine5(){
+		String vastus=this.restTemplate.getForObject(
+		  "/muuda?nimi=Split&seis=pooleli", String.class);
+		assertEquals("Muudetud: Split(2016) 117 min - pooleli", vastus);
+	}
+
+}
+
+/*
+Results :
+
+Tests run: 6, Failures: 0, Errors: 0, Skipped: 0
+
+[INFO]
+[INFO] --- maven-jar-plugin:2.6:jar (default-jar) @ t06 ---
+[INFO] Building jar: /home/raitkeer/public_html/java/t06veebirakendus2/target/t06-1.jar
+[INFO]
+[INFO] --- spring-boot-maven-plugin:1.5.2.RELEASE:repackage (default) @ t06 ---
+[INFO] ------------------------------------------------------------------------
+[INFO] BUILD SUCCESS
+[INFO] ------------------------------------------------------------------------
+[INFO] Total time: 8.755 s
+[INFO] Finished at: 2017-05-23T17:31:58+03:00
+[INFO] Final Memory: 32M/250M
+[INFO] ------------------------------------------------------------------------
+[raitkeer@greeny t06veebirakendus2]$
+*/
+

tabel.txt

@@ -0,0 +1,16 @@
+CREATE TABLE filmid(
+  nr INT NOT NULL AUTO_INCREMENT PRIMARY KEY,
+  nimi VARCHAR(80),
+  aasta INT,
+  seis ENUM ('vaadatud', 'pooleli', 'vaatamata'),
+  pikkus INT
+);
+
+
+INSERT INTO filmid VALUES (DEFAULT, 'Logan', 2017, 'vaatamata', 137);
+INSERT INTO filmid VALUES (DEFAULT, 'Guardians of the Galaxy Vol. 2', 2017, 'vaatamata', 136);
+INSERT INTO filmid VALUES (DEFAULT, 'John Wick: Chapter 2 ', 2017, 'vaatamata', 122);
+INSERT INTO filmid VALUES (DEFAULT, 'Split', 2016, 'vaadatud', 117);
+INSERT INTO filmid VALUES (DEFAULT, 'Rogue One', 2016, 'vaadatud', 133);
+INSERT INTO filmid VALUES (DEFAULT, 'Interstellar', 2014, 'vaadatud', 169);
+INSERT INTO filmid VALUES (DEFAULT, 'Snowden', 2016, 'pooleli', 134);

target/classes/application.properties

@@ -0,0 +1,4 @@
+spring.datasource.url = jdbc:mysql://localhost/if16_raitkeer
+
+spring.datasource.username = if16
+spring.datasource.password = ifikad16

target/maven-archiver/pom.properties

@@ -0,0 +1,5 @@
+#Generated by Maven
+#Tue May 23 13:51:33 EEST 2017
+version=1
+groupId=Rait
+artifactId=t06

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

@@ -0,0 +1,3 @@
+Rait/FilmidDao.class
+Rait/Rakendus.class
+Rait/Filmid.class

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

@@ -0,0 +1,3 @@
+/home/raitkeer/public_html/java/t06veebirakendus2/src/main/java/Rait/FilmidDao.java
+/home/raitkeer/public_html/java/t06veebirakendus2/src/main/java/Rait/Filmid.java
+/home/raitkeer/public_html/java/t06veebirakendus2/src/main/java/Rait/Rakendus.java

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

@@ -0,0 +1 @@
+Rait/RakenduseTest.class

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

@@ -0,0 +1 @@
+/home/raitkeer/public_html/java/t06veebirakendus2/src/test/java/Rait/RakenduseTest.java

target/surefire-reports/Rait.RakenduseTest.txt

@@ -0,0 +1,4 @@
+-------------------------------------------------------------------------------
+Test set: Rait.RakenduseTest
+-------------------------------------------------------------------------------
+Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 5.26 sec - in Rait.RakenduseTest

target/surefire-reports/TEST-Rait.RakenduseTest.xml

@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testsuite name="Rait.RakenduseTest" time="0.336" tests="6" 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/raitkeer/public_html/java/t06veebirakendus2"/>
+    <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/raitkeer/public_html/java/t06veebirakendus2"/>
+    <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/raitkeer"/>
+    <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="raitkeer"/>
+    <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="muutmine1" classname="Rait.RakenduseTest" time="0.214"/>
+  <testcase name="muutmine2" classname="Rait.RakenduseTest" time="0.019"/>
+  <testcase name="muutmine3" classname="Rait.RakenduseTest" time="0.065"/>
+  <testcase name="muutmine4" classname="Rait.RakenduseTest" time="0.003"/>
+  <testcase name="muutmine5" classname="Rait.RakenduseTest" time="0.034"/>
+  <testcase name="katse1" classname="Rait.RakenduseTest" time="0.001"/>
+</testsuite>