feat(xsd-parser): update generated EipSchema to use eipIds for EipElements

Author: a-asaad

xsd-parser/eip-schema-definitions/pom.xml

@@ -10,7 +10,7 @@
     </parent>
 
     <artifactId>eip-schema-definitions</artifactId>
-    <version>0.2.0</version>
+    <version>0.3.0</version>
 
     <packaging>jar</packaging>
 
@@ -22,7 +22,7 @@
         <dependency>
             <groupId>org.codice.keip.xsd</groupId>
             <artifactId>si-xsd-parser-cli</artifactId>
-            <version>0.1.0</version>
+            <version>0.2.0</version>
         </dependency>
     </dependencies>
 

xsd-parser/eip-schema-definitions/xsd-sources.yaml

@@ -61,7 +61,9 @@ schemas:
 importedSchemaLocations:
   - namespace: "http://www.springframework.org/schema/integration"
     location: "https://www.springframework.org/schema/integration/spring-integration-5.2.xsd"
-  - namespace: "http://www.springframework.org/schema/beans"
+  - alias: "beans"
+    namespace: "http://www.springframework.org/schema/beans"
     location: "https://www.springframework.org/schema/beans/spring-beans-4.3.xsd"
-  - namespace: "http://www.springframework.org/schema/tool"
+  - alias: "tools"
+    namespace: "http://www.springframework.org/schema/tool"
     location: "https://www.springframework.org/schema/tool/spring-tool-4.3.xsd"

xsd-parser/si-xsd-parser-cli/pom.xml

@@ -10,7 +10,7 @@
     </parent>
 
     <artifactId>si-xsd-parser-cli</artifactId>
-    <version>0.1.0</version>
+    <version>0.2.0</version>
 
     <dependencies>
         <dependency>
@@ -79,7 +79,7 @@
         <dependency>
             <groupId>org.codice.keip.schemas</groupId>
             <artifactId>validation</artifactId>
-            <version>0.2.0</version>
+            <version>0.4.0</version>
             <scope>test</scope>
         </dependency>
 

xsd-parser/si-xsd-parser-cli/src/main/java/org/codice/keip/xsd/EipSchemaTranslation.java

@@ -3,6 +3,10 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 import javax.xml.transform.TransformerException;
 import org.apache.ws.commons.schema.XmlSchemaCollection;
 import org.codice.keip.xsd.client.XmlSchemaClient;
