Clean up Lombok usage

Author: joschi

src/main/java/com/qdesrame/openapi/diff/compare/CacheKey.java

@@ -1,39 +1,12 @@
 package com.qdesrame.openapi.diff.compare;
 
 import com.qdesrame.openapi.diff.model.DiffContext;
-import lombok.Getter;
-import org.apache.commons.lang3.builder.EqualsBuilder;
-import org.apache.commons.lang3.builder.HashCodeBuilder;
+import lombok.Value;
 
-@Getter
-public final class CacheKey {
-  private final String left;
-  private final String right;
-  private final DiffContext context;
+@Value
+public class CacheKey {
 
-  public CacheKey(final String left, final String right, final DiffContext context) {
-    this.left = left;
-    this.right = right;
-    this.context = context;
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) return true;
-
-    if (o == null || getClass() != o.getClass()) return false;
-
-    CacheKey cacheKey = (CacheKey) o;
-
-    return new EqualsBuilder()
-        .append(left, cacheKey.left)
-        .append(right, cacheKey.right)
-        .append(context, cacheKey.context)
-        .isEquals();
-  }
-
-  @Override
-  public int hashCode() {
-    return new HashCodeBuilder(17, 37).append(left).append(right).append(context).toHashCode();
-  }
+  String left;
+  String right;
+  DiffContext context;
 }

src/main/java/com/qdesrame/openapi/diff/compare/ListDiff.java

@@ -1,9 +1,7 @@
 package com.qdesrame.openapi.diff.compare;
 
 import com.qdesrame.openapi.diff.model.ChangedList;
-import lombok.Getter;
 
