Upgrade to latest Micronaut release.

Signed-off-by: Tomas Langer <tomas.langer@oracle.com>
helidon-io · Nov 20, 2020 · f40e241 · f40e241
1 parent ef91e01
commit f40e241
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 23 deletions.
diff --git a/dependencies/pom.xml b/dependencies/pom.xml
@@ -87,9 +87,9 @@
         <version.lib.logback>1.2.3</version.lib.logback>
         <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.micronaut>2.0.2</version.lib.micronaut>
-        <version.lib.micronaut.data>2.0.1</version.lib.micronaut.data>
-        <version.lib.micronaut.sql>3.0.1</version.lib.micronaut.sql>
+        <version.lib.micronaut>2.2.0</version.lib.micronaut>
+        <version.lib.micronaut.data>2.2.0</version.lib.micronaut.data>
+        <version.lib.micronaut.sql>3.3.1</version.lib.micronaut.sql>
         <version.lib.microprofile-config>1.4</version.lib.microprofile-config>
         <version.lib.microprofile-fault-tolerance-api>2.1.1</version.lib.microprofile-fault-tolerance-api>
         <version.lib.microprofile-health>2.2</version.lib.microprofile-health>
@@ -1167,16 +1167,36 @@
                     </exclusion>
                 </exclusions>
             </dependency>
+            <dependency>
+                <groupId>io.micronaut</groupId>
+                <artifactId>micronaut-validation</artifactId>
+                <version>${version.lib.micronaut}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.micronaut</groupId>
+                <artifactId>micronaut-http</artifactId>
+                <version>${version.lib.micronaut}</version>
+            </dependency>
             <dependency>
                 <groupId>io.micronaut</groupId>
                 <artifactId>micronaut-runtime</artifactId>
                 <version>${version.lib.micronaut}</version>
             </dependency>
+            <dependency>
+                <groupId>io.micronaut</groupId>
+                <artifactId>micronaut-aop</artifactId>
+                <version>${version.lib.micronaut}</version>
+            </dependency>
             <dependency>
                 <groupId>io.micronaut.sql</groupId>
                 <artifactId>micronaut-jdbc-hikari</artifactId>
                 <version>${version.lib.micronaut.sql}</version>
             </dependency>
+            <dependency>
+                <groupId>io.micronaut.sql</groupId>
+                <artifactId>micronaut-jdbc</artifactId>
+                <version>${version.lib.micronaut.sql}</version>
+            </dependency>
             <dependency>
                 <groupId>io.micronaut.data</groupId>
                 <artifactId>micronaut-data-tx</artifactId>

diff --git a/...ronaut/cdi/src/main/java/io/helidon/integrations/micronaut/cdi/MicronautCdiExtension.java b/...ronaut/cdi/src/main/java/io/helidon/integrations/micronaut/cdi/MicronautCdiExtension.java
@@ -52,6 +52,7 @@
 import io.micronaut.core.annotation.AnnotationMetadata;
 import io.micronaut.core.io.service.ServiceDefinition;
 import io.micronaut.core.io.service.SoftServiceLoader;
+import io.micronaut.inject.AdvisedBeanType;
 import io.micronaut.inject.BeanDefinition;
 import io.micronaut.inject.BeanDefinitionReference;
 import io.micronaut.inject.ExecutableMethod;
@@ -309,19 +310,12 @@ private void loadMicronautBeanDefinitions() {
                 .map(ServiceDefinition::load)
                 .filter(BeanDefinitionReference::isPresent)
                 .map(ref -> {
-                    Class<?> beanType = ref.getBeanType();
-
-                    String className = ref.getBeanType().getName();
-                    if (className.endsWith("$Intercepted")) {
-                        // either superclass is the one we want, or first implemented interface
-                        if (Object.class.equals(beanType.getSuperclass())) {
-                            Class<?>[] interfaces = beanType.getInterfaces();
-                            if (interfaces.length > 0) {
-                                beanType = interfaces[0];
-                            }
-                        } else {
-                            beanType = beanType.getSuperclass();
-                        }
+                    Class<?> beanType;
+
+                    if (ref instanceof AdvisedBeanType) {
+                        beanType = ((AdvisedBeanType) ref).getInterceptedType();
+                    } else {
+                        beanType = ref.getBeanType();
                     }
 
                     return new MicronautBean(beanType, ref);
@@ -331,9 +325,9 @@ private void loadMicronautBeanDefinitions() {
         // using my own collection, so the field is final
         beanDefinitions.addAll(beans);
 
-        for (MicronautBean defRef : beanDefinitions) {
-            mBeanToDefRef.computeIfAbsent(defRef.beanType(), it -> new LinkedList<>())
-                    .add(defRef);
+        for (MicronautBean micronautBean : beanDefinitions) {
+            mBeanToDefRef.computeIfAbsent(micronautBean.beanType(), it -> new LinkedList<>())
+                    .add(micronautBean);
         }
 
         unprocessedBeans.putAll(mBeanToDefRef);
@@ -390,10 +384,7 @@ private void findInterceptors(Set<Class<?>> interceptors, AnnotationMetadata ann
     private BeanDefinitionReference<?> findMicronautBeanDefinition(List<MicronautBean> mBeans) {
         for (MicronautBean mBean : mBeans) {
             BeanDefinitionReference<?> ref = mBean.definitionRef();
-            //            if (ref instanceof AdvisedBeanType) {
-            //                continue;
-            //            }
-            if (ref.getBeanType().getName().endsWith("$Intercepted")) {
+            if (ref instanceof AdvisedBeanType) {
                 continue;
             }
             return ref;