From 5ff4a02c4e47e1337226cac0ec75caf244447a08 Mon Sep 17 00:00:00 2001
From: Jorge Bescos Gascon <jorge.bescos.gascon@oracle.com>
Date: Fri, 12 Jan 2024 10:26:17 +0100
Subject: [PATCH] Fix Micronaut integration in Helidon 3.x? #7206

Signed-off-by: Jorge Bescos Gascon <jorge.bescos.gascon@oracle.com>
---
 dependencies/pom.xml                          | 39 +++++++++----------
 examples/integrations/micronaut/data/pom.xml  | 13 ++++++-
 .../data/BeanValidationExceptionMapper.java   |  5 +--
 .../micronaut/data/PetResource.java           |  5 +--
 integrations/micronaut/cdi-processor/pom.xml  | 20 +++++++++-
 .../src/main/java/module-info.java            | 29 --------------
 integrations/micronaut/cdi/pom.xml            | 13 ++++---
 .../micronaut/cdi/CdiExecutableMethod.java    |  8 +---
 .../micronaut/cdi/TestBothBean.java           | 22 ++++++++++-
 integrations/micronaut/data/pom.xml           | 15 +++++--
 .../data/MicronautDataCdiExtensionTest.java   |  8 ++--
 11 files changed, 96 insertions(+), 81 deletions(-)
 delete mode 100644 integrations/micronaut/cdi-processor/src/main/java/module-info.java

diff --git a/dependencies/pom.xml b/dependencies/pom.xml
index ebdc0bae3dd..97ab5c213ff 100644
--- a/dependencies/pom.xml
+++ b/dependencies/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2019, 2023 Oracle and/or its affiliates.
+    Copyright (c) 2019, 2024 Oracle and/or its affiliates.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -72,7 +72,7 @@
         <version.lib.hystrix>1.5.18</version.lib.hystrix>
         <version.lib.jackson>2.15.2</version.lib.jackson>
         <version.lib.jakarta.activation-api>2.0.1</version.lib.jakarta.activation-api>
-        <version.lib.jakarta.annotation-api>2.0.0</version.lib.jakarta.annotation-api>
+        <version.lib.jakarta.annotation-api>2.1.0</version.lib.jakarta.annotation-api>
         <version.lib.jakarta.cdi-api>3.0.0</version.lib.jakarta.cdi-api>
         <version.lib.jakarta.el-api>4.0.0</version.lib.jakarta.el-api>
         <version.lib.jakarta.inject>2.0.0</version.lib.jakarta.inject>
@@ -106,9 +106,10 @@
         <version.lib.mariadb-java-client>2.6.2</version.lib.mariadb-java-client>
         <version.lib.maven-wagon>2.10</version.lib.maven-wagon>
         <version.lib.micrometer>1.6.6</version.lib.micrometer>
-        <version.lib.micronaut>3.8.7</version.lib.micronaut>
-        <version.lib.micronaut.data>3.4.3</version.lib.micronaut.data>
-        <version.lib.micronaut.sql>4.8.0</version.lib.micronaut.sql>
+        <version.lib.micronaut>4.2.2</version.lib.micronaut>
+        <version.lib.micronaut.validation>4.2.0</version.lib.micronaut.validation>
+        <version.lib.micronaut.data>4.4.1</version.lib.micronaut.data>
+        <version.lib.micronaut.sql>5.4.0</version.lib.micronaut.sql>
         <version.lib.microprofile-config>3.0.1</version.lib.microprofile-config>
         <version.lib.microprofile-fault-tolerance-api>4.0</version.lib.microprofile-fault-tolerance-api>
         <version.lib.microprofile-graphql>2.0</version.lib.microprofile-graphql>
@@ -1001,14 +1002,6 @@
                 <artifactId>micronaut-core</artifactId>
                 <version>${version.lib.micronaut}</version>
                 <exclusions>
-                    <exclusion>
-                        <groupId>javax.annotation</groupId>
-                        <artifactId>javax.annotation-api</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>javax.inject</groupId>
-                        <artifactId>javax.inject</artifactId>
-                    </exclusion>
                     <exclusion>
                         <groupId>com.github.spotbugs</groupId>
                         <artifactId>spotbugs-annotations</artifactId>
@@ -1019,6 +1012,11 @@
                     </exclusion>
                 </exclusions>
             </dependency>
+            <dependency>
+                <groupId>io.micronaut</groupId>
+                <artifactId>micronaut-core-processor</artifactId>
+                <version>${version.lib.micronaut}</version>
+            </dependency>
             <dependency>
                 <groupId>io.micronaut</groupId>
                 <artifactId>micronaut-aop</artifactId>
@@ -1086,20 +1084,19 @@
                 <version>${version.lib.activemq}</version>
             </dependency>
             <dependency>
