DROOLS-3833: Ensure CDI annotations are only generated in Maven plugin (

#5)
apache · May 3, 2019 · af8cbfb · af8cbfb
1 parent e68564f
commit af8cbfb
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 43 deletions.
diff --git a/...del/drools-model-compiler/src/main/java/org/drools/modelcompiler/builder/ModelWriter.java b/...del/drools-model-compiler/src/main/java/org/drools/modelcompiler/builder/ModelWriter.java
@@ -15,6 +15,13 @@
 
 public class ModelWriter {
 
+    private boolean hasCdi;
+
+    public ModelWriter withCdi() {
+        this.hasCdi = true;
+        return this;
+    }
+
     public Result writeModel(MemoryFileSystem srcMfs, Collection<PackageModel> packageModels) {
         List<String> sourceFiles = new ArrayList<>();
         List<String> modelFiles = new ArrayList<>();
@@ -53,7 +60,7 @@ public Result writeModel(MemoryFileSystem srcMfs, Collection<PackageModel> packa
 
             String sourceName = "src/main/java/" + folderName + "/" + DOMAIN_CLASSESS_METADATA_FILE_NAME + pkgModel.getPackageUUID() + ".java";
             addSource( srcMfs, sourceFiles, pkgModel, sourceName, pkgModel.getDomainClassesMetadataSource() );
-            pkgModel.getModuleGenerator().write(srcMfs);
+            pkgModel.getModuleGenerator().withCdi(hasCdi).write(srcMfs);
         }
 
         return new Result(sourceFiles, modelFiles);

diff --git a/...ols-model-compiler/src/main/java/org/drools/modelcompiler/builder/ProjectSourceClass.java b/...ols-model-compiler/src/main/java/org/drools/modelcompiler/builder/ProjectSourceClass.java
@@ -2,19 +2,24 @@
 
 import org.drools.compiler.compiler.io.memory.MemoryFileSystem;
 import org.drools.model.Model;
-import org.drools.modelcompiler.builder.generator.CdiContainers;
 import org.kie.api.KieBase;
 import org.kie.api.builder.model.KieBaseModel;
 import org.kie.api.runtime.KieSession;
 
 public class ProjectSourceClass {
 
     final KieModuleModelMethod modelMethod;
+    private boolean hasCdi;
 
     public ProjectSourceClass(KieModuleModelMethod modelMethod) {
         this.modelMethod = modelMethod;
     }
 
+    public ProjectSourceClass withCdi() {
+        this.hasCdi = true;
+        return this;
+    }
+
     public String generate() {
         StringBuilder sb = new StringBuilder();
         sb.append(
@@ -25,7 +30,7 @@ public String generate() {
                         "import " + KieBaseModel.class.getCanonicalName()  + ";\n" +
                         "import " + KieSession.class.getCanonicalName()  + ";\n" +
                         "\n" +
-                        ( CdiContainers.isRunningInContainer() ? "@javax.enterprise.context.ApplicationScoped\n" : "" ) +
+                        ( hasCdi ? "@javax.enterprise.context.ApplicationScoped\n" : "" ) +
                         "public class ProjectRuntime implements org.drools.modelcompiler.KieRuntimeBuilder {\n" +
                         "\n");
         sb.append(modelMethod.getConstructor());

diff --git a/...odel-compiler/src/main/java/org/drools/modelcompiler/builder/generator/CdiContainers.java b/...odel-compiler/src/main/java/org/drools/modelcompiler/builder/generator/CdiContainers.java
diff --git a/...-compiler/src/main/java/org/drools/modelcompiler/builder/generator/ModuleSourceClass.java b/...-compiler/src/main/java/org/drools/modelcompiler/builder/generator/ModuleSourceClass.java
@@ -23,6 +23,7 @@ public class ModuleSourceClass {
     private final List<RuleUnitSourceClass> ruleUnits;
     private final List<RuleUnitInstanceSourceClass> ruleUnitInstances;
     private String targetTypeName;
+    private boolean hasCdi;
 
     public ModuleSourceClass() {
         this.packageName = "org.drools.project.model";
@@ -43,7 +44,7 @@ public void addRuleUnitInstance(RuleUnitInstanceSourceClass ruisc) {
     }
 
     public void write(MemoryFileSystem srcMfs) {
-        ruleUnits.forEach(r -> r.write(srcMfs));
+        ruleUnits.forEach(r -> r.withCdi(hasCdi).write(srcMfs));
         ruleUnitInstances.forEach(r -> r.write(srcMfs));
         srcMfs.write(completePath, generate().getBytes());
     }
@@ -78,4 +79,9 @@ public static ClassOrInterfaceType ruleUnitType(String canonicalName) {
         return new ClassOrInterfaceType(null, RuleUnit.class.getCanonicalName())
                 .setTypeArguments(new ClassOrInterfaceType(null, canonicalName));
     }
+
+    public ModuleSourceClass withCdi(boolean hasCdi) {
+        this.hasCdi = hasCdi;
+        return this;
+    }
 }
diff --git a/...ompiler/src/main/java/org/drools/modelcompiler/builder/generator/RuleUnitSourceClass.java b/...ompiler/src/main/java/org/drools/modelcompiler/builder/generator/RuleUnitSourceClass.java
@@ -27,6 +27,7 @@ public class RuleUnitSourceClass {
     private final String canonicalName;
     private final String targetCanonicalName;
     private String targetTypeName;
+    private boolean hasCdi = false;
 
     public RuleUnitSourceClass(String packageName, String typeName, String generatedSourceFile) {
         this.packageName = packageName;
@@ -120,7 +121,7 @@ public ClassOrInterfaceDeclaration classDeclaration() {
         ClassOrInterfaceDeclaration cls = new ClassOrInterfaceDeclaration()
                 .setName(targetTypeName)
                 .setModifiers(Modifier.Keyword.PUBLIC);
-        if (CdiContainers.isRunningInContainer()) {
+        if (hasCdi) {
             cls.addAnnotation("javax.enterprise.context.ApplicationScoped");
         }
         String ruleUnitInstanceFQCN = RuleUnitInstanceSourceClass.qualifiedName(packageName, typeName);
@@ -130,4 +131,9 @@ public ClassOrInterfaceDeclaration classDeclaration() {
                 .addMember(methodDeclaration);
         return cls;
     }
+
+    public RuleUnitSourceClass withCdi(boolean hasCdi) {
+        this.hasCdi = true;
+        return this;
+    }
 }
diff --git a/kie-maven-plugin/pom.xml b/kie-maven-plugin/pom.xml
@@ -122,35 +122,10 @@
     <dependency>
       <groupId>org.drools</groupId>
       <artifactId>drools-core</artifactId>
-      <exclusions>
-        <exclusion>
-          <groupId>org.drools</groupId>
-          <artifactId>drools-core-dynamic</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>com.thoughtworks.xstream</groupId>
-          <artifactId>xstream</artifactId>
-        </exclusion>
-      </exclusions>
-
-    </dependency>
-    <dependency>
-      <groupId>org.drools</groupId>
-      <artifactId>drools-core-static</artifactId>
     </dependency>
     <dependency>
       <groupId>org.drools</groupId>
       <artifactId>drools-model-compiler</artifactId>
-      <exclusions>
-        <exclusion>
-          <groupId>org.drools</groupId>
-          <artifactId>drools-core-dynamic</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>com.thoughtworks.xstream</groupId>
-          <artifactId>xstream</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
 
     <dependency>

diff --git a/kie-maven-plugin/src/main/java/org/kie/maven/plugin/GenerateModelMojo.java b/kie-maven-plugin/src/main/java/org/kie/maven/plugin/GenerateModelMojo.java
@@ -246,6 +246,7 @@ public void writeProjectOutput(MemoryFileSystem trgMfs, ResultsImpl messages) {
                     getInternalKieModule().getReleaseId(), modelMethod, generatedSourceFiles)
                     .write(srcMfs);
             new ProjectSourceClass(modelMethod)
+                    .withCdi()
                     .write(srcMfs);
 
             srcMfs.copyFolder(srcMfs.getFolder("src/main/java"), trgMfs, trgMfs.getFolder("."));