fixes in CrossEntityReferenceLookup.java

[aai/sparky-be.git] / sparkybe-onap-service / src / main / java / org / onap / aai / sparky / config / oxm / CrossEntityReferenceLookup.java

diff --git a/sparkybe-onap-service/src/main/java/org/onap/aai/sparky/config/oxm/CrossEntityReferenceLookup.java b/sparkybe-onap-service/src/main/java/org/onap/aai/sparky/config/oxm/CrossEntityReferenceLookup.java
index 603b93d..7553bde 100644 (file)
--- a/sparkybe-onap-service/src/main/java/org/onap/aai/sparky/config/oxm/CrossEntityReferenceLookup.java
+++ b/sparkybe-onap-service/src/main/java/org/onap/aai/sparky/config/oxm/CrossEntityReferenceLookup.java
@@ -1,26 +1,22 @@
 /**
- * ============LICENSE_START===================================================
- * SPARKY (AAI UI service)
- * ============================================================================
- * Copyright © 2017 AT&T Intellectual Property.
- * Copyright © 2017 Amdocs
- * All rights reserved.
- * ============================================================================
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 Amdocs
+ * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *       http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- * ============LICENSE_END=====================================================
- *
- * ECOMP and OpenECOMP are trademarks
- * and service marks of AT&T Intellectual Property.
+ * ============LICENSE_END=========================================================
  */
 package org.onap.aai.sparky.config.oxm;
 
@@ -37,13 +33,16 @@ import org.eclipse.persistence.jaxb.dynamic.DynamicJAXBContext;
 
 public class CrossEntityReferenceLookup implements OxmModelProcessor {
 
+  private static final String ENTITY_NAME  = "entityName";
+  private static final String CROSS_ENTITY_REFERENCE  = "crossEntityReference";
   private Map<String, HashMap<String, String>> crossReferenceEntityOxmModel;
   private Map<String, CrossEntityReferenceDescriptor> crossReferenceEntityDescriptors;
 
 
+
   public CrossEntityReferenceLookup() {
-    crossReferenceEntityOxmModel = new LinkedHashMap<String, HashMap<String, String>>();
-    crossReferenceEntityDescriptors = new HashMap<String, CrossEntityReferenceDescriptor>();
+    crossReferenceEntityOxmModel = new LinkedHashMap<>();
+    crossReferenceEntityDescriptors = new HashMap<>();
   }
 
   @Override
@@ -57,7 +56,7 @@ public class CrossEntityReferenceLookup implements OxmModelProcessor {
 
       DynamicType entity = jaxbContext.getDynamicType(desc.getAlias());
 
-      LinkedHashMap<String, String> oxmProperties = new LinkedHashMap<String, String>();
+      LinkedHashMap<String, String> oxmProperties = new LinkedHashMap<>();
 
       // Not all fields have key attributes
       if (desc.getPrimaryKeyFields() != null) {
@@ -68,19 +67,19 @@ public class CrossEntityReferenceLookup implements OxmModelProcessor {
       String entityName = desc.getDefaultRootElement();
       
       // add entityName
-      oxmProperties.put("entityName", entityName);
+      oxmProperties.put(ENTITY_NAME, entityName);
 
       Map<String, String> properties = entity.getDescriptor().getProperties();
       if (properties != null) {
         for (Map.Entry<String, String> entry : properties.entrySet()) {
 
-          if (entry.getKey().equalsIgnoreCase("crossEntityReference")) {
-            oxmProperties.put("crossEntityReference", entry.getValue());
+          if (CROSS_ENTITY_REFERENCE.equalsIgnoreCase(entry.getKey())) {
+            oxmProperties.put(CROSS_ENTITY_REFERENCE, entry.getValue());
           }
         }
       }
 
-      if (oxmProperties.containsKey("crossEntityReference")) {
+      if (oxmProperties.containsKey(CROSS_ENTITY_REFERENCE)) {
         crossReferenceEntityOxmModel.put(entityName, oxmProperties);
       }
 
@@ -90,12 +89,12 @@ public class CrossEntityReferenceLookup implements OxmModelProcessor {
         .entrySet()) {
       HashMap<String, String> attribute = crossRefModel.getValue();
       CrossEntityReferenceDescriptor entity = new CrossEntityReferenceDescriptor();
-      entity.setEntityName(attribute.get("entityName"));
+      entity.setEntityName(attribute.get(ENTITY_NAME));
       entity.setPrimaryKeyAttributeNames(
           Arrays.asList(attribute.get("primaryKeyAttributeNames").replace(" ", "").split(",")));
 
       List<String> crossEntityRefTokens =
-          Arrays.asList(attribute.get("crossEntityReference").split(","));
+          Arrays.asList(attribute.get(CROSS_ENTITY_REFERENCE).split(","));
 
       if (crossEntityRefTokens.size() >= 2) {
         CrossEntityReference entityRef = new CrossEntityReference();
@@ -107,7 +106,7 @@ public class CrossEntityReferenceLookup implements OxmModelProcessor {
 
         entity.setCrossEntityReference(entityRef);
       }
-      crossReferenceEntityDescriptors.put(attribute.get("entityName"), entity);
+      crossReferenceEntityDescriptors.put(attribute.get(ENTITY_NAME), entity);
     }
 
   }