Merge branch 'main' into allow_pom_download_failures

openrewrite · Dec 3, 2024 · 5fbe47e · 5fbe47e
2 parents 42daecb + f0b1d51
commit 5fbe47e
Show file tree

Hide file tree

Showing 90 changed files with 4,032 additions and 608 deletions.
diff --git a/.github/workflows/receive-pr.yml b/.github/workflows/receive-pr.yml
@@ -77,4 +77,4 @@ jobs:
               annotationPattern: '@org.jetbrains.annotations.NotNull'
           - org.openrewrite.java.RemoveAnnotation:
               annotationPattern: '@jakarta.annotation.Nonnull'
-          - org.openrewrite.java.jspecify.MigrateToJspecify
+          #- org.openrewrite.java.jspecify.MigrateToJspecify
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,8 +1,8 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionSha256Sum=57dafb5c2622c6cc08b993c85b7c06956a2f53536432a30ead46166dbca0f1e9
+distributionSha256Sum=f397b287023acdba1e9f6fc5ea72d22dd63669d59ed4a289a29b1a76eee151c6
diff --git a/rewrite-benchmarks/src/jmh/java/org/openrewrite/benchmarks/java/JavaTypeCacheBenchmark.java b/rewrite-benchmarks/src/jmh/java/org/openrewrite/benchmarks/java/JavaTypeCacheBenchmark.java
@@ -22,8 +22,8 @@
 import org.openjdk.jmh.runner.RunnerException;
 import org.openjdk.jmh.runner.options.Options;
 import org.openjdk.jmh.runner.options.OptionsBuilder;
-import org.openrewrite.java.internal.JavaTypeCache;
 import org.openrewrite.java.internal.AdaptiveRadixJavaTypeCache;
+import org.openrewrite.java.internal.JavaTypeCache;
 
 import java.net.URISyntaxException;
 import java.util.Map;

