Revert "refactor: Use of @EqualsAndHashCode on Recipe"

This reverts commit eaa8871.
openrewrite · Feb 2, 2024 · 516c70b · 516c70b
1 parent eaa8871
commit 516c70b
Show file tree

Hide file tree

Showing 212 changed files with 409 additions and 409 deletions.
diff --git a/rewrite-core/src/main/java/org/openrewrite/Cursor.java b/rewrite-core/src/main/java/org/openrewrite/Cursor.java
@@ -26,7 +26,7 @@
 
 import static java.util.stream.StreamSupport.stream;
 
-@EqualsAndHashCode(exclude = false)
+@EqualsAndHashCode(exclude = "messages")
 public class Cursor {
     public static final String ROOT_VALUE = "root";
 

diff --git a/rewrite-core/src/main/java/org/openrewrite/DeleteSourceFiles.java b/rewrite-core/src/main/java/org/openrewrite/DeleteSourceFiles.java
@@ -23,7 +23,7 @@
 import java.nio.file.PathMatcher;
 
 @Value
-@EqualsAndHashCode(callSuper = false)
+@EqualsAndHashCode(callSuper = true)
 public class DeleteSourceFiles extends Recipe {
 
     @Option(displayName = "File pattern",

diff --git a/rewrite-core/src/main/java/org/openrewrite/FindCollidingSourceFiles.java b/rewrite-core/src/main/java/org/openrewrite/FindCollidingSourceFiles.java
@@ -27,7 +27,7 @@
 import java.util.Set;
 
 @Value
-@EqualsAndHashCode(callSuper = false)
+@EqualsAndHashCode(callSuper = true)
 public class FindCollidingSourceFiles extends ScanningRecipe<FindCollidingSourceFiles.Accumulator> {
 
     transient CollidingSourceFiles collidingSourceFiles = new CollidingSourceFiles(this);

diff --git a/rewrite-core/src/main/java/org/openrewrite/FindLstProvenance.java b/rewrite-core/src/main/java/org/openrewrite/FindLstProvenance.java
@@ -26,7 +26,7 @@
 import static java.time.ZoneOffset.UTC;
 
 @Value
-@EqualsAndHashCode(callSuper = false)
+@EqualsAndHashCode(callSuper = true)
 public class FindLstProvenance extends ScanningRecipe<FindLstProvenance.Accumulator> {
 
     @Override

diff --git a/rewrite-core/src/main/java/org/openrewrite/FindParseFailures.java b/rewrite-core/src/main/java/org/openrewrite/FindParseFailures.java
@@ -24,7 +24,7 @@
 import java.util.Objects;
 
 @Value
-@EqualsAndHashCode(callSuper = false)
+@EqualsAndHashCode(callSuper = true)
 public class FindParseFailures extends Recipe {
 
     @Option(displayName = "Max snippet length",

diff --git a/rewrite-core/src/main/java/org/openrewrite/FindQuarks.java b/rewrite-core/src/main/java/org/openrewrite/FindQuarks.java
@@ -24,7 +24,7 @@
 import static java.util.Objects.requireNonNull;
 
 @Value
-@EqualsAndHashCode(callSuper = false)
+@EqualsAndHashCode(callSuper = true)
 public class FindQuarks extends Recipe {
     @Override
     public String getDisplayName() {

diff --git a/rewrite-core/src/main/java/org/openrewrite/FindSourceFiles.java b/rewrite-core/src/main/java/org/openrewrite/FindSourceFiles.java
@@ -26,7 +26,7 @@
 
 
 @Value
-@EqualsAndHashCode(callSuper = false)
+@EqualsAndHashCode(callSuper = true)
 public class FindSourceFiles extends Recipe {
     transient SourcesFiles results = new SourcesFiles(this);
 

diff --git a/rewrite-core/src/main/java/org/openrewrite/IsInRepository.java b/rewrite-core/src/main/java/org/openrewrite/IsInRepository.java
@@ -25,7 +25,7 @@
 import java.util.Set;
 
 @Value
-@EqualsAndHashCode(callSuper = false)
+@EqualsAndHashCode(callSuper = true)
 public class IsInRepository extends Recipe {
     @Override
     public String getDisplayName() {

diff --git a/rewrite-core/src/main/java/org/openrewrite/RenameFile.java b/rewrite-core/src/main/java/org/openrewrite/RenameFile.java
@@ -23,7 +23,7 @@
 import java.nio.file.PathMatcher;
 
 @Value
-@EqualsAndHashCode(callSuper = false)
+@EqualsAndHashCode(callSuper = true)
 public class RenameFile extends Recipe {
     @Option(displayName = "File matcher",
             description = "Matching files will be renamed. This is a glob expression.",

diff --git a/rewrite-core/src/main/java/org/openrewrite/SetFilePermissions.java b/rewrite-core/src/main/java/org/openrewrite/SetFilePermissions.java
@@ -23,7 +23,7 @@
 import java.nio.file.PathMatcher;
 
 @Value
-@EqualsAndHashCode(callSuper = false)
+@EqualsAndHashCode(callSuper = true)
 public class SetFilePermissions extends Recipe {
     @Option(displayName = "File matcher",
             description = "Permissions will be applied to matching files. This is a glob expression.",

diff --git a/rewrite-core/src/main/java/org/openrewrite/config/ColumnDescriptor.java b/rewrite-core/src/main/java/org/openrewrite/config/ColumnDescriptor.java
@@ -20,7 +20,7 @@
 import org.openrewrite.internal.lang.Nullable;
 
 @Value
-@EqualsAndHashCode(onlyExplicitlyIncluded = false)
+@EqualsAndHashCode(onlyExplicitlyIncluded = true)
 public class ColumnDescriptor {
 
     @EqualsAndHashCode.Include

diff --git a/rewrite-core/src/main/java/org/openrewrite/config/DataTableDescriptor.java b/rewrite-core/src/main/java/org/openrewrite/config/DataTableDescriptor.java
@@ -21,7 +21,7 @@
 import java.util.List;
 
 @Value
-@EqualsAndHashCode(onlyExplicitlyIncluded = false)
+@EqualsAndHashCode(onlyExplicitlyIncluded = true)
 public class DataTableDescriptor {
 
     @EqualsAndHashCode.Include

diff --git a/rewrite-core/src/main/java/org/openrewrite/config/DeclarativeRecipe.java b/rewrite-core/src/main/java/org/openrewrite/config/DeclarativeRecipe.java
@@ -124,7 +124,7 @@ private void initialize(List<Recipe> uninitialized, List<Recipe> initialized, Co
     }
 
     @Value
-    @EqualsAndHashCode(callSuper = false)
+    @EqualsAndHashCode(callSuper = true)
     @RequiredArgsConstructor
     static class PreconditionBellwether extends Recipe {
 
@@ -162,7 +162,7 @@ public boolean isAcceptable(SourceFile sourceFile, ExecutionContext ctx) {
         }
     }
 
-    @EqualsAndHashCode(callSuper = false)
+    @EqualsAndHashCode(callSuper = true)
     @Value
     static class BellwetherDecoratedRecipe extends Recipe {
 
@@ -196,7 +196,7 @@ public List<Recipe> getRecipeList() {
     }
 
     @Value
-    @EqualsAndHashCode(callSuper = false)
+    @EqualsAndHashCode(callSuper = true)
     static class BellwetherDecoratedScanningRecipe<T>  extends ScanningRecipe<T> {
 
         DeclarativeRecipe.PreconditionBellwether bellwether;
@@ -318,7 +318,7 @@ public Validated<Object> validate() {
     }
 
     @Value
-    @EqualsAndHashCode(callSuper = false)
+    @EqualsAndHashCode(callSuper = true)
     private static class LazyLoadedRecipe extends Recipe {
         String recipeFqn;
 

diff --git a/rewrite-core/src/main/java/org/openrewrite/config/OptionDescriptor.java b/rewrite-core/src/main/java/org/openrewrite/config/OptionDescriptor.java
@@ -22,7 +22,7 @@
 import java.util.List;
 
 @Value
-@EqualsAndHashCode(onlyExplicitlyIncluded = false)
+@EqualsAndHashCode(onlyExplicitlyIncluded = true)
 public class OptionDescriptor {
 
     @EqualsAndHashCode.Include

diff --git a/rewrite-core/src/main/java/org/openrewrite/config/RecipeDescriptor.java b/rewrite-core/src/main/java/org/openrewrite/config/RecipeDescriptor.java
@@ -28,7 +28,7 @@
 import java.util.Set;
 
 @Value
-@EqualsAndHashCode(onlyExplicitlyIncluded = false)
+@EqualsAndHashCode(onlyExplicitlyIncluded = true)
 public class RecipeDescriptor {
     @EqualsAndHashCode.Include
     String name;

diff --git a/rewrite-core/src/main/java/org/openrewrite/marker/BuildMetadata.java b/rewrite-core/src/main/java/org/openrewrite/marker/BuildMetadata.java
@@ -23,7 +23,7 @@
 import java.util.UUID;
 
 @Value
-@EqualsAndHashCode(onlyExplicitlyIncluded = false)
+@EqualsAndHashCode(onlyExplicitlyIncluded = true)
 @With
 public class BuildMetadata implements Marker {
     @EqualsAndHashCode.Include

diff --git a/rewrite-core/src/main/java/org/openrewrite/marker/BuildTool.java b/rewrite-core/src/main/java/org/openrewrite/marker/BuildTool.java
@@ -22,7 +22,7 @@
 import java.util.UUID;
 
 @Value
-@EqualsAndHashCode(onlyExplicitlyIncluded = false)
+@EqualsAndHashCode(onlyExplicitlyIncluded = true)
 @With
 public class BuildTool implements Marker {
     @EqualsAndHashCode.Include

diff --git a/rewrite-core/src/main/java/org/openrewrite/marker/BuildToolFailure.java b/rewrite-core/src/main/java/org/openrewrite/marker/BuildToolFailure.java
@@ -27,7 +27,7 @@
  */
 @Deprecated
 @Value
-@EqualsAndHashCode(onlyExplicitlyIncluded = false)
+@EqualsAndHashCode(onlyExplicitlyIncluded = true)
 @With
 public class BuildToolFailure implements Marker {
     @EqualsAndHashCode.Include

diff --git a/rewrite-core/src/main/java/org/openrewrite/marker/DeserializationError.java b/rewrite-core/src/main/java/org/openrewrite/marker/DeserializationError.java
@@ -23,7 +23,7 @@
 import java.util.UUID;
 
 @FieldDefaults(makeFinal = true, level = AccessLevel.PRIVATE)
-@EqualsAndHashCode(callSuper = false, onlyExplicitlyIncluded = false)
+@EqualsAndHashCode(callSuper = false, onlyExplicitlyIncluded = true)
 @With
 @Getter
 @ToString

diff --git a/rewrite-core/src/main/java/org/openrewrite/marker/Markup.java b/rewrite-core/src/main/java/org/openrewrite/marker/Markup.java
@@ -85,7 +85,7 @@ static <T extends Tree> T markup(T t, Markup markup) {
     }
 
     @Value
-    @EqualsAndHashCode(onlyExplicitlyIncluded = false)
+    @EqualsAndHashCode(onlyExplicitlyIncluded = true)
     @With
     class Error implements Markup {
         UUID id;
@@ -112,7 +112,7 @@ public Error(UUID id, String message, String detail) {
     }
 
     @Value
-    @EqualsAndHashCode(onlyExplicitlyIncluded = false)
+    @EqualsAndHashCode(onlyExplicitlyIncluded = true)
     @With
     class Warn implements Markup {
         UUID id;
@@ -139,7 +139,7 @@ public Warn(UUID id, String message, String detail) {
     }
 
     @Value
-    @EqualsAndHashCode(onlyExplicitlyIncluded = false)
+    @EqualsAndHashCode(onlyExplicitlyIncluded = true)
     @With
     class Info implements Markup {
         UUID id;
@@ -164,7 +164,7 @@ public String getDetail() {
     }
 
     @Value
-    @EqualsAndHashCode(onlyExplicitlyIncluded = false)
+    @EqualsAndHashCode(onlyExplicitlyIncluded = true)
     @With
     class Debug implements Markup {
         UUID id;

diff --git a/rewrite-core/src/main/java/org/openrewrite/marker/OperatingSystemProvenance.java b/rewrite-core/src/main/java/org/openrewrite/marker/OperatingSystemProvenance.java
@@ -279,7 +279,7 @@ public String getPathVar() {
     }
 
     @AllArgsConstructor
-    @EqualsAndHashCode(callSuper = false, onlyExplicitlyIncluded = false)
+    @EqualsAndHashCode(callSuper = true, onlyExplicitlyIncluded = true)
     static class Windows extends OperatingSystemProvenance {
         String nativePrefix;
 
@@ -378,7 +378,7 @@ public UUID getId() {
     }
 
     @AllArgsConstructor
-    @EqualsAndHashCode(callSuper = false, onlyExplicitlyIncluded = false)
+    @EqualsAndHashCode(callSuper = true, onlyExplicitlyIncluded = true)
     static class Unix extends OperatingSystemProvenance {
         String nativePrefix;
 

diff --git a/rewrite-core/src/main/java/org/openrewrite/marker/OutdatedSerializer.java b/rewrite-core/src/main/java/org/openrewrite/marker/OutdatedSerializer.java
@@ -22,7 +22,7 @@
 import java.util.UUID;
 
 @Value
-@EqualsAndHashCode(onlyExplicitlyIncluded = false)
+@EqualsAndHashCode(onlyExplicitlyIncluded = true)
 @With
 public class OutdatedSerializer implements Marker {
     @EqualsAndHashCode.Include

diff --git a/rewrite-core/src/main/java/org/openrewrite/marker/RecipesThatMadeChanges.java b/rewrite-core/src/main/java/org/openrewrite/marker/RecipesThatMadeChanges.java
@@ -24,7 +24,7 @@
 import java.util.*;
 
 @Value
-@EqualsAndHashCode(onlyExplicitlyIncluded = false)
+@EqualsAndHashCode(onlyExplicitlyIncluded = true)
 @With
 public class RecipesThatMadeChanges implements Marker {
     @EqualsAndHashCode.Include

diff --git a/rewrite-core/src/main/java/org/openrewrite/marker/SearchResult.java b/rewrite-core/src/main/java/org/openrewrite/marker/SearchResult.java
@@ -30,7 +30,7 @@
 
 @RequiredArgsConstructor
 @FieldDefaults(makeFinal = true, level = AccessLevel.PRIVATE)
-@EqualsAndHashCode(onlyExplicitlyIncluded = false)
+@EqualsAndHashCode(onlyExplicitlyIncluded = true)
 @Getter
 @With
 public final class SearchResult implements Marker {

diff --git a/rewrite-core/src/main/java/org/openrewrite/remote/RemoteArchive.java b/rewrite-core/src/main/java/org/openrewrite/remote/RemoteArchive.java
@@ -50,7 +50,7 @@
  * Post-processing of Recipe results by a build plugin or other caller of OpenRewrite is responsible for this.
  */
 @Value
-@EqualsAndHashCode(callSuper = false, onlyExplicitlyIncluded = false)
+@EqualsAndHashCode(callSuper = false, onlyExplicitlyIncluded = true)
 @With
 public class RemoteArchive implements Remote {
     @EqualsAndHashCode.Include

diff --git a/rewrite-core/src/main/java/org/openrewrite/remote/RemoteFile.java b/rewrite-core/src/main/java/org/openrewrite/remote/RemoteFile.java
@@ -37,7 +37,7 @@
 import java.util.UUID;
 
 @Value
-@EqualsAndHashCode(callSuper = false, onlyExplicitlyIncluded = false)
+@EqualsAndHashCode(callSuper = false, onlyExplicitlyIncluded = true)
 @With
 public class RemoteFile implements Remote {
     @EqualsAndHashCode.Include

diff --git a/rewrite-core/src/main/java/org/openrewrite/search/FindCommitters.java b/rewrite-core/src/main/java/org/openrewrite/search/FindCommitters.java
@@ -32,7 +32,7 @@
 import java.util.TreeMap;
 
 @Value
-@EqualsAndHashCode(callSuper = false)
+@EqualsAndHashCode(callSuper = true)
 public class FindCommitters extends ScanningRecipe<Map<String, GitProvenance.Committer>> {
     private transient final DistinctCommitters committers = new DistinctCommitters(this);
     private transient final CommitsByDay commitsByDay = new CommitsByDay(this);

diff --git a/rewrite-core/src/main/java/org/openrewrite/style/NamedStyles.java b/rewrite-core/src/main/java/org/openrewrite/style/NamedStyles.java
@@ -33,7 +33,7 @@
  * A collection of styles by name, e.g., IntelliJ IDEA or Google Java Format.
  */
 @Data
-@EqualsAndHashCode(onlyExplicitlyIncluded = false)
+@EqualsAndHashCode(onlyExplicitlyIncluded = true)
 @AllArgsConstructor
 @With
 public class NamedStyles implements Marker {

diff --git a/rewrite-core/src/main/java/org/openrewrite/text/AppendToTextFile.java b/rewrite-core/src/main/java/org/openrewrite/text/AppendToTextFile.java
@@ -29,7 +29,7 @@
 import static java.util.Objects.requireNonNull;
 
 @Value
-@EqualsAndHashCode(callSuper = false)
+@EqualsAndHashCode(callSuper = true)
 public class AppendToTextFile extends ScanningRecipe<AtomicBoolean> {
     @Option(displayName = "Relative File Name",
             description = "File name, using a relative path. If a non-plaintext file already exists at this location, then this recipe will do nothing.",

diff --git a/rewrite-core/src/main/java/org/openrewrite/text/Find.java b/rewrite-core/src/main/java/org/openrewrite/text/Find.java
@@ -34,7 +34,7 @@
 import static java.util.Objects.requireNonNull;
 
 @Value
-@EqualsAndHashCode(callSuper = false)
+@EqualsAndHashCode(callSuper = true)
 public class Find extends Recipe {
 
     @Override

diff --git a/rewrite-core/src/main/java/org/openrewrite/text/FindAndReplace.java b/rewrite-core/src/main/java/org/openrewrite/text/FindAndReplace.java
@@ -34,7 +34,7 @@
 import static org.openrewrite.Tree.randomId;
 
 @Value
-@EqualsAndHashCode(callSuper = false)
+@EqualsAndHashCode(callSuper = true)
 public class FindAndReplace extends Recipe {
 
     @Option(displayName = "Find",

diff --git a/rewrite-core/src/main/java/org/openrewrite/text/FindMultiselect.java b/rewrite-core/src/main/java/org/openrewrite/text/FindMultiselect.java
@@ -37,7 +37,7 @@
 
 @Incubating(since = "8.2.0")
 @Value
-@EqualsAndHashCode(callSuper = false)
+@EqualsAndHashCode(callSuper = true)
 public class FindMultiselect extends Recipe {
 
     @Override

diff --git a/rewrite-core/src/test/java/org/openrewrite/RecipeLifecycleTest.java b/rewrite-core/src/test/java/org/openrewrite/RecipeLifecycleTest.java
@@ -81,7 +81,7 @@ void generateFile() {
     }
 
     @Value
-    @EqualsAndHashCode(callSuper = false)
+    @EqualsAndHashCode(callSuper = true)
     static class DeleteFirst extends Recipe {
 
         @Override

diff --git a/rewrite-core/src/test/java/org/openrewrite/text/FindAndReplaceTest.java b/rewrite-core/src/test/java/org/openrewrite/text/FindAndReplaceTest.java
@@ -128,7 +128,7 @@ void dollarSignsTolerated() {
     }
 
     @Value
-    @EqualsAndHashCode(callSuper = false)
+    @EqualsAndHashCode(callSuper = true)
     static class MultiFindAndReplace extends Recipe {
 
         @Override

diff --git a/rewrite-gradle/src/main/java/org/openrewrite/gradle/AddDependency.java b/rewrite-gradle/src/main/java/org/openrewrite/gradle/AddDependency.java
@@ -37,7 +37,7 @@
 import static java.util.Objects.requireNonNull;
 
 @Value
-@EqualsAndHashCode(callSuper = false)
+@EqualsAndHashCode(callSuper = true)
 public class AddDependency extends ScanningRecipe<AddDependency.Scanned> {
 
     @EqualsAndHashCode.Exclude

diff --git a/rewrite-gradle/src/main/java/org/openrewrite/gradle/ChangeDependency.java b/rewrite-gradle/src/main/java/org/openrewrite/gradle/ChangeDependency.java
@@ -45,7 +45,7 @@
 import static java.util.Objects.requireNonNull;
 
 @Value
-@EqualsAndHashCode(callSuper = false)
+@EqualsAndHashCode(callSuper = true)
 public class ChangeDependency extends Recipe {
     @Option(displayName = "Old groupId",
             description = "The old groupId to replace. The groupId is the first part of a dependency coordinate 'com.google.guava:guava:VERSION'. Supports glob expressions.",

diff --git a/rewrite-gradle/src/main/java/org/openrewrite/gradle/ChangeDependencyArtifactId.java b/rewrite-gradle/src/main/java/org/openrewrite/gradle/ChangeDependencyArtifactId.java
@@ -35,7 +35,7 @@
 
 import static java.util.Objects.requireNonNull;
 
-@EqualsAndHashCode(callSuper = false)
+@EqualsAndHashCode(callSuper = true)
 @Value
 public class ChangeDependencyArtifactId extends Recipe {
     @Option(displayName = "Group",