Merge pull request #97 from coderPaddyS/Adriano/refactoring

Add test classes for package 'Models', add missing test

Author: lukas-zetto

backend/src/main/java/de/itermori/pse/kitroomfinder/backend/BackendApplication.java

@@ -1,13 +1,12 @@
 package de.itermori.pse.kitroomfinder.backend;
 
 import com.ulisesbocchio.jasyptspringboot.annotation.EnableEncryptableProperties;
+import java.time.Clock;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
-
-import java.time.Clock;
 /**
  * The main class.
  *

backend/src/main/java/de/itermori/pse/kitroomfinder/backend/ErrorHandling.java

@@ -4,10 +4,9 @@
 import graphql.GraphQLError;
 import graphql.kickstart.execution.error.GenericGraphQLError;
 import graphql.kickstart.execution.error.GraphQLErrorHandler;
-import org.springframework.stereotype.Component;
-
 import java.util.List;
 import java.util.stream.Collectors;
+import org.springframework.stereotype.Component;
 
 /**
  * Handles GraphQL errors.

backend/src/main/java/de/itermori/pse/kitroomfinder/backend/instrumentation/RequestLogging.java

@@ -2,15 +2,11 @@
 
 
 import de.itermori.pse.kitroomfinder.backend.BackendApplication;
+import graphql.ExecutionResult;
 import graphql.execution.instrumentation.InstrumentationContext;
 import graphql.execution.instrumentation.SimpleInstrumentation;
 import graphql.execution.instrumentation.SimpleInstrumentationContext;
-
-import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Import;
-import org.springframework.stereotype.Component;
-
+import graphql.execution.instrumentation.parameters.InstrumentationExecutionParameters;
 import java.io.File;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
@@ -23,9 +19,10 @@
 import java.time.Instant;
 import java.util.ArrayList;
 import java.util.List;
-
-import graphql.ExecutionResult;
-import graphql.execution.instrumentation.parameters.InstrumentationExecutionParameters;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Import;
+import org.springframework.stereotype.Component;
 
 @Import(BackendApplication.class)
 @Component

backend/src/main/java/de/itermori/pse/kitroomfinder/backend/models/Alias.java

@@ -78,7 +78,7 @@ public String getName() {
      *
      * @param name  The new name to set for the alias.
      */