-                <groupId>io.micronaut</groupId>
+                <groupId>io.micronaut.validation</groupId>
                 <artifactId>micronaut-validation</artifactId>
-                <version>${version.lib.micronaut}</version>
+                <version>${version.lib.micronaut.validation}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.micronaut.validation</groupId>
+                <artifactId>micronaut-validation-processor</artifactId>
+                <version>${version.lib.micronaut.validation}</version>
             </dependency>
             <dependency>
                 <groupId>io.micronaut</groupId>
                 <artifactId>micronaut-runtime</artifactId>
                 <version>${version.lib.micronaut}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>javax.validation</groupId>
-                        <artifactId>validation-api</artifactId>
-                    </exclusion>
-                </exclusions>
             </dependency>
             <dependency>
                 <groupId>io.micronaut.sql</groupId>
diff --git a/examples/integrations/micronaut/data/pom.xml b/examples/integrations/micronaut/data/pom.xml
index 7feda3b4aa7..9bc9bcfb299 100644
--- a/examples/integrations/micronaut/data/pom.xml
+++ b/examples/integrations/micronaut/data/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2020, 2023 Oracle and/or its affiliates.
+    Copyright (c) 2020, 2024 Oracle and/or its affiliates.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -44,6 +44,10 @@
             <groupId>io.micronaut.data</groupId>
             <artifactId>micronaut-data-jdbc</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.micronaut.validation</groupId>
+            <artifactId>micronaut-validation</artifactId>
+        </dependency>
         <dependency>
             <groupId>io.micronaut</groupId>
             <artifactId>micronaut-runtime</artifactId>
@@ -118,9 +122,14 @@
                         </path>
                         <path>
                             <groupId>io.micronaut</groupId>
-                            <artifactId>micronaut-validation</artifactId>
+                            <artifactId>micronaut-core-processor</artifactId>
                             <version>${version.lib.micronaut}</version>
                         </path>
+                        <path>
+                            <groupId>io.micronaut.validation</groupId>
+                            <artifactId>micronaut-validation-processor</artifactId>
+                            <version>${version.lib.micronaut.validation}</version>
+                        </path>
                         <path>
                             <groupId>io.micronaut.data</groupId>
                             <artifactId>micronaut-data-processor</artifactId>
diff --git a/examples/integrations/micronaut/data/src/main/java/io/helidon/examples/integrations/micronaut/data/BeanValidationExceptionMapper.java b/examples/integrations/micronaut/data/src/main/java/io/helidon/examples/integrations/micronaut/data/BeanValidationExceptionMapper.java
index ca2f919979a..5dce587aca4 100644
--- a/examples/integrations/micronaut/data/src/main/java/io/helidon/examples/integrations/micronaut/data/BeanValidationExceptionMapper.java
+++ b/examples/integrations/micronaut/data/src/main/java/io/helidon/examples/integrations/micronaut/data/BeanValidationExceptionMapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2023 Oracle and/or its affiliates.
+ * Copyright (c) 2020, 2024 Oracle and/or its affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,8 +16,7 @@
 
 package io.helidon.examples.integrations.micronaut.data;
 
-import javax.validation.ConstraintViolationException;
-
+import jakarta.validation.ConstraintViolationException;
 import jakarta.ws.rs.core.Response;
 import jakarta.ws.rs.ext.ExceptionMapper;
 import jakarta.ws.rs.ext.Provider;
diff --git a/examples/integrations/micronaut/data/src/main/java/io/helidon/examples/integrations/micronaut/data/PetResource.java b/examples/integrations/micronaut/data/src/main/java/io/helidon/examples/integrations/micronaut/data/PetResource.java
index 4c18e721b84..1ac68ccda9f 100644
--- a/examples/integrations/micronaut/data/src/main/java/io/helidon/examples/integrations/micronaut/data/PetResource.java
+++ b/examples/integrations/micronaut/data/src/main/java/io/helidon/examples/integrations/micronaut/data/PetResource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2023 Oracle and/or its affiliates.
+ * Copyright (c) 2020, 2024 Oracle and/or its affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,11 +16,10 @@
 
 package io.helidon.examples.integrations.micronaut.data;
 
-import javax.validation.constraints.Pattern;
-
 import io.helidon.examples.integrations.micronaut.data.model.Pet;
 
 import jakarta.inject.Inject;
+import jakarta.validation.constraints.Pattern;
 import jakarta.ws.rs.GET;
 import jakarta.ws.rs.NotFoundException;
 import jakarta.ws.rs.Path;
