diff --git a/src/main/java/roomescape/common/exception/ErrorType.kt b/src/main/java/roomescape/common/exception/ErrorType.kt index 8d19efe4..4cb5a16b 100644 --- a/src/main/java/roomescape/common/exception/ErrorType.kt +++ b/src/main/java/roomescape/common/exception/ErrorType.kt @@ -5,7 +5,7 @@ import com.fasterxml.jackson.annotation.JsonProperty import org.springframework.http.HttpStatus enum class ErrorType( - @JvmField val description: String + val description: String ) { // 400 Bad Request REQUEST_DATA_BLANK("요청 데이터에 유효하지 않은 값(null OR 공백)이 포함되어있습니다."), diff --git a/src/main/java/roomescape/payment/infrastructure/client/PaymentProperties.kt b/src/main/java/roomescape/payment/infrastructure/client/PaymentProperties.kt index 06758eb8..a421028e 100644 --- a/src/main/java/roomescape/payment/infrastructure/client/PaymentProperties.kt +++ b/src/main/java/roomescape/payment/infrastructure/client/PaymentProperties.kt @@ -4,8 +4,8 @@ import org.springframework.boot.context.properties.ConfigurationProperties @ConfigurationProperties(prefix = "payment") data class PaymentProperties( - @JvmField val apiBaseUrl: String, - @JvmField val confirmSecretKey: String, - @JvmField val readTimeout: Int, - @JvmField val connectTimeout: Int + val apiBaseUrl: String, + val confirmSecretKey: String, + val readTimeout: Int, + val connectTimeout: Int ) diff --git a/src/test/java/roomescape/payment/SampleTossPaymentConst.kt b/src/test/java/roomescape/payment/SampleTossPaymentConst.kt index ba1db53e..c2188bae 100644 --- a/src/test/java/roomescape/payment/SampleTossPaymentConst.kt +++ b/src/test/java/roomescape/payment/SampleTossPaymentConst.kt @@ -6,22 +6,16 @@ import roomescape.payment.web.PaymentCancel import kotlin.math.roundToLong object SampleTossPaymentConst { - @JvmField val paymentKey: String = "5EnNZRJGvaBX7zk2yd8ydw26XvwXkLrx9POLqKQjmAw4b0e1" - @JvmField val orderId: String = "MC4wODU4ODQwMzg4NDk0" - @JvmField val amount: Long = 1000L - @JvmField val paymentType: String = "카드" - @JvmField val cancelReason: String = "테스트 결제 취소" - @JvmField val paymentRequest: PaymentApprove.Request = PaymentApprove.Request( paymentKey, orderId, @@ -29,7 +23,6 @@ object SampleTossPaymentConst { paymentType ) - @JvmField val paymentRequestJson: String = """ { "paymentKey": "$paymentKey", @@ -39,21 +32,18 @@ object SampleTossPaymentConst { } """.trimIndent() - @JvmField val cancelRequest: PaymentCancel.Request = PaymentCancel.Request( paymentKey, amount, cancelReason ) - @JvmField val cancelRequestJson: String = """ { "cancelReason": "$cancelReason" } """.trimIndent() - @JvmField val tossPaymentErrorJson: String = """ { "code": "ERROR_CODE", @@ -61,7 +51,6 @@ object SampleTossPaymentConst { } """.trimIndent() - @JvmField val confirmJson: String = """ { "mId": "tosspayments", @@ -127,7 +116,6 @@ object SampleTossPaymentConst { } """.trimIndent() - @JvmField val cancelJson: String = """ { "mId": "tosspayments",