Merge remote-tracking branch 'origin/feature/Payment-(1-4)' into feat…

…ure/Payment-(1-4) # Conflicts: # src/main/java/com/zufar/onlinestore/payment/PaymentApi.java # src/main/java/com/zufar/onlinestore/payment/config/StripeConfiguration.java # src/main/java/com/zufar/onlinestore/payment/controller/PaymentController.java # src/main/java/com/zufar/onlinestore/payment/dto/CreatePaymentDto.java # src/main/java/com/zufar/onlinestore/payment/dto/PriceDetailsDto.java # src/main/java/com/zufar/onlinestore/payment/enums/PaymentStatus.java # src/main/java/com/zufar/onlinestore/payment/model/Payment.java # src/main/java/com/zufar/onlinestore/payment/processor/PaymentProcessor.java # src/main/java/com/zufar/onlinestore/payment/service/PaymentService.java # src/main/java/com/zufar/onlinestore/payment/service/impl/PaymentServiceImpl.java
Sunagatov · Jul 20, 2023 · 7282841 · 7282841
2 parents ca4f4fa + b7c0965
commit 7282841
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/pom.xml b/pom.xml
@@ -221,7 +221,6 @@
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
-                <version>${spring-boot-maven-plugin.version}</version>
                 <configuration>
                     <excludes>
                         <exclude>

diff --git a/src/main/java/com/zufar/onlinestore/payment/dto/PaymentWithTokenDetailsDto.java b/src/main/java/com/zufar/onlinestore/payment/dto/PaymentWithTokenDetailsDto.java
@@ -0,0 +1,6 @@
+package com.zufar.onlinestore.payment.dto;
+
+import lombok.Builder;
+
+@Builder
+public record PaymentWithTokenDetailsDto(String paymentToken, PaymentDetailsDto paymentDetailsDto) {}
diff --git a/src/main/java/com/zufar/onlinestore/payment/model/Payment.java b/src/main/java/com/zufar/onlinestore/payment/model/Payment.java
@@ -10,9 +10,6 @@
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 import lombok.Getter;
-import org.apache.commons.lang3.builder.EqualsBuilder;
-import org.apache.commons.lang3.builder.HashCodeBuilder;
-import org.apache.commons.lang3.builder.ToStringBuilder;
 import java.math.BigDecimal;
 
 @Getter