endOfUpgradingToSpringBoot2

in28minutes · Aug 3, 2017 · e1fcbe1 · e1fcbe1
1 parent 55d3d97
commit e1fcbe1
Show file tree

Hide file tree

Showing 5 changed files with 836 additions and 8 deletions.
diff --git a/02.Spring-Boot-Web-Application/pom.xml b/02.Spring-Boot-Web-Application/pom.xml
@@ -14,7 +14,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>1.4.3.RELEASE</version>
+		<version>2.0.0.M3</version>
 		<relativePath /> <!-- lookup parent from repository -->
 	</parent>
 
@@ -34,7 +34,7 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-data-jpa</artifactId>
 		</dependency>
-		
+
 		<dependency>
 			<groupId>com.h2database</groupId>
 			<artifactId>h2</artifactId>
@@ -56,13 +56,13 @@
 			<artifactId>bootstrap</artifactId>
 			<version>3.3.6</version>
 		</dependency>
-		
+
 		<dependency>
 			<groupId>org.webjars</groupId>
 			<artifactId>bootstrap-datepicker</artifactId>
 			<version>1.0.1</version>
 		</dependency>
-		
+
 		<dependency>
 			<groupId>org.webjars</groupId>
 			<artifactId>jquery</artifactId>
@@ -97,4 +97,20 @@
 		</plugins>
 	</build>
 
-</project>
+	<repositories>
+		<repository>
+			<id>spring-milestones</id>
+			<name>Spring Milestones</name>
+			<url>https://repo.spring.io/milestones</url>
+		</repository>
+	</repositories>
+
+	<pluginRepositories>
+		<pluginRepository>
+			<id>spring-milestones</id>
+			<name>Spring Milestones</name>
+			<url>https://repo.spring.io/milestones</url>
+		</pluginRepository>
+	</pluginRepositories>
+
+</project>
diff --git a/...b-Application/src/main/java/com/in28minutes/springboot/web/controller/TodoController.java b/...b-Application/src/main/java/com/in28minutes/springboot/web/controller/TodoController.java
@@ -66,14 +66,14 @@ public String deleteTodo(@RequestParam int id) {
 
 		//if(id==1)
 			//throw new RuntimeException("Something went wrong");
-		repository.delete(id);
+		repository.deleteById(id);
 		//service.deleteTodo(id);
 		return "redirect:/list-todos";
 	}
 
 	@RequestMapping(value = "/update-todo", method = RequestMethod.GET)
 	public String showUpdateTodoPage(@RequestParam int id, ModelMap model) {
-		Todo todo = repository.findOne(id);
+		Todo todo = repository.findById(id).get();
 		//Todo todo = service.retrieveTodo(id);
 		model.put("todo", todo);
 		return "todo";

diff --git a/02.Spring-Boot-Web-Application/src/main/webapp/WEB-INF/jsp/todo.jsp b/02.Spring-Boot-Web-Application/src/main/webapp/WEB-INF/jsp/todo.jsp
@@ -1,7 +1,7 @@
 <%@ include file="common/header.jspf" %>
 <%@ include file="common/navigation.jspf" %>
 <div class="container">
-	<form:form method="post" commandName="todo">
+	<form:form method="post" modelAttribute="todo">
 		<form:hidden path="id" />
 		<fieldset class="form-group">
 			<form:label path="desc">Description</form:label>