Fix checkstyle errors

MrSebastian · Feb 21, 2024 · 482a725 · 482a725
1 parent 12ab047
commit 482a725
Show file tree

Hide file tree

Showing 30 changed files with 49 additions and 75 deletions.
diff --git a/...c/main/java/de/mrsebastian/todoappdemo/backend/configuration/NoSecurityConfiguration.java b/...c/main/java/de/mrsebastian/todoappdemo/backend/configuration/NoSecurityConfiguration.java
@@ -4,6 +4,8 @@
  */
 package de.mrsebastian.todoappdemo.backend.configuration;
 
+import static org.springframework.security.web.util.matcher.AntPathRequestMatcher.antMatcher;
+
 import org.springframework.boot.autoconfigure.security.servlet.PathRequest;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -14,8 +16,6 @@
 import org.springframework.security.config.annotation.web.configurers.HeadersConfigurer;
 import org.springframework.security.web.SecurityFilterChain;
 
-import static org.springframework.security.web.util.matcher.AntPathRequestMatcher.antMatcher;
-
 @Configuration
 @Profile("no-security")
 @EnableWebSecurity

diff --git a/...src/main/java/de/mrsebastian/todoappdemo/backend/configuration/SecurityConfiguration.java b/...src/main/java/de/mrsebastian/todoappdemo/backend/configuration/SecurityConfiguration.java
@@ -4,6 +4,8 @@
  */
 package de.mrsebastian.todoappdemo.backend.configuration;
 
+import static org.springframework.security.web.util.matcher.AntPathRequestMatcher.antMatcher;
+
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.security.servlet.PathRequest;
 import org.springframework.boot.autoconfigure.web.client.RestTemplateAutoConfiguration;
@@ -17,8 +19,6 @@
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
 import org.springframework.security.web.SecurityFilterChain;
 
-import static org.springframework.security.web.util.matcher.AntPathRequestMatcher.antMatcher;
-
 /**
  * The central class for configuration of all security aspects.
  */

diff --git a/...rc/main/java/de/mrsebastian/todoappdemo/backend/configuration/nfcconverter/NfcReader.java b/...rc/main/java/de/mrsebastian/todoappdemo/backend/configuration/nfcconverter/NfcReader.java
@@ -4,11 +4,10 @@
  */
 package de.mrsebastian.todoappdemo.backend.configuration.nfcconverter;
 
+import de.mrsebastian.todoappdemo.backend.exception.NfcException;
 import java.io.CharArrayReader;
 import java.io.IOException;
 import java.io.Reader;
-
-import de.mrsebastian.todoappdemo.backend.exception.NfcException;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.IOUtils;
 import org.springframework.lang.NonNull;

diff --git a/backend/src/main/java/de/mrsebastian/todoappdemo/backend/domain/document/BaseDocument.java b/backend/src/main/java/de/mrsebastian/todoappdemo/backend/domain/document/BaseDocument.java
@@ -1,12 +1,11 @@
 package de.mrsebastian.todoappdemo.backend.domain.document;
 
+import java.util.UUID;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import org.springframework.data.annotation.Id;
 
-import java.util.UUID;
-
 @Data
 @NoArgsConstructor
 @AllArgsConstructor

diff --git a/backend/src/main/java/de/mrsebastian/todoappdemo/backend/exception/NotFoundException.java b/backend/src/main/java/de/mrsebastian/todoappdemo/backend/exception/NotFoundException.java
@@ -1,11 +1,10 @@
 package de.mrsebastian.todoappdemo.backend.exception;
 
+import java.util.UUID;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.ToString;
 
-import java.util.UUID;
-
 @Getter
 @EqualsAndHashCode(callSuper = true)
 @ToString

diff --git a/backend/src/main/java/de/mrsebastian/todoappdemo/backend/graphql/PostController.java b/backend/src/main/java/de/mrsebastian/todoappdemo/backend/graphql/PostController.java
@@ -4,12 +4,11 @@
 import de.mrsebastian.todoappdemo.backend.person.service.PersonService;
 import de.mrsebastian.todoappdemo.backend.task.rest.TaskDTO;
 import de.mrsebastian.todoappdemo.backend.task.service.TaskService;
