refactor: ktlint versioning by kotlin 2.1.0

.editorconfig

@@ -27,4 +27,6 @@ max_line_length = 120
 # [no-wildcard-imports]
 ktlint_no-wildcard-imports = disabled
 ktlint_standard_no-wildcard-imports = disabled
-ktlint_standard_package-name = disabled
+ktlint_standard_package-name = disabled
+
+ktlint_function_naming_ignore_when_annotated_with = Composable

build.gradle.kts

@@ -4,7 +4,11 @@ plugins {
     kotlin("plugin.jpa") version "2.1.0"
     id("org.springframework.boot") version "3.4.1"
     id("io.spring.dependency-management") version "1.1.7"
-    id("org.jlleitschuh.gradle.ktlint") version "12.1.1"
+    id("org.jlleitschuh.gradle.ktlint") version "12.1.2"
+}
+
+ktlint {
+    version.set("1.5.0")
 }
 
 version = "${property("applicationVersion")}"
@@ -18,7 +22,6 @@ java {
 
 extra["springModulithVersion"] = "1.3.1"
 
-
 repositories {
     mavenCentral()
 }
@@ -70,7 +73,6 @@ dependencyManagement {
     }
 }
 
-
 kotlin {
     compilerOptions {
         freeCompilerArgs.addAll("-Xjsr305=strict")
@@ -85,8 +87,10 @@ tasks.register("addLintPreCommitHook", DefaultTask::class) {
         val hooksDir = project.file(".git/hooks")
         val scriptDir = project.file("scripts")
         val preCommit = scriptDir.resolve("pre-commit")
+        Runtime.getRuntime().exec("chmod +x .git/hooks/pre-commit")
         preCommit.copyTo(hooksDir.resolve("pre-commit"), overwrite = true)
         hooksDir.resolve("pre-commit").setExecutable(true)
+        // chmod +x .git/hooks/pre-commit
     }
 }
 

src/main/kotlin/tech/sipe/fintech/account/Account.kt

@@ -1,4 +1,3 @@
 package tech.sipe.fintech.account
 
-class Account {
-}
+class Account

src/main/kotlin/tech/sipe/fintech/account/AccountApi.kt

@@ -6,19 +6,18 @@ import org.springframework.web.bind.annotation.RestController
 
 @RestController
 class AccountApi(
-	private val accountService: AccountService
+	private val accountService: AccountService,
 ) {
-
 	@PostMapping("/accounts/registration")
 	fun register(
-		@RequestParam memberId: Long
+		@RequestParam memberId: Long,
 	) {
 		accountService.register()
 	}
 
 	@PostMapping("/accounts/cancellation")
 	fun cancel(
-		@RequestParam memberId: Long
+		@RequestParam memberId: Long,
 	) {
 		accountService.cancel()
 	}

src/main/kotlin/tech/sipe/fintech/account/AccountEntity.kt

@@ -1,4 +1,3 @@
 package tech.sipe.fintech.account
 
-class AccountEntity {
-}
+class AccountEntity

src/main/kotlin/tech/sipe/fintech/account/AccountModuleMetadata.kt

@@ -2,9 +2,8 @@ package tech.sipe.fintech.account
 
 import org.springframework.modulith.ApplicationModule
 
-
 @ApplicationModule(
 	type = ApplicationModule.Type.CLOSED,
-	allowedDependencies = []
+	allowedDependencies = [],
 )
 class AccountModuleMetadata

src/main/kotlin/tech/sipe/fintech/account/AccountRepository.kt

@@ -2,5 +2,6 @@ package tech.sipe.fintech.account
 
 interface AccountRepository {
 	fun save(account: Account)
+
 	fun delete(account: Account)
 }

src/main/kotlin/tech/sipe/fintech/account/AccountService.kt

@@ -4,10 +4,9 @@ import org.springframework.stereotype.Service
 
 @Service
 class AccountService {
-
 	fun register() {
 	}
 
 	fun cancel() {
 	}
-}
+}

src/main/kotlin/tech/sipe/fintech/common/LoggerUtil.kt

@@ -8,8 +8,10 @@ fun Any.logInfo(message: String) {
 	logger.info(message)
 }
 
-fun Any.logError(message: String? = null, e: Exception) {
+fun Any.logError(
+	message: String? = null,
+	e: Exception,
+) {
 	val logger = org.slf4j.LoggerFactory.getLogger(this.javaClass)
 	logger.error(message ?: e.message ?: e.localizedMessage, e)
 }
-

src/main/kotlin/tech/sipe/fintech/payment/Payment.kt

@@ -1,5 +1,3 @@
 package tech.sipe.fintech.payment
 
 class Payment
-{
-}

src/main/kotlin/tech/sipe/fintech/payment/PaymentApi.kt

@@ -6,12 +6,9 @@ import org.springframework.web.bind.annotation.RestController
 
 @RestController
 class PaymentApi {
-
 	@PostMapping("/payments")
 	fun pay(
-		@RequestParam memberId: Long
+		@RequestParam memberId: Long,
 	) {
-
 	}
-
 }

src/main/kotlin/tech/sipe/fintech/payment/PaymentEntity.kt

@@ -1,4 +1,3 @@
 package tech.sipe.fintech.payment
 
-class PaymentEntity {
-}
+class PaymentEntity

src/main/kotlin/tech/sipe/fintech/payment/PaymentJpaRepository.kt

@@ -1,4 +1,3 @@
 package tech.sipe.fintech.payment
 
-interface PaymentJpaRepository {
-}
+interface PaymentJpaRepository

src/main/kotlin/tech/sipe/fintech/payment/PaymentModuleMetadata.kt

@@ -4,6 +4,6 @@ import org.springframework.modulith.ApplicationModule
 
 @ApplicationModule(
 	type = ApplicationModule.Type.CLOSED,
-	allowedDependencies = []
+	allowedDependencies = [],
 )
 class PaymentModuleMetadata

src/main/kotlin/tech/sipe/fintech/payment/PaymentService.kt

@@ -1,4 +1,3 @@
 package tech.sipe.fintech.payment
 
-class PaymentService {
-}
+class PaymentService

src/main/kotlin/tech/sipe/fintech/transfer/TransferModuleMetadata.kt

@@ -3,7 +3,6 @@ package tech.sipe.fintech.transfer
 import org.springframework.modulith.ApplicationModule
 
 @ApplicationModule(
-	allowedDependencies = ["wallet"]
+	allowedDependencies = ["wallet"],
 )
-class TransferModuleMetadata {
-}
+class TransferModuleMetadata

src/main/kotlin/tech/sipe/fintech/transfer/internal/Transfer.kt

@@ -2,6 +2,5 @@ package tech.sipe.fintech.transfer.internal
 
 class Transfer(
 	val id: Long,
-	val money: Long
-) {
-}
+	val money: Long,
+)

src/main/kotlin/tech/sipe/fintech/transfer/internal/TransferApi.kt

@@ -8,27 +8,25 @@ import tech.sipe.fintech.wallet.PayWalletApi
 @RestController
 class TransferApi(
 	private val transferService: TransferService,
-	private val payWalletApi: PayWalletApi
+	private val payWalletApi: PayWalletApi,
 ) {
-
 	@PostMapping("/transfers/charge")
 	fun charge(
-		@RequestParam memberId: Long
+		@RequestParam memberId: Long,
 	) {
 		val balance = payWalletApi.getBalance(123)
 		transferService.charge()
 	}
 
 	@PostMapping("/transfers/withdrawal")
 	fun withdraw(
-		@RequestParam memberId: Long
+		@RequestParam memberId: Long,
 	) {}
 
 	@PostMapping("/transfers")
 	fun transfer(
-		@RequestParam memberId: Long
+		@RequestParam memberId: Long,
 	) {
 		transferService.transfer()
 	}
-
 }

src/main/kotlin/tech/sipe/fintech/transfer/internal/TransferEntity.kt

@@ -1,4 +1,3 @@
 package tech.sipe.fintech.transfer.internal
 
-class TransferEntity {
-}
+class TransferEntity

src/main/kotlin/tech/sipe/fintech/transfer/internal/TransferJpaRepository.kt

@@ -1,4 +1,3 @@
 package tech.sipe.fintech.transfer.internal
 
-interface TransferJpaRepository {
-}
+interface TransferJpaRepository

src/main/kotlin/tech/sipe/fintech/transfer/internal/TransferRepository.kt

@@ -1,5 +1,3 @@
 package tech.sipe.fintech.transfer.internal
 
 interface TransferRepository
-{
-}

src/main/kotlin/tech/sipe/fintech/transfer/internal/TransferService.kt

@@ -1,18 +1,12 @@
 package tech.sipe.fintech.transfer.internal
 
 import org.springframework.stereotype.Service
-import tech.sipe.fintech.wallet.internal.domain.Currency
-import tech.sipe.fintech.wallet.internal.domain.PayWallet
-import tech.sipe.fintech.wallet.internal.domain.WalletStatus
-import java.math.BigDecimal
-
 
 @Service
-class TransferService(
-) {
+class TransferService {
 	fun charge() {
 	}
-	fun transfer() {
 
+	fun transfer() {
 	}
 }

src/main/kotlin/tech/sipe/fintech/wallet/PayWalletApi.kt

@@ -4,7 +4,15 @@ package tech.sipe.fintech.wallet
  * @author 김재영 ([email protected])
  */
 interface PayWalletApi {
-	fun charge(amount: Long, payWalletId: Long)
-	fun pay(amount: Long, payWalletId: Long)
+	fun charge(
+		amount: Long,
+		payWalletId: Long,
+	)
+
+	fun pay(
+		amount: Long,
+		payWalletId: Long,
+	)
+
 	fun getBalance(payWalletId: Long): Long
 }

src/main/kotlin/tech/sipe/fintech/wallet/WalletModuleMetadata.kt

@@ -4,6 +4,6 @@ import org.springframework.modulith.ApplicationModule
 
 @ApplicationModule(
 	type = ApplicationModule.Type.CLOSED,
-	allowedDependencies = []
+	allowedDependencies = [],
 )
 class WalletModuleMetadata

src/main/kotlin/tech/sipe/fintech/wallet/internal/domain/PayWallet.kt

@@ -10,19 +10,21 @@ class PayWallet(
 	balance: BigDecimal,
 	val currency: Currency,
 ) {
+	companion object {
+		private const val MINIMUM_CHARGE_AMOUNT = 1000
+	}
+
 	var balance: BigDecimal = balance
 		private set
 
-	private val MINIMUM_CHARGE_AMOUNT = 1000
-
 	/**
 	 * 충전
 	 */
 	fun charge(amount: Long) {
 		if (amount < MINIMUM_CHARGE_AMOUNT) {
 			throw IllegalArgumentException("최소 충전 금액은 1,000원입니다.")
 		}
-		 balance += BigDecimal.valueOf(amount)
+		balance += BigDecimal.valueOf(amount)
 	}
 
 	/**

src/main/kotlin/tech/sipe/fintech/wallet/internal/domain/PayWalletMapper.kt

@@ -5,23 +5,23 @@ import tech.sipe.fintech.wallet.internal.infra.PayWalletEntity
 
 class PayWalletMapper {
 	companion object {
-		fun toDomain(entity: PayWalletEntity): PayWallet {
-			return PayWallet(
+		fun toDomain(entity: PayWalletEntity): PayWallet =
+			PayWallet(
 				id = entity.id ?: throw DataIntegrityViolationException("Id is null"),
 				userId = entity.userId,
 				accountId = entity.accountId,
 				walletStatus = entity.walletStatus,
 				balance = entity.balance,
-				currency = entity.currency
+				currency = entity.currency,
 			)
-		}
 
-		fun toEntity(domain: PayWallet) = PayWalletEntity(
-			userId =  domain.userId,
-			accountId =  domain.accountId,
-			walletStatus = domain.walletStatus,
-			balance = domain.balance,
-			currency = domain.currency
-		)
+		fun toEntity(domain: PayWallet) =
+			PayWalletEntity(
+				userId = domain.userId,
+				accountId = domain.accountId,
+				walletStatus = domain.walletStatus,
+				balance = domain.balance,
+				currency = domain.currency,
+			)
 	}
 }

src/main/kotlin/tech/sipe/fintech/wallet/internal/domain/PayWalletRepository.kt

@@ -1,7 +1,7 @@
 package tech.sipe.fintech.wallet.internal.domain
 
-
 interface PayWalletRepository {
 	fun findByUserId(userId: Long): PayWallet
+
 	fun save(payWalletEntity: PayWallet): PayWallet
 }

src/main/kotlin/tech/sipe/fintech/wallet/internal/domain/WalletStatus.kt

@@ -6,5 +6,5 @@ package tech.sipe.fintech.wallet.internal.domain
 enum class WalletStatus {
 	ACTIVE,
 	INACTIVE,
-	SUSPENDED
+	SUSPENDED,
 }

src/main/kotlin/tech/sipe/fintech/wallet/internal/infra/PayWalletEntity.kt

@@ -19,4 +19,4 @@ class PayWalletEntity(
 	val balance: BigDecimal = BigDecimal.ZERO,
 	@Enumerated(value = EnumType.STRING)
 	val currency: Currency,
-): BaseEntity()
+) : BaseEntity()

src/main/kotlin/tech/sipe/fintech/wallet/internal/infra/PayWalletJpaRepository.kt

@@ -2,6 +2,6 @@ package tech.sipe.fintech.wallet.internal.infra
 
 import org.springframework.data.jpa.repository.JpaRepository
 
-interface PayWalletJpaRepository : JpaRepository<PayWalletEntity, Long>{
-	fun findByUserId(userId: Long) : PayWalletEntity?
+interface PayWalletJpaRepository : JpaRepository<PayWalletEntity, Long> {
+	fun findByUserId(userId: Long): PayWalletEntity?
 }