From 482a725d66accab5b9b47bc9c89e2bd362c9915f Mon Sep 17 00:00:00 2001 From: Sebastian <13592751+MrSebastian@users.noreply.github.com> Date: Wed, 21 Feb 2024 17:09:55 +0100 Subject: [PATCH 1/2] Fix checkstyle errors --- .../configuration/NoSecurityConfiguration.java | 4 ++-- .../configuration/SecurityConfiguration.java | 4 ++-- .../configuration/nfcconverter/NfcReader.java | 3 +-- .../backend/domain/document/BaseDocument.java | 3 +-- .../backend/exception/NotFoundException.java | 3 +-- .../backend/graphql/PostController.java | 3 +-- .../backend/person/dataaccess/PersonDao.java | 3 +-- .../document/PersonDocumentRepository.java | 3 +-- .../document/PersonDocumentService.java | 5 ++--- .../dataaccess/entity/PersonRepository.java | 3 +-- .../dataaccess/entity/PersonSQLService.java | 5 ++--- .../backend/person/rest/PersonDTO.java | 3 +-- .../backend/person/service/PersonService.java | 5 ++--- .../backend/task/dataaccess/TaskCreateDao.java | 3 +-- .../backend/task/dataaccess/TaskDao.java | 3 +-- .../backend/task/dataaccess/TaskUpdateDao.java | 1 - .../task/dataaccess/document/TaskDocument.java | 3 +-- .../document/TaskDocumentRepository.java | 3 +-- .../document/TaskDocumentService.java | 5 ++--- .../backend/task/dataaccess/entity/Task.java | 3 +-- .../dataaccess/entity/TaskEntityService.java | 5 ++--- .../task/dataaccess/entity/TaskRepository.java | 3 +-- .../backend/task/rest/TaskController.java | 5 ++--- .../backend/task/rest/TaskCreateDTO.java | 3 +-- .../todoappdemo/backend/task/rest/TaskDTO.java | 3 +-- .../backend/task/rest/TaskUpdateDTO.java | 1 - .../backend/task/service/TaskService.java | 5 ++--- .../CacheControlConfigurationTest.java | 12 ++++++------ .../configuration/UnicodeConfigurationTest.java | 17 ++++++++--------- .../nfcconverter/NfcHelperTest.java | 2 +- 30 files changed, 49 insertions(+), 75 deletions(-) diff --git a/backend/src/main/java/de/mrsebastian/todoappdemo/backend/configuration/NoSecurityConfiguration.java b/backend/src/main/java/de/mrsebastian/todoappdemo/backend/configuration/NoSecurityConfiguration.java index df5a902b..9ef5812c 100644 --- a/backend/src/main/java/de/mrsebastian/todoappdemo/backend/configuration/NoSecurityConfiguration.java +++ b/backend/src/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/backend/src/main/java/de/mrsebastian/todoappdemo/backend/configuration/SecurityConfiguration.java b/backend/src/main/java/de/mrsebastian/todoappdemo/backend/configuration/SecurityConfiguration.java index 5d93dade..c75f15cd 100644 --- a/backend/src/main/java/de/mrsebastian/todoappdemo/backend/configuration/SecurityConfiguration.java +++ b/backend/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/backend/src/main/java/de/mrsebastian/todoappdemo/backend/configuration/nfcconverter/NfcReader.java b/backend/src/main/java/de/mrsebastian/todoappdemo/backend/configuration/nfcconverter/NfcReader.java index 739a721e..1005798c 100644 --- a/backend/src/main/java/de/mrsebastian/todoappdemo/backend/configuration/nfcconverter/NfcReader.java +++ b/backend/src/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 index 18f656da..ee0cf2a1 100644 --- 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 index 4179c7ce..df7e1d86 100644 --- 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 index 972a07e1..6760001f 100644 --- 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 index e20999e6..0dd50801 100644 --- 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/backend/src/main/java/de/mrsebastian/todoappdemo/backend/person/dataaccess/document/PersonDocumentRepository.java b/backend/src/main/java/de/mrsebastian/todoappdemo/backend/person/dataaccess/document/PersonDocumentRepository.java index f8d9a851..1149a221 100644 --- a/backend/src/main/java/de/mrsebastian/todoappdemo/backend/person/dataaccess/document/PersonDocumentRepository.java +++ b/backend/src/main/java/de/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 { } diff --git a/backend/src/main/java/de/mrsebastian/todoappdemo/backend/person/dataaccess/document/PersonDocumentService.java b/backend/src/main/java/de/mrsebastian/todoappdemo/backend/person/dataaccess/document/PersonDocumentService.java index 5dbc9995..0badb8e0 100644 --- a/backend/src/main/java/de/mrsebastian/todoappdemo/backend/person/dataaccess/document/PersonDocumentService.java +++ b/backend/src/main/java/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/backend/src/main/java/de/mrsebastian/todoappdemo/backend/person/dataaccess/entity/PersonRepository.java b/backend/src/main/java/de/mrsebastian/todoappdemo/backend/person/dataaccess/entity/PersonRepository.java index 5c42ba5a..c657ece4 100644 --- a/backend/src/main/java/de/mrsebastian/todoappdemo/backend/person/dataaccess/entity/PersonRepository.java +++ b/backend/src/main/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 { } diff --git a/backend/src/main/java/de/mrsebastian/todoappdemo/backend/person/dataaccess/entity/PersonSQLService.java b/backend/src/main/java/de/mrsebastian/todoappdemo/backend/person/dataaccess/entity/PersonSQLService.java index fd8f5307..9e0fc4d1 100644 --- a/backend/src/main/java/de/mrsebastian/todoappdemo/backend/person/dataaccess/entity/PersonSQLService.java +++ b/backend/src/main/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 index 986e000c..d53620f0 100644 --- 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 index 78ba4611..d1fd549d 100644 --- 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 index eca326a5..e700c0ad 100644 --- 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 index 1f4ff46d..b6cd867d 100644 --- 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 index 9f73b58b..68caae7e 100644 --- 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/backend/src/main/java/de/mrsebastian/todoappdemo/backend/task/dataaccess/document/TaskDocument.java b/backend/src/main/java/de/mrsebastian/todoappdemo/backend/task/dataaccess/document/TaskDocument.java index 4001ce1b..63c4ba1b 100644 --- a/backend/src/main/java/de/mrsebastian/todoappdemo/backend/task/dataaccess/document/TaskDocument.java +++ b/backend/src/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/backend/src/main/java/de/mrsebastian/todoappdemo/backend/task/dataaccess/document/TaskDocumentRepository.java b/backend/src/main/java/de/mrsebastian/todoappdemo/backend/task/dataaccess/document/TaskDocumentRepository.java index 30707e2c..e2316c6d 100644 --- a/backend/src/main/java/de/mrsebastian/todoappdemo/backend/task/dataaccess/document/TaskDocumentRepository.java +++ b/backend/src/main/java/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 { } diff --git a/backend/src/main/java/de/mrsebastian/todoappdemo/backend/task/dataaccess/document/TaskDocumentService.java b/backend/src/main/java/de/mrsebastian/todoappdemo/backend/task/dataaccess/document/TaskDocumentService.java index b1398730..28909aae 100644 --- a/backend/src/main/java/de/mrsebastian/todoappdemo/backend/task/dataaccess/document/TaskDocumentService.java +++ b/backend/src/main/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 index dc6be036..40918d98 100644 --- 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/backend/src/main/java/de/mrsebastian/todoappdemo/backend/task/dataaccess/entity/TaskEntityService.java b/backend/src/main/java/de/mrsebastian/todoappdemo/backend/task/dataaccess/entity/TaskEntityService.java index c46e766e..c780164f 100644 --- a/backend/src/main/java/de/mrsebastian/todoappdemo/backend/task/dataaccess/entity/TaskEntityService.java +++ b/backend/src/main/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/backend/src/main/java/de/mrsebastian/todoappdemo/backend/task/dataaccess/entity/TaskRepository.java b/backend/src/main/java/de/mrsebastian/todoappdemo/backend/task/dataaccess/entity/TaskRepository.java index 33d03aaf..c175ee81 100644 --- a/backend/src/main/java/de/mrsebastian/todoappdemo/backend/task/dataaccess/entity/TaskRepository.java +++ b/backend/src/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 { } 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 index 5c36aca1..6d38a928 100644 --- 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 index a69b9e0f..a965e0b4 100644 --- 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 index 406da3f6..f0d4109d 100644 --- 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 index 6c0e90ed..84012c2e 100644 --- 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 index 89b0a39b..e27ec265 100644 --- 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/backend/src/test/java/de/mrsebastian/todoappdemo/backend/configuration/CacheControlConfigurationTest.java b/backend/src/test/java/de/mrsebastian/todoappdemo/backend/configuration/CacheControlConfigurationTest.java index d708cce9..f3dfb36e 100644 --- a/backend/src/test/java/de/mrsebastian/todoappdemo/backend/configuration/CacheControlConfigurationTest.java +++ b/backend/src/test/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, diff --git a/backend/src/test/java/de/mrsebastian/todoappdemo/backend/configuration/UnicodeConfigurationTest.java b/backend/src/test/java/de/mrsebastian/todoappdemo/backend/configuration/UnicodeConfigurationTest.java index b5e17940..bf98248b 100644 --- a/backend/src/test/java/de/mrsebastian/todoappdemo/backend/configuration/UnicodeConfigurationTest.java +++ b/backend/src/test/java/de/mrsebastian/todoappdemo/backend/configuration/UnicodeConfigurationTest.java @@ -4,9 +4,17 @@ */ 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 de.mrsebastian.todoappdemo.backend.TestConstants.TheEntityDto; +import static org.junit.jupiter.api.Assertions.assertEquals; + import de.mrsebastian.todoappdemo.backend.MicroServiceApplication; import de.mrsebastian.todoappdemo.backend.task.dataaccess.entity.Task; import de.mrsebastian.todoappdemo.backend.task.dataaccess.entity.TaskRepository; +import java.net.URI; +import java.util.UUID; import org.apache.commons.lang3.StringUtils; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; @@ -15,15 +23,6 @@ import org.springframework.boot.test.web.client.TestRestTemplate; import org.springframework.test.context.ActiveProfiles; -import java.net.URI; -import java.util.UUID; - -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 de.mrsebastian.todoappdemo.backend.TestConstants.TheEntityDto; -import static org.junit.jupiter.api.Assertions.assertEquals; - @SpringBootTest( classes = { MicroServiceApplication.class }, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, diff --git a/backend/src/test/java/de/mrsebastian/todoappdemo/backend/configuration/nfcconverter/NfcHelperTest.java b/backend/src/test/java/de/mrsebastian/todoappdemo/backend/configuration/nfcconverter/NfcHelperTest.java index 0db53988..278c107c 100644 --- a/backend/src/test/java/de/mrsebastian/todoappdemo/backend/configuration/nfcconverter/NfcHelperTest.java +++ b/backend/src/test/java/de/mrsebastian/todoappdemo/backend/configuration/nfcconverter/NfcHelperTest.java @@ -4,8 +4,8 @@ */ package de.mrsebastian.todoappdemo.backend.configuration.nfcconverter; -import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import jakarta.servlet.http.Cookie; import java.util.Arrays; From 7e25980374e14b6d91cab4458b1a8750014c33af Mon Sep 17 00:00:00 2001 From: Sebastian <13592751+MrSebastian@users.noreply.github.com> Date: Wed, 21 Feb 2024 17:10:20 +0100 Subject: [PATCH 2/2] update readme with information about checkstyle setup --- README.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 9eb44eb9..c358749f 100644 --- a/README.md +++ b/README.md @@ -1 +1,7 @@ -# TodoAppOSSDemo \ No newline at end of file +# TodoAppOSSDemo + +## IDE Setup + +### IntelliJ + +- import checkstyle to `code stlye` for `java` \ No newline at end of file