+import java.util.List;
 import lombok.RequiredArgsConstructor;
 import org.springframework.graphql.data.method.annotation.QueryMapping;
 import org.springframework.stereotype.Controller;
 
-import java.util.List;
-
 @Controller
 @RequiredArgsConstructor
 public class PostController {

diff --git a/backend/src/main/java/de/mrsebastian/todoappdemo/backend/person/dataaccess/PersonDao.java b/backend/src/main/java/de/mrsebastian/todoappdemo/backend/person/dataaccess/PersonDao.java
@@ -1,9 +1,8 @@
 package de.mrsebastian.todoappdemo.backend.person.dataaccess;
 
 import jakarta.validation.constraints.NotNull;
-import lombok.Builder;
-
 import java.util.UUID;
+import lombok.Builder;
 
 @Builder
 public record PersonDao(@NotNull UUID id, String firstname, String lastname, @NotNull String email) {

diff --git a/.../mrsebastian/todoappdemo/backend/person/dataaccess/document/PersonDocumentRepository.java b/.../mrsebastian/todoappdemo/backend/person/dataaccess/document/PersonDocumentRepository.java
@@ -1,11 +1,10 @@
 package de.mrsebastian.todoappdemo.backend.person.dataaccess.document;
 
 import de.mrsebastian.todoappdemo.backend.configuration.Profiles;
+import java.util.UUID;
 import org.springframework.context.annotation.Profile;
 import org.springframework.data.mongodb.repository.MongoRepository;
 
-import java.util.UUID;
-
 @Profile(Profiles.PROFILE_MONGO)
 public interface PersonDocumentRepository extends MongoRepository<PersonDocument, UUID> {
 }
diff --git a/.../de/mrsebastian/todoappdemo/backend/person/dataaccess/document/PersonDocumentService.java b/.../de/mrsebastian/todoappdemo/backend/person/dataaccess/document/PersonDocumentService.java
@@ -4,14 +4,13 @@
 import de.mrsebastian.todoappdemo.backend.person.dataaccess.PersonCreateDao;
 import de.mrsebastian.todoappdemo.backend.person.dataaccess.PersonDao;
 import de.mrsebastian.todoappdemo.backend.person.dataaccess.PersonDataAccessService;
+import java.util.List;
+import java.util.UUID;
 import lombok.RequiredArgsConstructor;
 import lombok.val;
 import org.springframework.context.annotation.Profile;
 import org.springframework.stereotype.Service;
 
-import java.util.List;
-import java.util.UUID;
-
 @Service
 @Profile(Profiles.PROFILE_MONGO)
 @RequiredArgsConstructor

diff --git a/...in/java/de/mrsebastian/todoappdemo/backend/person/dataaccess/entity/PersonRepository.java b/...in/java/de/mrsebastian/todoappdemo/backend/person/dataaccess/entity/PersonRepository.java
@@ -1,8 +1,7 @@
 package de.mrsebastian.todoappdemo.backend.person.dataaccess.entity;
 
-import org.springframework.data.jpa.repository.JpaRepository;
-
 import java.util.UUID;
+import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface PersonRepository extends JpaRepository<Person, UUID> {
 }
diff --git a/...in/java/de/mrsebastian/todoappdemo/backend/person/dataaccess/entity/PersonSQLService.java b/...in/java/de/mrsebastian/todoappdemo/backend/person/dataaccess/entity/PersonSQLService.java
@@ -4,14 +4,13 @@
 import de.mrsebastian.todoappdemo.backend.person.dataaccess.PersonCreateDao;
 import de.mrsebastian.todoappdemo.backend.person.dataaccess.PersonDao;
 import de.mrsebastian.todoappdemo.backend.person.dataaccess.PersonDataAccessService;
+import java.util.List;
+import java.util.UUID;
 import lombok.RequiredArgsConstructor;
 import lombok.val;
 import org.springframework.context.annotation.Profile;
 import org.springframework.stereotype.Service;
 
-import java.util.List;
-import java.util.UUID;
-
 @Service
 @Profile(Profiles.PROFILE_SQL)
 @RequiredArgsConstructor

diff --git a/backend/src/main/java/de/mrsebastian/todoappdemo/backend/person/rest/PersonDTO.java b/backend/src/main/java/de/mrsebastian/todoappdemo/backend/person/rest/PersonDTO.java
@@ -1,9 +1,8 @@
 package de.mrsebastian.todoappdemo.backend.person.rest;
 
 import jakarta.validation.constraints.NotNull;
-import lombok.Builder;
-
 import java.util.UUID;
+import lombok.Builder;
 
 @Builder
 public record PersonDTO(@NotNull UUID id, String firstname, String lastname, @NotNull String email) {

diff --git a/backend/src/main/java/de/mrsebastian/todoappdemo/backend/person/service/PersonService.java b/backend/src/main/java/de/mrsebastian/todoappdemo/backend/person/service/PersonService.java
@@ -5,13 +5,12 @@
 import de.mrsebastian.todoappdemo.backend.person.dataaccess.entity.Person;
 import de.mrsebastian.todoappdemo.backend.person.rest.PersonCreateDTO;
 import de.mrsebastian.todoappdemo.backend.person.rest.PersonDTO;
+import java.util.List;
+import java.util.UUID;
 import lombok.RequiredArgsConstructor;
 import lombok.val;
 import org.springframework.stereotype.Service;
 
-import java.util.List;
-import java.util.UUID;
-
 @Service
 @RequiredArgsConstructor
 public class PersonService {

diff --git a/backend/src/main/java/de/mrsebastian/todoappdemo/backend/task/dataaccess/TaskCreateDao.java b/backend/src/main/java/de/mrsebastian/todoappdemo/backend/task/dataaccess/TaskCreateDao.java
@@ -1,10 +1,9 @@
 package de.mrsebastian.todoappdemo.backend.task.dataaccess;
 
 import jakarta.validation.constraints.NotNull;
-import lombok.Builder;
-
 import java.time.LocalDate;
 import java.util.UUID;
+import lombok.Builder;
 
 @Builder
 public record TaskCreateDao(@NotNull String title, @NotNull String description, LocalDate dueDate, UUID creatorId) {

diff --git a/backend/src/main/java/de/mrsebastian/todoappdemo/backend/task/dataaccess/TaskDao.java b/backend/src/main/java/de/mrsebastian/todoappdemo/backend/task/dataaccess/TaskDao.java
@@ -2,10 +2,9 @@
 
 import de.mrsebastian.todoappdemo.backend.person.rest.PersonDTO;
 import jakarta.validation.constraints.NotNull;
-import lombok.Builder;
-
 import java.time.LocalDate;
 import java.util.UUID;
+import lombok.Builder;
 
 @Builder
 public record TaskDao(@NotNull UUID id, @NotNull String title, @NotNull String description, LocalDate dueDate, PersonDTO creator) {

diff --git a/backend/src/main/java/de/mrsebastian/todoappdemo/backend/task/dataaccess/TaskUpdateDao.java b/backend/src/main/java/de/mrsebastian/todoappdemo/backend/task/dataaccess/TaskUpdateDao.java
@@ -1,7 +1,6 @@
 package de.mrsebastian.todoappdemo.backend.task.dataaccess;
 
 import jakarta.validation.constraints.NotNull;
-
 import java.time.LocalDate;
 
 public record TaskUpdateDao(@NotNull String title, @NotNull String description, LocalDate dueDate) {

diff --git a/...c/main/java/de/mrsebastian/todoappdemo/backend/task/dataaccess/document/TaskDocument.java b/...c/main/java/de/mrsebastian/todoappdemo/backend/task/dataaccess/document/TaskDocument.java
@@ -3,11 +3,10 @@
 import de.mrsebastian.todoappdemo.backend.domain.document.BaseDocument;
 import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.Size;
+import java.time.LocalDate;
 import lombok.Data;
 import org.springframework.data.mongodb.core.mapping.Document;
 
-import java.time.LocalDate;
-
 @Document
 @Data
 public class TaskDocument extends BaseDocument {

diff --git a/...a/de/mrsebastian/todoappdemo/backend/task/dataaccess/document/TaskDocumentRepository.java b/...a/de/mrsebastian/todoappdemo/backend/task/dataaccess/document/TaskDocumentRepository.java
@@ -1,11 +1,10 @@
 package de.mrsebastian.todoappdemo.backend.task.dataaccess.document;
 
 import de.mrsebastian.todoappdemo.backend.configuration.Profiles;
+import java.util.UUID;
 import org.springframework.context.annotation.Profile;
 import org.springframework.data.mongodb.repository.MongoRepository;
 
-import java.util.UUID;
-
 @Profile(Profiles.PROFILE_MONGO)
 public interface TaskDocumentRepository extends MongoRepository<TaskDocument, UUID> {
 }
diff --git a/...java/de/mrsebastian/todoappdemo/backend/task/dataaccess/document/TaskDocumentService.java b/...java/de/mrsebastian/todoappdemo/backend/task/dataaccess/document/TaskDocumentService.java
@@ -6,14 +6,13 @@
 import de.mrsebastian.todoappdemo.backend.task.dataaccess.TaskDao;
 import de.mrsebastian.todoappdemo.backend.task.dataaccess.TaskDataAccessService;
 import de.mrsebastian.todoappdemo.backend.task.dataaccess.TaskUpdateDao;
+import java.util.List;
+import java.util.UUID;
 import lombok.RequiredArgsConstructor;
 import lombok.val;
 import org.springframework.context.annotation.Profile;
 import org.springframework.stereotype.Service;
 
-import java.util.List;
-import java.util.UUID;
-
 @Service
 @Profile(Profiles.PROFILE_MONGO)
 @RequiredArgsConstructor

diff --git a/backend/src/main/java/de/mrsebastian/todoappdemo/backend/task/dataaccess/entity/Task.java b/backend/src/main/java/de/mrsebastian/todoappdemo/backend/task/dataaccess/entity/Task.java
@@ -8,13 +8,12 @@
 import jakarta.persistence.Table;
 import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.Size;
+import java.time.LocalDate;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 
-import java.time.LocalDate;
-
 @Entity
 @Table(name = "tasks")
 @NoArgsConstructor

diff --git a/...ain/java/de/mrsebastian/todoappdemo/backend/task/dataaccess/entity/TaskEntityService.java b/...ain/java/de/mrsebastian/todoappdemo/backend/task/dataaccess/entity/TaskEntityService.java
@@ -6,14 +6,13 @@
 import de.mrsebastian.todoappdemo.backend.task.dataaccess.TaskDao;
 import de.mrsebastian.todoappdemo.backend.task.dataaccess.TaskDataAccessService;
 import de.mrsebastian.todoappdemo.backend.task.dataaccess.TaskUpdateDao;
+import java.util.List;
+import java.util.UUID;
 import lombok.RequiredArgsConstructor;
 import lombok.val;
 import org.springframework.context.annotation.Profile;
 import org.springframework.stereotype.Service;
 
-import java.util.List;
-import java.util.UUID;
-
 @Service
 @Profile({ Profiles.PROFILE_SQL })
 @RequiredArgsConstructor

diff --git a/...c/main/java/de/mrsebastian/todoappdemo/backend/task/dataaccess/entity/TaskRepository.java b/...c/main/java/de/mrsebastian/todoappdemo/backend/task/dataaccess/entity/TaskRepository.java
@@ -1,8 +1,7 @@
 package de.mrsebastian.todoappdemo.backend.task.dataaccess.entity;
 
-import org.springframework.data.jpa.repository.JpaRepository;
-
 import java.util.UUID;
+import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface TaskRepository extends JpaRepository<Task, UUID> {
 }
diff --git a/backend/src/main/java/de/mrsebastian/todoappdemo/backend/task/rest/TaskController.java b/backend/src/main/java/de/mrsebastian/todoappdemo/backend/task/rest/TaskController.java
@@ -2,6 +2,8 @@
 
 import de.mrsebastian.todoappdemo.backend.task.service.TaskService;
 import jakarta.validation.Valid;
+import java.util.List;
+import java.util.UUID;
 import lombok.AllArgsConstructor;
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.DeleteMapping;
@@ -14,9 +16,6 @@
 import org.springframework.web.bind.annotation.ResponseStatus;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.List;
-import java.util.UUID;
-
 @RestController
 @RequestMapping("tasks")
 @AllArgsConstructor

diff --git a/backend/src/main/java/de/mrsebastian/todoappdemo/backend/task/rest/TaskCreateDTO.java b/backend/src/main/java/de/mrsebastian/todoappdemo/backend/task/rest/TaskCreateDTO.java
@@ -1,10 +1,9 @@
 package de.mrsebastian.todoappdemo.backend.task.rest;
 
 import jakarta.validation.constraints.NotNull;
-import lombok.Builder;
-
 import java.time.LocalDate;
 import java.util.UUID;
+import lombok.Builder;
 
 @Builder
 public record TaskCreateDTO(@NotNull String title, @NotNull String description, LocalDate dueDate, UUID creatorId) {

diff --git a/backend/src/main/java/de/mrsebastian/todoappdemo/backend/task/rest/TaskDTO.java b/backend/src/main/java/de/mrsebastian/todoappdemo/backend/task/rest/TaskDTO.java
@@ -2,9 +2,8 @@
 
 import de.mrsebastian.todoappdemo.backend.person.rest.PersonDTO;
 import jakarta.validation.constraints.NotNull;
-
 import java.time.LocalDate;
 import java.util.UUID;
 
-public record TaskDTO (@NotNull UUID id, @NotNull String title, @NotNull String description, LocalDate dueDate, PersonDTO creator) {
+public record TaskDTO(@NotNull UUID id, @NotNull String title, @NotNull String description, LocalDate dueDate, PersonDTO creator) {
 }
diff --git a/backend/src/main/java/de/mrsebastian/todoappdemo/backend/task/rest/TaskUpdateDTO.java b/backend/src/main/java/de/mrsebastian/todoappdemo/backend/task/rest/TaskUpdateDTO.java
@@ -1,7 +1,6 @@
 package de.mrsebastian.todoappdemo.backend.task.rest;
 
 import jakarta.validation.constraints.NotNull;
-
 import java.time.LocalDate;
 
 public record TaskUpdateDTO(@NotNull String title, @NotNull String description, LocalDate dueDate) {

diff --git a/backend/src/main/java/de/mrsebastian/todoappdemo/backend/task/service/TaskService.java b/backend/src/main/java/de/mrsebastian/todoappdemo/backend/task/service/TaskService.java
@@ -7,14 +7,13 @@
 import de.mrsebastian.todoappdemo.backend.task.rest.TaskCreateDTO;
 import de.mrsebastian.todoappdemo.backend.task.rest.TaskDTO;
 import de.mrsebastian.todoappdemo.backend.task.rest.TaskUpdateDTO;
+import java.util.List;
+import java.util.UUID;
 import lombok.AllArgsConstructor;
 import lombok.val;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.stereotype.Service;
 
-import java.util.List;
-import java.util.UUID;
-
 @Service
 @AllArgsConstructor
 public class TaskService {

diff --git a/.../java/de/mrsebastian/todoappdemo/backend/configuration/CacheControlConfigurationTest.java b/.../java/de/mrsebastian/todoappdemo/backend/configuration/CacheControlConfigurationTest.java
@@ -4,6 +4,12 @@
  */
 package de.mrsebastian.todoappdemo.backend.configuration;
 
+import static de.mrsebastian.todoappdemo.backend.TestConstants.SPRING_NO_SECURITY_PROFILE;
+import static de.mrsebastian.todoappdemo.backend.TestConstants.SPRING_TEST_DB_H2;
+import static de.mrsebastian.todoappdemo.backend.TestConstants.SPRING_TEST_PROFILE;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 import de.mrsebastian.todoappdemo.backend.MicroServiceApplication;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
@@ -16,12 +22,6 @@
 import org.springframework.http.ResponseEntity;
 import org.springframework.test.context.ActiveProfiles;
 
-import static de.mrsebastian.todoappdemo.backend.TestConstants.SPRING_TEST_DB_H2;
-import static de.mrsebastian.todoappdemo.backend.TestConstants.SPRING_TEST_PROFILE;
-import static de.mrsebastian.todoappdemo.backend.TestConstants.SPRING_NO_SECURITY_PROFILE;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
 @SpringBootTest(
         classes = { MicroServiceApplication.class },
         webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,