fix(dvs-upstream): lombok annotation fixes

vincejv · Aug 28, 2023 · bbd1d10 · bbd1d10
1 parent 7725350
commit bbd1d10
Show file tree

Hide file tree

Showing 16 changed files with 32 additions and 2 deletions.
diff --git a/src/main/java/com/dtone/dvs/dto/BenefitAmountFixed.java b/src/main/java/com/dtone/dvs/dto/BenefitAmountFixed.java
@@ -9,8 +9,8 @@
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-@EqualsAndHashCode(callSuper = true)
-public class BenefitAmountFixed extends Benefit {
+@EqualsAndHashCode
+public class BenefitAmountFixed {
 
   @JsonProperty(value = "base")
   private Double base;

diff --git a/src/main/java/com/dtone/dvs/dto/BenefitFixed.java b/src/main/java/com/dtone/dvs/dto/BenefitFixed.java
@@ -6,12 +6,14 @@
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
+import lombok.ToString;
 
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
 @EqualsAndHashCode(callSuper = true)
 @JsonIgnoreProperties(ignoreUnknown = true)
+@ToString(callSuper = true)
 public class BenefitFixed extends Benefit {
 
   @JsonProperty(value = "amount")

diff --git a/src/main/java/com/dtone/dvs/dto/BenefitRanged.java b/src/main/java/com/dtone/dvs/dto/BenefitRanged.java
@@ -6,12 +6,14 @@
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
+import lombok.ToString;
 
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
 @EqualsAndHashCode(callSuper = true)
 @JsonIgnoreProperties(ignoreUnknown = true)
+@ToString(callSuper = true)
 public class BenefitRanged extends Benefit {
 
   @JsonProperty(value = "amount")

diff --git a/src/main/java/com/dtone/dvs/dto/LookupOperatorRequest.java b/src/main/java/com/dtone/dvs/dto/LookupOperatorRequest.java
@@ -8,13 +8,15 @@
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
+import lombok.ToString;
 
 @JsonInclude(Include.NON_NULL)
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
 @EqualsAndHashCode(callSuper = true)
 @JsonIgnoreProperties(ignoreUnknown = true)
+@ToString(callSuper = true)
 public class LookupOperatorRequest extends ApiRequest {
 
   @JsonProperty(value = "mobile_number")

diff --git a/src/main/java/com/dtone/dvs/dto/ProductFixed.java b/src/main/java/com/dtone/dvs/dto/ProductFixed.java
@@ -8,12 +8,14 @@
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
+import lombok.ToString;
 
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
 @EqualsAndHashCode(callSuper = true)
 @JsonIgnoreProperties(ignoreUnknown = true)
+@ToString(callSuper = true)
 public class ProductFixed extends Product {
 
   @JsonProperty(value = "benefits")

diff --git a/src/main/java/com/dtone/dvs/dto/ProductPriceFixed.java b/src/main/java/com/dtone/dvs/dto/ProductPriceFixed.java
@@ -6,12 +6,14 @@
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
+import lombok.ToString;
 
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
 @EqualsAndHashCode(callSuper = true)
 @JsonIgnoreProperties(ignoreUnknown = true)
+@ToString(callSuper = true)
 public class ProductPriceFixed extends ProductPrice {
 
   @JsonProperty(value = "amount")

diff --git a/src/main/java/com/dtone/dvs/dto/ProductPriceRanged.java b/src/main/java/com/dtone/dvs/dto/ProductPriceRanged.java
@@ -6,12 +6,14 @@
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
+import lombok.ToString;
 
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
 @EqualsAndHashCode(callSuper = true)
 @JsonIgnoreProperties(ignoreUnknown = true)
+@ToString(callSuper = true)
 public class ProductPriceRanged extends ProductPrice {
 
   @JsonProperty(value = "amount")

diff --git a/src/main/java/com/dtone/dvs/dto/ProductRanged.java b/src/main/java/com/dtone/dvs/dto/ProductRanged.java
@@ -8,12 +8,14 @@
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
+import lombok.ToString;
 
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
 @EqualsAndHashCode(callSuper = true)
 @JsonIgnoreProperties(ignoreUnknown = true)
+@ToString(callSuper = true)
 public class ProductRanged extends Product {
 
   @JsonProperty(value = "benefits")

diff --git a/src/main/java/com/dtone/dvs/dto/ProductSource.java b/src/main/java/com/dtone/dvs/dto/ProductSource.java
@@ -6,12 +6,14 @@
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
+import lombok.ToString;
 
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
 @EqualsAndHashCode
 @JsonIgnoreProperties(ignoreUnknown = true)
+@ToString(callSuper = true)
 public class ProductSource {
 
   @JsonProperty(value = "unit_type")

diff --git a/src/main/java/com/dtone/dvs/dto/Source.java b/src/main/java/com/dtone/dvs/dto/Source.java
@@ -7,12 +7,14 @@
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
+import lombok.ToString;
 
 @Data
 @NoArgsConstructor
 @EqualsAndHashCode(callSuper = true)
 @JsonInclude(Include.NON_NULL)
 @JsonIgnoreProperties(ignoreUnknown = true)
+@ToString(callSuper = true)
 public class Source extends ProductSource {
 
   @JsonProperty(value = "amount")

diff --git a/src/main/java/com/dtone/dvs/dto/SourceFixed.java b/src/main/java/com/dtone/dvs/dto/SourceFixed.java
@@ -6,12 +6,14 @@
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
+import lombok.ToString;
 
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
 @EqualsAndHashCode(callSuper = true)
 @JsonIgnoreProperties(ignoreUnknown = true)
+@ToString(callSuper = true)
 public class SourceFixed extends ProductSource {
 
   @JsonProperty(value = "amount")

diff --git a/src/main/java/com/dtone/dvs/dto/SourceRanged.java b/src/main/java/com/dtone/dvs/dto/SourceRanged.java
@@ -6,12 +6,14 @@
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
+import lombok.ToString;
 
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
 @EqualsAndHashCode(callSuper = true)
 @JsonIgnoreProperties(ignoreUnknown = true)
+@ToString(callSuper = true)
 public class SourceRanged extends ProductSource {
 
   @JsonProperty(value = "amount")

diff --git a/src/main/java/com/dtone/dvs/dto/TransactionDeserializer.java b/src/main/java/com/dtone/dvs/dto/TransactionDeserializer.java
@@ -1,6 +1,7 @@
 package com.dtone.dvs.dto;
 
 import java.io.IOException;
+import java.io.Serial;
 import java.util.List;
 
 import com.dtone.dvs.util.ProductUtils;
@@ -13,6 +14,7 @@
 
 public class TransactionDeserializer extends StdDeserializer<Transaction> {
 
+  @Serial
   private static final long serialVersionUID = -6186626005507523730L;
   private static final ObjectMapper mapper = new ObjectMapper();
 

diff --git a/src/main/java/com/dtone/dvs/dto/TransactionFixed.java b/src/main/java/com/dtone/dvs/dto/TransactionFixed.java
@@ -8,12 +8,14 @@
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
+import lombok.ToString;
 
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
 @EqualsAndHashCode(callSuper = true)
 @JsonIgnoreProperties(ignoreUnknown = true)
+@ToString(callSuper = true)
 public class TransactionFixed extends Transaction {
 
   @JsonProperty(value = "benefits")

diff --git a/src/main/java/com/dtone/dvs/dto/TransactionRanged.java b/src/main/java/com/dtone/dvs/dto/TransactionRanged.java
@@ -8,12 +8,14 @@
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
+import lombok.ToString;
 
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
 @EqualsAndHashCode(callSuper = true)
 @JsonIgnoreProperties(ignoreUnknown = true)
+@ToString(callSuper = true)
 public class TransactionRanged extends Transaction {
 
   @JsonProperty(value = "benefits")

diff --git a/src/main/java/com/dtone/dvs/dto/TransactionRequest.java b/src/main/java/com/dtone/dvs/dto/TransactionRequest.java
@@ -8,13 +8,15 @@
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
+import lombok.ToString;
 
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
 @EqualsAndHashCode(callSuper = true)
 @JsonInclude(Include.NON_NULL)
 @JsonIgnoreProperties(ignoreUnknown = true)
+@ToString(callSuper = true)
 public class TransactionRequest extends ApiRequest {
 
 	@JsonProperty(value = "external_id")