diff --git a/integrations/micronaut/cdi-processor/pom.xml b/integrations/micronaut/cdi-processor/pom.xml
index 20f145cf7a0..73d6111be06 100644
--- a/integrations/micronaut/cdi-processor/pom.xml
+++ b/integrations/micronaut/cdi-processor/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    Copyright (c) 2020, 2023 Oracle and/or its affiliates.
+    Copyright (c) 2020, 2024 Oracle and/or its affiliates.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -34,22 +34,32 @@
         <dependency>
             <groupId>io.micronaut</groupId>
             <artifactId>micronaut-inject-java</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>io.micronaut</groupId>
             <artifactId>micronaut-inject</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>io.micronaut</groupId>
             <artifactId>micronaut-core</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.micronaut</groupId>
+            <artifactId>micronaut-core-processor</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>jakarta.inject</groupId>
             <artifactId>jakarta.inject-api</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>jakarta.annotation</groupId>
             <artifactId>jakarta.annotation-api</artifactId>
+            <scope>provided</scope>
         </dependency>
     </dependencies>
 
@@ -62,6 +72,14 @@
                     <compilerArgument>-proc:none</compilerArgument>
                 </configuration>
             </plugin>
+            <!-- https://github.com/micronaut-projects/micronaut-core/issues/10299 -->
+            <plugin>
+                <groupId>io.helidon.build-tools</groupId>
+                <artifactId>helidon-services-plugin</artifactId>
+                <configuration>
+                    <failOnMissingModuleInfo>false</failOnMissingModuleInfo>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/integrations/micronaut/cdi-processor/src/main/java/module-info.java b/integrations/micronaut/cdi-processor/src/main/java/module-info.java
deleted file mode 100644
index 7a7178f924c..00000000000
--- a/integrations/micronaut/cdi-processor/src/main/java/module-info.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright (c) 2020, 2021 Oracle and/or its affiliates.
- *
- * 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
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * 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.
- */
-
-/**
- * Micronaut integration with CDI - annotation processor for Micronaut.
- */
-module io.helidon.integrations.micronaut.cdi.processor {
-    requires io.micronaut.core;
-    requires io.micronaut.inject;
-    requires jakarta.inject;
-
-    provides io.micronaut.inject.annotation.AnnotationTransformer with
-            io.helidon.integrations.micronaut.cdi.processor.ApplicationScopedTransformer,
-            io.helidon.integrations.micronaut.cdi.processor.RequestScopedTransformer,
-            io.helidon.integrations.micronaut.cdi.processor.DependentTransformer;
-}
diff --git a/integrations/micronaut/cdi/pom.xml b/integrations/micronaut/cdi/pom.xml
index 13914c7878c..3f91213e15a 100644
--- a/integrations/micronaut/cdi/pom.xml
+++ b/integrations/micronaut/cdi/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    Copyright (c) 2020, 2023 Oracle and/or its affiliates.
+    Copyright (c) 2020, 2024 Oracle and/or its affiliates.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -35,10 +35,6 @@
             <groupId>jakarta.enterprise</groupId>
             <artifactId>jakarta.enterprise.cdi-api</artifactId>
         </dependency>
-        <dependency>
-            <groupId>io.micronaut</groupId>
-            <artifactId>micronaut-inject-java</artifactId>
-        </dependency>
         <dependency>
             <groupId>io.micronaut</groupId>
             <artifactId>micronaut-inject</artifactId>
@@ -116,9 +112,14 @@
                                 </path>
                                 <path>
                                     <groupId>io.micronaut</groupId>
-                                    <artifactId>micronaut-validation</artifactId>
+                                    <artifactId>micronaut-core-processor</artifactId>
                                     <version>${version.lib.micronaut}</version>
                                 </path>
+                                <path>
+                                    <groupId>io.micronaut.validation</groupId>
+                                    <artifactId>micronaut-validation-processor</artifactId>
+                                    <version>${version.lib.micronaut.validation}</version>
+                                </path>
                                 <path>
                                     <groupId>io.micronaut.data</groupId>
                                     <artifactId>micronaut-data-processor</artifactId>
diff --git a/integrations/micronaut/cdi/src/main/java/io/helidon/integrations/micronaut/cdi/CdiExecutableMethod.java b/integrations/micronaut/cdi/src/main/java/io/helidon/integrations/micronaut/cdi/CdiExecutableMethod.java
index 7f9a702c5f8..1c6f8fc73c5 100644
--- a/integrations/micronaut/cdi/src/main/java/io/helidon/integrations/micronaut/cdi/CdiExecutableMethod.java
+++ b/integrations/micronaut/cdi/src/main/java/io/helidon/integrations/micronaut/cdi/CdiExecutableMethod.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2021 Oracle and/or its affiliates.
+ * Copyright (c) 2020, 2024 Oracle and/or its affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,7 +18,6 @@
 
 import java.lang.annotation.Annotation;
 import java.lang.annotation.Documented;
