♻️ Refactor: googleJavaFormat().aosp() 적용

Team-Shaka · Dec 27, 2023 · fe8987d · fe8987d
1 parent 8bbd6fc
commit fe8987d
Show file tree

Hide file tree

Showing 106 changed files with 2,904 additions and 2,856 deletions.
diff --git a/build.gradle b/build.gradle
@@ -2,7 +2,7 @@ plugins {
     id 'java'
     id 'org.springframework.boot' version '3.1.2'
     id 'io.spring.dependency-management' version '1.1.2'
-    id 'com.diffplug.spotless' version '6.23.3'
+    id 'com.diffplug.spotless' version '6.23.3' // Spotless 플러그인
 }
 
 group = 'briefing.info'
@@ -88,7 +88,12 @@ jar {
 spotless {
     java {
         // Google Java 포맷 적용
-        googleJavaFormat()
+        /*
+            googleJavaFormat() : 탭은 2개의 공백
+            googleJavaFormat().aosp() : 탭은 4개의 공백
+            [참고] https://github.com/google/google-java-format/issues/525
+         */
+        googleJavaFormat().aosp()
         // 아래 순서로 import문 정렬
         importOrder('java', 'javax', 'jakarta', 'org', 'com')
         // 사용하지 않는 import 제거
@@ -97,7 +102,5 @@ spotless {
         trimTrailingWhitespace()
         // 파일 끝에 새로운 라인 추가
         endWithNewline()
-        // 공백 4개로 들여쓰기
-        indentWithTabs(4)
     }
 }
diff --git a/src/main/java/briefing/BriefingApplication.java b/src/main/java/briefing/BriefingApplication.java
@@ -13,7 +13,7 @@
 @ImportAutoConfiguration({FeignAutoConfiguration.class})
 public class BriefingApplication {
 
-public static void main(final String[] args) {
-	SpringApplication.run(BriefingApplication.class, args);
-}
+    public static void main(final String[] args) {
+        SpringApplication.run(BriefingApplication.class, args);
+    }
 }
diff --git a/src/main/java/briefing/GlobalControllerAdvice.java b/src/main/java/briefing/GlobalControllerAdvice.java
@@ -11,17 +11,17 @@
 // @RestControllerAdvice
 public class GlobalControllerAdvice {
 
-@ExceptionHandler(BaseException.class)
-public ResponseEntity<ExceptionResponse> handleException(final BaseException e) {
-	final BaseExceptionType type = e.exceptionType();
-	log.warn("[WARN] MESSAGE: {}", type.message());
-	return new ResponseEntity<>(ExceptionResponse.from(e), e.exceptionType().status());
-}
+    @ExceptionHandler(BaseException.class)
+    public ResponseEntity<ExceptionResponse> handleException(final BaseException e) {
+        final BaseExceptionType type = e.exceptionType();
+        log.warn("[WARN] MESSAGE: {}", type.message());
+        return new ResponseEntity<>(ExceptionResponse.from(e), e.exceptionType().status());
+    }
 
-private record ExceptionResponse(String message) {
+    private record ExceptionResponse(String message) {
 
-	private static ExceptionResponse from(final BaseException e) {
-	return new ExceptionResponse(e.exceptionType().message());
-	}
-}
+        private static ExceptionResponse from(final BaseException e) {
+            return new ExceptionResponse(e.exceptionType().message());
+        }
+    }
 }
diff --git a/src/main/java/briefing/base/BaseDateTimeEntity.java b/src/main/java/briefing/base/BaseDateTimeEntity.java
@@ -17,9 +17,9 @@
 @Getter
 public abstract class BaseDateTimeEntity {
 
-@Column(updatable = false)
-@CreatedDate
-private LocalDateTime createdAt;
+    @Column(updatable = false)
+    @CreatedDate
+    private LocalDateTime createdAt;
 
-@LastModifiedDate private LocalDateTime updatedAt;
+    @LastModifiedDate private LocalDateTime updatedAt;
 }
diff --git a/src/main/java/briefing/base/BaseException.java b/src/main/java/briefing/base/BaseException.java
@@ -2,9 +2,9 @@
 
 public abstract class BaseException extends RuntimeException {
 
-protected BaseException(final String message) {
-	super(message);
-}
+    protected BaseException(final String message) {
+        super(message);
+    }
 
-public abstract BaseExceptionType exceptionType();
+    public abstract BaseExceptionType exceptionType();
 }
diff --git a/src/main/java/briefing/base/BaseExceptionType.java b/src/main/java/briefing/base/BaseExceptionType.java
@@ -4,7 +4,7 @@
 
 public interface BaseExceptionType {
 
-HttpStatus status();
+    HttpStatus status();
 
-String message();
+    String message();
 }
diff --git a/src/main/java/briefing/briefing/api/BriefingApi.java b/src/main/java/briefing/briefing/api/BriefingApi.java
@@ -30,91 +30,92 @@
 @RequiredArgsConstructor
 public class BriefingApi {
 
-private final BriefingQueryService briefingQueryService;
-private final BriefingCommandService briefingCommandService;
-private final ScrapQueryService scrapQueryService;
-
-@GetMapping("/v2/briefings")
-@Operation(summary = "03-01Briefing \uD83D\uDCF0  브리핑 목록 조회 V2", description = "")
-public CommonResponse<BriefingResponseDTO.BriefingPreviewListDTOV2> findBriefingsV2(
-	@ParameterObject @ModelAttribute BriefingRequestParam.BriefingPreviewListParam params) {
-	List<Briefing> briefingList = briefingQueryService.findBriefings(params, APIVersion.V2);
-	return CommonResponse.onSuccess(
-		BriefingConverter.toBriefingPreviewListDTOV2(params.getDate(), briefingList));
-}
-
-@GetMapping("/briefings")
-@Parameter(name = "timeOfDay", hidden = true)
-@Operation(summary = "03-01Briefing \uD83D\uDCF0  브리핑 목록 조회 V1", description = "")
-public CommonResponse<BriefingResponseDTO.BriefingPreviewListDTO> findBriefings(
-	@ParameterObject @ModelAttribute BriefingRequestParam.BriefingPreviewListParam params) {
-
-	List<Briefing> briefingList = briefingQueryService.findBriefings(params, APIVersion.V1);
-	return CommonResponse.onSuccess(
-		BriefingConverter.toBriefingPreviewListDTO(params.getDate(), briefingList));
-}
-
-@Deprecated
-@Operation(
-	summary = "키워드 전달 V2 임시 API",
-	description = "키워드 전달 V2 임시 API 입니다. 응답은 무조건 동일합니다. type만 주신걸 담아서 드립니다.")
-@ApiResponse(responseCode = "1000", description = "OK, 성공")
-@GetMapping("/briefings/temp")
-public CommonResponse<BriefingResponseDTO.BriefingV2PreviewListDTO> findBriefingsV2Temp(
-	@RequestParam("type") final BriefingType type, @RequestParam("date") final LocalDate date) {
-	List<Long> idList = Arrays.asList(346L, 347L, 348L, 349L, 350L);
-	return CommonResponse.onSuccess(
-		BriefingConverter.toBriefingPreviewV2TempListDTO(date, idList, type));
-}
-
-@GetMapping("/v2/briefings/{id}")
-@Operation(summary = "03-02Briefing \uD83D\uDCF0  브리핑 단건 조회 V2", description = "")
-@Parameter(name = "member", hidden = true)
-public CommonResponse<BriefingResponseDTO.BriefingDetailDTOV2> findBriefingV2(
-	@PathVariable final Long id, @AuthMember Member member) {
-
-	Boolean isScrap =
-		Optional.ofNullable(member)
-			.map(m -> scrapQueryService.existsByMemberIdAndBriefingId(m.getId(), id))
-			.orElseGet(() -> Boolean.FALSE);
-
-	Boolean isBriefingOpen = false;
-	Boolean isWarning = false;
-
-	return CommonResponse.onSuccess(
-		BriefingConverter.toBriefingDetailDTOV2(
-			briefingQueryService.findBriefing(id, APIVersion.V2),
-			isScrap,
-			isBriefingOpen,
-			isWarning));
-}
-
-@GetMapping("/briefings/{id}")
-@Parameter(name = "member", hidden = true)
-@Operation(summary = "03-02Briefing \uD83D\uDCF0  브리핑 단건 조회 V1", description = "")
-public CommonResponse<BriefingResponseDTO.BriefingDetailDTO> findBriefing(
-	@PathVariable final Long id, @AuthMember Member member) {
-
-	Boolean isScrap =
-		Optional.ofNullable(member)
-			.map(m -> scrapQueryService.existsByMemberIdAndBriefingId(m.getId(), id))
-			.orElseGet(() -> Boolean.FALSE);
-
-	Boolean isBriefingOpen = false;
-	Boolean isWarning = false;
-
-	return CommonResponse.onSuccess(
-		BriefingConverter.toBriefingDetailDTO(
-			briefingQueryService.findBriefing(id, APIVersion.V1),
-			isScrap,
-			isBriefingOpen,
-			isWarning));
-}
-
-@PostMapping("/briefings")
-@ResponseStatus(HttpStatus.CREATED)
-@Operation(summary = "03-03Briefing \uD83D\uDCF0  브리핑 등록", description = "")
-public void createBriefing(@RequestBody final BriefingRequestDTO.BriefingCreate request) {
-	briefingCommandService.createBriefing(request);
-}
+    private final BriefingQueryService briefingQueryService;
+    private final BriefingCommandService briefingCommandService;
+    private final ScrapQueryService scrapQueryService;
+
+    @GetMapping("/v2/briefings")
+    @Operation(summary = "03-01Briefing \uD83D\uDCF0  브리핑 목록 조회 V2", description = "")
+    public CommonResponse<BriefingResponseDTO.BriefingPreviewListDTOV2> findBriefingsV2(
+            @ParameterObject @ModelAttribute BriefingRequestParam.BriefingPreviewListParam params) {
+        List<Briefing> briefingList = briefingQueryService.findBriefings(params, APIVersion.V2);
+        return CommonResponse.onSuccess(
+                BriefingConverter.toBriefingPreviewListDTOV2(params.getDate(), briefingList));
+    }
+
+    @GetMapping("/briefings")
+    @Parameter(name = "timeOfDay", hidden = true)
+    @Operation(summary = "03-01Briefing \uD83D\uDCF0  브리핑 목록 조회 V1", description = "")
+    public CommonResponse<BriefingResponseDTO.BriefingPreviewListDTO> findBriefings(
+            @ParameterObject @ModelAttribute BriefingRequestParam.BriefingPreviewListParam params) {
+
+        List<Briefing> briefingList = briefingQueryService.findBriefings(params, APIVersion.V1);
+        return CommonResponse.onSuccess(
+                BriefingConverter.toBriefingPreviewListDTO(params.getDate(), briefingList));
+    }
+
+    @Deprecated
+    @Operation(
+            summary = "키워드 전달 V2 임시 API",
+            description = "키워드 전달 V2 임시 API 입니다. 응답은 무조건 동일합니다. type만 주신걸 담아서 드립니다.")
+    @ApiResponse(responseCode = "1000", description = "OK, 성공")
+    @GetMapping("/briefings/temp")
+    public CommonResponse<BriefingResponseDTO.BriefingV2PreviewListDTO> findBriefingsV2Temp(
+            @RequestParam("type") final BriefingType type,
+            @RequestParam("date") final LocalDate date) {
+        List<Long> idList = Arrays.asList(346L, 347L, 348L, 349L, 350L);
+        return CommonResponse.onSuccess(
+                BriefingConverter.toBriefingPreviewV2TempListDTO(date, idList, type));
+    }
+
+    @GetMapping("/v2/briefings/{id}")
+    @Operation(summary = "03-02Briefing \uD83D\uDCF0  브리핑 단건 조회 V2", description = "")
+    @Parameter(name = "member", hidden = true)
+    public CommonResponse<BriefingResponseDTO.BriefingDetailDTOV2> findBriefingV2(
+            @PathVariable final Long id, @AuthMember Member member) {
+
+        Boolean isScrap =
+                Optional.ofNullable(member)
+                        .map(m -> scrapQueryService.existsByMemberIdAndBriefingId(m.getId(), id))
+                        .orElseGet(() -> Boolean.FALSE);
+
+        Boolean isBriefingOpen = false;
+        Boolean isWarning = false;
+
+        return CommonResponse.onSuccess(
+                BriefingConverter.toBriefingDetailDTOV2(
+                        briefingQueryService.findBriefing(id, APIVersion.V2),
+                        isScrap,
+                        isBriefingOpen,
+                        isWarning));
+    }
+
+    @GetMapping("/briefings/{id}")
+    @Parameter(name = "member", hidden = true)
+    @Operation(summary = "03-02Briefing \uD83D\uDCF0  브리핑 단건 조회 V1", description = "")
+    public CommonResponse<BriefingResponseDTO.BriefingDetailDTO> findBriefing(
+            @PathVariable final Long id, @AuthMember Member member) {
+
+        Boolean isScrap =
+                Optional.ofNullable(member)
+                        .map(m -> scrapQueryService.existsByMemberIdAndBriefingId(m.getId(), id))
+                        .orElseGet(() -> Boolean.FALSE);
+
+        Boolean isBriefingOpen = false;
+        Boolean isWarning = false;
+
+        return CommonResponse.onSuccess(
+                BriefingConverter.toBriefingDetailDTO(
+                        briefingQueryService.findBriefing(id, APIVersion.V1),
+                        isScrap,
+                        isBriefingOpen,
+                        isWarning));
+    }
+
+    @PostMapping("/briefings")
+    @ResponseStatus(HttpStatus.CREATED)
+    @Operation(summary = "03-03Briefing \uD83D\uDCF0  브리핑 등록", description = "")
+    public void createBriefing(@RequestBody final BriefingRequestDTO.BriefingCreate request) {
+        briefingCommandService.createBriefing(request);
+    }
 }