Added UnitTests (1/2) - Some Cleanup

Author: open-schnick

src/main/java/de/filefighter/rest/configuration/PrepareDataBase.java

@@ -25,6 +25,7 @@ public class PrepareDataBase {
     private static final Logger LOG = LoggerFactory.getLogger(PrepareDataBase.class);
 
     @Bean
+    @Profile("dev,prod")
     CommandLineRunner veryImportantFileFighterStartScript() {
         return args -> {
             System.out.println();

src/main/java/de/filefighter/rest/domain/filesystem/data/dto/FileSystemItemUpdate.java

@@ -5,7 +5,7 @@
 import lombok.Data;
 
 @Data
-@Builder(builderMethodName = "create")
+@Builder
 public class FileSystemItemUpdate {
     private String name;
     private FileSystemType type;

src/main/java/de/filefighter/rest/domain/filesystem/data/dto/FolderContents.java

@@ -4,7 +4,7 @@
 import lombok.Getter;
 
 @Getter
-@Builder(buildMethodName = "create")
+@Builder
 public class FolderContents {
     private final Folder[] folders;
     private final File[] files;

src/main/java/de/filefighter/rest/domain/filesystem/data/persistance/FileSystemEntity.java

@@ -7,7 +7,7 @@
 
 @Data
 @Document(collection = "file")
-@Builder(buildMethodName = "create")
+@Builder
 public class FileSystemEntity {
     @MongoId private String _id;
     private long id;

src/main/java/de/filefighter/rest/domain/health/business/SystemHealthBusinessService.java

@@ -22,7 +22,7 @@ public SystemHealth getCurrentSystemHealthInfo(){
         return SystemHealth.builder()
                 .uptimeInSeconds(currentEpoch - serverStartedAt)
                 .userCount(userBusinessService.getUserCount())
-                .create();
+                .build();
     }
 
     public long getCurrentEpochSeconds(){

src/main/java/de/filefighter/rest/domain/health/data/SystemHealth.java

@@ -8,7 +8,7 @@
  */
 
 @Getter
-@Builder(buildMethodName = "create")
+@Builder
 public class SystemHealth {
     private final long uptimeInSeconds;
     private final long userCount;

src/main/java/de/filefighter/rest/domain/token/business/AccessTokenBusinessService.java

@@ -59,7 +59,7 @@ public AccessToken getValidAccessTokenForUser(User user) {
 
     public AccessToken findAccessTokenByValueAndUserId(String accessTokenValue, long userId) {
         if (!stringIsValid(accessTokenValue))
-            throw new IllegalArgumentException("AccessTokenValue was not valid.");
+            throw new IllegalArgumentException("Value of AccessToken was not valid.");
 
         AccessTokenEntity accessTokenEntity = accessTokenRepository.findByUserIdAndValue(userId, accessTokenValue);
         if (null == accessTokenEntity)
@@ -73,7 +73,7 @@ public String generateRandomTokenValue() {
     }
 
     public String checkBearerHeader(String accessTokenValue) {
-        if (!accessTokenValue.matches("^" + AUTHORIZATION_BEARER_PREFIX + "(.*)$"))
+        if (!accessTokenValue.matches("^" + AUTHORIZATION_BEARER_PREFIX + "[^\\s](.*)$"))
             throw new UserNotAuthenticatedException("Header does not contain '" + AUTHORIZATION_BEARER_PREFIX + "', or format is invalid.");
         return accessTokenValue.split(AUTHORIZATION_BEARER_PREFIX)[1];
     }

src/main/java/de/filefighter/rest/domain/token/business/AccessTokenDtoService.java

@@ -28,7 +28,7 @@ public AccessToken createDto(AccessTokenEntity entity) {
 
     @Override
     public AccessTokenEntity findEntity(AccessToken dto) {
-        AccessTokenEntity accessTokenEntity = accessTokenRepository.findByValue(dto.getToken());
+        AccessTokenEntity accessTokenEntity = accessTokenRepository.findByUserIdAndValue(dto.getUserId(), dto.getToken());
         if (null == accessTokenEntity)
             throw new AccessTokenNotFoundException("AccessTokenEntity does not exist for AccessToken: "+ dto);
 

src/main/java/de/filefighter/rest/domain/user/business/UserDtoService.java

@@ -26,7 +26,7 @@ public User createDto(UserEntity entity) {
                 .id(entity.getUserId())
                 .username(entity.getUsername())
                 .groups(groupRepository.getRolesByIds(entity.getGroupIds()))
-                .create();
+                .build();
     }
 
     @Override

src/main/java/de/filefighter/rest/domain/user/data/dto/User.java

@@ -4,8 +4,8 @@
 import lombok.Data;
 
 
-@Builder(builderClassName = "UserBuilder", buildMethodName = "create")
 @Data
+@Builder
 public class User {
     private long id;
     private String username;