Upgraded to Spring Boot 2.0.0.RELEASE

Author: Rajeev Kumar Singh

jpa-composite-primary-key-demo/pom.xml

@@ -14,7 +14,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>1.5.8.RELEASE</version>
+		<version>2.0.0.RELEASE</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 

jpa-composite-primary-key-demo/src/main/java/com/example/jpa/JpaCompositePrimaryKeyDemoApplication.java

@@ -32,7 +32,7 @@ public void run(String... args) throws Exception {
 		employeeRepository.save(employee);
 
 		// Retrieving an Employee Record with the composite primary key
-		employeeRepository.findOne(new EmployeeIdentity("E-123", "D-457"));
+		employeeRepository.findById(new EmployeeIdentity("E-123", "D-457"));
 
 		// Retrieving all the employees of a particular company
 		employeeRepository.findByEmployeeIdentityCompanyId("D-457");

jpa-composite-primary-key-demo/src/main/java/com/example/jpa/model/Employee.java

@@ -1,11 +1,11 @@
 package com.example.jpa.model;
 
 import org.hibernate.annotations.NaturalId;
-
 import javax.persistence.Column;
 import javax.persistence.EmbeddedId;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.validation.constraints.Email;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 
@@ -20,11 +20,13 @@ public class Employee {
     private EmployeeIdentity employeeIdentity;
 
     @NotNull
+    @Size(max = 60)
     private String name;
 
-    @NotNull
-    @Size(max = 100)
     @NaturalId
+    @NotNull
+    @Email
+    @Size(max = 60)
     private String email;
 
     @Size(max = 15)

jpa-composite-primary-key-demo/src/main/java/com/example/jpa/model/EmployeeIdentity.java

@@ -2,6 +2,7 @@
 
 import javax.persistence.Embeddable;
 import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
 import java.io.Serializable;
 
 /**
@@ -10,9 +11,11 @@
 @Embeddable
 public class EmployeeIdentity implements Serializable {
     @NotNull
+    @Size(max = 20)
     private String employeeId;
 
     @NotNull
+    @Size(max = 20)
     private String companyId;
 
     public EmployeeIdentity() {

jpa-composite-primary-key-demo/src/main/resources/application.properties

@@ -1,12 +1,12 @@
 # DATASOURCE (DataSourceAutoConfiguration & DataSourceProperties)
 spring.datasource.url=jdbc:mysql://localhost:3306/jpa_composite_pk_demo?useSSL=false
 spring.datasource.username=root
-spring.datasource.password=root
+spring.datasource.password=callicoder
 
 # Hibernate
 
 # The SQL dialect makes Hibernate generate better SQL for the chosen database
-spring.jpa.properties.hibernate.dialect = org.hibernate.dialect.MySQL5Dialect
+spring.jpa.properties.hibernate.dialect = org.hibernate.dialect.MySQL5InnoDBDialect
 
 # Hibernate ddl auto (create, create-drop, validate, update)
 spring.jpa.hibernate.ddl-auto = update

jpa-element-collection-demo/pom.xml

@@ -14,7 +14,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>1.5.8.RELEASE</version>
+		<version>2.0.0.RELEASE</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 

jpa-element-collection-demo/src/main/java/com/example/jpa/model/User.java

@@ -1,8 +1,7 @@
 package com.example.jpa.model;
 
-import org.hibernate.validator.constraints.Email;
-
 import javax.persistence.*;
+import javax.validation.constraints.Email;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 import java.util.HashSet;
@@ -15,7 +14,7 @@
 @Table(name = "users")
 public class User {
     @Id
-    @GeneratedValue(strategy = GenerationType.AUTO)
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
 
     @NotNull

jpa-element-collection-demo/src/main/resources/application.properties

@@ -1,7 +1,7 @@
 # DATASOURCE (DataSourceAutoConfiguration & DataSourceProperties)
 spring.datasource.url=jdbc:mysql://localhost:3306/jpa_element_collection_demo?useSSL=false
 spring.datasource.username=root
-spring.datasource.password=root
+spring.datasource.password=callicoder
 
 # Hibernate
 

jpa-embeddable-demo/pom.xml

@@ -14,7 +14,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>1.5.8.RELEASE</version>
+		<version>2.0.0.RELEASE</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 

jpa-embeddable-demo/src/main/java/com/example/jpa/model/User.java

@@ -12,7 +12,7 @@
 @Table(name = "users")
 public class User {
     @Id
-    @GeneratedValue(strategy = GenerationType.AUTO)
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
 
     @Embedded