-@Getter
 public class ListDiff {
 
   public static <K extends ChangedList<X>, X> K diff(K instance) {

src/main/java/com/qdesrame/openapi/diff/compare/OpenApiDiff.java

@@ -2,8 +2,12 @@
 
 import static com.qdesrame.openapi.diff.compare.PathsDiff.valOrEmpty;
 
-import com.qdesrame.openapi.diff.model.*;
 import com.qdesrame.openapi.diff.model.ChangedExtensions;
+import com.qdesrame.openapi.diff.model.ChangedOpenApi;
+import com.qdesrame.openapi.diff.model.ChangedOperation;
+import com.qdesrame.openapi.diff.model.ChangedPath;
+import com.qdesrame.openapi.diff.model.ChangedPaths;
+import com.qdesrame.openapi.diff.model.Endpoint;
 import com.qdesrame.openapi.diff.utils.EndpointUtils;
 import io.swagger.v3.oas.models.OpenAPI;
 import io.swagger.v3.oas.models.PathItem;
@@ -22,7 +26,7 @@ public class OpenApiDiff {
 
   public static final String SWAGGER_VERSION_V2 = "2.0";
 
-  private static Logger logger = LoggerFactory.getLogger(OpenApiDiff.class);
+  private static final Logger logger = LoggerFactory.getLogger(OpenApiDiff.class);
 
   private PathsDiff pathsDiff;
   private PathDiff pathDiff;
@@ -44,8 +48,8 @@ public class OpenApiDiff {
   private ExtensionsDiff extensionsDiff;
   private MetadataDiff metadataDiff;
 
-  private OpenAPI oldSpecOpenApi;
-  private OpenAPI newSpecOpenApi;
+  private final OpenAPI oldSpecOpenApi;
+  private final OpenAPI newSpecOpenApi;
   private List<Endpoint> newEndpoints;
   private List<Endpoint> missingEndpoints;
   private List<ChangedOperation> changedOperations;

src/main/java/com/qdesrame/openapi/diff/compare/SecurityDiffInfo.java

@@ -6,14 +6,12 @@
 import java.util.List;
 import java.util.Optional;
 import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.Setter;
+import lombok.Data;
 
-/** Created by adarsh.sharma on 11/01/18. */
-@Getter
-@Setter
+@Data
 @AllArgsConstructor
 public class SecurityDiffInfo {
+
   private String ref;
   private SecurityScheme securityScheme;
   private List<String> scopes;
@@ -43,14 +41,20 @@ public static boolean sameList(
 
   @Override
   public boolean equals(Object o) {
-    if (this == o) return true;
-    if (o == null || getClass() != o.getClass()) return false;
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
 
     SecurityDiffInfo that = (SecurityDiffInfo) o;
 
     if (securityScheme != null
         ? !securityScheme.equals(that.securityScheme)
-        : that.securityScheme != null) return false;
+        : that.securityScheme != null) {
+      return false;
+    }
     return scopes != null ? scopes.equals(that.scopes) : that.scopes == null;
   }
 

src/main/java/com/qdesrame/openapi/diff/model/Change.java

@@ -1,18 +1,13 @@
 package com.qdesrame.openapi.diff.model;
 
-import lombok.Getter;
+import lombok.Value;
 
-@Getter
+@Value
 public class Change<T> {
-  private final T oldValue;
-  private final T newValue;
-  private final Type type;
 
-  private Change(T oldValue, T newValue, Type type) {
-    this.oldValue = oldValue;
-    this.newValue = newValue;
-    this.type = type;
-  }
+  T oldValue;
+  T newValue;
+  Type type;
 
   public static <T> Change<T> changed(T oldValue, T newValue) {
     return new Change<>(oldValue, newValue, Type.CHANGED);

src/main/java/com/qdesrame/openapi/diff/model/ChangedApiResponse.java

@@ -7,15 +7,13 @@
 import java.util.Map;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-import lombok.Getter;
-import lombok.Setter;
+import lombok.Data;
 import lombok.experimental.Accessors;
 
-/** Created by adarsh.sharma on 22/12/17. */
-@Getter
-@Setter
+@Data
 @Accessors(chain = true)
 public class ChangedApiResponse implements ComposedChanged {
+
   private final ApiResponses oldApiResponses;
   private final ApiResponses newApiResponses;
   private final DiffContext context;

src/main/java/com/qdesrame/openapi/diff/model/ChangedContent.java

@@ -6,15 +6,13 @@
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
-import lombok.Getter;
-import lombok.Setter;
+import lombok.Data;
 import lombok.experimental.Accessors;
 
-/** Created by adarsh.sharma on 22/12/17. */
-@Getter
-@Setter
+@Data
 @Accessors(chain = true)
 public class ChangedContent implements ComposedChanged {
+
   private final Content oldContent;
   private final Content newContent;
   private final DiffContext context;

src/main/java/com/qdesrame/openapi/diff/model/ChangedExtensions.java

@@ -6,14 +6,11 @@
 import java.util.Map;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-import lombok.Getter;
-import lombok.Setter;
-import lombok.experimental.Accessors;
+import lombok.Data;
 
-@Getter
-@Setter
-@Accessors
+@Data
 public class ChangedExtensions implements ComposedChanged {
+
   private final Map<String, Object> oldExtensions;
   private final Map<String, Object> newExtensions;
   private final DiffContext context;

src/main/java/com/qdesrame/openapi/diff/model/ChangedHeader.java

@@ -3,15 +3,13 @@
 import io.swagger.v3.oas.models.headers.Header;
 import java.util.Arrays;
 import java.util.List;
-import lombok.Getter;
-import lombok.Setter;
+import lombok.Data;
 import lombok.experimental.Accessors;
 
-/** Created by adarsh.sharma on 28/12/17. */
-@Getter
-@Setter
+@Data
 @Accessors(chain = true)
 public class ChangedHeader implements ComposedChanged {
+
   private final Header oldHeader;
   private final Header newHeader;
   private final DiffContext context;

src/main/java/com/qdesrame/openapi/diff/model/ChangedHeaders.java

@@ -4,15 +4,13 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import lombok.Getter;
-import lombok.Setter;
+import lombok.Data;
 import lombok.experimental.Accessors;
 
-/** Created by adarsh.sharma on 28/12/17. */
-@Getter
-@Setter
+@Data
 @Accessors(chain = true)
 public class ChangedHeaders implements ComposedChanged {
+
   private final Map<String, Header> oldHeaders;
   private final Map<String, Header> newHeaders;
   private final DiffContext context;

src/main/java/com/qdesrame/openapi/diff/model/ChangedList.java

@@ -3,14 +3,13 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
-import lombok.Getter;
-import lombok.Setter;
+import lombok.Data;
 import lombok.experimental.Accessors;
 
-@Getter
-@Setter
+@Data
 @Accessors(chain = true)
 public abstract class ChangedList<T> implements Changed {
+
   protected DiffContext context;
   protected List<T> oldValue;
   protected List<T> newValue;

src/main/java/com/qdesrame/openapi/diff/model/ChangedMediaType.java

@@ -3,14 +3,13 @@
 import io.swagger.v3.oas.models.media.Schema;
 import java.util.Collections;
 import java.util.List;
-import lombok.Getter;
-import lombok.Setter;
+import lombok.Data;
 import lombok.experimental.Accessors;
 
-@Getter
-@Setter
+@Data
 @Accessors(chain = true)
 public class ChangedMediaType implements ComposedChanged {
+
   private final Schema oldSchema;
   private final Schema newSchema;
   private final DiffContext context;

src/main/java/com/qdesrame/openapi/diff/model/ChangedMetadata.java

@@ -1,12 +1,10 @@
 package com.qdesrame.openapi.diff.model;
 
 import java.util.Objects;
-import lombok.Getter;
-import lombok.Setter;
+import lombok.Data;
 import lombok.experimental.Accessors;
 
-@Getter
-@Setter
+@Data
 @Accessors(chain = true)
 public class ChangedMetadata implements Changed {
 

src/main/java/com/qdesrame/openapi/diff/model/ChangedOAuthFlow.java

@@ -3,15 +3,13 @@
 import io.swagger.v3.oas.models.security.OAuthFlow;
 import java.util.Collections;
 import java.util.List;
-import lombok.Getter;
-import lombok.Setter;
+import lombok.Data;
 import lombok.experimental.Accessors;
 
-/** Created by adarsh.sharma on 12/01/18. */
-@Getter
-@Setter
+@Data
 @Accessors(chain = true)
 public class ChangedOAuthFlow implements ComposedChanged {
+
   private OAuthFlow oldOAuthFlow;
   private OAuthFlow newOAuthFlow;
 

src/main/java/com/qdesrame/openapi/diff/model/ChangedOAuthFlows.java

@@ -3,15 +3,13 @@
 import io.swagger.v3.oas.models.security.OAuthFlows;
 import java.util.Arrays;
 import java.util.List;
-import lombok.Getter;
-import lombok.Setter;
+import lombok.Data;
 import lombok.experimental.Accessors;
 
-/** Created by adarsh.sharma on 12/01/18. */
-@Getter
-@Setter
+@Data
 @Accessors(chain = true)
 public class ChangedOAuthFlows implements ComposedChanged {
+
   private final OAuthFlows oldOAuthFlows;
   private final OAuthFlows newOAuthFlows;
 

src/main/java/com/qdesrame/openapi/diff/model/ChangedOneOfSchema.java

@@ -4,15 +4,13 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import lombok.Getter;
-import lombok.Setter;
+import lombok.Data;
 import lombok.experimental.Accessors;
 
-/** Created by adarsh.sharma on 22/12/17. */
-@Getter
-@Setter
+@Data
 @Accessors(chain = true)
 public class ChangedOneOfSchema implements ComposedChanged {
+
   private final Map<String, String> oldMapping;
   private final Map<String, String> newMapping;
   private final DiffContext context;

src/main/java/com/qdesrame/openapi/diff/model/ChangedOpenApi.java

@@ -5,15 +5,13 @@
 import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-import lombok.Getter;
-import lombok.Setter;
+import lombok.Data;
 import lombok.experimental.Accessors;
 
-/** Created by adarsh.sharma on 22/12/17. */
-@Getter
-@Setter
+@Data
 @Accessors(chain = true)
 public class ChangedOpenApi implements ComposedChanged {
+
   private OpenAPI oldSpecOpenApi;
   private OpenAPI newSpecOpenApi;
 

src/main/java/com/qdesrame/openapi/diff/model/ChangedOperation.java

@@ -6,14 +6,13 @@
 import io.swagger.v3.oas.models.PathItem;
 import java.util.Arrays;
 import java.util.List;
-import lombok.Getter;
-import lombok.Setter;
+import lombok.Data;
 import lombok.experimental.Accessors;
 
-@Getter
-@Setter
+@Data
 @Accessors(chain = true)
 public class ChangedOperation implements ComposedChanged {
+
   private Operation oldOperation;
   private Operation newOperation;