feat: 들여쓰기

build.gradle

@@ -60,30 +60,13 @@ bootJar {
 	archiveFileName = 'ROOT.jar'
 }
 
-// Spotless configuration for code formatting
+// Spotless configuration for code formatting (2-space indent)
-//spotless {
-//	java {
-//		target 'src/**/*.java'
-//		googleJavaFormat('1.19.2').aosp().reflowLongStrings()
-//		indentWithSpaces(2)
-//		trimTrailingWhitespace()
-//		endWithNewline()
-//		importOrder()
-//		removeUnusedImports()
-//		formatAnnotations()
-//	}
-//}
-
-
 spotless {
   java {
     target 'src/**/*.java'
-    indentWithSpaces(2)
+    googleJavaFormat('1.19.2')  // Default Google Style = 2 spaces (NO .aosp()!)
     trimTrailingWhitespace()
     endWithNewline()
-    importOrder()
-    removeUnusedImports()
-    formatAnnotations()
   }
 }
 

src/main/java/com/kamco/cd/kamcoback/config/StartupLogger.java

@@ -20,8 +20,7 @@ public class StartupLogger {
   @EventListener(ApplicationReadyEvent.class)
   public void logStartupInfo() {
     String[] activeProfiles = environment.getActiveProfiles();
-        String profileInfo =
+    String profileInfo = activeProfiles.length > 0 ? String.join(", ", activeProfiles) : "default";
-                activeProfiles.length > 0 ? String.join(", ", activeProfiles) : "default";
 
     // Database connection information
     String dbUrl = environment.getProperty("spring.datasource.url");
@@ -51,8 +50,7 @@ public class StartupLogger {
     String batchSize =
         environment.getProperty("spring.jpa.properties.hibernate.jdbc.batch_size", "N/A");
     String batchFetchSize =
-                environment.getProperty(
+        environment.getProperty("spring.jpa.properties.hibernate.default_batch_fetch_size", "N/A");
-                        "spring.jpa.properties.hibernate.default_batch_fetch_size", "N/A");
 
     String startupMessage =
         String.format(

src/main/java/com/kamco/cd/kamcoback/postgres/core/AnimalCoreService.java

@@ -26,10 +26,7 @@ public class AnimalCoreService
     AnimalEntity getZoo =
         animalRepository
             .getAnimalByUuid(uuid)
-                        .orElseThrow(
+            .orElseThrow(() -> new EntityNotFoundException("Zoo not found with uuid: " + uuid));
-                                () ->
-                                        new EntityNotFoundException(
-                                                "Zoo not found with uuid: " + uuid));
     return getZoo.toDto();
   }
 
@@ -42,12 +39,9 @@ public class AnimalCoreService
           zooRepository
               .getZooByUid(req.getZooId())
               .orElseThrow(
-                                    () ->
+                  () -> new EntityNotFoundException(" not found with id: " + req.getZooId()));
-                                            new EntityNotFoundException(
-                                                    "Zoo not found with id: " + req.getZooId()));
     }
-        AnimalEntity entity =
+    AnimalEntity entity = new AnimalEntity(req.getCategory(), req.getSpecies(), req.getName(), zoo);
-                new AnimalEntity(req.getCategory(), req.getSpecies(), req.getName(), zoo);
     AnimalEntity saved = animalRepository.save(entity);
     return saved.toDto();
   }
@@ -55,28 +49,26 @@ public class AnimalCoreService
   @Override
   @Transactional
   public void remove(Long id) {
-        AnimalEntity getZoo =
+    AnimalEntity getAnimal =
         animalRepository
             .getAnimalByUid(id)
-                        .orElseThrow(
+            .orElseThrow(() -> new EntityNotFoundException("getAnimal not found with id: " + id));
-                                () -> new EntityNotFoundException("Zoo not found with id: " + id));
+    getAnimal.deleted();
-        getZoo.deleted();
   }
 
   @Override
   public AnimalDto.Basic getOneById(Long id) {
-        AnimalEntity getZoo =
+    AnimalEntity getAnimal =
         animalRepository
             .getAnimalByUid(id)
-                        .orElseThrow(
+            .orElseThrow(() -> new EntityNotFoundException("Zoo not found with id: " + id));
-                                () -> new EntityNotFoundException("Zoo not found with id: " + id));
+    return getAnimal.toDto();
-        return getZoo.toDto();
   }
 
   @Override
   public Page<AnimalDto.Basic> search(AnimalDto.SearchReq searchReq) {
 
-        Page<AnimalEntity> zooEntities = animalRepository.listAnimal(searchReq);
+    Page<AnimalEntity> animalEntities = animalRepository.listAnimal(searchReq);
-        return zooEntities.map(AnimalEntity::toDto);
+    return animalEntities.map(AnimalEntity::toDto);
   }
 }

src/main/java/com/kamco/cd/kamcoback/postgres/core/ZooCoreService.java

@@ -22,10 +22,7 @@ public class ZooCoreService implements BaseCoreService<ZooDto.Detail, Long, ZooD
     ZooEntity zoo =
         zooRepository
             .getZooByUuid(uuid)