@@ -18,6 +22,8 @@ public class EipSchemaTranslation {
 
   private static final Logger LOGGER = LoggerFactory.getLogger(EipSchemaTranslation.class);
 
+  private final Map<String, String> uriToEipNamespace;
+
   private final XmlSchemaClient xmlSchemaClient;
 
   private final EipSchema eipSchema;
@@ -28,9 +34,20 @@ public EipSchemaTranslation(
       XsdSourceConfiguration sourceConfiguration, XmlSchemaClient xmlSchemaClient) {
     this.errors = new ArrayList<>();
     this.xmlSchemaClient = xmlSchemaClient;
+    this.uriToEipNamespace = buildUriToNamespaceMap(sourceConfiguration);
     this.eipSchema = translate(sourceConfiguration);
   }
 
+  private Map<String, String> buildUriToNamespaceMap(XsdSourceConfiguration sourceConfiguration) {
+    return Stream.concat(
+            sourceConfiguration.getSchemas().stream(),
+            sourceConfiguration.getImportedSchemaLocations().stream())
+        .filter(conf -> Objects.nonNull(conf.getAlias()))
+        .collect(
+            Collectors.toUnmodifiableMap(
+                SchemaIdentifier::getNamespace, SchemaIdentifier::getAlias));
+  }
+
   public EipSchema getEipSchema() {
     return eipSchema;
   }
@@ -46,7 +63,8 @@ private EipSchema translate(XsdSourceConfiguration sourceConfiguration) {
       try {
         XmlSchemaCollection schemaCollection = xmlSchemaClient.collect(targetSchema.getLocation());
 
-        var translator = new SchemaTranslator(targetSchema.getExcludedElements());
+        var translator =
+            new SchemaTranslator(targetSchema.getExcludedElements(), uriToEipNamespace);
 
         List<EipComponent> components =
             translator.translate(

xsd-parser/si-xsd-parser-cli/src/main/java/org/codice/keip/xsd/config/XsdSourceConfiguration.java

@@ -25,7 +25,7 @@ public void setSchemas(List<SchemaIdentifier> schemas) {
     this.schemas = schemas;
   }
 
-  List<SchemaIdentifier> getImportedSchemaLocations() {
+  public List<SchemaIdentifier> getImportedSchemaLocations() {
     if (importedSchemaLocations == null) {
       return Collections.emptyList();
     }

xsd-parser/si-xsd-parser-cli/src/main/java/org/codice/keip/xsd/model/eip/EipChildElement.java

@@ -41,8 +41,8 @@ public static class Builder extends EipElement.Builder<Builder> {
 
     private Occurrence occurrence;
 
-    public Builder(String name) {
-      this.name = Objects.requireNonNull(name);
+    public Builder(EipId eipId) {
+      this.eipId = Objects.requireNonNull(eipId);
     }
 
     public Builder(EipChildElement element) {

xsd-parser/si-xsd-parser-cli/src/main/java/org/codice/keip/xsd/model/eip/EipComponent.java

@@ -28,8 +28,8 @@ public static class Builder extends EipElement.Builder<Builder> {
     private Role role;
     private ConnectionType connectionType;
 
-    public Builder(String name, Role role, ConnectionType connectionType) {
-      this.name = Objects.requireNonNull(name);
+    public Builder(EipId eipId, Role role, ConnectionType connectionType) {
+      this.eipId = Objects.requireNonNull(eipId);
       this.role = Objects.requireNonNull(role);
       this.connectionType = Objects.requireNonNull(connectionType);
     }

xsd-parser/si-xsd-parser-cli/src/main/java/org/codice/keip/xsd/model/eip/EipElement.java

@@ -6,20 +6,20 @@
 
 public abstract class EipElement {
 
-  protected final String name;
+  protected final EipId eipId;
   protected final String description;
   protected Set<Attribute> attributes;
   protected ChildComposite childGroup;
 
   protected EipElement(Builder<?> builder) {
-    this.name = builder.name;
+    this.eipId = builder.eipId;
     this.description = builder.description;
     this.attributes = builder.attributes;
     this.childGroup = builder.childGroup;
   }
 
-  public String getName() {
-    return name;
+  public EipId getEipId() {
+    return eipId;
   }
 
   public String getDescription() {
@@ -50,28 +50,28 @@ public void addAttribute(Attribute attribute) {
 
   @Override
   public String toString() {
-    return this.name;
+    return this.eipId.toString();
   }
 
   // Effective Java - Hierarchical builder pattern
   protected abstract static class Builder<T extends Builder<T>> {
 
-    protected String name;
+    protected EipId eipId;
     protected String description;
     protected Set<Attribute> attributes;
     protected ChildComposite childGroup;
 
     public Builder() {}
 
     public Builder(EipElement element) {
-      this.name = element.name;
+      this.eipId = element.eipId;
       this.description = element.description;
       this.attributes = element.attributes;
       this.childGroup = element.childGroup;
     }
 
-    public T name(String name) {
-      this.name = name;
+    public T eipId(EipId eipId) {
+      this.eipId = eipId;
       return self();
     }
 

xsd-parser/si-xsd-parser-cli/src/main/java/org/codice/keip/xsd/model/eip/EipId.java

@@ -0,0 +1,8 @@
+package org.codice.keip.xsd.model.eip;
+
+public record EipId(String namespace, String name) {
+  @Override
+  public String toString() {
+    return namespace + ":" + name;
+  }
+}

xsd-parser/si-xsd-parser-cli/src/main/java/org/codice/keip/xsd/xml/ChildGroupReducer.java

@@ -12,6 +12,7 @@
 import org.codice.keip.xsd.model.eip.ChildComposite;
 import org.codice.keip.xsd.model.eip.ChildGroup;
 import org.codice.keip.xsd.model.eip.EipChildElement;
+import org.codice.keip.xsd.model.eip.EipId;
 import org.codice.keip.xsd.model.eip.Indicator;
 import org.codice.keip.xsd.model.eip.Occurrence;
 
@@ -92,14 +93,14 @@ private EipChildElement makeTerminalNode(EipChildElement element) {
 
   /** Remove any duplicate (by name) element siblings in a child group. */
   ChildGroup deDuplicateElements(ChildGroup group) {
-    Set<String> names = new HashSet<>();
+    Set<EipId> names = new HashSet<>();
     List<ChildComposite> deDuplicated =
         group.children().stream()
             .map(
                 child ->
                     switch (child) {
                       case EipChildElement element -> {
-                        if (names.add(element.getName())) {
+                        if (names.add(element.getEipId())) {
                           yield element;
                         }
                         yield null;
@@ -248,7 +249,7 @@ private String concatChildNames(ChildGroup group) {
             .map(
                 child ->
                     switch (child) {
-                      case EipChildElement element -> element.getName();
+                      case EipChildElement element -> eipIdToString(element.getEipId());
                       case ChildGroup ignored -> null;
                     })
             .filter(Objects::nonNull)
@@ -260,4 +261,8 @@ private String concatChildNames(ChildGroup group) {
   private boolean allChildrenAreElements(ChildGroup cg) {
     return cg.children().stream().allMatch(c -> c instanceof EipChildElement);
   }
+
+  private String eipIdToString(EipId id) {
+    return id.namespace() + "_" + id.name();
+  }
 }