1 files changed, 62 insertions, 1 deletions

diff --git a/src/main/java/org/onap/aai/spike/schema/OXMModelLoader.java b/src/main/java/org/onap/aai/spike/schema/OXMModelLoader.java
index 0d174db..5d35017 100644
--- a/src/main/java/org/onap/aai/spike/schema/OXMModelLoader.java
+++ b/src/main/java/org/onap/aai/spike/schema/OXMModelLoader.java
@@ -22,11 +22,17 @@ package org.onap.aai.spike.schema;
 
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+
+import javax.ws.rs.core.Response.Status;
+
+import org.eclipse.persistence.dynamic.DynamicType;
+import org.eclipse.persistence.internal.oxm.mappings.Descriptor;
 import org.eclipse.persistence.jaxb.dynamic.DynamicJAXBContext;
 import org.onap.aai.cl.eelf.LoggerFactory;
 import org.onap.aai.nodes.NodeIngestor;
@@ -36,6 +42,7 @@ import org.onap.aai.setup.Version;
 import org.onap.aai.spike.exception.SpikeException;
 import org.onap.aai.spike.logging.SpikeMsgs;
 import org.onap.aai.spike.util.SchemaIngestPropertiesReader;
+import com.google.common.base.CaseFormat;
 
 /**
  * This class contains all of the logic for importing OXM model schemas from the available OXM
@@ -45,7 +52,8 @@ public class OXMModelLoader {
 
     private static Map<String, DynamicJAXBContext> versionContextMap =
             new ConcurrentHashMap<String, DynamicJAXBContext>();
-
+    private static Map<String, HashMap<String, DynamicType>> xmlElementLookup  = new ConcurrentHashMap<String, HashMap<String, DynamicType>>();
+  
     final static Pattern p = Pattern.compile("aai_oxm_(.*).xml");
     final static Pattern versionPattern = Pattern.compile("V(\\d*)");
 
@@ -82,6 +90,7 @@ public class OXMModelLoader {
 
     private synchronized static void loadModel(String oxmVersion, DynamicJAXBContext jaxbContext) {
         versionContextMap.put(oxmVersion, jaxbContext);
+        loadXmlLookupMap(oxmVersion, jaxbContext);
         logger.info(SpikeMsgs.LOADED_OXM_FILE, oxmVersion);
     }
 
@@ -158,6 +167,58 @@ public class OXMModelLoader {
         OXMModelLoader.versionContextMap = versionContextMap;
     }
 
+  public static void loadXmlLookupMap(String version, DynamicJAXBContext jaxbContext) {
+
+    @SuppressWarnings("rawtypes")
+    List<Descriptor> descriptorsList = jaxbContext.getXMLContext().getDescriptors();
+    HashMap<String, DynamicType> types = new HashMap<String, DynamicType>();
+
+    for (@SuppressWarnings("rawtypes")
+    Descriptor desc : descriptorsList) {
+
+      DynamicType entity = jaxbContext.getDynamicType(desc.getAlias());
+      String entityName = desc.getDefaultRootElement();
+      types.put(entityName, entity);
+    }
+    xmlElementLookup.put(version, types);
+  }
+
+  public static DynamicType getDynamicTypeForVersion(String version, String type) throws SpikeException {
+
+    DynamicType dynamicType;
+    // If we haven't already loaded in the available OXM models, then do so now.
+    if (versionContextMap == null || versionContextMap.isEmpty()) {
+      loadModels();
+    } else if (!versionContextMap.containsKey(version)) {
+      logger.error(SpikeMsgs.OXM_LOAD_ERROR, "Error loading oxm model: " + version);
+      throw new SpikeException("Error loading oxm model: " + version);
+    }
+
+    // First try to match the Java-type based on hyphen to camel case
+    // translation
+    String javaTypeName = CaseFormat.LOWER_HYPHEN.to(CaseFormat.UPPER_CAMEL, type);
+    dynamicType = versionContextMap.get(version).getDynamicType(javaTypeName);
+
+    if (xmlElementLookup.containsKey(version)) {
+    if (dynamicType == null) {
+      // Try to lookup by xml root element by exact match
+      dynamicType = xmlElementLookup.get(version).get(type);
+    }
+
+    if (dynamicType == null) {
+      // Try to lookup by xml root element by lowercase
+      dynamicType = xmlElementLookup.get(version).get(type.toLowerCase());
+    }
+
+    if (dynamicType == null) {
+      // Direct lookup as java-type name
+      dynamicType = versionContextMap.get(version).getDynamicType(type);
+    }
+    }
+
+    return dynamicType;
+  }
+
     /**
      * Retrieves the list of all Loaded OXM versions.
      *