diff --git a/rewrite-core/src/main/java/org/openrewrite/Cursor.java b/rewrite-core/src/main/java/org/openrewrite/Cursor.java
@@ -57,7 +57,7 @@ public Cursor getRoot() {
     /**
      * @return true if this cursor is the root of the tree, false otherwise
      */
-    final boolean isRoot() {
+    final public boolean isRoot() {
         return ROOT_VALUE.equals(value);
     }
 

diff --git a/rewrite-core/src/main/java/org/openrewrite/GitRemote.java b/rewrite-core/src/main/java/org/openrewrite/GitRemote.java
@@ -279,7 +279,7 @@ private String repositoryPath(RemoteServerMatch match, URI normalizedUri) {
                     .replaceFirst("^/", "");
         }
 
-        private static final Pattern PORT_PATTERN = Pattern.compile(":\\d+");
+        private static final Pattern PORT_PATTERN = Pattern.compile(":\\d+(/.+)(/.+)+");
 
         static URI normalize(String url) {
             try {

diff --git a/rewrite-core/src/main/java/org/openrewrite/ScanningRecipe.java b/rewrite-core/src/main/java/org/openrewrite/ScanningRecipe.java
@@ -19,6 +19,7 @@
 
 import java.util.Collection;
 import java.util.Collections;
+import java.util.List;
 import java.util.UUID;
 
 /**
@@ -126,4 +127,15 @@ public boolean isAcceptable(SourceFile sourceFile, ExecutionContext ctx) {
             }
         };
     }
+
+    // For now, ScanningRecipes do not support `*RecipeList`, as the accumulator is not evaluated for these methods
+    @Override
+    public final List<Recipe> getRecipeList() {
+        return super.getRecipeList();
+    }
+
+    @Override
+    public final void buildRecipeList(RecipeList list) {
+        super.buildRecipeList(list);
+    }
 }
diff --git a/rewrite-core/src/main/java/org/openrewrite/config/DeclarativeRecipe.java b/rewrite-core/src/main/java/org/openrewrite/config/DeclarativeRecipe.java
@@ -246,11 +246,6 @@ public TreeVisitor<?, ExecutionContext> getVisitor(T acc) {
             return Preconditions.check(bellwether.isPreconditionApplicable(), delegate.getVisitor(acc));
         }
 
-        @Override
-        public List<Recipe> getRecipeList() {
-            return decorateWithPreconditionBellwether(bellwether, delegate.getRecipeList());
-        }
-
         @Override
         public boolean causesAnotherCycle() {
             return delegate.causesAnotherCycle();

diff --git a/rewrite-core/src/main/java/org/openrewrite/internal/AdaptiveRadixTree.java b/rewrite-core/src/main/java/org/openrewrite/internal/AdaptiveRadixTree.java
@@ -60,7 +60,7 @@ protected boolean matchesPartialKey(byte[] key, int depth) {
         }
 
         // Helper method to find common prefix length
-        protected static int findCommonPrefixLength(byte[] key1, int start1, byte[] key2, int start2) {
+        protected static int findCommonPrefixLength(byte[] key1, int start1, byte[] key2) {
             int maxLength = Math.min(key1.length - start1, key2.length);
             int i = 0;
             while (i < maxLength && key1[start1 + i] == key2[i]) {
@@ -118,7 +118,7 @@ Node<V> insert(byte[] key, int depth, V value) {
                 return new LeafNode<>(partialKey, value);
             }
 
-            int commonPrefix = findCommonPrefixLength(key, depth, partialKey, 0);
+            int commonPrefix = findCommonPrefixLength(key, depth, partialKey);
             byte[] commonKey = Arrays.copyOfRange(key, depth, depth + commonPrefix);
             Node4<V> newNode = new Node4<>(commonKey);
 
@@ -194,7 +194,7 @@ V search(byte[] key, int depth) {
         @Override
         Node<V> insert(byte[] key, int depth, V value) {
             if (!matchesPartialKey(key, depth)) {
-                int commonPrefix = findCommonPrefixLength(key, depth, partialKey, 0);
+                int commonPrefix = findCommonPrefixLength(key, depth, partialKey);
 
                 byte[] commonKey = Arrays.copyOfRange(key, depth, depth + commonPrefix);
                 Node4<V> newNode = new Node4<>(commonKey);
@@ -272,7 +272,7 @@ Node<V> insert(byte[] key, int depth, V value) {
     private static class Node4<V> extends InternalNode<V> {
         // Keys and children inline to avoid array overhead
         private byte k0, k1, k2, k3;
-        private Node<V> c0, c1, c2, c3;
+        private @Nullable Node<V> c0, c1, c2, c3;
         private byte size;
 
         Node4(byte[] partialKey) {
@@ -290,6 +290,7 @@ private static class Node4<V> extends InternalNode<V> {
             return null;
         }
 
+        @SuppressWarnings("DataFlowIssue")
         @Override
         @Nullable InternalNode<V> addChild(byte key, Node<V> child) {
             // Check if we're replacing an existing child
@@ -390,6 +391,7 @@ InternalNode<V> cloneWithNewKey(byte[] newKey) {
             return clone;
         }
 
+        @SuppressWarnings("DataFlowIssue")
         @Override
         Node<V> copy() {
             Node4<V> clone = new Node4<>(Arrays.copyOf(partialKey, partialKey.length));
@@ -410,7 +412,7 @@ Node<V> copy() {
     private static class Node16<V> extends InternalNode<V> {
         private static final int LINEAR_SEARCH_THRESHOLD = 8;
         private byte[] keys;
-        private Node<V>[] children;
+        private @Nullable Node<V>[] children;
         private int size;
 
         @SuppressWarnings("unchecked")
@@ -432,13 +434,13 @@ Node<V> getChild(byte key) {
                 return null;
             }
 
-            int idx = unsignedBinarySearch(keys, 0, size, key & 0xFF);
+            int idx = unsignedBinarySearch(keys, size, key & 0xFF);
             return idx >= 0 ? children[idx] : null;
         }
 
         // Custom binary search for unsigned bytes
-        private int unsignedBinarySearch(byte[] array, int fromIndex, int toIndex, int key) {
-            int low = fromIndex;
+        private int unsignedBinarySearch(byte[] array, int toIndex, int key) {
+            int low = 0;
             int high = toIndex - 1;
 
             while (low <= high) {
@@ -471,6 +473,7 @@ InternalNode<V> addChild(byte key, Node<V> child) {
                 Node48<V> node = new Node48<>(partialKey);
                 node.value = this.value;
                 for (int i = 0; i < size; i++) {
+                    //noinspection DataFlowIssue
                     node.addChild(keys[i], children[i]);
                 }
                 node.addChild(key, child);
@@ -511,6 +514,7 @@ Node<V> copy() {
             clone.children = Arrays.copyOf(this.children, this.children.length);
             // Deep copy children
             for (int i = 0; i < size; i++) {
+                //noinspection DataFlowIssue
                 clone.children[i] = children[i].copy();
             }
             return clone;
@@ -519,7 +523,7 @@ Node<V> copy() {
 
     private static class Node48<V> extends InternalNode<V> {
         private byte[] index;
-        private Node<V>[] children;
+        private @Nullable Node<V>[] children;
         private int size;
 
         @SuppressWarnings("unchecked")
@@ -552,6 +556,7 @@ InternalNode<V> addChild(byte key, Node<V> child) {
                 node.value = this.value;
                 for (int i = 0; i < 256; i++) {
                     if (index[i] >= 0) {
+                        //noinspection DataFlowIssue
                         node.addChild((byte) i, children[index[i]]);
                     }
                 }
@@ -584,14 +589,15 @@ Node<V> copy() {
             clone.children = Arrays.copyOf(this.children, this.children.length);
             // Deep copy children
             for (int i = 0; i < size; i++) {
+                //noinspection DataFlowIssue
                 clone.children[i] = children[i].copy();
             }
             return clone;
         }
     }
 
     private static class Node256<V> extends InternalNode<V> {
-        private final @Nullable Node<V>[] children;
+        private final @Nullable Node<V> [] children;
 
         @SuppressWarnings("unchecked")
         Node256(byte[] partialKey) {
@@ -628,8 +634,9 @@ Node<V> copy() {
             System.arraycopy(this.children, 0, clone.children, 0, this.children.length);
             // Deep copy children
             for (int i = 0; i < 256; i++) {
-                if (children[i] != null) {
-                    clone.children[i] = children[i].copy();
+                Node<V> child = children[i];
+                if (child != null) {
+                    clone.children[i] = child.copy();
                 }
             }
             return clone;