-    private void setName(String name) {
+    public void setName(String name) {
         // Hibernate requires the setter for reading values from the database.
         this.name = name;
     }
@@ -97,7 +97,7 @@ public int getVersion() {
      *
      * @param version  The new version to set for the alias.
      */
-    private void setVersion(int version) {
+    public void setVersion(int version) {
         // Hibernate requires the setter for reading values from the database.
         this.version = version;
     }
@@ -116,7 +116,7 @@ public Integer getMapID() {
      *
      * @param mapID  The new mapID to set for the alias.
      */
-    private void setMapID(Integer mapID) {
+    public void setMapID(Integer mapID) {
         // Hibernate requires the setter for reading values from the database.
         this.mapID = mapID;
     }
@@ -135,7 +135,7 @@ public String getMapObject() {
      *
      * @param mapObject  The new name of the mapID to set for the alias.
      */
-    private void setMapObject(String mapObject) {
+    public void setMapObject(String mapObject) {
         // Hibernate requires the setter for reading values from the database.
         this.mapObject = mapObject;
     }

backend/src/main/java/de/itermori/pse/kitroomfinder/backend/models/AliasSuggestion.java

@@ -89,7 +89,7 @@ public String getName() {
      *
      * @param name  The new name to set for the alias suggestion.
      */
-    private void setName(String name) {
+    public void setName(String name) {
         // Hibernate requires the setter for reading values from the database.
         this.name = name;
     }
@@ -108,7 +108,7 @@ public Integer getMapID() {
      *
      * @param mapID  The new mapID to set for the alias suggestion.
      */
-    private void setMapID(Integer mapID) {
+    public void setMapID(Integer mapID) {
         // Hibernate requires the setter for reading values from the database.
         this.mapID = mapID;
     }
@@ -127,7 +127,7 @@ public String getMapObject() {
      *
      * @param mapObject  The new name of the mapID to set for the alias suggestion.
      */
-    private void setMapObject(String mapObject) {
+    public void setMapObject(String mapObject) {
         // Hibernate requires the setter for reading values from the database.
         this.mapObject = mapObject;
     }
@@ -146,7 +146,7 @@ public String getSuggester() {
      *
      * @param suggester  The new suggester to set for the alias suggestion.
      */
-    private void setSuggester(String suggester) {
+    public void setSuggester(String suggester) {
         // Hibernate requires the setter for reading values from the database.
         this.suggester = suggester;
     }
@@ -165,7 +165,7 @@ public String getVoters() {
      *
      * @param voters  The new voters to set for the alias suggestion.
      */
-    private void setVoters(String voters) {
+    public void setVoters(String voters) {
         // Hibernate requires the setter for reading values from the database.
         this.voters = voters;
     }
@@ -184,7 +184,7 @@ public Integer getPosVotes() {
      *
      * @param posVotes  The new amount of positive votes to set for the alias suggestion.
      */
-    private void setPosVotes(Integer posVotes) {
+    public void setPosVotes(Integer posVotes) {
         // Hibernate requires the setter for reading values from the database.
         this.posVotes = posVotes;
     }
@@ -203,7 +203,7 @@ public Integer getNegVotes() {
      *
      * @param negVotes  The new amount of negative votes to set for the alias suggestion.
      */
-    private void setNegVotes(Integer negVotes) {
+    public void setNegVotes(Integer negVotes) {
         // Hibernate requires the setter for reading values from the database.
         this.negVotes = negVotes;
     }

backend/src/main/java/de/itermori/pse/kitroomfinder/backend/models/BlacklistEntry.java

@@ -1,7 +1,11 @@
 package de.itermori.pse.kitroomfinder.backend.models;
 
 import java.util.Objects;
-import javax.persistence.*;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
 
 /**
  * Provides a model for the entity BlacklistEntry.
@@ -58,7 +62,7 @@ public String getName() {
      *
      * @param name  The new name to set for the blacklist entry.
      */
-    private void setName(String name) {
+    public void setName(String name) {
         // Hibernate requires the setter for reading values from the database.
         this.name = name;
     }

backend/src/main/java/de/itermori/pse/kitroomfinder/backend/models/DeletedAlias.java

@@ -73,7 +73,7 @@ public String getName() {
      *
      * @param name  The new name to set for the deleted alias.
      */
-    private void setName(String name) {
+    public void setName(String name) {
         // Hibernate requires the setter for reading values from the database.
         this.name = name;
     }
@@ -92,7 +92,7 @@ public int getVersion() {
      *
      * @param version  The new version to set for the deleted alias.
      */
-    private void setVersion(int version) {
+    public void setVersion(int version) {
         // Hibernate requires the setter for reading values from the database.
         this.version = version;
     }
@@ -111,7 +111,7 @@ public Integer getMapID() {
      *
      * @param mapID  The new mapID to set for the deleted alias.
      */
-    private void setMapID(Integer mapID) {
+    public void setMapID(Integer mapID) {
         // Hibernate requires the setter for reading values from the database.
         this.mapID = mapID;
     }

backend/src/main/java/de/itermori/pse/kitroomfinder/backend/models/MapObject.java

@@ -68,7 +68,7 @@ public String getName() {
      *
      * @param name  The new name to set for the map object entity.
      */
-    private void setName(String name) {
+    public void setName(String name) {
         // Hibernate requires the setter for reading values from the database.
         this.name = name;
     }
@@ -87,7 +87,7 @@ public Integer getMapID() {
      *
      * @param mapID  The new mapID to set for the map object entity.
      */
-    private void setMapID(Integer mapID) {
+    public void setMapID(Integer mapID) {
         // Hibernate requires the setter for reading values from the database.
         this.mapID = mapID;
     }

backend/src/main/java/de/itermori/pse/kitroomfinder/backend/models/User.java

@@ -68,7 +68,7 @@ public String getName() {
      *
      * @param name  The new name to set for the user.
      */
-    private void setName(String name) {
+    public void setName(String name) {
         // Hibernate requires the setter for reading values from the database.
         this.name = name;
     }
@@ -88,6 +88,7 @@ public String getAuthorities() {
      * @param authorities  The new authorities to set for the user.
      */
     public void setAuthorities(String authorities) {
+        // Hibernate requires the setter for reading values from the database.
         this.authorities = authorities;
     }
 

backend/src/main/java/de/itermori/pse/kitroomfinder/backend/models/Version.java

@@ -64,7 +64,7 @@ public Integer getCurrentVersion() {
      *
      * @param currentVersion  The new current version to set for the version entity (and database).
      */
-    private void setCurrentVersion(Integer currentVersion) {
+    public void setCurrentVersion(Integer currentVersion) {
         // Hibernate requires the setter for reading values from the database.
         this.currentVersion = currentVersion;
     }