Make sure we do not fail validation of scheduling when annotation processor is present in an MP application. (#10846)

Author: tomas-langer

declarative/codegen/src/main/java/io/helidon/declarative/codegen/scheduling/SchedulingExtension.java

@@ -352,10 +352,15 @@ private boolean checkAndHasArgument(TypedElementInfo element, TypeName annotatio
     private void checkTypeIsService(RegistryRoundContext roundContext, TypeInfo typeInfo) {
         Optional<ClassModel.Builder> descriptor = roundContext.generatedType(ctx.descriptorType(typeInfo.typeName()));
         if (descriptor.isEmpty()) {
-            throw new CodegenException("Type annotated with one of the scheduling annotations is not a service itself."
-                                               + " It must be annotated with "
-                                               + SERVICE_ANNOTATION_SINGLETON.classNameWithEnclosingNames() + ".",
-                                       typeInfo.originatingElementValue());
+            // we may be in CDI (as we support the annotations on both CDI beans and Helidon Declarative Services)
+            // let's just check there is any annotation on the type
+            if (typeInfo.annotations().isEmpty()) {
+                throw new CodegenException("Type annotated with one of the scheduling annotations is not a service itself."
+                                                   + " It must be annotated with "
+                                                   + SERVICE_ANNOTATION_SINGLETON.classNameWithEnclosingNames() + ","
+                                                   + " or it must be a CDI bean (in Helidon MP).",
+                                           typeInfo.originatingElementValue());
+            }
         }
     }
 

microprofile/scheduling/pom.xml

@@ -98,6 +98,12 @@
                             <artifactId>helidon-common-features-codegen</artifactId>
                             <version>${helidon.version}</version>
                         </path>
+                        <path>
+                            <!-- Make sure the build does not fail on scheduling validation even in MP -->
+                            <groupId>io.helidon.declarative</groupId>
+                            <artifactId>helidon-declarative-codegen</artifactId>
+                            <version>${helidon.version}</version>
+                        </path>
                     </annotationProcessorPaths>
                 </configuration>
                 <dependencies>
@@ -111,6 +117,11 @@
                         <artifactId>helidon-common-features-codegen</artifactId>
                         <version>${helidon.version}</version>
                     </dependency>
+                    <dependency>
+                        <groupId>io.helidon.declarative</groupId>
+                        <artifactId>helidon-declarative-codegen</artifactId>
+                        <version>${helidon.version}</version>
+                    </dependency>
                 </dependencies>
             </plugin>
         </plugins>