KOGITO-590: Rules should "see" process variables

api/kogito-internal/src/main/java/org/kie/internal/ruleunit/RuleUnitComponentFactory.java

@@ -30,6 +30,8 @@ static RuleUnitComponentFactory get() {
 
     RuleUnitDescription createRuleUnitDescription( KiePackage pkg, Class<?> ruleUnitClass );
 
+    RuleUnitDescription createRuleUnitDescription( KiePackage pkg, String ruleUnitSimpleName );
+
     ApplyPmmlModelCommandExecutor newApplyPmmlModelCommandExecutor();
 
     boolean isRuleUnitClass( Class<?> ruleUnitClass );

api/kogito-internal/src/main/java/org/kie/internal/ruleunit/RuleUnitDescription.java

@@ -22,19 +22,15 @@
 public interface RuleUnitDescription {
 
     /**
-     * @deprecated this is only used by PMML
+     * @deprecated this is only used by PMML / it should not be used for other purposes
      *
      */
     @Deprecated
     Class<?> getRuleUnitClass();
 
-    default String getRuleUnitName() {
-        return getRuleUnitClass().getName();
-    }
+    String getRuleUnitName();
 
-    default String getCanonicalName() {
-        return getRuleUnitClass().getCanonicalName();
-    }
+    String getCanonicalName();
 
     String getSimpleName();
 

drools/drools-core/src/main/java/org/drools/core/ruleunit/RuleUnitDescriptionLoader.java

@@ -62,11 +62,21 @@ private RuleUnitDescription findDescription(final String ruleUnit) {
         if (nonExistingUnits.contains(ruleUnit)) {
             return null;
         }
+        RuleUnitComponentFactory ruleUnitComponentFactory = RuleUnitComponentFactory.get();
+        // short-circuit if there is no support for units
+        if (ruleUnitComponentFactory == null) {
+            return null;
+        }
         try {
-            return RuleUnitComponentFactory.get().createRuleUnitDescription( pkg, pkg.getTypeResolver().resolveType(ruleUnit) );
+            return ruleUnitComponentFactory.createRuleUnitDescription(pkg, pkg.getTypeResolver().resolveType(ruleUnit) );
         } catch (final ClassNotFoundException e) {
-            nonExistingUnits.add(ruleUnit);
-            return null;
+            RuleUnitDescription ruleUnitDescription = ruleUnitComponentFactory.createRuleUnitDescription(pkg, ruleUnit);
+            if (ruleUnitDescription == null) {
+                nonExistingUnits.add(ruleUnit);
+                return null;
+            } else {
+                return ruleUnitDescription;
+            }
         }
     }
 }

drools/kogito-ruleunits/src/main/java/org/kie/kogito/rules/units/AbstractRuleUnitDescription.java

@@ -29,13 +29,6 @@ public abstract class AbstractRuleUnitDescription implements RuleUnitDescription
 
     private final Map<String, RuleUnitVariable> varDeclarations = new HashMap<>();
 
-//    @Override
-//    public Optional<EntryPointId> getEntryPointId(String name) {
-//        return Optional.ofNullable(varDeclarations.get(name))
-//                .filter(RuleUnitVariable::isDataSource)
-//                .map(ds -> new EntryPointId(name));
-//    }
-
     @Override
     public Optional<Class<?>> getDatasourceType(String name) {
         return Optional.ofNullable(varDeclarations.get(name))

drools/kogito-ruleunits/src/main/java/org/kie/kogito/rules/units/GeneratedRuleUnitDescription.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.drools.core.ruleunit;
+package org.kie.kogito.rules.units;
 
 import java.lang.reflect.Method;
 import java.lang.reflect.ParameterizedType;
@@ -59,6 +59,11 @@ public Class<?> getRuleUnitClass() {
         return null;
     }
 
+    @Override
+    public String getCanonicalName() {
+        return getPackageName() + '.' + getSimpleName();
+    }
+
     @Override
     public String getSimpleName() {
         return simpleName;

drools/kogito-ruleunits/src/main/java/org/kie/kogito/rules/units/ReflectiveRuleUnitDescription.java

@@ -47,6 +47,11 @@ public Class<?> getRuleUnitClass() {
         return ruleUnitClass;
     }
 
+    @Override
+    public String getCanonicalName() {
+        return getRuleUnitClass().getCanonicalName();
+    }
+
     @Override
     public String getSimpleName() {
         return ruleUnitClass.getSimpleName();

drools/kogito-ruleunits/src/main/java/org/kie/kogito/rules/units/ReflectiveRuleUnitVariable.java

@@ -1,6 +1,5 @@
 package org.kie.kogito.rules.units;
 
-import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;

drools/kogito-ruleunits/src/main/java/org/kie/kogito/rules/units/impl/RuleUnitComponentFactoryImpl.java

@@ -16,22 +16,37 @@
 
 package org.kie.kogito.rules.units.impl;
 
+import java.util.HashMap;
+import java.util.Map;
+
 import org.drools.core.definitions.InternalKnowledgePackage;
 import org.kie.api.definition.KiePackage;
 import org.kie.internal.ruleunit.ApplyPmmlModelCommandExecutor;
 import org.kie.internal.ruleunit.RuleUnitComponentFactory;
 import org.kie.internal.ruleunit.RuleUnitDescription;
 import org.kie.kogito.rules.DataSource;
 import org.kie.kogito.rules.RuleUnitData;
+import org.kie.kogito.rules.units.GeneratedRuleUnitDescription;
 import org.kie.kogito.rules.units.ReflectiveRuleUnitDescription;
 
 public class RuleUnitComponentFactoryImpl implements RuleUnitComponentFactory {
 
+    private final Map<String, GeneratedRuleUnitDescription> generatedRuleUnitDescriptions = new HashMap<>();
+
+    public void registerRuleUnitDescription(GeneratedRuleUnitDescription ruleUnitDescription) {
+        generatedRuleUnitDescriptions.put(ruleUnitDescription.getCanonicalName(), ruleUnitDescription);
+    }
+
     @Override
     public RuleUnitDescription createRuleUnitDescription(KiePackage pkg, Class<?> ruleUnitClass ) {
         return new ReflectiveRuleUnitDescription((InternalKnowledgePackage) pkg, (Class<? extends RuleUnitData>) ruleUnitClass );
     }
 
+    @Override
+    public RuleUnitDescription createRuleUnitDescription(KiePackage pkg, String ruleUnitSimpleName ) {
+        return generatedRuleUnitDescriptions.get(pkg.getName() + '.' + ruleUnitSimpleName);
+    }
+
     @Override
     public ApplyPmmlModelCommandExecutor newApplyPmmlModelCommandExecutor() {
         throw new UnsupportedOperationException();

jbpm/jbpm-flow-builder/pom.xml

@@ -33,6 +33,10 @@
       <groupId>org.kie.kogito</groupId>
       <artifactId>drools-core</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.kie.kogito</groupId>
+      <artifactId>kogito-ruleunits</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.kie.kogito</groupId>
       <artifactId>kogito-api</artifactId>