From a843846346260c5a014c806731ab24a3479038db Mon Sep 17 00:00:00 2001 From: Gemini Kim Date: Sun, 9 Jul 2023 22:33:10 +0900 Subject: [PATCH 1/2] [lint] apply spring java format --- .githooks/pre-commit | 2 +- .github/workflows/ci.yml | 2 +- .springjavaformatconfig | 1 + README.md | 4 ++++ build.gradle | 2 +- gradle.properties | 3 +-- lint.gradle | 10 ++-------- settings.gradle | 2 +- 8 files changed, 12 insertions(+), 14 deletions(-) create mode 100644 .springjavaformatconfig diff --git a/.githooks/pre-commit b/.githooks/pre-commit index 85887f0..2645971 100755 --- a/.githooks/pre-commit +++ b/.githooks/pre-commit @@ -1,4 +1,4 @@ #!/bin/bash GIT_DIR=$(git rev-parse --show-toplevel) -$GIT_DIR/gradlew spotlessCheck +$GIT_DIR/gradlew checkFormat diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index be01044..952b584 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,7 +23,7 @@ jobs: - name: Lint uses: gradle/gradle-build-action@67421db6bd0bf253fb4bd25b31ebb98943c375e1 with: - arguments: spotlessCheck + arguments: checkFormat - name: Test uses: gradle/gradle-build-action@67421db6bd0bf253fb4bd25b31ebb98943c375e1 with: diff --git a/.springjavaformatconfig b/.springjavaformatconfig new file mode 100644 index 0000000..2588c59 --- /dev/null +++ b/.springjavaformatconfig @@ -0,0 +1 @@ +indentation-style=spaces \ No newline at end of file diff --git a/README.md b/README.md index f7fdd8d..178d133 100644 --- a/README.md +++ b/README.md @@ -130,6 +130,10 @@ This setting makes it easier to run the `test code` out of the box. Build, Execution, Deployment > Build Tools > Gradle > Run tests using > IntelliJ IDEA ``` +If you want to apply lint settings to the format of IDEA, please refer to the guide below. + +[Spring Java Format IntelliJ IDEA](https://github.com/spring-io/spring-javaformat#intellij-idea) + --- # Supported By diff --git a/build.gradle b/build.gradle index de1cf7a..6851f70 100644 --- a/build.gradle +++ b/build.gradle @@ -2,8 +2,8 @@ plugins { id 'java-library' id 'org.springframework.boot' apply(false) id 'io.spring.dependency-management' + id 'io.spring.javaformat' apply(false) id 'org.asciidoctor.jvm.convert' apply(false) - id 'com.diffplug.spotless' apply(false) } apply from: 'lint.gradle' diff --git a/gradle.properties b/gradle.properties index c6d775e..6ac4e04 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,8 +7,7 @@ javaVersion=17 ### Plugin depdency versions ### asciidoctorConvertVersion=3.3.2 -spotlessVersion=6.18.0 -spotlessFindbugsVersion=3.0.2 +springJavaFormatVersion=0.0.39 ### Spring dependency versions ### springBootVersion=3.1.1 diff --git a/lint.gradle b/lint.gradle index 5b9d897..ae2fee1 100644 --- a/lint.gradle +++ b/lint.gradle @@ -1,14 +1,8 @@ subprojects { apply plugin: 'java' - apply plugin: 'com.diffplug.spotless' + apply plugin: 'io.spring.javaformat' dependencies { - compileOnly "com.google.code.findbugs:jsr305:${spotlessFindbugsVersion}" - } - - spotless { - java { - googleJavaFormat().aosp() - } + compileOnly "io.spring.javaformat:spring-javaformat-gradle-plugin:${springJavaFormatVersion}" } } \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index dbc4bbc..32b8006 100644 --- a/settings.gradle +++ b/settings.gradle @@ -3,7 +3,7 @@ pluginManagement { id 'org.springframework.boot' version "${springBootVersion}" id 'io.spring.dependency-management' version "${springDependencyManagementVersion}" id 'org.asciidoctor.jvm.convert' version "${asciidoctorConvertVersion}" - id 'com.diffplug.spotless' version "${spotlessVersion}" + id 'io.spring.javaformat' version "${springJavaFormatVersion}" } } From 01f32a2e6fc7f20e3c97c5e1532f3e2440df25c5 Mon Sep 17 00:00:00 2001 From: Gemini Kim Date: Sun, 9 Jul 2023 22:33:57 +0900 Subject: [PATCH 2/2] [lint] reformat with lint --- .../springboot/client/example/ExampleApi.java | 6 +++--- .../client/example/ExampleClient.java | 2 ++ .../client/example/ExampleConfig.java | 4 +++- .../client/example/ExampleRequestDto.java | 3 ++- .../example/model/ExampleClientResult.java | 3 ++- .../client/ClientExampleContextTest.java | 4 +++- .../client/ClientExampleTestApplication.java | 2 ++ .../client/example/ExampleClientTest.java | 5 ++++- .../io/dodn/springboot/CoreApiApplication.java | 2 ++ .../core/api/config/AsyncConfig.java | 2 ++ .../core/api/config/AsyncExceptionHandler.java | 5 ++++- .../api/controller/ApiControllerAdvice.java | 8 ++++---- .../core/api/controller/HealthController.java | 2 ++ .../api/controller/v1/ExampleController.java | 9 +++++---- .../v1/response/ExampleResponseDto.java | 3 ++- .../core/api/domain/ExampleData.java | 3 ++- .../core/api/domain/ExampleResult.java | 3 ++- .../core/api/domain/ExampleService.java | 2 ++ .../api/support/error/CoreApiException.java | 3 +++ .../core/api/support/error/ErrorCode.java | 2 ++ .../core/api/support/error/ErrorMessage.java | 4 ++++ .../core/api/support/error/ErrorType.java | 10 ++++++---- .../core/api/support/response/ApiResponse.java | 4 ++++ .../core/api/support/response/ResultType.java | 5 +++-- .../java/io/dodn/springboot/ContextTest.java | 4 +++- .../springboot/CoreApiApplicationTest.java | 2 ++ .../java/io/dodn/springboot/DevelopTest.java | 4 +++- .../controller/v1/ExampleControllerTest.java | 3 +++ .../springboot/core/enums/ExampleEnum.java | 4 +++- .../springboot/storage/db/core/BaseEntity.java | 10 ++++++++-- .../storage/db/core/ExampleEntity.java | 8 ++++++-- .../storage/db/core/ExampleRepository.java | 4 +++- .../db/core/config/CoreDataSourceConfig.java | 2 ++ .../storage/db/core/config/CoreJpaConfig.java | 4 +++- .../storage/db/CoreDbContextTest.java | 4 +++- .../storage/db/CoreDbTestApplication.java | 2 ++ .../storage/db/core/ExampleRepositoryIT.java | 2 ++ .../dodn/springboot/test/api/RestDocsTest.java | 18 +++++++++--------- .../springboot/test/api/RestDocsUtils.java | 2 ++ 39 files changed, 124 insertions(+), 45 deletions(-) diff --git a/clients/client-example/src/main/java/io/dodn/springboot/client/example/ExampleApi.java b/clients/client-example/src/main/java/io/dodn/springboot/client/example/ExampleApi.java index 3db2e27..d7031e5 100644 --- a/clients/client-example/src/main/java/io/dodn/springboot/client/example/ExampleApi.java +++ b/clients/client-example/src/main/java/io/dodn/springboot/client/example/ExampleApi.java @@ -8,9 +8,9 @@ @FeignClient(value = "example-api", url = "${example.api.url}") interface ExampleApi { - @RequestMapping( - method = RequestMethod.POST, - value = "/example/example-api", + + @RequestMapping(method = RequestMethod.POST, value = "/example/example-api", consumes = MediaType.APPLICATION_JSON_VALUE) ExampleResponseDto example(@RequestBody ExampleRequestDto request); + } diff --git a/clients/client-example/src/main/java/io/dodn/springboot/client/example/ExampleClient.java b/clients/client-example/src/main/java/io/dodn/springboot/client/example/ExampleClient.java index fb74ead..ac5dd52 100644 --- a/clients/client-example/src/main/java/io/dodn/springboot/client/example/ExampleClient.java +++ b/clients/client-example/src/main/java/io/dodn/springboot/client/example/ExampleClient.java @@ -6,6 +6,7 @@ @Component public class ExampleClient { + private final ExampleApi exampleApi; public ExampleClient(ExampleApi exampleApi) { @@ -16,4 +17,5 @@ public ExampleClientResult example(String exampleParameter) { ExampleRequestDto request = new ExampleRequestDto(exampleParameter); return exampleApi.example(request).toResult(); } + } diff --git a/clients/client-example/src/main/java/io/dodn/springboot/client/example/ExampleConfig.java b/clients/client-example/src/main/java/io/dodn/springboot/client/example/ExampleConfig.java index 303373d..bb98c3a 100644 --- a/clients/client-example/src/main/java/io/dodn/springboot/client/example/ExampleConfig.java +++ b/clients/client-example/src/main/java/io/dodn/springboot/client/example/ExampleConfig.java @@ -5,4 +5,6 @@ @EnableFeignClients @Configuration -class ExampleConfig {} +class ExampleConfig { + +} diff --git a/clients/client-example/src/main/java/io/dodn/springboot/client/example/ExampleRequestDto.java b/clients/client-example/src/main/java/io/dodn/springboot/client/example/ExampleRequestDto.java index ec3562d..3a4b384 100644 --- a/clients/client-example/src/main/java/io/dodn/springboot/client/example/ExampleRequestDto.java +++ b/clients/client-example/src/main/java/io/dodn/springboot/client/example/ExampleRequestDto.java @@ -1,3 +1,4 @@ package io.dodn.springboot.client.example; -record ExampleRequestDto(String exampleRequestValue) {} +record ExampleRequestDto(String exampleRequestValue) { +} diff --git a/clients/client-example/src/main/java/io/dodn/springboot/client/example/model/ExampleClientResult.java b/clients/client-example/src/main/java/io/dodn/springboot/client/example/model/ExampleClientResult.java index 351bb39..4780829 100644 --- a/clients/client-example/src/main/java/io/dodn/springboot/client/example/model/ExampleClientResult.java +++ b/clients/client-example/src/main/java/io/dodn/springboot/client/example/model/ExampleClientResult.java @@ -1,3 +1,4 @@ package io.dodn.springboot.client.example.model; -public record ExampleClientResult(String exampleResult) {} +public record ExampleClientResult(String exampleResult) { +} diff --git a/clients/client-example/src/test/java/io/dodn/springboot/client/ClientExampleContextTest.java b/clients/client-example/src/test/java/io/dodn/springboot/client/ClientExampleContextTest.java index 0250a0c..a27e113 100644 --- a/clients/client-example/src/test/java/io/dodn/springboot/client/ClientExampleContextTest.java +++ b/clients/client-example/src/test/java/io/dodn/springboot/client/ClientExampleContextTest.java @@ -9,4 +9,6 @@ @Tag("context") @SpringBootTest @TestConstructor(autowireMode = TestConstructor.AutowireMode.ALL) -public abstract class ClientExampleContextTest {} +public abstract class ClientExampleContextTest { + +} diff --git a/clients/client-example/src/test/java/io/dodn/springboot/client/ClientExampleTestApplication.java b/clients/client-example/src/test/java/io/dodn/springboot/client/ClientExampleTestApplication.java index 80bd276..0d4d445 100644 --- a/clients/client-example/src/test/java/io/dodn/springboot/client/ClientExampleTestApplication.java +++ b/clients/client-example/src/test/java/io/dodn/springboot/client/ClientExampleTestApplication.java @@ -7,7 +7,9 @@ @ConfigurationPropertiesScan @SpringBootApplication public class ClientExampleTestApplication { + public static void main(String[] args) { SpringApplication.run(ClientExampleTestApplication.class, args); } + } diff --git a/clients/client-example/src/test/java/io/dodn/springboot/client/example/ExampleClientTest.java b/clients/client-example/src/test/java/io/dodn/springboot/client/example/ExampleClientTest.java index c822257..698eeee 100644 --- a/clients/client-example/src/test/java/io/dodn/springboot/client/example/ExampleClientTest.java +++ b/clients/client-example/src/test/java/io/dodn/springboot/client/example/ExampleClientTest.java @@ -9,6 +9,7 @@ import org.junit.jupiter.api.Test; public class ExampleClientTest extends ClientExampleContextTest { + private final ExampleClient exampleClient; public ExampleClientTest(ExampleClient exampleClient) { @@ -19,8 +20,10 @@ public ExampleClientTest(ExampleClient exampleClient) { public void shouldBeThrownExceptionWhenExample() { try { exampleClient.example("HELLO!"); - } catch (Exception e) { + } + catch (Exception e) { assertThat(e).isExactlyInstanceOf(RetryableException.class); } } + } diff --git a/core/core-api/src/main/java/io/dodn/springboot/CoreApiApplication.java b/core/core-api/src/main/java/io/dodn/springboot/CoreApiApplication.java index 085a8e1..c81d2b0 100644 --- a/core/core-api/src/main/java/io/dodn/springboot/CoreApiApplication.java +++ b/core/core-api/src/main/java/io/dodn/springboot/CoreApiApplication.java @@ -7,7 +7,9 @@ @ConfigurationPropertiesScan @SpringBootApplication public class CoreApiApplication { + public static void main(String[] args) { SpringApplication.run(CoreApiApplication.class, args); } + } diff --git a/core/core-api/src/main/java/io/dodn/springboot/core/api/config/AsyncConfig.java b/core/core-api/src/main/java/io/dodn/springboot/core/api/config/AsyncConfig.java index 6a33ffd..0594705 100644 --- a/core/core-api/src/main/java/io/dodn/springboot/core/api/config/AsyncConfig.java +++ b/core/core-api/src/main/java/io/dodn/springboot/core/api/config/AsyncConfig.java @@ -11,6 +11,7 @@ @Configuration @EnableAsync public class AsyncConfig implements AsyncConfigurer { + @Override public Executor getAsyncExecutor() { ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor(); @@ -27,4 +28,5 @@ public Executor getAsyncExecutor() { public AsyncUncaughtExceptionHandler getAsyncUncaughtExceptionHandler() { return new AsyncExceptionHandler(); } + } diff --git a/core/core-api/src/main/java/io/dodn/springboot/core/api/config/AsyncExceptionHandler.java b/core/core-api/src/main/java/io/dodn/springboot/core/api/config/AsyncExceptionHandler.java index a122d89..0ac2863 100644 --- a/core/core-api/src/main/java/io/dodn/springboot/core/api/config/AsyncExceptionHandler.java +++ b/core/core-api/src/main/java/io/dodn/springboot/core/api/config/AsyncExceptionHandler.java @@ -9,6 +9,7 @@ import java.lang.reflect.Method; public class AsyncExceptionHandler implements AsyncUncaughtExceptionHandler { + private final Logger log = LoggerFactory.getLogger(getClass()); @Override @@ -19,8 +20,10 @@ public void handleUncaughtException(Throwable e, Method method, Object... params case WARN -> log.warn("CoreApiException : {}", e.getMessage(), e); default -> log.info("CoreApiException : {}", e.getMessage(), e); } - } else { + } + else { log.error("Exception : {}", e.getMessage(), e); } } + } diff --git a/core/core-api/src/main/java/io/dodn/springboot/core/api/controller/ApiControllerAdvice.java b/core/core-api/src/main/java/io/dodn/springboot/core/api/controller/ApiControllerAdvice.java index daf0328..e8cc2f8 100644 --- a/core/core-api/src/main/java/io/dodn/springboot/core/api/controller/ApiControllerAdvice.java +++ b/core/core-api/src/main/java/io/dodn/springboot/core/api/controller/ApiControllerAdvice.java @@ -12,6 +12,7 @@ @RestControllerAdvice public class ApiControllerAdvice { + private final Logger log = LoggerFactory.getLogger(getClass()); @ExceptionHandler(CoreApiException.class) @@ -21,14 +22,13 @@ public ResponseEntity> handleCoreApiException(CoreApiException e) case WARN -> log.warn("CoreApiException : {}", e.getMessage(), e); default -> log.info("CoreApiException : {}", e.getMessage(), e); } - return new ResponseEntity<>( - ApiResponse.error(e.getErrorType(), e.getData()), e.getErrorType().getStatus()); + return new ResponseEntity<>(ApiResponse.error(e.getErrorType(), e.getData()), e.getErrorType().getStatus()); } @ExceptionHandler(Exception.class) public ResponseEntity> handleException(Exception e) { log.error("Exception : {}", e.getMessage(), e); - return new ResponseEntity<>( - ApiResponse.error(ErrorType.DEFAULT_ERROR), ErrorType.DEFAULT_ERROR.getStatus()); + return new ResponseEntity<>(ApiResponse.error(ErrorType.DEFAULT_ERROR), ErrorType.DEFAULT_ERROR.getStatus()); } + } diff --git a/core/core-api/src/main/java/io/dodn/springboot/core/api/controller/HealthController.java b/core/core-api/src/main/java/io/dodn/springboot/core/api/controller/HealthController.java index 027f398..f4fe4d1 100644 --- a/core/core-api/src/main/java/io/dodn/springboot/core/api/controller/HealthController.java +++ b/core/core-api/src/main/java/io/dodn/springboot/core/api/controller/HealthController.java @@ -7,8 +7,10 @@ @RestController public class HealthController { + @GetMapping("/health") public ResponseEntity health() { return ResponseEntity.status(HttpStatus.OK).build(); } + } diff --git a/core/core-api/src/main/java/io/dodn/springboot/core/api/controller/v1/ExampleController.java b/core/core-api/src/main/java/io/dodn/springboot/core/api/controller/v1/ExampleController.java index 176e9c8..ad3ba9b 100644 --- a/core/core-api/src/main/java/io/dodn/springboot/core/api/controller/v1/ExampleController.java +++ b/core/core-api/src/main/java/io/dodn/springboot/core/api/controller/v1/ExampleController.java @@ -16,6 +16,7 @@ @RestController public class ExampleController { + private final ExampleService exampleExampleService; public ExampleController(ExampleService exampleExampleService) { @@ -23,10 +24,9 @@ public ExampleController(ExampleService exampleExampleService) { } @GetMapping("/get/{exampleValue}") - public ApiResponse exampleGet( - @PathVariable String exampleValue, @RequestParam String exampleParam) { - ExampleResult result = - exampleExampleService.processExample(new ExampleData(exampleValue, exampleParam)); + public ApiResponse exampleGet(@PathVariable String exampleValue, + @RequestParam String exampleParam) { + ExampleResult result = exampleExampleService.processExample(new ExampleData(exampleValue, exampleParam)); return ApiResponse.success(new ExampleResponseDto(result.data())); } @@ -35,4 +35,5 @@ public ApiResponse examplePost(@RequestBody ExampleRequestDt ExampleResult result = exampleExampleService.processExample(request.toExampleData()); return ApiResponse.success(new ExampleResponseDto(result.data())); } + } diff --git a/core/core-api/src/main/java/io/dodn/springboot/core/api/controller/v1/response/ExampleResponseDto.java b/core/core-api/src/main/java/io/dodn/springboot/core/api/controller/v1/response/ExampleResponseDto.java index ea9853e..3c034c5 100644 --- a/core/core-api/src/main/java/io/dodn/springboot/core/api/controller/v1/response/ExampleResponseDto.java +++ b/core/core-api/src/main/java/io/dodn/springboot/core/api/controller/v1/response/ExampleResponseDto.java @@ -1,3 +1,4 @@ package io.dodn.springboot.core.api.controller.v1.response; -public record ExampleResponseDto(String result) {} +public record ExampleResponseDto(String result) { +} diff --git a/core/core-api/src/main/java/io/dodn/springboot/core/api/domain/ExampleData.java b/core/core-api/src/main/java/io/dodn/springboot/core/api/domain/ExampleData.java index adc68c8..9bd355e 100644 --- a/core/core-api/src/main/java/io/dodn/springboot/core/api/domain/ExampleData.java +++ b/core/core-api/src/main/java/io/dodn/springboot/core/api/domain/ExampleData.java @@ -1,3 +1,4 @@ package io.dodn.springboot.core.api.domain; -public record ExampleData(String value, String param) {} +public record ExampleData(String value, String param) { +} diff --git a/core/core-api/src/main/java/io/dodn/springboot/core/api/domain/ExampleResult.java b/core/core-api/src/main/java/io/dodn/springboot/core/api/domain/ExampleResult.java index a3128f7..5cd00cb 100644 --- a/core/core-api/src/main/java/io/dodn/springboot/core/api/domain/ExampleResult.java +++ b/core/core-api/src/main/java/io/dodn/springboot/core/api/domain/ExampleResult.java @@ -1,3 +1,4 @@ package io.dodn.springboot.core.api.domain; -public record ExampleResult(String data) {} +public record ExampleResult(String data) { +} diff --git a/core/core-api/src/main/java/io/dodn/springboot/core/api/domain/ExampleService.java b/core/core-api/src/main/java/io/dodn/springboot/core/api/domain/ExampleService.java index c349c8e..fdb658e 100644 --- a/core/core-api/src/main/java/io/dodn/springboot/core/api/domain/ExampleService.java +++ b/core/core-api/src/main/java/io/dodn/springboot/core/api/domain/ExampleService.java @@ -4,7 +4,9 @@ @Service public class ExampleService { + public ExampleResult processExample(ExampleData exampleData) { return new ExampleResult(exampleData.value()); } + } diff --git a/core/core-api/src/main/java/io/dodn/springboot/core/api/support/error/CoreApiException.java b/core/core-api/src/main/java/io/dodn/springboot/core/api/support/error/CoreApiException.java index f22ca49..eb06d58 100644 --- a/core/core-api/src/main/java/io/dodn/springboot/core/api/support/error/CoreApiException.java +++ b/core/core-api/src/main/java/io/dodn/springboot/core/api/support/error/CoreApiException.java @@ -1,7 +1,9 @@ package io.dodn.springboot.core.api.support.error; public class CoreApiException extends RuntimeException { + private final ErrorType errorType; + private final Object data; public CoreApiException(ErrorType errorType, Object data) { @@ -17,4 +19,5 @@ public ErrorType getErrorType() { public Object getData() { return data; } + } diff --git a/core/core-api/src/main/java/io/dodn/springboot/core/api/support/error/ErrorCode.java b/core/core-api/src/main/java/io/dodn/springboot/core/api/support/error/ErrorCode.java index 29d903d..f42c97d 100644 --- a/core/core-api/src/main/java/io/dodn/springboot/core/api/support/error/ErrorCode.java +++ b/core/core-api/src/main/java/io/dodn/springboot/core/api/support/error/ErrorCode.java @@ -1,5 +1,7 @@ package io.dodn.springboot.core.api.support.error; public enum ErrorCode { + E500 + } diff --git a/core/core-api/src/main/java/io/dodn/springboot/core/api/support/error/ErrorMessage.java b/core/core-api/src/main/java/io/dodn/springboot/core/api/support/error/ErrorMessage.java index 091bb75..d13c23f 100644 --- a/core/core-api/src/main/java/io/dodn/springboot/core/api/support/error/ErrorMessage.java +++ b/core/core-api/src/main/java/io/dodn/springboot/core/api/support/error/ErrorMessage.java @@ -1,8 +1,11 @@ package io.dodn.springboot.core.api.support.error; public class ErrorMessage { + private final String code; + private final String message; + private final Object data; public ErrorMessage(ErrorType errorType) { @@ -28,4 +31,5 @@ public String getMessage() { public Object getData() { return data; } + } diff --git a/core/core-api/src/main/java/io/dodn/springboot/core/api/support/error/ErrorType.java b/core/core-api/src/main/java/io/dodn/springboot/core/api/support/error/ErrorType.java index f8deb7a..00a0930 100644 --- a/core/core-api/src/main/java/io/dodn/springboot/core/api/support/error/ErrorType.java +++ b/core/core-api/src/main/java/io/dodn/springboot/core/api/support/error/ErrorType.java @@ -4,15 +4,16 @@ import org.springframework.http.HttpStatus; public enum ErrorType { - DEFAULT_ERROR( - HttpStatus.INTERNAL_SERVER_ERROR, - ErrorCode.E500, - "An unexpected error has occurred.", + + DEFAULT_ERROR(HttpStatus.INTERNAL_SERVER_ERROR, ErrorCode.E500, "An unexpected error has occurred.", LogLevel.ERROR); private final HttpStatus status; + private final ErrorCode code; + private final String message; + private final LogLevel logLevel; ErrorType(HttpStatus status, ErrorCode code, String message, LogLevel logLevel) { @@ -38,4 +39,5 @@ public String getMessage() { public LogLevel getLogLevel() { return logLevel; } + } diff --git a/core/core-api/src/main/java/io/dodn/springboot/core/api/support/response/ApiResponse.java b/core/core-api/src/main/java/io/dodn/springboot/core/api/support/response/ApiResponse.java index 4cb34d7..864a107 100644 --- a/core/core-api/src/main/java/io/dodn/springboot/core/api/support/response/ApiResponse.java +++ b/core/core-api/src/main/java/io/dodn/springboot/core/api/support/response/ApiResponse.java @@ -4,8 +4,11 @@ import io.dodn.springboot.core.api.support.error.ErrorType; public class ApiResponse { + private final ResultType result; + private final S data; + private final ErrorMessage error; private ApiResponse(ResultType result, S data, ErrorMessage error) { @@ -41,4 +44,5 @@ public Object getData() { public ErrorMessage getError() { return error; } + } diff --git a/core/core-api/src/main/java/io/dodn/springboot/core/api/support/response/ResultType.java b/core/core-api/src/main/java/io/dodn/springboot/core/api/support/response/ResultType.java index b8b1a93..c45bd83 100644 --- a/core/core-api/src/main/java/io/dodn/springboot/core/api/support/response/ResultType.java +++ b/core/core-api/src/main/java/io/dodn/springboot/core/api/support/response/ResultType.java @@ -1,6 +1,7 @@ package io.dodn.springboot.core.api.support.response; public enum ResultType { - SUCCESS, - ERROR + + SUCCESS, ERROR + } diff --git a/core/core-api/src/test/java/io/dodn/springboot/ContextTest.java b/core/core-api/src/test/java/io/dodn/springboot/ContextTest.java index 863406b..9111635 100644 --- a/core/core-api/src/test/java/io/dodn/springboot/ContextTest.java +++ b/core/core-api/src/test/java/io/dodn/springboot/ContextTest.java @@ -7,4 +7,6 @@ @Tag("context") @SpringBootTest @TestConstructor(autowireMode = TestConstructor.AutowireMode.ALL) -public abstract class ContextTest {} +public abstract class ContextTest { + +} diff --git a/core/core-api/src/test/java/io/dodn/springboot/CoreApiApplicationTest.java b/core/core-api/src/test/java/io/dodn/springboot/CoreApiApplicationTest.java index f27f7e6..fc2957e 100644 --- a/core/core-api/src/test/java/io/dodn/springboot/CoreApiApplicationTest.java +++ b/core/core-api/src/test/java/io/dodn/springboot/CoreApiApplicationTest.java @@ -3,8 +3,10 @@ import org.junit.jupiter.api.Test; public class CoreApiApplicationTest extends ContextTest { + @Test public void shouldBeLoadedContext() { // it should be passed } + } diff --git a/core/core-api/src/test/java/io/dodn/springboot/DevelopTest.java b/core/core-api/src/test/java/io/dodn/springboot/DevelopTest.java index e4a99e2..d528892 100644 --- a/core/core-api/src/test/java/io/dodn/springboot/DevelopTest.java +++ b/core/core-api/src/test/java/io/dodn/springboot/DevelopTest.java @@ -7,4 +7,6 @@ @Tag("develop") @SpringBootTest @TestConstructor(autowireMode = TestConstructor.AutowireMode.ALL) -public abstract class DevelopTest {} +public abstract class DevelopTest { + +} diff --git a/core/core-api/src/test/java/io/dodn/springboot/core/api/controller/v1/ExampleControllerTest.java b/core/core-api/src/test/java/io/dodn/springboot/core/api/controller/v1/ExampleControllerTest.java index ca10c7d..d9789f1 100644 --- a/core/core-api/src/test/java/io/dodn/springboot/core/api/controller/v1/ExampleControllerTest.java +++ b/core/core-api/src/test/java/io/dodn/springboot/core/api/controller/v1/ExampleControllerTest.java @@ -26,7 +26,9 @@ import org.springframework.restdocs.payload.JsonFieldType; public class ExampleControllerTest extends RestDocsTest { + private ExampleService exampleService; + private ExampleController controller; @BeforeEach @@ -97,4 +99,5 @@ public void examplePost() { .type(JsonFieldType.STRING) .ignored()))); } + } diff --git a/core/core-enum/src/main/java/io/dodn/springboot/core/enums/ExampleEnum.java b/core/core-enum/src/main/java/io/dodn/springboot/core/enums/ExampleEnum.java index d20a61b..d14ae84 100644 --- a/core/core-enum/src/main/java/io/dodn/springboot/core/enums/ExampleEnum.java +++ b/core/core-enum/src/main/java/io/dodn/springboot/core/enums/ExampleEnum.java @@ -1,3 +1,5 @@ package io.dodn.springboot.core.enums; -public enum ExampleEnum {} +public enum ExampleEnum { + +} diff --git a/storage/db-core/src/main/java/io/dodn/springboot/storage/db/core/BaseEntity.java b/storage/db-core/src/main/java/io/dodn/springboot/storage/db/core/BaseEntity.java index a779644..8b5ad0d 100644 --- a/storage/db-core/src/main/java/io/dodn/springboot/storage/db/core/BaseEntity.java +++ b/storage/db-core/src/main/java/io/dodn/springboot/storage/db/core/BaseEntity.java @@ -13,13 +13,18 @@ @MappedSuperclass public abstract class BaseEntity { + @Id @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; - @CreationTimestamp @Column private LocalDateTime createdAt; + @CreationTimestamp + @Column + private LocalDateTime createdAt; - @UpdateTimestamp @Column private LocalDateTime updatedAt; + @UpdateTimestamp + @Column + private LocalDateTime updatedAt; public Long getId() { return id; @@ -32,4 +37,5 @@ public LocalDateTime getCreatedAt() { public LocalDateTime getUpdatedAt() { return updatedAt; } + } diff --git a/storage/db-core/src/main/java/io/dodn/springboot/storage/db/core/ExampleEntity.java b/storage/db-core/src/main/java/io/dodn/springboot/storage/db/core/ExampleEntity.java index 8a6def2..00f5680 100644 --- a/storage/db-core/src/main/java/io/dodn/springboot/storage/db/core/ExampleEntity.java +++ b/storage/db-core/src/main/java/io/dodn/springboot/storage/db/core/ExampleEntity.java @@ -5,9 +5,12 @@ @Entity public class ExampleEntity extends BaseEntity { - @Column private String exampleColumn; - public ExampleEntity() {} + @Column + private String exampleColumn; + + public ExampleEntity() { + } public ExampleEntity(String exampleColumn) { this.exampleColumn = exampleColumn; @@ -16,4 +19,5 @@ public ExampleEntity(String exampleColumn) { public String getExampleColumn() { return exampleColumn; } + } diff --git a/storage/db-core/src/main/java/io/dodn/springboot/storage/db/core/ExampleRepository.java b/storage/db-core/src/main/java/io/dodn/springboot/storage/db/core/ExampleRepository.java index 38fd41c..f66c3c2 100644 --- a/storage/db-core/src/main/java/io/dodn/springboot/storage/db/core/ExampleRepository.java +++ b/storage/db-core/src/main/java/io/dodn/springboot/storage/db/core/ExampleRepository.java @@ -2,4 +2,6 @@ import org.springframework.data.jpa.repository.JpaRepository; -public interface ExampleRepository extends JpaRepository {} +public interface ExampleRepository extends JpaRepository { + +} diff --git a/storage/db-core/src/main/java/io/dodn/springboot/storage/db/core/config/CoreDataSourceConfig.java b/storage/db-core/src/main/java/io/dodn/springboot/storage/db/core/config/CoreDataSourceConfig.java index 0b34313..3268189 100644 --- a/storage/db-core/src/main/java/io/dodn/springboot/storage/db/core/config/CoreDataSourceConfig.java +++ b/storage/db-core/src/main/java/io/dodn/springboot/storage/db/core/config/CoreDataSourceConfig.java @@ -10,6 +10,7 @@ @Configuration class CoreDataSourceConfig { + @Bean @ConfigurationProperties(prefix = "storage.datasource.core") public HikariConfig coreHikariConfig() { @@ -20,4 +21,5 @@ public HikariConfig coreHikariConfig() { public HikariDataSource coreDataSource(@Qualifier("coreHikariConfig") HikariConfig config) { return new HikariDataSource(config); } + } diff --git a/storage/db-core/src/main/java/io/dodn/springboot/storage/db/core/config/CoreJpaConfig.java b/storage/db-core/src/main/java/io/dodn/springboot/storage/db/core/config/CoreJpaConfig.java index 3087a46..aaac11f 100644 --- a/storage/db-core/src/main/java/io/dodn/springboot/storage/db/core/config/CoreJpaConfig.java +++ b/storage/db-core/src/main/java/io/dodn/springboot/storage/db/core/config/CoreJpaConfig.java @@ -9,4 +9,6 @@ @EnableTransactionManagement @EntityScan(basePackages = "io.dodn.springboot.storage.db.core") @EnableJpaRepositories(basePackages = "io.dodn.springboot.storage.db.core") -class CoreJpaConfig {} +class CoreJpaConfig { + +} diff --git a/storage/db-core/src/test/java/io/dodn/springboot/storage/db/CoreDbContextTest.java b/storage/db-core/src/test/java/io/dodn/springboot/storage/db/CoreDbContextTest.java index ddcc54c..4ad40d3 100644 --- a/storage/db-core/src/test/java/io/dodn/springboot/storage/db/CoreDbContextTest.java +++ b/storage/db-core/src/test/java/io/dodn/springboot/storage/db/CoreDbContextTest.java @@ -9,4 +9,6 @@ @Tag("context") @SpringBootTest @TestConstructor(autowireMode = TestConstructor.AutowireMode.ALL) -public abstract class CoreDbContextTest {} +public abstract class CoreDbContextTest { + +} diff --git a/storage/db-core/src/test/java/io/dodn/springboot/storage/db/CoreDbTestApplication.java b/storage/db-core/src/test/java/io/dodn/springboot/storage/db/CoreDbTestApplication.java index 914a4cb..88a5943 100644 --- a/storage/db-core/src/test/java/io/dodn/springboot/storage/db/CoreDbTestApplication.java +++ b/storage/db-core/src/test/java/io/dodn/springboot/storage/db/CoreDbTestApplication.java @@ -7,7 +7,9 @@ @ConfigurationPropertiesScan @SpringBootApplication public class CoreDbTestApplication { + public static void main(String[] args) { SpringApplication.run(CoreDbTestApplication.class, args); } + } diff --git a/storage/db-core/src/test/java/io/dodn/springboot/storage/db/core/ExampleRepositoryIT.java b/storage/db-core/src/test/java/io/dodn/springboot/storage/db/core/ExampleRepositoryIT.java index 155ee36..c96da29 100644 --- a/storage/db-core/src/test/java/io/dodn/springboot/storage/db/core/ExampleRepositoryIT.java +++ b/storage/db-core/src/test/java/io/dodn/springboot/storage/db/core/ExampleRepositoryIT.java @@ -7,6 +7,7 @@ import org.junit.jupiter.api.Test; public class ExampleRepositoryIT extends CoreDbContextTest { + private final ExampleRepository exampleRepository; public ExampleRepositoryIT(ExampleRepository exampleRepository) { @@ -21,4 +22,5 @@ public void testShouldBeSavedAndFound() { ExampleEntity found = exampleRepository.findById(saved.getId()).get(); assertThat(found.getExampleColumn()).isEqualTo("SPRING_BOOT"); } + } diff --git a/tests/api-docs/src/main/java/io/dodn/springboot/test/api/RestDocsTest.java b/tests/api-docs/src/main/java/io/dodn/springboot/test/api/RestDocsTest.java index 458d4d3..144ab84 100644 --- a/tests/api-docs/src/main/java/io/dodn/springboot/test/api/RestDocsTest.java +++ b/tests/api-docs/src/main/java/io/dodn/springboot/test/api/RestDocsTest.java @@ -21,6 +21,7 @@ public abstract class RestDocsTest { protected MockMvcRequestSpecification mockMvc; + private RestDocumentationContextProvider restDocumentation; @BeforeEach @@ -38,19 +39,18 @@ protected MockMvcRequestSpecification mockController(Object controller) { } private MockMvc createMockMvc(Object controller) { - MappingJackson2HttpMessageConverter converter = - new MappingJackson2HttpMessageConverter(objectMapper()); + MappingJackson2HttpMessageConverter converter = new MappingJackson2HttpMessageConverter(objectMapper()); return MockMvcBuilders.standaloneSetup(controller) - .apply(MockMvcRestDocumentation.documentationConfiguration(restDocumentation)) - .setMessageConverters(converter) - .build(); + .apply(MockMvcRestDocumentation.documentationConfiguration(restDocumentation)) + .setMessageConverters(converter) + .build(); } private ObjectMapper objectMapper() { - return new ObjectMapper() - .findAndRegisterModules() - .disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS) - .disable(SerializationFeature.WRITE_DURATIONS_AS_TIMESTAMPS); + return new ObjectMapper().findAndRegisterModules() + .disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS) + .disable(SerializationFeature.WRITE_DURATIONS_AS_TIMESTAMPS); } + } diff --git a/tests/api-docs/src/main/java/io/dodn/springboot/test/api/RestDocsUtils.java b/tests/api-docs/src/main/java/io/dodn/springboot/test/api/RestDocsUtils.java index 0229d7e..c11ae12 100644 --- a/tests/api-docs/src/main/java/io/dodn/springboot/test/api/RestDocsUtils.java +++ b/tests/api-docs/src/main/java/io/dodn/springboot/test/api/RestDocsUtils.java @@ -5,6 +5,7 @@ import org.springframework.restdocs.operation.preprocess.Preprocessors; public class RestDocsUtils { + public static OperationRequestPreprocessor requestPreprocessor() { return Preprocessors.preprocessRequest( Preprocessors.modifyUris().scheme("http").host("dev.dodn.io").removePort(), @@ -14,4 +15,5 @@ public static OperationRequestPreprocessor requestPreprocessor() { public static OperationResponsePreprocessor responsePreprocessor() { return Preprocessors.preprocessResponse(Preprocessors.prettyPrint()); } + }