Merge branch 'main' into pipenv-lockfiles

Author: Jenson3210

rewrite-docker/src/main/resources/META-INF/rewrite/examples.yml

@@ -141,7 +141,7 @@ examples:
       RUN apt-get install -y curl
       ENTRYPOINT /app/start.sh
     after: |
-      ~~(EOL: ubuntu:20.04 (ended 2025-05-31, suggest noble (24.04)))~~>~~(Missing HEALTHCHECK instruction)~~>FROM ubuntu:20.04
+      ~~(EOL: ubuntu:20.04 (ended 2025-05-31, suggest plucky (26.04)))~~>~~(Missing HEALTHCHECK instruction)~~>FROM ubuntu:20.04
       COPY app.jar /app/
       RUN apt-get update && apt-get install -y curl && rm -rf /var/lib/apt/lists/*
       ENTRYPOINT ["/app/start.sh"]

rewrite-docker/src/test/java/org/openrewrite/docker/DockerBestPracticesTest.java

@@ -42,7 +42,7 @@ void appliesBestPractices() {
               ENTRYPOINT /app/start.sh
               """,
             """
-              ~~(EOL: ubuntu:20.04 (ended 2025-05-31, suggest noble (24.04)))~~>~~(Missing HEALTHCHECK instruction)~~>FROM ubuntu:20.04
+              ~~(EOL: ubuntu:20.04 (ended 2025-05-31, suggest plucky (26.04)))~~>~~(Missing HEALTHCHECK instruction)~~>FROM ubuntu:20.04
               COPY app.jar /app/
               RUN apt-get update && apt-get install -y curl && rm -rf /var/lib/apt/lists/*
               ENTRYPOINT ["/app/start.sh"]

rewrite-docker/src/test/java/org/openrewrite/docker/search/FindEndOfLifeImagesTest.java

@@ -102,7 +102,7 @@ void detectUbuntuXenial() {
               RUN apt-get update
               """,
             """
-              ~~(EOL: ubuntu:16.04 (ended 2021-04-02, suggest noble (24.04)))~~>FROM ubuntu:16.04
+              ~~(EOL: ubuntu:16.04 (ended 2021-04-02, suggest plucky (26.04)))~~>FROM ubuntu:16.04
               RUN apt-get update
               """
           )
@@ -118,7 +118,7 @@ void detectUbuntuBionic() {
               RUN apt-get update
               """,
             """
-              ~~(EOL: ubuntu:bionic (ended 2023-05-31, suggest noble (24.04)))~~>FROM ubuntu:bionic
+              ~~(EOL: ubuntu:bionic (ended 2023-05-31, suggest plucky (26.04)))~~>FROM ubuntu:bionic
               RUN apt-get update
               """
           )

rewrite-groovy/src/main/java/org/openrewrite/groovy/GroovyParserVisitor.java

@@ -2743,7 +2743,7 @@ public TypeTree visitVariableExpressionType(@Nullable VariableExpression express
                     emptyList(),
                     typeName,
                     type, null);
-            if (expression.getOriginType().getGenericsTypes() != null) {
+            if (expression.getOriginType().getGenericsTypes() != null && !expression.getOriginType().isGenericsPlaceHolder() && sourceStartsWith("<")) {
                 return new J.ParameterizedType(randomId(), prefix, Markers.EMPTY, ident, visitTypeParameterizations(
                         staticType((org.codehaus.groovy.ast.expr.Expression) expression).getGenericsTypes()), type);
             }

rewrite-groovy/src/test/java/org/openrewrite/groovy/tree/VariableDeclarationsTest.java

@@ -233,4 +233,35 @@ void defVariableStartsWithDef() {
           )
         );
     }
+
+    @Test
+    void typeParameterAsLocalVariableType() {
+        rewriteRun(
+          groovy(
+            """
+              class TaskRunner<E> {
+                  void run() {
+                      E task = null
+                  }
+              }
+              """
+          )
+        );
+    }
+
+    @Test
+    void typeParameterAsLocalVariableTypeFromMethodCall() {
+        rewriteRun(
+          groovy(
+            """
+              class TaskRunner<E> {
+                  java.util.concurrent.BlockingQueue<E> queue
+                  void run() {
+                      E task = queue.take()
+                  }
+              }
+              """
+          )
+        );
+    }
 }