Detect factories having designate element with both "pid" and

"factoryPid" attributes This relates to #1728
Adobe-Consulting-Services · Nov 10, 2023 · 9ece0cf · 9ece0cf
1 parent e5b4df5
commit 9ece0cf
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/bundle/src/test/java/com/adobe/acs/commons/it/build/ScrMetadataIT.java b/bundle/src/test/java/com/adobe/acs/commons/it/build/ScrMetadataIT.java
@@ -365,15 +365,16 @@ private Descriptor parseMetatype(InputStream is, String name) throws IOException
  StartElement start = event.asStartElement();
  String elementName = start.getName().getLocalPart();
  if (elementName.equals("Designate")) {
- Attribute pidAttribute = start.getAttributeByName(new QName("pid"));
+ // Felix SCR Generator incorrectly generates both attributes "factoryPid" and "pid" for factories
+ Attribute pidAttribute = start.getAttributeByName(new QName("factoryPid"));
  if (pidAttribute != null) {
  result.name = pidAttribute.getValue();
+ result.factory = true;
  } else {
- pidAttribute = start.getAttributeByName(new QName("factoryPid"));
+ pidAttribute = start.getAttributeByName(new QName("pid");
  if (pidAttribute != null) {
  result.name = pidAttribute.getValue();
  }
- result.factory = true;
  }
  } else if (elementName.equals("AD")) {
  String propName = start.getAttributeByName(new QName("id")).getValue();