-import java.lang.annotation.Repeatable;
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 import java.lang.reflect.Array;
@@ -208,11 +207,6 @@ private static void processAnnotations(Map<Class<? extends Annotation>, Annotati
                                            Map<Class<? extends Annotation>, Annotation> stereotypeMap,
                                            Map<String, Set<String>> annotationsByStereotype) {
         for (var entry : declaredAnnotations.entrySet()) {
-            if (stereotypeMap.containsKey(Repeatable.class)) {
-                // I need to ignore this (used only when there is just one repetition)
-                // this gets processed as part of the Repeatable container
-                continue;
-            }
             String annotName = entry.getKey().getName();
             miAnnotations.put(annotName, annotationValues(entry.getValue()));
             Set<Annotation> stereotypes = getStereotypes(entry.getValue());
diff --git a/integrations/micronaut/cdi/src/test/java/io/helidon/integrations/micronaut/cdi/TestBothBean.java b/integrations/micronaut/cdi/src/test/java/io/helidon/integrations/micronaut/cdi/TestBothBean.java
index 6f6227ada22..0f4780e9c85 100644
--- a/integrations/micronaut/cdi/src/test/java/io/helidon/integrations/micronaut/cdi/TestBothBean.java
+++ b/integrations/micronaut/cdi/src/test/java/io/helidon/integrations/micronaut/cdi/TestBothBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2021 Oracle and/or its affiliates.
+ * Copyright (c) 2020, 2024 Oracle and/or its affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,8 +21,28 @@
 @ApplicationScoped
 @MicronautBeanDef
 public class TestBothBean implements TestBean {
+
     @Override
     public String name() {
         return "BothBean";
     }
+
+    @CdiIntercepted
+    @Override
+    public String cdiAnnotated() {
+        return TestBean.super.cdiAnnotated();
+    }
+
+    @MicroIntercepted
+    @Override
+    public String µAnnotated() {
+        return TestBean.super.µAnnotated();
+    }
+
+    @CdiIntercepted
+    @MicroIntercepted
+    @Override
+    public String bothAnnotated() {
+        return TestBean.super.bothAnnotated();
+    }
 }
diff --git a/integrations/micronaut/data/pom.xml b/integrations/micronaut/data/pom.xml
index 81f7d78e71d..9fa742b284e 100644
--- a/integrations/micronaut/data/pom.xml
+++ b/integrations/micronaut/data/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    Copyright (c) 2020, 2023 Oracle and/or its affiliates.
+    Copyright (c) 2020, 2024 Oracle and/or its affiliates.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -46,7 +46,6 @@
         <dependency>
             <groupId>jakarta.validation</groupId>
             <artifactId>jakarta.validation-api</artifactId>
-            <version>2.0.2</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -59,6 +58,11 @@
             <artifactId>micronaut-runtime</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>io.micronaut.validation</groupId>
+            <artifactId>micronaut-validation</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>jakarta.persistence</groupId>
             <artifactId>jakarta.persistence-api</artifactId>
@@ -151,9 +155,14 @@
                                 </path>
                                 <path>
                                     <groupId>io.micronaut</groupId>
-                                    <artifactId>micronaut-validation</artifactId>
+                                    <artifactId>micronaut-core-processor</artifactId>
                                     <version>${version.lib.micronaut}</version>
                                 </path>
+                                <path>
+                                    <groupId>io.micronaut.validation</groupId>
+                                    <artifactId>micronaut-validation-processor</artifactId>
+                                    <version>${version.lib.micronaut.validation}</version>
+                                </path>
                                 <path>
                                     <groupId>io.micronaut.data</groupId>
                                     <artifactId>micronaut-data-processor</artifactId>
diff --git a/integrations/micronaut/data/src/test/java/io/helidon/integrations/micronaut/cdi/data/MicronautDataCdiExtensionTest.java b/integrations/micronaut/data/src/test/java/io/helidon/integrations/micronaut/cdi/data/MicronautDataCdiExtensionTest.java
index f18f9405c57..34ad5fc0044 100644
--- a/integrations/micronaut/data/src/test/java/io/helidon/integrations/micronaut/cdi/data/MicronautDataCdiExtensionTest.java
+++ b/integrations/micronaut/data/src/test/java/io/helidon/integrations/micronaut/cdi/data/MicronautDataCdiExtensionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2022 Oracle and/or its affiliates.
+ * Copyright (c) 2020, 2024 Oracle and/or its affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,14 +27,12 @@
 import io.helidon.microprofile.tests.junit5.Configuration;
 import io.helidon.microprofile.tests.junit5.HelidonTest;
 
-import javax.validation.ConstraintViolationException;
-import javax.validation.constraints.Pattern;
-
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.inject.Inject;
 import jakarta.transaction.Transactional;
+import jakarta.validation.ConstraintViolationException;
+import jakarta.validation.constraints.Pattern;
 import org.eclipse.microprofile.config.inject.ConfigProperty;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import static io.helidon.config.testing.OptionalMatcher.present;