Spring Boot 2.3.0 Update

Author: naturalprogrammer

lemon-demo-jpa/pom.xml

@@ -14,7 +14,7 @@
 	<parent>
 		<groupId>com.naturalprogrammer</groupId>
 		<artifactId>spring-lemon</artifactId>
-		<version>1.0.0.RC3</version>
+		<version>1.0.0.RC4</version>
 	</parent>
 
 	<dependencies>

lemon-demo-jpa/src/main/java/com/naturalprogrammer/spring/lemondemo/MySecurityConfig.java

@@ -1,12 +1,11 @@
 package com.naturalprogrammer.spring.lemondemo;
 
+import com.naturalprogrammer.spring.lemon.security.LemonJpaSecurityConfig;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.stereotype.Component;
 
-import com.naturalprogrammer.spring.lemon.security.LemonJpaSecurityConfig;
-
 @Component
 public class MySecurityConfig extends LemonJpaSecurityConfig {
 

lemon-demo-jpa/src/main/java/com/naturalprogrammer/spring/lemondemo/controllers/MyController.java

@@ -1,10 +1,9 @@
 package com.naturalprogrammer.spring.lemondemo.controllers;
 
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
 import com.naturalprogrammer.spring.lemon.LemonController;
 import com.naturalprogrammer.spring.lemondemo.entities.User;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 @RestController
 @RequestMapping(MyController.BASE_URI)

lemon-demo-jpa/src/main/java/com/naturalprogrammer/spring/lemondemo/entities/User.java

@@ -1,22 +1,20 @@
 package com.naturalprogrammer.spring.lemondemo.entities;
 
-import java.io.Serializable;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Size;
-
 import com.fasterxml.jackson.annotation.JsonView;
 import com.naturalprogrammer.spring.lemon.commons.util.UserUtils;
 import com.naturalprogrammer.spring.lemon.domain.AbstractUser;
-
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 import lombok.ToString;
 
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Size;
+import java.io.Serializable;
+
 @Entity
 @Table(name="usr")
 @Getter @Setter @NoArgsConstructor
@@ -43,7 +41,7 @@ public User(String email, String password, String name) {
 	@JsonView(UserUtils.SignupInput.class)
 	@NotBlank(message = "{blank.name}", groups = {UserUtils.SignUpValidation.class, UserUtils.UpdateValidation.class})
     @Size(min=NAME_MIN, max=NAME_MAX, groups = {UserUtils.SignUpValidation.class, UserUtils.UpdateValidation.class})
-    @Column(nullable = false, length = NAME_MAX)
+    @Column(nullable = false, length = NAME_MAX) // Note: don't use JPA annotations on getter: https://github.com/naturalprogrammer/spring-lemon/issues/9
     private String name;
 
 	@Override

lemon-demo-jpa/src/main/java/com/naturalprogrammer/spring/lemondemo/services/MyService.java

@@ -1,14 +1,13 @@
 package com.naturalprogrammer.spring.lemondemo.services;
 
-import java.util.Map;
-
-import org.springframework.security.oauth2.core.oidc.StandardClaimNames;
-import org.springframework.stereotype.Service;
-
 import com.naturalprogrammer.spring.lemon.LemonService;
 import com.naturalprogrammer.spring.lemon.commons.security.UserDto;
 import com.naturalprogrammer.spring.lemon.commonsjpa.LecjUtils;
 import com.naturalprogrammer.spring.lemondemo.entities.User;
+import org.springframework.security.oauth2.core.oidc.StandardClaimNames;
+import org.springframework.stereotype.Service;
+
+import java.util.Map;
 
 @Service
 public class MyService extends LemonService<User, Long> {

lemon-demo-jpa/src/test/java/com/naturalprogrammer/spring/lemondemo/AbstractMvcTests.java

@@ -1,13 +1,8 @@
 package com.naturalprogrammer.spring.lemondemo;
 
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
-
-import java.util.HashMap;
-import java.util.Map;
-
+import com.naturalprogrammer.spring.lemon.commons.mail.MailSender;
+import com.naturalprogrammer.spring.lemon.commons.util.LecUtils;
+import com.naturalprogrammer.spring.lemondemo.repositories.UserRepository;
 import org.junit.Before;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -23,9 +18,13 @@
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.MvcResult;
 
-import com.naturalprogrammer.spring.lemon.commons.mail.MailSender;
-import com.naturalprogrammer.spring.lemon.commons.util.LecUtils;
-import com.naturalprogrammer.spring.lemondemo.repositories.UserRepository;
+import java.util.HashMap;
+import java.util.Map;
+
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest({

lemon-demo-jpa/src/test/java/com/naturalprogrammer/spring/lemondemo/BasicMvcTests.java

@@ -1,16 +1,13 @@
 package com.naturalprogrammer.spring.lemondemo;
 
-import static org.hamcrest.Matchers.containsString;
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.header;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
-
+import com.naturalprogrammer.spring.lemon.commons.util.LecUtils;
 import org.junit.Test;
 import org.springframework.http.HttpHeaders;
 import org.springframework.test.context.jdbc.Sql;
 
-import com.naturalprogrammer.spring.lemon.commons.util.LecUtils;
+import static org.hamcrest.Matchers.containsString;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
 
 @Sql({"/test-data/initialize.sql", "/test-data/finalize.sql", })
 public class BasicMvcTests extends AbstractMvcTests {

lemon-demo-jpa/src/test/java/com/naturalprogrammer/spring/lemondemo/ChangeEmailMvcTests.java

@@ -1,21 +1,18 @@
 package com.naturalprogrammer.spring.lemondemo;
 
-import static org.hamcrest.Matchers.containsString;
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.header;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
-
+import com.naturalprogrammer.spring.lemon.commons.security.GreenTokenService;
+import com.naturalprogrammer.spring.lemon.commons.util.LecUtils;
+import com.naturalprogrammer.spring.lemondemo.entities.User;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
 
-import com.naturalprogrammer.spring.lemon.commons.security.GreenTokenService;
-import com.naturalprogrammer.spring.lemon.commons.util.LecUtils;
-import com.naturalprogrammer.spring.lemondemo.entities.User;
+import static org.hamcrest.Matchers.containsString;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
 
 public class ChangeEmailMvcTests extends AbstractMvcTests {
 

lemon-demo-jpa/src/test/java/com/naturalprogrammer/spring/lemondemo/ChangePasswordMvcTests.java

@@ -1,20 +1,15 @@
 package com.naturalprogrammer.spring.lemondemo;
 
-import static org.hamcrest.Matchers.containsString;
-import static org.hamcrest.Matchers.hasItems;
-import static org.hamcrest.Matchers.hasSize;
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.header;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
-
+import com.naturalprogrammer.spring.lemon.commons.domain.ChangePasswordForm;
+import com.naturalprogrammer.spring.lemon.commons.util.LecUtils;
 import org.junit.Test;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
 import org.springframework.test.context.jdbc.Sql;
 
-import com.naturalprogrammer.spring.lemon.commons.domain.ChangePasswordForm;
-import com.naturalprogrammer.spring.lemon.commons.util.LecUtils;
+import static org.hamcrest.Matchers.*;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
 
 @Sql({"/test-data/initialize.sql", "/test-data/finalize.sql"})
 public class ChangePasswordMvcTests extends AbstractMvcTests {

lemon-demo-jpa/src/test/java/com/naturalprogrammer/spring/lemondemo/FetchNewTokenMvcTests.java

@@ -1,17 +1,16 @@
 package com.naturalprogrammer.spring.lemondemo;
 
-import static org.hamcrest.Matchers.containsString;
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
-
+import com.naturalprogrammer.spring.lemon.commons.util.LecUtils;
 import org.junit.Test;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
 import org.springframework.test.web.servlet.MvcResult;
 
-import com.naturalprogrammer.spring.lemon.commons.util.LecUtils;
+import static org.hamcrest.Matchers.containsString;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
 public class FetchNewTokenMvcTests extends AbstractMvcTests {