Fix for Issue #88, A layer can expect multiple add-on families

.github/workflows/ci.yml

@@ -52,7 +52,7 @@ jobs:
         run: mvn clean install -Dversion.org.wildfly.glow=${{ env.WILDFLY_GLOW_VERSION }}
         shell: bash
         working-directory: wildfly-maven-plugin
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
         if: failure()
         with:
           name: surefire-reports-${{ matrix.os }}-${{ matrix.java }}

core/src/main/java/org/wildfly/glow/GlowSession.java

@@ -929,21 +929,22 @@ private static void fixAddOns(ErrorIdentificationSession errorSession,
         }
         // handle the case of layers expecting addOn
         for (Layer l : layers) {
-            String familyExpected = l.getExpectFamily();
-            if (familyExpected != null) {
-                boolean found = false;
-                for (AddOn addOn : allEnabledAddOns) {
-                    if (addOn.getFamily().equals(familyExpected)) {
-                        found = true;
-                        break;
+            for (String familyExpected : l.getExpectFamilies()) {
+                if (familyExpected != null) {
+                    boolean found = false;
+                    for (AddOn addOn : allEnabledAddOns) {
+                        if (addOn.getFamily().equals(familyExpected)) {
+                            found = true;
+                            break;
+                        }
+                    }
+                    if (!found) {
+                        Set<AddOn> members = mapping.getAddOnFamilyMembers().get(familyExpected);
+                        IdentifiedError err = new IdentifiedError("expected add-on not found",
+                                "an add-on of the " + familyExpected + " family is expected by the " + l + " layer", ERROR);
+                        err.getPossibleAddons().addAll(members);
+                        errorSession.addError(err);
                     }
-                }
-                if (!found) {
-                    Set<AddOn> members = mapping.getAddOnFamilyMembers().get(familyExpected);
-                    IdentifiedError err = new IdentifiedError("expected add-on not found",
-                            "an add-on of the " + familyExpected + " family is expected by the " + l + " layer", ERROR);
-                    err.getPossibleAddons().addAll(members);
-                    errorSession.addError(err);
                 }
             }
         }

core/src/main/java/org/wildfly/glow/Layer.java

@@ -41,7 +41,7 @@ public class Layer implements Comparable<Layer> {
     private final Set<String> bringDatasources = new TreeSet<>();
     private boolean isAutomaticInjection;
     private final Set<String> configuration = new TreeSet<>();
-    private String expectFamily;
+    private final Set<String> expectFamilies = new TreeSet<>();
     private boolean banned;
 
     Layer(String name) {
@@ -157,15 +157,15 @@ public Set<String> getConfiguration() {
     /**
      * @return the expectFamily
      */
-    public String getExpectFamily() {
-        return expectFamily;
+    public Set<String> getExpectFamilies() {
+        return expectFamilies;
     }
 
     /**
      * @param expectFamily the expectFamily to set
      */
-    public void setExpectFamily(String expectFamily) {
-        this.expectFamily = expectFamily;
+    public void addExpectFamily(String expectFamily) {
+        expectFamilies.add(expectFamily);
     }
 
     /**

core/src/main/java/org/wildfly/glow/LayerMetadata.java

@@ -38,6 +38,7 @@ public abstract class LayerMetadata {
     public static final String CLASS = PREFIX + "class";
     public static final String CONFIGURATION = PREFIX + "configuration";
     public static final String EXPECT_ADD_ON_FAMILY = PREFIX + "expect-add-on-family";
+    public static final String EXPECT_ADD_ON_FAMILIES = PREFIX + "expect-add-on-families";
     public static final String EXPECTED_FILE = PREFIX + "expected-file";
     public static final String HIDDEN_IF = PREFIX + "hidden-if";
     public static final String INCLUSION_MODE = PREFIX + "inclusion-mode";
@@ -63,6 +64,7 @@ public abstract class LayerMetadata {
         FULLY_NAMED_RULES.add(CLASS);
         FULLY_NAMED_RULES.add(CONFIGURATION);
         FULLY_NAMED_RULES.add(EXPECT_ADD_ON_FAMILY);
+        FULLY_NAMED_RULES.add(EXPECT_ADD_ON_FAMILIES);
         FULLY_NAMED_RULES.add(INCLUSION_MODE);
         FULLY_NAMED_RULES.add(KIND);
 

core/src/main/java/org/wildfly/glow/Utils.java

@@ -452,7 +452,15 @@ public static LayerMapping buildMapping(Map<String, Layer> layers, Set<String> p
                     continue;
                 }
                 if (LayerMetadata.EXPECT_ADD_ON_FAMILY.equals(k)) {
-                    l.setExpectFamily(l.getProperties().get(k));
+                    l.addExpectFamily(l.getProperties().get(k));
+                    continue;
+                }
+                if (LayerMetadata.EXPECT_ADD_ON_FAMILIES.equals(k)) {
+                    String val = l.getProperties().get(k);
+                    String[] split = val.split(",");
+                    for(String v : split) {
+                        l.addExpectFamily(v.trim());
+                    }
                     continue;
                 }
                 if (LayerMetadata.ADD_ON.equals(k)) {