Gradle version upgrade, updated few deps, changed the entity user to …

…right format, added few roles
surajcm · Jul 7, 2023 · f44fdd2 · f44fdd2
1 parent 3c0646c
commit f44fdd2
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 10 deletions.
diff --git a/build.gradle b/build.gradle
@@ -18,7 +18,7 @@ buildscript {
 plugins {
 	id 'java'
 	id 'idea'
-	id 'org.springframework.boot' version '3.1.0'
+	id 'org.springframework.boot' version '3.1.1'
 	id 'io.spring.dependency-management' version '1.1.0'
 	id 'net.ltgt.errorprone' version '3.1.0'
 	id 'com.github.spotbugs' version '5.0.14' apply false

diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
@@ -1,5 +1,5 @@
 dependencies {
-    errorprone("com.google.errorprone:error_prone_core:2.19.1")
+    errorprone("com.google.errorprone:error_prone_core:2.20.0")
     errorproneJavac("com.google.errorprone:javac:9+181-r4173-1")
 
     implementation("org.springframework.boot:spring-boot-starter-web")

diff --git a/gradle/staticCodeAnalysis.gradle b/gradle/staticCodeAnalysis.gradle
@@ -4,7 +4,7 @@ apply plugin: 'jacoco'
 //apply plugin: 'com.github.spotbugs'
 
 checkstyle {
-    toolVersion = '10.12.0'
+    toolVersion = '10.12.1'
     ignoreFailures = false
     maxWarnings = 0
     checkstyleMain {

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
@@ -130,10 +130,13 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.

diff --git a/src/main/java/com/quiz/darkhold/login/entity/User.java b/src/main/java/com/quiz/darkhold/login/entity/User.java
@@ -23,18 +23,19 @@ public class User implements Serializable {
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
 
-    @Column(name = "firstname")
+    @Column(name = "firstname", length = 64, nullable = false)
     private String firstName;
 
-    @Column(name = "lastname")
+    @Column(name = "lastname", length = 64, nullable = false)
     private String lastName;
 
-    @Column(name = "email")
+    @Column(length = 128, nullable = false, unique = true)
     private String email;
 
+    @Column(length = 64, nullable = false)
     private String password;
 
-    @Column(name = "photo")
+    @Column(length = 64)
     private String photo;
 
     @Column(name = "enabled")

diff --git a/src/main/java/com/quiz/darkhold/login/service/UserServiceImpl.java b/src/main/java/com/quiz/darkhold/login/service/UserServiceImpl.java
@@ -8,7 +8,6 @@
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.stereotype.Service;
 
-import java.util.HashSet;
 import java.util.List;
 
 @Service

diff --git a/src/main/resources/data.sql b/src/main/resources/data.sql
@@ -1,6 +1,15 @@
 insert into roles (id, name, description, createdOn, modifiedOn, createdBy, modifiedBy) values
     (1,'ADMIN','Administrator of the darkhold', '2019-11-20 00:00:00','2019-11-20 00:00:00','admin','admin');
 
+insert into roles (id, name, description, createdOn, modifiedOn, createdBy, modifiedBy) values
+    (2,'GUEST','Guest of the darkhold', '2019-11-20 00:00:00','2019-11-20 00:00:00','admin','admin');
+
+insert into roles (id, name, description, createdOn, modifiedOn, createdBy, modifiedBy) values
+    (3,'GAME_MANAGER','Manager of the darkhold', '2019-11-20 00:00:00','2019-11-20 00:00:00','admin','admin');
+
+insert into roles (id, name, description, createdOn, modifiedOn, createdBy, modifiedBy) values
+    (4,'PARTICIPANT','Participant of the darkhold', '2019-11-20 00:00:00','2019-11-20 00:00:00','admin','admin');
+
 insert into member (id, firstname, lastname, email, password, enabled, createdOn, modifiedOn, createdBy, modifiedBy) values
     (1, 'Administrator','Of Darkhold', 'admin@admin.com', '$2a$10$l0Y76CoFAdXlkZZYkVDsIeRP..4UcpuhQ01H0B4QvTNF2uATZx9Gq',
      true, '2022-12-27 00:00:00','2022-12-27 00:00:00','admin','admin');