CDI recipe

src/main/java/org/openrewrite/java/migrate/jakarta/UpdateAddAnnotatedType.java

@@ -0,0 +1,71 @@
+/*
+ * Copyright 2023 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.java.migrate.jakarta;
+
+import lombok.EqualsAndHashCode;
+import lombok.Value;
+import org.openrewrite.ExecutionContext;
+import org.openrewrite.Option;
+import org.openrewrite.Recipe;
+import org.openrewrite.TreeVisitor;
+import org.openrewrite.internal.lang.NonNull;
+import org.openrewrite.java.JavaTemplate;
+import org.openrewrite.java.JavaVisitor;
+import org.openrewrite.java.MethodMatcher;
+import org.openrewrite.java.tree.J;
+
+@Value
+@EqualsAndHashCode(callSuper = true)
+public class UpdateAddAnnotatedType extends Recipe {
+
+    @Option(displayName = "Method Pattern", description = "A method pattern for matching required method definition.", example = "jakarta.enterprise.inject.spi.BeforeBeanDiscovery addAnnotatedType(jakarta.enterprise.inject.spi.AnnotatedType)")
+    @NonNull String methodPattern;
+    String TEMPLATE_STRING_JAKARTA = "jakarta.enterprise.inject.spi.AnnotatedType";
+    String TEMPLATE_STRING_JAVAX = "javax.enterprise.inject.spi.AnnotatedType";
+
+    @Override
+    public String getDisplayName() {
+        return "Replace `addAnnotatedType(AnnotatedType)` with `addAnnotatedType(AnnotatedType,String)`";
+    }
+
+    @Override
+    public String getDescription() {
+        return "BeforeBeanDiscovery.addAnnotatedType(AnnotatedType) is Deprecated in CDI 1.1. It is Replaced by BeforeBeanDiscovery.addAnnotatedType(AnnotatedType, String).";
+    }
+
+    @Override
+    public TreeVisitor<?, ExecutionContext> getVisitor() {
+        MethodMatcher METHOD_INPUT_PATTERN = new MethodMatcher(methodPattern, false);
+        String templateBuilderString = null;
+        if (methodPattern.contains("jakarta.enterprise.inject.spi.")) {
+            templateBuilderString = TEMPLATE_STRING_JAKARTA;
+        } else if (methodPattern.contains("javax.enterprise.inject.spi.")) {
+            templateBuilderString = TEMPLATE_STRING_JAVAX;
+        }
+        String finalTemplateBuilderString = templateBuilderString;
+        return new JavaVisitor<ExecutionContext>() {
+            @Override
+            public J visitMethodInvocation(J.MethodInvocation method, ExecutionContext ctx) {
+                if (METHOD_INPUT_PATTERN.matches(method)) {
+                    String tempString = "#{any(" + finalTemplateBuilderString + ")},null\"";
+                    //"#{any(jakarta.enterprise.inject.spi.AnnotatedType)},null"
+                    return JavaTemplate.builder(tempString).build().apply(updateCursor(method), method.getCoordinates().replaceArguments(), method.getArguments().get(0));
+                }
+                return super.visitMethodInvocation(method, ctx);
+            }
+        };
+    }
+}

src/main/java/org/openrewrite/java/migrate/jakarta/UpdateBeanManagerMethod.java

@@ -0,0 +1,84 @@
+/*
+ * Copyright 2023 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.openrewrite.java.migrate.jakarta;
+
+import lombok.EqualsAndHashCode;
+import lombok.Value;
+import org.jetbrains.annotations.NotNull;
+import org.openrewrite.ExecutionContext;
+import org.openrewrite.Option;
+import org.openrewrite.Recipe;
+import org.openrewrite.TreeVisitor;
+import org.openrewrite.internal.lang.NonNull;
+import org.openrewrite.internal.lang.Nullable;
+import org.openrewrite.java.JavaVisitor;
+import org.openrewrite.java.MethodMatcher;
+import org.openrewrite.java.tree.J;
+import org.openrewrite.java.tree.JavaType;
+
+@Value
+@EqualsAndHashCode(callSuper = false)
+public class UpdateBeanManagerMethod extends Recipe {
+    @Option(displayName = "Method Pattern",
+            description = "A `BeanManager.fireEvent()` or `BeanManager.createInjectionTarget()` matching required",
+            example = "jakarta.enterprise.inject.spi.BeanManager fireEvent()")
+    @NonNull String methodPattern;
+
+    @Override
+    public @NotNull String getDisplayName() {
+        return "Update fireEvent() and createInjectionTarget() calls";
+    }
+
+    @Override
+    public @NotNull String getDescription() {
+        return " Updates `BeanManager.fireEvent()` or `BeanManager.createInjectionTarget()`";
+    }
+
+    @Override
+    public @NotNull TreeVisitor<?, ExecutionContext> getVisitor() {
+        return new MethodInvocationVisitor(methodPattern);
+    }
+
+    private static class MethodInvocationVisitor extends JavaVisitor<ExecutionContext> {
+        private final MethodMatcher METHOD_PATTERN;
+
+        private MethodInvocationVisitor(String methodPattern) {
+            METHOD_PATTERN = new MethodMatcher(methodPattern, false);
+        }
+
+        @Nullable
+        @Override
+        public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, ExecutionContext ec) {
+            String newMethodName = "";
+            if (METHOD_PATTERN.matches(method)) {
+                if (method.getSimpleName().equals("fireEvent")){
+                    newMethodName = "getEvent()." + "fire";
+                }
+                else if (method.getSimpleName().equals("createInjectionTarget")){
+                    newMethodName = "getInjectionTargetFactory()." + "createInjectionTarget";
+                }
+               // newMethodName = newMethodName + method.getSimpleName();
+                JavaType.Method type = method.getMethodType();
+                if (type != null) {
+                    type = type.withName(newMethodName);
+                }
+                method = method.withName(method.getName().withSimpleName(newMethodName)).withMethodType(type);
+            }
+            return method;
+        }
+    }
+}

src/main/resources/META-INF/rewrite/jakarta-ee-10.yml

@@ -31,6 +31,7 @@ recipeList:
   - org.openrewrite.java.migrate.jakarta.RemovedUIComponentConstant
   - org.openrewrite.java.migrate.jakarta.WsWsocServerContainerDeprecation
   - org.openrewrite.java.migrate.jakarta.ServletCookieBehaviorChangeRFC6265
+  - org.openrewrite.java.migrate.jakarta.DeprecatedCDIAPIsRemoved40
 ---
 type: specs.openrewrite.org/v1beta/recipe
 name: org.openrewrite.java.migrate.jakarta.ServletCookieBehaviorChangeRFC6265
@@ -253,3 +254,19 @@ recipeList:
       oldFullyQualifiedTypeName: javax.faces.el.ReferenceSyntaxException
       newFullyQualifiedTypeName: jakarta.el.ELException
       ignoreDefinition: true
+---
+type: specs.openrewrite.org/v1beta/recipe
+name: org.openrewrite.java.migrate.jakarta.DeprecatedCDIAPIsRemoved40
+displayName: Remove deprecated API's not supported in CDI4.0
+description: >
+  Deprecated APIs have been removed in CDI 4.0. This recipe removes and updates the corresponding deprecated methods.
+recipeList:
+  - org.openrewrite.java.migrate.jakarta.RemoveMethods:
+      methodPattern: jakarta.enterprise.inject.spi.Bean isNullable()
+  - org.openrewrite.java.migrate.jakarta.UpdateAddAnnotatedType:
+      methodPattern: jakarta.enterprise.inject.spi.BeforeBeanDiscovery addAnnotatedType(jakarta.enterprise.inject.spi.AnnotatedType)
+  - org.openrewrite.java.migrate.jakarta.UpdateBeanManagerMethod:
+      methodPattern: "jakarta.enterprise.inject.spi.BeanManager fireEvent(..)"
+  - org.openrewrite.java.migrate.jakarta.UpdateBeanManagerMethod:
+      methodPattern:  "jakarta.enterprise.inject.spi.BeanManager createInjectionTarget(..)"
+

src/test/java/org/openrewrite/java/migrate/jakarta/DeprecatedCDIAPIsRemoved40Test.java

@@ -0,0 +1,106 @@
+/*
+ * Copyright 2023 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.java.migrate.jakarta;
+
+import org.junit.jupiter.api.Test;
+import org.openrewrite.InMemoryExecutionContext;
+import org.openrewrite.config.Environment;
+import org.openrewrite.java.JavaParser;
+import org.openrewrite.test.RecipeSpec;
+import org.openrewrite.test.RewriteTest;
+
+import static org.openrewrite.java.Assertions.java;
+
+
+public class DeprecatedCDIAPIsRemoved40Test implements RewriteTest {
+    @Override
+    public void defaults(RecipeSpec spec) {
+        spec
+          .parser(JavaParser.fromJavaVersion()
+            .classpathFromResources(new InMemoryExecutionContext(), "jakarta.enterprise.cdi-api-3.0.0-M4","jakarta.enterprise.cdi-api-4.0.1"))
+          .recipe(Environment.builder()
+            .scanRuntimeClasspath("org.openrewrite.java.migrate.jakarta").build()
+            .activateRecipes("org.openrewrite.java.migrate.jakarta.DeprecatedCDIAPIsRemoved40"));
+    }
+
+    @Test
+    void updateCDI() {
+        rewriteRun(
+          //language=java
+          java("""             
+            package sample.cdi;
+
+            import jakarta.enterprise.event.Observes;
+            import jakarta.enterprise.inject.New;
+            import jakarta.enterprise.inject.spi.AnnotatedType;
+            import jakarta.enterprise.inject.spi.Bean;
+            import jakarta.enterprise.inject.spi.BeanManager;
+            import jakarta.enterprise.inject.spi.BeforeBeanDiscovery;
+            import jakarta.enterprise.inject.spi.Extension;
+            import java.util.Set;
+
+            public class JakartaCdiMethods implements Extension {            
+
+            	public void beforeBeanDiscovery(@Observes BeforeBeanDiscovery beforeBeanDiscovery, BeanManager beanManager) {
+            		System.out.println("SPI registered extention beforeBeanDiscovery has been fired");
+            		AnnotatedType<String> producerType = beanManager.createAnnotatedType(String.class);
+
+            		beforeBeanDiscovery.addAnnotatedType(producerType);									// Flag this one
+            		beforeBeanDiscovery.addAnnotatedType(producerType, "my unique id");				// Not this one
+            		beforeBeanDiscovery.addAnnotatedType(String.class, "my other unique id");	// Not this one
+
+            		beanManager.createInjectionTarget(producerType);
+
+            		beanManager.fireEvent(beforeBeanDiscovery);
+
+            		Set<Bean<?>> myBeans = beanManager.getBeans("my precious beans");
+            		Bean myFavoriteBean = myBeans.stream().findFirst().get();
+            		myFavoriteBean.isNullable();
+            	}
+            }
+            """, """
+            package sample.cdi;
+
+            import jakarta.enterprise.event.Observes;
+            import jakarta.enterprise.inject.New;
+            import jakarta.enterprise.inject.spi.AnnotatedType;
+            import jakarta.enterprise.inject.spi.Bean;
+            import jakarta.enterprise.inject.spi.BeanManager;
+            import jakarta.enterprise.inject.spi.BeforeBeanDiscovery;
+            import jakarta.enterprise.inject.spi.Extension;
+            import java.util.Set;
+
+            public class JakartaCdiMethods implements Extension {
+
+            	public void beforeBeanDiscovery(@Observes BeforeBeanDiscovery beforeBeanDiscovery, BeanManager beanManager) {
+            		System.out.println("SPI registered extention beforeBeanDiscovery has been fired");
+            		AnnotatedType<String> producerType = beanManager.createAnnotatedType(String.class);
+
+            		beforeBeanDiscovery.addAnnotatedType(producerType, null);									// Flag this one
+            		beforeBeanDiscovery.addAnnotatedType(producerType, "my unique id");				// Not this one
+            		beforeBeanDiscovery.addAnnotatedType(String.class, "my other unique id");	// Not this one
+
+            		beanManager.getInjectionTargetFactory().createInjectionTarget(producerType);
+
+            		beanManager.getEvent().fire(beforeBeanDiscovery);
+
+            		Set<Bean<?>> myBeans = beanManager.getBeans("my precious beans");
+            		Bean myFavoriteBean = myBeans.stream().findFirst().get();           
+            	}
+            }
+            """));
+    }
+}