From: Tian Lee <TianL@amdocs.com>
Date: Thu, 1 Feb 2018 16:02:43 +0000 (+0000)
Subject: Merge "Config to be able to route GET through datarouter"
X-Git-Tag: 2.0.0-ONAP~30
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=aai%2Fgizmo.git;a=commitdiff_plain;h=4a574e5f3824069de897b9ff9b8c346b5b4dceef;hp=74879a7b7a5607c89aef5fa9d64aca5ddea8e3b7

Merge "Config to be able to route GET through datarouter"
---

diff --git a/src/main/java/org/onap/schema/OxmModelValidator.java b/src/main/java/org/onap/schema/OxmModelValidator.java
index ae3e18b..1607f18 100644
--- a/src/main/java/org/onap/schema/OxmModelValidator.java
+++ b/src/main/java/org/onap/schema/OxmModelValidator.java
@@ -44,11 +44,11 @@ import javax.ws.rs.core.Response.Status;
 
 public class OxmModelValidator {
   public enum Metadata {
-    NODE_TYPE("aai-node-type"), 
-    URI("aai-uri"), 
-    CREATED_TS("aai-created-ts"), 
-    UPDATED_TS("aai-last-mod-ts"), 
-    SOT("source-of-truth"), 
+    NODE_TYPE("aai-node-type"),
+    URI("aai-uri"),
+    CREATED_TS("aai-created-ts"),
+    UPDATED_TS("aai-last-mod-ts"),
+    SOT("source-of-truth"),
     LAST_MOD_SOT("last-mod-source-of-truth");
 
     private final String propName;
@@ -318,13 +318,15 @@ public class OxmModelValidator {
               vertex.getProperties().get(Metadata.NODE_TYPE.propertyName()) != null
                   ? vertex.getProperties().get(Metadata.NODE_TYPE.propertyName()).toString() : vertex.getType()));
       final DynamicType modelObjectType = jaxbContext.getDynamicType(modelObjectClass);
+      final DynamicType reservedObjectType = jaxbContext.getDynamicType("ReservedPropNames");
 
       for (String key : vertex.getProperties().keySet()) {
         DatabaseField field = getDatabaseField(key, modelObjectType);
+        if (field == null) {
+          field = getDatabaseField(key, reservedObjectType);
+        }
         if (field != null) {
-          if (!Metadata.isProperty(key)) {
-            modelVertexBuilder.property(key, vertex.getProperties().get(key));
-          }
+          modelVertexBuilder.property(key, vertex.getProperties().get(key));
         }
       }