-                        .orElseThrow(
+            .orElseThrow(() -> new EntityNotFoundException("Zoo not found with uuid: " + uuid));
-                                () ->
-                                        new EntityNotFoundException(
-                                                "Zoo not found with uuid: " + uuid));
     return toDetailDto(zoo);
   }
 
@@ -43,8 +40,7 @@ public class ZooCoreService implements BaseCoreService<ZooDto.Detail, Long, ZooD
     ZooEntity zoo =
         zooRepository
             .getZooByUid(id)
-                        .orElseThrow(
+            .orElseThrow(() -> new EntityNotFoundException("Zoo not found with id: " + id));
-                                () -> new EntityNotFoundException("Zoo not found with id: " + id));
     zoo.deleted();
   }
 
@@ -53,8 +49,7 @@ public class ZooCoreService implements BaseCoreService<ZooDto.Detail, Long, ZooD
     ZooEntity zoo =
         zooRepository
             .getZooByUid(id)
-                        .orElseThrow(
+            .orElseThrow(() -> new EntityNotFoundException("Zoo not found with id: " + id));
-                                () -> new EntityNotFoundException("Zoo not found with id: " + id));
     return toDetailDto(zoo);
   }
 

src/main/java/com/kamco/cd/kamcoback/postgres/repository/AnimalRepositoryImpl.java

@@ -36,10 +36,7 @@ public class AnimalRepositoryImpl extends QuerydslRepositorySupport
     QAnimalEntity animal = QAnimalEntity.animalEntity;
 
     return Optional.ofNullable(
-                queryFactory
+        queryFactory.selectFrom(animal).where(animal.uuid.eq(UUID.fromString(uuid))).fetchFirst());
-                        .selectFrom(animal)
-                        .where(animal.uuid.eq(UUID.fromString(uuid)))
-                        .fetchFirst());
   }
 
   @Override

src/main/java/com/kamco/cd/kamcoback/postgres/repository/ZooRepositoryImpl.java

@@ -39,7 +39,8 @@ public class ZooRepositoryImpl implements ZooRepositoryCustom {
     long total = query.fetchCount();
 
     List<ZooEntity> content =
-                query.offset(pageable.getOffset())
+        query
+            .offset(pageable.getOffset())
             .limit(pageable.getPageSize())
             .orderBy(qZoo.createdDate.desc())
             .fetch();
@@ -59,10 +60,7 @@ public class ZooRepositoryImpl implements ZooRepositoryCustom {
   @Override
   public Optional<ZooEntity> getZooByUid(Long uid) {
     return Optional.ofNullable(
-                queryFactory
+        queryFactory.selectFrom(qZoo).where(qZoo.uid.eq(uid), qZoo.isDeleted.eq(false)).fetchOne());
-                        .selectFrom(qZoo)
-                        .where(qZoo.uid.eq(uid), qZoo.isDeleted.eq(false))
-                        .fetchOne());
   }
 
   @Override

src/main/java/com/kamco/cd/kamcoback/zoo/dto/AnimalDto.java

@@ -29,8 +29,7 @@ public class AnimalDto {
   @Getter
   public static class Basic {
 
-    @JsonIgnore
+    @JsonIgnore private Long id;
-    private Long id;
     private String uuid;
     private Category category;
     private Species species;
@@ -120,9 +119,7 @@ public class AnimalDto {
         String[] sortParams = sort.split(",");
         String property = sortParams[0];
         Sort.Direction direction =
-          sortParams.length > 1
+            sortParams.length > 1 ? Sort.Direction.fromString(sortParams[1]) : Sort.Direction.ASC;
-            ? Sort.Direction.fromString(sortParams[1])
-            : Sort.Direction.ASC;
         return PageRequest.of(page, size, Sort.by(direction, property));
       }
       return PageRequest.of(page, size);

src/main/java/com/kamco/cd/kamcoback/zoo/dto/ZooDto.java

@@ -27,8 +27,7 @@ public class ZooDto {
   @Getter
   public static class Basic {
 
-    @JsonIgnore
+    @JsonIgnore private Long id;
-    private Long id;
     private String uuid;
     private String name;
     private String location;
@@ -103,9 +102,7 @@ public class ZooDto {
         String[] sortParams = sort.split(",");
         String property = sortParams[0];
         Sort.Direction direction =
-          sortParams.length > 1
+            sortParams.length > 1 ? Sort.Direction.fromString(sortParams[1]) : Sort.Direction.ASC;
-            ? Sort.Direction.fromString(sortParams[1])
-            : Sort.Direction.ASC;
         return PageRequest.of(page, size, Sort.by(direction, property));
       }
       return PageRequest.of(page, size);

src/main/java/com/kamco/cd/kamcoback/zoo/service/ZooService.java

@@ -11,6 +11,7 @@ import org.springframework.transaction.annotation.Transactional;
 @Service
 @Transactional(readOnly = true)
 public class ZooService {
+
   private final ZooCoreService zooCoreService;
 
   // 동물원의 UUID로 id조회