Xlsx decision tables (#365)

* Allow XLSX as format for decision table data

* Replace starter decision table files with new .xlsx versions

Author: ohecker

core/src/main/java/com/devonfw/tools/solicitor/common/LogMessages.java

@@ -75,7 +75,7 @@ public enum LogMessages {
   SHORTENING_XLS_CELL_CONTENT(49, "Shortening text content for XLS"), //
   REPLACING_EXCESSIVE_HTML_CONTENT(50,
       "At least one license text contained a large amount of raw HTML and was substituted by placeholder text '{}'"), //
-  MULTIPLE_DECISIONTABLES(51, "Multiple decision tables in both .xls and .csv format. Prioritizing '{}.xls'."), //
+  MULTIPLE_DECISIONTABLES(51, "Multiple decision tables in .xlsx, .xls and/or .csv format. Prioritizing '{}'."), //
   ADDING_ADDITIONALWRITER_CONFIG(52, "Merging config: Adding additional writers to base config from {}"), //
   NOT_A_VALID_NPM_PACKAGE_IDENTIFIER(53, "{} is not a valid identifier for an NPM package"), //
   SCANCODE_PROCESSOR_STARTING(54,

core/src/main/java/com/devonfw/tools/solicitor/common/ResourceToFileCopier.java

@@ -236,18 +236,18 @@ public String copyReourcesToFile(ResourceGroup resourceGroup, String targetDir)
             .withCopyOperation("classpath:starters/solicitor.cfg", "new_project/solicitor.cfg")
             .withCopyOperation("classpath:starters/input/licenses_starter.xml",
                 "new_project/input/licenses_starter.xml")
-            .withCopyOperation("classpath:starters/rules/LegalEvaluationProject.xls",
-                "new_project/rules/LegalEvaluationProject.xls")
-            .withCopyOperation("classpath:starters/rules/LegalPreEvaluationProject.xls",
-                "new_project/rules/LegalPreEvaluationProject.xls")
-            .withCopyOperation("classpath:starters/rules/LicenseAssignmentV2Project.xls",
-                "new_project/rules/LicenseAssignmentV2Project.xls")
-            .withCopyOperation("classpath:starters/rules/LicenseNameMappingProject.xls",
-                "new_project/rules/LicenseNameMappingProject.xls")
-            .withCopyOperation("classpath:starters/rules/LicenseSelectionProject.xls",
-                "new_project/rules/LicenseSelectionProject.xls")
-            .withCopyOperation("classpath:starters/rules/MultiLicenseSelectionProject.xls",
-                "new_project/rules/MultiLicenseSelectionProject.xls")
+            .withCopyOperation("classpath:starters/rules/LegalEvaluationProject.xlsx",
+                "new_project/rules/LegalEvaluationProject.xlsx")
+            .withCopyOperation("classpath:starters/rules/LegalPreEvaluationProject.xlsx",
+                "new_project/rules/LegalPreEvaluationProject.xlsx")
+            .withCopyOperation("classpath:starters/rules/LicenseAssignmentV2Project.xlsx",
+                "new_project/rules/LicenseAssignmentV2Project.xlsx")
+            .withCopyOperation("classpath:starters/rules/LicenseNameMappingProject.xlsx",
+                "new_project/rules/LicenseNameMappingProject.xlsx")
+            .withCopyOperation("classpath:starters/rules/LicenseSelectionProject.xlsx",
+                "new_project/rules/LicenseSelectionProject.xlsx")
+            .withCopyOperation("classpath:starters/rules/MultiLicenseSelectionProject.xlsx",
+                "new_project/rules/MultiLicenseSelectionProject.xlsx")
             .withCopyOperation("classpath:starters/readme.txt", "new_project/readme.txt");
         optionallyAddExtensionFiles(csb2);
         csb2.replaceInTarget("new_project", targetDir).execute();

core/src/main/java/com/devonfw/tools/solicitor/ruleengine/drools/DroolsRuleEngine.java

@@ -121,21 +121,40 @@ private int executeRuleGroup(ModelRoot modelRoot, RuleConfig rc) {
 
   /**
    * Determine the final rule source name. If the resource given by {@link RuleConfig#getRuleSource()} exists then take
-   * this. Otherwise check for alternatives by appending xls or csv suffix (with xls taking priority over csv).
+   * this. Otherwise check for alternatives by appending xlsx, xls or csv suffix (with decreasing priority: xlsx, xls,
+   * csv).
    *
    * @param rc the configuration of the rule
    */
   private void determineFinalRuleSourceName(RuleConfig rc) {
 
     if (!this.inputStreamFactory.isExisting(rc.getRuleSource())) {
+      boolean xlsxExists = false;
+      boolean xlsExists = false;
+      boolean csvExists = false;
+      int countExisting = 0;
+      if (this.inputStreamFactory.isExisting(rc.getRuleSource() + ".xlsx")) {
+        xlsxExists = true;
+        countExisting++;
+      }
       if (this.inputStreamFactory.isExisting(rc.getRuleSource() + ".xls")) {
-        if (this.inputStreamFactory.isExisting(rc.getRuleSource() + ".csv")) {
-          LOG.warn(LogMessages.MULTIPLE_DECISIONTABLES.msg(), rc.getRuleSource());
-        }
+        xlsExists = true;
+        countExisting++;
+      }
+      if (this.inputStreamFactory.isExisting(rc.getRuleSource() + ".csv")) {
+        csvExists = true;
+        countExisting++;
+      }
+      if (xlsxExists) {
+        rc.setRuleSource(rc.getRuleSource() + ".xlsx");
+      } else if (xlsExists) {
         rc.setRuleSource(rc.getRuleSource() + ".xls");
-      } else if (this.inputStreamFactory.isExisting(rc.getRuleSource() + ".csv")) {
+      } else if (csvExists) {
         rc.setRuleSource(rc.getRuleSource() + ".csv");
       }
+      if (countExisting > 1) {
+        LOG.warn(LogMessages.MULTIPLE_DECISIONTABLES.msg(), rc.getRuleSource());
+      }
     }
   }