Updated Spring boot version to 2.0.0.RELEASE

Author: Rajeev Kumar Singh

polling-app-client/src/constants/index.js

@@ -1,4 +1,5 @@
 export const API_BASE_URL = 'http://localhost:5000';
+//export const API_BASE_URL = 'http://polls.callicoder.com';
 export const ACCESS_TOKEN = 'accessToken';
 
 export const POLL_LIST_SIZE = 30;

polling-app-server/pom.xml

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

polling-app-server/src/main/java/com/example/polls/config/AuditingConfig.java

@@ -9,6 +9,8 @@
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
 
+import java.util.Optional;
+
 @Configuration
 @EnableJpaAuditing
 public class AuditingConfig {
@@ -22,15 +24,17 @@ public AuditorAware<Long> auditorProvider() {
 class SpringSecurityAuditAwareImpl implements AuditorAware<Long> {
 
     @Override
-    public Long getCurrentAuditor() {
+    public Optional<Long> getCurrentAuditor() {
         Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
 
         if (authentication == null ||
                 !authentication.isAuthenticated() ||
                 authentication instanceof AnonymousAuthenticationToken) {
-            return null;
+            return Optional.empty();
         }
 
-        return ((UserPrincipal) authentication.getPrincipal()).getId();
+        UserPrincipal userPrincipal = (UserPrincipal) authentication.getPrincipal();
+
+        return Optional.ofNullable(userPrincipal.getId());
     }
 }

polling-app-server/src/main/java/com/example/polls/model/Choice.java

@@ -1,6 +1,7 @@
 package com.example.polls.model;
 
 import javax.persistence.*;
+import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 import java.util.Objects;
@@ -16,7 +17,7 @@ public class Choice {
     @GeneratedValue(strategy = GenerationType.AUTO)
     private Long id;
 
-    @NotNull
+    @NotBlank
     @Size(max = 40)
     private String text;
 

polling-app-server/src/main/java/com/example/polls/model/Poll.java

@@ -6,6 +6,7 @@
 import org.hibernate.annotations.FetchMode;
 
 import javax.persistence.*;
+import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 import java.time.Instant;
@@ -22,7 +23,7 @@ public class Poll extends UserDateAudit {
     @GeneratedValue(strategy = GenerationType.AUTO)
     private Long id;
 
-    @NotNull
+    @NotBlank
     @Size(max = 140)
     private String question;
 

polling-app-server/src/main/java/com/example/polls/model/User.java

@@ -3,8 +3,9 @@
 import com.example.polls.model.audit.DateAudit;
 import org.hibernate.annotations.NaturalId;
 import javax.persistence.*;
+import javax.validation.constraints.Email;
+import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Pattern;
 import javax.validation.constraints.Size;
 import java.util.HashSet;
 import java.util.Set;
@@ -27,20 +28,21 @@ public class User extends DateAudit {
     @GeneratedValue(strategy = GenerationType.AUTO)
     private Long id;
 
-    @NotNull
+    @NotBlank
     @Size(max = 40)
     private String name;
 
-    @NotNull
+    @NotBlank
     @Size(max = 15)
     private String username;
 
     @NaturalId
+    @NotBlank
     @Size(max = 40)
-    @Pattern(regexp = "[^@ ]+@[^@ ]+\\.[^@ ]+")
+    @Email
     private String email;
 
-    @NotNull
+    @NotBlank
     @Size(max = 100)
     private String password;
 

polling-app-server/src/main/java/com/example/polls/payload/ChoiceRequest.java

@@ -1,11 +1,11 @@
 package com.example.polls.payload;
 
-import javax.validation.constraints.NotNull;
+import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Size;
 
 public class ChoiceRequest {
-    @NotNull
-    @Size(min = 1, max = 40)
+    @NotBlank
+    @Size(max = 40)
     private String text;
 
     public String getText() {

polling-app-server/src/main/java/com/example/polls/payload/LoginRequest.java

@@ -1,15 +1,15 @@
 package com.example.polls.payload;
 
-import javax.validation.constraints.NotNull;
+import javax.validation.constraints.NotBlank;
 
 /**
  * Created by rajeevkumarsingh on 02/08/17.
  */
 public class LoginRequest {
-    @NotNull
+    @NotBlank
     private String usernameOrEmail;
 
-    @NotNull
+    @NotBlank
     private String password;
 
     public String getUsernameOrEmail() {

polling-app-server/src/main/java/com/example/polls/payload/PollRequest.java

@@ -1,13 +1,14 @@
 package com.example.polls.payload;
 
 import javax.validation.Valid;
+import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 import java.util.List;
 
 public class PollRequest {
-    @NotNull
-    @Size(min = 1, max = 140)
+    @NotBlank
+    @Size(max = 140)
     private String question;
 
     @NotNull

polling-app-server/src/main/java/com/example/polls/payload/SignUpRequest.java

@@ -1,28 +1,26 @@
 package com.example.polls.payload;
 
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Pattern;
-import javax.validation.constraints.Size;
+import javax.validation.constraints.*;
 
 /**
  * Created by rajeevkumarsingh on 02/08/17.
  */
 
 public class SignUpRequest {
-    @NotNull
+    @NotBlank
     @Size(min = 4, max = 40)
     private String name;
 
-    @NotNull
+    @NotBlank
     @Size(min = 3, max = 15)
     private String username;
 
-    @NotNull
+    @NotBlank
     @Size(max = 40)
-    @Pattern(regexp = "[^@ ]+@[^@ ]+\\.[^@ ]+")
+    @Email
     private String email;
 
-    @NotNull
+    @NotBlank
     @Size(min = 6, max = 20)
     private String password;
 

polling-app-server/src/main/resources/application.properties

@@ -22,3 +22,6 @@ spring.jackson.time-zone= UTC
 ## App Properties
 app.jwtSecret= JWTSuperSecretKey
 app.jwtExpirationInMs = 604800000
+
+## Spring Profiles
+# spring.profiles.active=prod