fixed spotbugs issues (#46)

Reviewed-on: de.nclazz/codebuilder#46
Co-authored-by: Niclas Thobaben <nthobaben@nclazz.de>
Co-committed-by: Niclas Thobaben <nthobaben@nclazz.de>

Jenkinsfile

@@ -48,6 +48,7 @@ pipeline {
         }
 
         stage('Deploy maven artifacts') {
+            when { branch 'master' }
             steps {
                 withCredentials([usernamePassword(credentialsId: 'jenkins_nexus', usernameVariable: 'USERNAME', passwordVariable: 'PASSWORD')]) {
                     sh 'mvn deploy -Dnexus.user=${USERNAME} -Dnexus.password=${PASSWORD} -B -s settings.xml'
@@ -59,6 +60,7 @@ pipeline {
         }
 
         stage('Build Docker') {
+            when { branch 'master' }
             steps {
                 dir('codebuilder-service') {
                     sh "docker build --tag $DOCKER_IMAGE_TAG_NAME:$VERSION ."
@@ -70,6 +72,7 @@ pipeline {
         }
 
         stage('Deploy docker artifacts') {
+            when { branch 'master' }
             steps {
                 script {
                     docker.withRegistry("https://"+env.DOCKER_REGISTRY, "jenkins_nexus") {

codebuilder-core/src/main/java/de/nclazz/apps/codebuilder/facade/BodyFacade.java

@@ -3,7 +3,9 @@ package de.nclazz.apps.codebuilder.facade;
 import de.nclazz.apps.codebuilder.types.DataType;
 import de.nclazz.apps.codebuilder.types.DataTypeResolver;
 import io.apibuilder.spec.v0.models.Body;
+import lombok.Getter;
 
+@Getter
 public class BodyFacade extends AbstractItem {
 
     private final DataType type;
@@ -19,4 +21,5 @@ public class BodyFacade extends AbstractItem {
         this.type = resolver.resolve(body.getType());
     }
 
+
 }

codebuilder-core/src/main/java/de/nclazz/apps/codebuilder/facade/InterfaceFacade.java

@@ -8,7 +8,6 @@ import java.util.List;
 
 public class InterfaceFacade extends AbstractItem {
 
-    private final Interface anInterface;
     private List<FieldFacade> fields;
 
     public InterfaceFacade(Interface anInterface, DataTypeResolver resolver) {
@@ -20,7 +19,6 @@ public class InterfaceFacade extends AbstractItem {
                 resolver.getService().getNamespace(),
                 anInterface.getAttributes()
         );
-        this.anInterface = anInterface;
         this.fields = TypeUtils.mapList(
                 anInterface.getFields(),
                 field -> new FieldFacade(field, resolver.resolve(field.getType()))

codebuilder-core/src/main/java/de/nclazz/apps/codebuilder/facade/ServiceFacade.java

@@ -22,7 +22,7 @@ public class ServiceFacade extends AbstractItem {
     private final List<ResourceFacade> resources;
     private final List<AnnotationFacade> annotations;
 
-    public ServiceFacade(@NonNull DataTypeResolver resolver) {
+    public ServiceFacade(DataTypeResolver resolver) {
         super(
                 resolver.getService().getName(),
                 resolver.getService().getDescription(),
@@ -79,7 +79,7 @@ public class ServiceFacade extends AbstractItem {
         return this.service.getVersion();
     }
 
-    public String getBaseurl() {
+    public String getBaseUrl() {
         return this.service.getBaseUrl();
     }
 

codebuilder-core/src/main/java/de/nclazz/apps/codebuilder/types/DataTypeMapping.java

@@ -7,7 +7,7 @@ import lombok.RequiredArgsConstructor;
 @RequiredArgsConstructor
 public class DataTypeMapping {
 
-    public static DataTypeMapping DEFAULT = new DataTypeMapping(
+    public static final DataTypeMapping DEFAULT = new DataTypeMapping(
             DataType.primitive("boolean"),
             DataType.primitive("date-iso8601"),
             DataType.primitive("date-time-iso8601"),

codebuilder-service/src/main/java/de/nclazz/apps/codebuilder/common/AuditedEntity.java

@@ -1,6 +1,9 @@
 package de.nclazz.apps.codebuilder.common;
 
 import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
 import org.hibernate.annotations.Type;
 import org.springframework.data.annotation.CreatedBy;
 import org.springframework.data.annotation.CreatedDate;
@@ -14,7 +17,8 @@ import javax.persistence.MappedSuperclass;
 import java.time.LocalDateTime;
 import java.util.UUID;
 
-@Data
+@Getter
+@Setter
 @MappedSuperclass
 @EntityListeners(AuditingEntityListener.class)
 public class AuditedEntity {

codebuilder-service/src/main/java/de/nclazz/apps/codebuilder/common/ValidationError.java

@@ -5,12 +5,15 @@ import de.nclazz.codebuilder.v0.models.Severity;
 import lombok.Data;
 import lombok.RequiredArgsConstructor;
 
+import java.io.Serializable;
 import java.time.LocalDateTime;
 import java.util.UUID;
 
 @Data
 @RequiredArgsConstructor
-public class ValidationError {
+public class ValidationError implements Serializable {
+
+    private static final long serialVersionUID = 1L;
 
     private final LocalDateTime timestamp = LocalDateTime.now();
     private final String message;

codebuilder-service/src/main/java/de/nclazz/apps/codebuilder/security/AuthenticatedUser.java

@@ -18,6 +18,8 @@ import java.util.stream.Collectors;
 @Builder
 public class AuthenticatedUser implements UserDetails {
 
+    private static final long serialVersionUID = 1L;
+
     private final UUID guid;
     private final String username;
     private final String email;

codebuilder-service/src/main/java/de/nclazz/apps/codebuilder/security/TokenAuthenticationFilter.java

@@ -21,6 +21,7 @@ import java.util.Optional;
 public class TokenAuthenticationFilter extends AbstractAuthenticationProcessingFilter {
 
     private static final String BEARER = "Bearer ";
+    private static final Authentication ANONYMOUS_USER = new AnonymousUser();
 
     public TokenAuthenticationFilter(RequestMatcher requestMatcher) {
         super(requestMatcher);
@@ -33,7 +34,7 @@ public class TokenAuthenticationFilter extends AbstractAuthenticationProcessingF
         String param = request.getHeader(HttpHeaders.AUTHORIZATION);
 
         return tryAuthentication(param)
-                .orElseGet(this::getAnonymousUser);
+                .orElse(ANONYMOUS_USER);
 
     }
 
@@ -60,42 +61,43 @@ public class TokenAuthenticationFilter extends AbstractAuthenticationProcessingF
         response.setStatus(404);
     }
 
-    private Authentication getAnonymousUser() {
-        AuthenticatedUser anonymous = WebSecurity.getAnonymousUser();
-        return new Authentication() {
-            @Override
-            public Collection<? extends GrantedAuthority> getAuthorities() {
-                return Collections.emptyList();
-            }
+    private static class AnonymousUser implements Authentication {
 
-            @Override
-            public Object getCredentials() {
-                return "";
-            }
+        private static final long serialVersionUID = 1L;
 
-            @Override
-            public Object getDetails() {
-                return anonymous;
-            }
+        @Override
+        public Collection<? extends GrantedAuthority> getAuthorities() {
+            return Collections.emptyList();
+        }
 
-            @Override
-            public Object getPrincipal() {
-                return anonymous;
-            }
+        @Override
+        public Object getCredentials() {
+            return "";
+        }
 
-            @Override
-            public boolean isAuthenticated() {
-                return true;
-            }
+        @Override
+        public Object getDetails() {
+            return WebSecurity.getAnonymousUser();
+        }
 
-            @Override
-            public void setAuthenticated(boolean b) throws IllegalArgumentException {
-            }
+        @Override
+        public Object getPrincipal() {
+            return WebSecurity.getAnonymousUser();
+        }
 
-            @Override
-            public String getName() {
-                return "anonymous";
-            }
-        };
+        @Override
+        public boolean isAuthenticated() {
+            return true;
+        }
+
+        @Override
+        public void setAuthenticated(boolean b) throws IllegalArgumentException {
+        }
+
+        @Override
+        public String getName() {
+            return "anonymous";
+        }
     }
+
 }

codebuilder-service/src/main/java/de/nclazz/apps/codebuilder/security/UserAuthenticationService.java

@@ -17,7 +17,6 @@ public class UserAuthenticationService {
 
     private static final String USER_GUID_CLAIM = "uid";
 
-    private final PasswordEncoder passwordEncoder;
     private final JWTService jwtService;
     private final UsersService usersService;
     private final AuthenticationsService authenticationsService;