Skip to content
This repository was archived by the owner on Apr 5, 2024. It is now read-only.

Commit 811af7c

Browse files
open-schnickopen-schnick
committed
Refactored Usage of Logger to use Lombok instead,
Added lombok.config
1 parent de1e252 commit 811af7c

18 files changed

+77
-82
lines changed

‎lombok.config‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
lombok.addLombokGeneratedAnnotation = true

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

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@
88
import de.filefighter.rest.domain.token.data.persistance.AccessTokenRepository;
99
import de.filefighter.rest.domain.user.data.persistance.UserEntity;
1010
import de.filefighter.rest.domain.user.data.persistance.UserRepository;
11-
import org.slf4j.Logger;
12-
import org.slf4j.LoggerFactory;
11+
import lombok.extern.log4j.Log4j2;
1312
import org.springframework.beans.factory.annotation.Value;
1413
import org.springframework.boot.CommandLineRunner;
1514
import org.springframework.context.annotation.Bean;
@@ -18,6 +17,7 @@
1817

1918
import java.time.Instant;
2019

20+
@Log4j2
2121
@Configuration
2222
public class PrepareDataBase {
2323

@@ -32,9 +32,7 @@ public class PrepareDataBase {
3232

3333
@Value("${filefighter.date}")
3434
String date;
35-
36-
private static final Logger LOG = LoggerFactory.getLogger(PrepareDataBase.class);
37-
35+
3836
@Bean
3937
@Profile({"dev", "prod"})
4038
CommandLineRunner veryImportantFileFighterStartScript() {
@@ -62,11 +60,11 @@ CommandLineRunner veryImportantFileFighterStartScript() {
6260
@Bean
6361
CommandLineRunner cleanDataBase(UserRepository userRepository, FileSystemRepository fileSystemRepository, AccessTokenRepository accessTokenRepository) {
6462
return args -> {
65-
LOG.info("Starting with clean user collection.");
63+
log.info("Starting with clean user collection.");
6664
userRepository.deleteAll();
67-
LOG.info("Starting with clean fileSystem collection.");
65+
log.info("Starting with clean fileSystem collection.");
6866
fileSystemRepository.deleteAll();
69-
LOG.info("Starting with clean accessToken collection.");
67+
log.info("Starting with clean accessToken collection.");
7068
accessTokenRepository.deleteAll();
7169
};
7270
}
@@ -75,7 +73,7 @@ CommandLineRunner cleanDataBase(UserRepository userRepository, FileSystemReposit
7573
@Profile("prod")
7674
CommandLineRunner initDataBaseProd(UserRepository userRepository, FileSystemRepository fileSystemRepository) {
7775
return args -> {
78-
LOG.info("Preloading default admin user: {}.", userRepository.save(UserEntity
76+
log.info("Preloading default admin user: {}.", userRepository.save(UserEntity
7977
.builder()
8078
.userId(0L)
8179
.username("Admin")
@@ -85,7 +83,7 @@ CommandLineRunner initDataBaseProd(UserRepository userRepository, FileSystemRepo
8583
.groupIds(new long[]{0, 1})
8684
.build()));
8785

88-
LOG.info("Preloading default fsStructure: {}.", fileSystemRepository.save(FileSystemEntity
86+
log.info("Preloading default fsStructure: {}.", fileSystemRepository.save(FileSystemEntity
8987
.builder()
9088
.createdByUserId(0)
9189
.fileSystemId(0)
@@ -99,16 +97,16 @@ CommandLineRunner initDataBaseProd(UserRepository userRepository, FileSystemRepo
9997
.visibleForGroupIds(new long[]{-1, 0, 1})
10098
.build()));
10199

102-
LOG.info("Inserting Users {}", (userRepository.findAll().size() == 1 ? MESSAGE_ON_SUCCESS : MESSAGE_ON_FAILURE));
103-
LOG.info("Inserting fsItems {}", (fileSystemRepository.findAll().size() == 1 ? MESSAGE_ON_SUCCESS : MESSAGE_ON_FAILURE));
100+
log.info("Inserting Users {}", (userRepository.findAll().size() == 1 ? MESSAGE_ON_SUCCESS : MESSAGE_ON_FAILURE));
101+
log.info("Inserting fsItems {}", (fileSystemRepository.findAll().size() == 1 ? MESSAGE_ON_SUCCESS : MESSAGE_ON_FAILURE));
104102
};
105103
}
106104

107105
@Bean
108106
@Profile("dev")
109107
CommandLineRunner initDataBaseDev(UserRepository userRepository, AccessTokenRepository accessTokenRepository, FileSystemRepository fileSystemRepository) {
110108
return args -> {
111-
LOG.info("Preloading default users: {} {}.",
109+
log.info("Preloading default users: {} {}.",
112110
userRepository.save(UserEntity
113111
.builder()
114112
.userId(0)
@@ -128,7 +126,7 @@ CommandLineRunner initDataBaseDev(UserRepository userRepository, AccessTokenRepo
128126
.groupIds(new long[]{-1})
129127
.build()));
130128

131-
LOG.info("Preloading default tokens: {} {}",
129+
log.info("Preloading default tokens: {} {}",
132130
accessTokenRepository.save(AccessTokenEntity
133131
.builder()
134132
.userId(0)
@@ -142,7 +140,7 @@ CommandLineRunner initDataBaseDev(UserRepository userRepository, AccessTokenRepo
142140
.validUntil(Instant.now().getEpochSecond() + AccessTokenBusinessService.ACCESS_TOKEN_DURATION_IN_SECONDS)
143141
.build()));
144142

145-
LOG.info("Preloading default fsItems: {} {}.",
143+
log.info("Preloading default fsItems: {} {}.",
146144
fileSystemRepository.save(FileSystemEntity.builder()
147145
.createdByUserId(0)
148146
.fileSystemId(0)
@@ -167,9 +165,9 @@ CommandLineRunner initDataBaseDev(UserRepository userRepository, AccessTokenRepo
167165
.visibleForGroupIds(new long[]{0})
168166
.build()));
169167

170-
LOG.info("Inserting FileSystemItems {}", (fileSystemRepository.findAll().size() == 2 ? MESSAGE_ON_SUCCESS : MESSAGE_ON_FAILURE));
171-
LOG.info("Inserting token {}", (accessTokenRepository.findAll().size() == 2 ? MESSAGE_ON_SUCCESS : MESSAGE_ON_FAILURE));
172-
LOG.info("Inserting Users {}", (userRepository.findAll().size() == 2 ? MESSAGE_ON_SUCCESS : MESSAGE_ON_FAILURE));
168+
log.info("Inserting FileSystemItems {}", (fileSystemRepository.findAll().size() == 2 ? MESSAGE_ON_SUCCESS : MESSAGE_ON_FAILURE));
169+
log.info("Inserting token {}", (accessTokenRepository.findAll().size() == 2 ? MESSAGE_ON_SUCCESS : MESSAGE_ON_FAILURE));
170+
log.info("Inserting Users {}", (userRepository.findAll().size() == 2 ? MESSAGE_ON_SUCCESS : MESSAGE_ON_FAILURE));
173171
};
174172
}
175173
}

‎src/main/java/de/filefighter/rest/domain/filesystem/business/FileSystemBusinessService.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
public class FileSystemBusinessService {
1515

1616
public FileSystemBusinessService() {
17-
1817
}
1918

2019
public static FolderContents getContentsOfFolder(String path, User authenticatedUser) {

‎src/main/java/de/filefighter/rest/domain/filesystem/exceptions/FileSystemContentsNotAccessibleAdvise.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,23 @@
11
package de.filefighter.rest.domain.filesystem.exceptions;
22

33
import de.filefighter.rest.rest.ServerResponse;
4-
import org.slf4j.LoggerFactory;
4+
import lombok.extern.log4j.Log4j2;
55
import org.springframework.http.HttpStatus;
66
import org.springframework.http.ResponseEntity;
77
import org.springframework.web.bind.annotation.ControllerAdvice;
88
import org.springframework.web.bind.annotation.ExceptionHandler;
99
import org.springframework.web.bind.annotation.ResponseBody;
1010
import org.springframework.web.bind.annotation.ResponseStatus;
1111

12+
@Log4j2
1213
@ControllerAdvice
1314
public class FileSystemContentsNotAccessibleAdvise {
1415

1516
@ResponseBody
1617
@ExceptionHandler(FileSystemContentsNotAccessibleException.class)
1718
@ResponseStatus(HttpStatus.BAD_REQUEST)
1819
ResponseEntity<ServerResponse> fileSystemContentsNotAccessibleAdvise(FileSystemContentsNotAccessibleException ex) {
19-
LoggerFactory.getLogger(FileSystemContentsNotAccessibleException.class).warn(ex.getMessage());
20+
log.warn(ex.getMessage());
2021
return new ResponseEntity<>(new ServerResponse(HttpStatus.BAD_REQUEST, ex.getMessage()), HttpStatus.BAD_REQUEST);
2122
}
2223
}

‎src/main/java/de/filefighter/rest/domain/filesystem/rest/FileSystemRestController.java‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,18 @@
55
import de.filefighter.rest.domain.filesystem.data.dto.FolderContents;
66
import de.filefighter.rest.rest.ServerResponse;
77
import io.swagger.annotations.Api;
8-
import org.slf4j.Logger;
9-
import org.slf4j.LoggerFactory;
8+
import lombok.extern.log4j.Log4j2;
109
import org.springframework.http.ResponseEntity;
1110
import org.springframework.web.bind.annotation.*;
1211

1312
import static de.filefighter.rest.configuration.RestConfiguration.*;
1413

14+
@Log4j2
1515
@RestController
1616
@Api(value = "FileSystem Rest Controller", tags = {"FileSystem"})
1717
@RequestMapping(BASE_API_URI)
1818
public class FileSystemRestController {
1919

20-
private static final Logger LOG = LoggerFactory.getLogger(FileSystemRestController.class);
21-
2220
private final FileSystemRestServiceInterface fileSystemRestService;
2321

2422
public FileSystemRestController(FileSystemRestServiceInterface fileSystemRestService) {
@@ -31,7 +29,7 @@ public ResponseEntity<FolderContents> getContentsOfFolder(
3129
@RequestHeader(value = "Authorization", defaultValue = AUTHORIZATION_BEARER_PREFIX + "token") String accessToken
3230
) {
3331

34-
LOG.info("Requested Folder contents of folder with path {}.", path);
32+
log.info("Requested Folder contents of folder with path {}.", path);
3533
return fileSystemRestService.getContentsOfFolderByPathAndAccessToken(path, accessToken);
3634
}
3735

@@ -41,7 +39,7 @@ public ResponseEntity<FileSystemItem> getFileOrFolderInfo(
4139
@RequestHeader(value = "Authorization", defaultValue = AUTHORIZATION_BEARER_PREFIX + "token") String accessToken
4240
) {
4341

44-
LOG.info("Requested information about FileSystemItem with id {}.", fsItemId);
42+
log.info("Requested information about FileSystemItem with id {}.", fsItemId);
4543
return fileSystemRestService.getInfoAboutFileOrFolderByIdAndAccessToken(fsItemId, accessToken);
4644
}
4745

@@ -51,7 +49,7 @@ public ResponseEntity<FileSystemItem> searchFileOrFolderByName(
5149
@RequestHeader(value = "Authorization", defaultValue = AUTHORIZATION_BEARER_PREFIX + "token") String accessToken
5250
){
5351

54-
LOG.info("Searching for file or folder with name {}", name);
52+
log.info("Searching for file or folder with name {}", name);
5553
return fileSystemRestService.findFileOrFolderByNameAndAccessToken(name, accessToken);
5654
}
5755

@@ -61,7 +59,7 @@ public ResponseEntity<FileSystemItem> uploadFileOrFolder(
6159
@RequestHeader(value = "Authorization", defaultValue = AUTHORIZATION_BEARER_PREFIX + "token") String accessToken
6260
){
6361

64-
LOG.info("Tried uploading new FileSystemItem {}", fileSystemItemUpdate);
62+
log.info("Tried uploading new FileSystemItem {}", fileSystemItemUpdate);
6563
return fileSystemRestService.uploadFileSystemItemWithAccessToken(fileSystemItemUpdate, accessToken);
6664
}
6765

@@ -72,7 +70,7 @@ public ResponseEntity<FileSystemItem> updateExistingFileOrFolder(
7270
@RequestHeader(value = "Authorization", defaultValue = AUTHORIZATION_BEARER_PREFIX + "token") String accessToken
7371
){
7472

75-
LOG.info("Tried updating FileSystemItem {} with {}.", fsItemId, fileSystemItemUpdate);
73+
log.info("Tried updating FileSystemItem {} with {}.", fsItemId, fileSystemItemUpdate);
7674
return fileSystemRestService.updatedFileSystemItemWithIdAndAccessToken(fsItemId, fileSystemItemUpdate, accessToken);
7775
}
7876

@@ -82,7 +80,7 @@ public ResponseEntity<ServerResponse> deleteFileOrFolder(
8280
@RequestHeader(value = "Authorization", defaultValue = AUTHORIZATION_BEARER_PREFIX + "token") String accessToken
8381
){
8482

85-
LOG.info("Tried deleting FileSystemItem with id {}", fsItemId);
83+
log.info("Tried deleting FileSystemItem with id {}", fsItemId);
8684
return fileSystemRestService.deleteFileSystemItemWithIdAndAccessToken(fsItemId, accessToken);
8785
}
8886
}

‎src/main/java/de/filefighter/rest/domain/permission/rest/PermissionRestController.java‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,18 @@
44
import de.filefighter.rest.domain.permission.data.dto.request.PermissionRequest;
55
import de.filefighter.rest.rest.ServerResponse;
66
import io.swagger.annotations.Api;
7-
import org.slf4j.Logger;
8-
import org.slf4j.LoggerFactory;
7+
import lombok.extern.log4j.Log4j2;
98
import org.springframework.http.ResponseEntity;
109
import org.springframework.web.bind.annotation.*;
1110

1211
import static de.filefighter.rest.configuration.RestConfiguration.*;
1312

13+
@Log4j2
1414
@RestController
1515
@Api(value = "Permissions Controller", tags = {"Permissions"})
1616
@RequestMapping(BASE_API_URI)
1717
public class PermissionRestController {
1818

19-
private static final Logger LOG = LoggerFactory.getLogger(PermissionRestController.class);
2019
private final PermissionRestServiceInterface permissionsRestService;
2120

2221
public PermissionRestController(PermissionRestServiceInterface permissionsRestService) {
@@ -30,7 +29,7 @@ public ResponseEntity<PermissionSet> getPermissionSetForFileOrFolder(
3029
@RequestHeader(value = "Authorization", defaultValue = AUTHORIZATION_BEARER_PREFIX + "token") String accessToken
3130
){
3231

33-
LOG.info("Requested PermissionSet for FileSystemItem {}", fsItemId);
32+
log.info("Requested PermissionSet for FileSystemItem {}", fsItemId);
3433
return permissionsRestService.getPermissionSetByIdAndToken(fsItemId, accessToken);
3534
}
3635

@@ -42,7 +41,7 @@ public ResponseEntity<ServerResponse> addUsersOrGroupsToPermissionSetForFileOrFo
4241
@RequestHeader(value = "Authorization", defaultValue = AUTHORIZATION_BEARER_PREFIX + "token") String accessToken
4342
){
4443

45-
LOG.info("Requested new User or Group permissions {} for Id {}.",permissionRequest, fsItemId);
44+
log.info("Requested new User or Group permissions {} for Id {}.",permissionRequest, fsItemId);
4645
return permissionsRestService.addUsersOrGroupsToPermissionSetForFileOrFolderWithAccessToken(permissionRequest,fsItemId, accessToken);
4746
}
4847

@@ -54,7 +53,7 @@ public ResponseEntity<ServerResponse> removeUsersOrGroupsFromPermissionSetForFil
5453
@RequestHeader(value = "Authorization", defaultValue = AUTHORIZATION_BEARER_PREFIX + "token") String accessToken
5554
){
5655

57-
LOG.info("Requested removal of User or Group permissions {} for Id {}.",permissionRequest, fsItemId);
56+
log.info("Requested removal of User or Group permissions {} for Id {}.",permissionRequest, fsItemId);
5857
return permissionsRestService.removeUsersOrGroupsFromPermissionSetForFileOrFolderWithAccessToken(permissionRequest,fsItemId, accessToken);
5958
}
6059
}

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
import de.filefighter.rest.domain.user.data.dto.User;
77
import de.filefighter.rest.domain.user.exceptions.UserNotAuthenticatedException;
88
import de.filefighter.rest.rest.exceptions.FileFighterDataException;
9-
import org.slf4j.Logger;
10-
import org.slf4j.LoggerFactory;
9+
import lombok.extern.log4j.Log4j2;
1110
import org.springframework.stereotype.Service;
1211

1312
import java.time.Instant;
1413
import java.util.UUID;
1514

15+
@Log4j2
1616
@Service
1717
public class AccessTokenBusinessService {
1818

@@ -21,7 +21,6 @@ public class AccessTokenBusinessService {
2121

2222
public static final long ACCESS_TOKEN_DURATION_IN_SECONDS = 3600L;
2323
public static final long ACCESS_TOKEN_SAFETY_MARGIN = 5L;
24-
private static final Logger LOG = LoggerFactory.getLogger(AccessTokenBusinessService.class);
2524

2625
public AccessTokenBusinessService(AccessTokenRepository accessTokenRepository, AccessTokenDtoService accessTokenDtoService) {
2726
this.accessTokenRepository = accessTokenRepository;
@@ -43,7 +42,7 @@ public AccessToken getValidAccessTokenForUser(User user) {
4342
accessTokenEntity = accessTokenRepository.save(accessTokenEntity);
4443
} else {
4544
if (currentTimeSeconds + ACCESS_TOKEN_SAFETY_MARGIN > accessTokenEntity.getValidUntil()) {
46-
LOG.info("Deleting AccessToken for UserId {}, because its invalid now.", userId);
45+
log.info("Deleting AccessToken for UserId {}, because its invalid now.", userId);
4746
long deletedTokenAmount = accessTokenRepository.deleteByUserId(userId);
4847
if (1L != deletedTokenAmount)
4948
throw new FileFighterDataException("AccessToken for userId " + userId + " could not be deleted.");

‎src/main/java/de/filefighter/rest/domain/token/exceptions/AccessTokenNotFoundAdvise.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package de.filefighter.rest.domain.token.exceptions;
22

33
import de.filefighter.rest.rest.ServerResponse;
4-
import org.slf4j.LoggerFactory;
4+
import lombok.extern.log4j.Log4j2;
55
import org.springframework.http.HttpStatus;
66
import org.springframework.http.ResponseEntity;
77
import org.springframework.web.bind.annotation.ControllerAdvice;
@@ -10,13 +10,14 @@
1010
import org.springframework.web.bind.annotation.ResponseStatus;
1111

1212
@ControllerAdvice
13+
@Log4j2
1314
public class AccessTokenNotFoundAdvise {
1415
@ResponseBody
1516
@ExceptionHandler(AccessTokenNotFoundException.class)
1617
@ResponseStatus(HttpStatus.BAD_REQUEST)
1718

1819
ResponseEntity<ServerResponse> tokenNotFoundAdvise(AccessTokenNotFoundException ex) {
19-
LoggerFactory.getLogger(AccessTokenNotFoundException.class).warn(ex.getMessage());
20+
log.warn(ex.getMessage());
2021
return new ResponseEntity<>(new ServerResponse(HttpStatus.BAD_REQUEST, ex.getMessage()), HttpStatus.BAD_REQUEST);
2122
}
2223
}

‎src/main/java/de/filefighter/rest/domain/user/business/UserAuthorizationService.java‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,21 +8,19 @@
88
import de.filefighter.rest.domain.user.exceptions.UserNotAuthenticatedException;
99
import de.filefighter.rest.domain.user.group.Groups;
1010
import de.filefighter.rest.rest.exceptions.RequestDidntMeetFormalRequirementsException;
11-
import org.slf4j.Logger;
12-
import org.slf4j.LoggerFactory;
11+
import lombok.extern.log4j.Log4j2;
1312
import org.springframework.stereotype.Service;
1413

1514
import java.nio.charset.StandardCharsets;
1615
import java.util.Base64;
1716

17+
@Log4j2
1818
@Service
1919
public class UserAuthorizationService {
2020

2121
private final UserRepository userRepository;
2222
private final UserDtoService userDtoService;
2323

24-
private static final Logger LOG = LoggerFactory.getLogger(UserAuthorizationService.class);
25-
2624
public UserAuthorizationService(UserRepository userRepository, UserDtoService userDtoService) {
2725
this.userRepository = userRepository;
2826
this.userDtoService = userDtoService;
@@ -34,7 +32,7 @@ public User authenticateUserWithUsernameAndPassword(String base64encodedUserAndP
3432
byte[] decodedValue = Base64.getDecoder().decode(base64encodedUserAndPassword);
3533
decodedUsernameAndPassword = new String(decodedValue, StandardCharsets.UTF_8);
3634
} catch (IllegalArgumentException ex) {
37-
LOG.warn("Found {} in {}", ex.getMessage(), base64encodedUserAndPassword);
35+
log.warn("Found {} in {}", ex.getMessage(), base64encodedUserAndPassword);
3836
throw new RequestDidntMeetFormalRequirementsException("Found unsupported character in header.");
3937
}
4038

0 commit comments

Comments
 (0)