[incubator-kie-drools-6160] Clean up leftover of .rf support

apache · Dec 6, 2024 · ae5505f · ae5505f
1 parent 924e88a
commit ae5505f
Show file tree

Hide file tree

Showing 13 changed files with 4 additions and 374 deletions.
diff --git a/drools-base/src/main/java/org/drools/base/definitions/ProcessPackage.java b/drools-base/src/main/java/org/drools/base/definitions/ProcessPackage.java
@@ -41,7 +41,6 @@ public static ProcessPackage getOrCreate(ResourceTypePackageRegistry rtps) {
             rtp = new ProcessPackage();
             // register the same instance for all types. There is no distinction
             rtps.put(ResourceType.BPMN2, rtp);
-            rtps.put(ResourceType.DRF, rtp);
             rtps.put(ResourceType.CMMN, rtp);
         }
         return rtp;
@@ -55,7 +54,7 @@ public Map<String, Process> getRuleFlows() {
 
     /**
      * The ResourceType for {@link ProcessPackage} is always BPMN2,
-     * but there is no distinction between DRF, and CMMN as they all live under
+     * but there is no distinction between CMMN as they all live under
      * the same package.
      */
     @Override

diff --git a/...ompiler/src/main/java/org/drools/compiler/builder/impl/CompositeKnowledgeBuilderImpl.java b/...ompiler/src/main/java/org/drools/compiler/builder/impl/CompositeKnowledgeBuilderImpl.java
@@ -136,7 +136,6 @@ private void buildProcesses() {
 
     private void buildResources() {
         buildResourceType(ResourceBuilder.DSL_RESOURCE_BUILDER, ResourceType.DSL);
-        buildResourceType(ResourceBuilder.DRF_RESOURCE_BUILDER, ResourceType.DRF);
         buildResourceType(ResourceBuilder.XSD_RESOURCE_BUILDER, ResourceType.XSD);
     }
 
@@ -277,8 +276,6 @@ private interface ResourceBuilder {
         ResourceBuilder BPMN2_RESOURCE_BUILDER = ( kBuilder, resourceDescr ) -> kBuilder.addKnowledgeResource( resourceDescr.resource, ResourceType.BPMN2, resourceDescr.configuration );
 
         ResourceBuilder CMMN_RESOURCE_BUILDER = ( kBuilder, resourceDescr ) -> kBuilder.addKnowledgeResource( resourceDescr.resource, ResourceType.CMMN, resourceDescr.configuration );
-
-        ResourceBuilder DRF_RESOURCE_BUILDER = ( kBuilder, resourceDescr ) -> kBuilder.addKnowledgeResource( resourceDescr.resource, ResourceType.DRF, resourceDescr.configuration );
     }
 
 }
diff --git a/drools-compiler/src/main/java/org/drools/compiler/builder/impl/KnowledgeBuilderImpl.java b/drools-compiler/src/main/java/org/drools/compiler/builder/impl/KnowledgeBuilderImpl.java
@@ -340,16 +340,6 @@ public void addDsl(Resource resource) throws IOException {
         }
     }
 
-    /**
-     * Add a ruleflow (.rfm) asset to this package.
-     */
-    public void addRuleFlow(Reader processSource) {
-        addKnowledgeResource(
-                new ReaderResource(processSource, ResourceType.DRF),
-                ResourceType.DRF,
-                null);
-    }
-
     @Deprecated
     public void addProcessFromXml(Resource resource) {
         addKnowledgeResource(
@@ -362,11 +352,6 @@ public ProcessBuilder getProcessBuilder() {
         return processBuilder;
     }
 
-    @Deprecated
-    public void addProcessFromXml( Reader processSource) {
-        addProcessFromXml(new ReaderResource(processSource, ResourceType.DRF));
-    }
-
     public void addKnowledgeResource(Resource resource,
                                      ResourceType type,
                                      ResourceConfiguration configuration) {

diff --git a/...odel/drools-model-compiler/src/main/java/org/drools/modelcompiler/CanonicalKieModule.java b/...odel/drools-model-compiler/src/main/java/org/drools/modelcompiler/CanonicalKieModule.java
@@ -371,7 +371,7 @@ private List<Process> findProcesses(InternalKieModule kieModule, KieBaseModelImp
             List<Resource> processResources = kieModule.getFileNames().stream()
                     .filter(fileName -> {
                         ResourceType resourceType = determineResourceType(fileName);
-                        return resourceType == ResourceType.DRF || resourceType == ResourceType.BPMN2;
+                        return resourceType == ResourceType.BPMN2;
                     })
                     .map(fileName -> {
                         final Resource processResource = kieModule.getResource(fileName);

diff --git a/...r-integration/src/test/java/org/drools/mvel/integrationtests/FakeDRFAssemblerService.java b/...r-integration/src/test/java/org/drools/mvel/integrationtests/FakeDRFAssemblerService.java
diff --git a/...t-compiler-integration/src/test/java/org/drools/mvel/integrationtests/KieBuilderTest.java b/...t-compiler-integration/src/test/java/org/drools/mvel/integrationtests/KieBuilderTest.java
@@ -497,7 +497,7 @@ private void checkKModule(KieBaseTestConfiguration kieBaseTestConfiguration , fi
     public void testAddMissingResourceToPackageBuilder(KieBaseTestConfiguration kieBaseTestConfiguration) throws Exception {
         final KnowledgeBuilder kbuilder = KnowledgeBuilderFactory.newKnowledgeBuilder();
 
-        assertThatThrownBy(() -> kbuilder.add(ResourceFactory.newClassPathResource("some.rf"), ResourceType.DRL))
+        assertThatThrownBy(() -> kbuilder.add(ResourceFactory.newClassPathResource("some.drl"), ResourceType.DRL))
                 .isInstanceOf(RuntimeException.class);
 
         assertThatThrownBy(() -> kbuilder.add(ResourceFactory.newClassPathResource("some.bpmn"), ResourceType.BPMN2))

diff --git a/...ration/src/test/java/org/drools/mvel/integrationtests/PackageInMultipleResourcesTest.java b/...ration/src/test/java/org/drools/mvel/integrationtests/PackageInMultipleResourcesTest.java
diff --git a/...n/src/test/resources/META-INF/services/org.kie.api.internal.assembler.KieAssemblerService b/...n/src/test/resources/META-INF/services/org.kie.api.internal.assembler.KieAssemblerService
diff --git a/...piler-integration/src/test/resources/org/drools/mvel/integrationtests/rf_test_ruleflow.rf b/...piler-integration/src/test/resources/org/drools/mvel/integrationtests/rf_test_ruleflow.rf
diff --git a/...c/test/resources/org/drools/mvel/integrationtests/test_modifyWithRuleflowAndSubnetwork.rf b/...c/test/resources/org/drools/mvel/integrationtests/test_modifyWithRuleflowAndSubnetwork.rf
diff --git a/...t-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/ResourcesTest.java b/...t-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/ResourcesTest.java
@@ -39,7 +39,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
- * Tests loading of different types of resources (DRL, DSL, DRF, BPMN2, DTABLE).
+ * Tests loading of different types of resources (DRL, DSL, BPMN2, DTABLE).
  * Packages are loaded and built using KnowledgeBuilder.
  */
 public class ResourcesTest {