Sonar Minor:Constant instead of duplicate literal 87/26687/1
authoraishkashyap <as00476394@techmahindra.com>
Thu, 21 Dec 2017 07:36:35 +0000 (13:06 +0530)
committeraishkashyap <as00476394@techmahindra.com>
Thu, 21 Dec 2017 07:38:13 +0000 (13:08 +0530)
Declare constant instead of duplicate literal

Sonar Link:
https://sonar.onap.org/component_issues/index?id=org.onap.aai.resources%3Aresources#severities=BLOCKER%2CMINOR|statuses=OPEN|assigned=false

Location:
src/main/java/org/onap/aai/rest/tools/ModelVersionTransformer.java
Line No:183

Change-Id: I34b6e1874a56dd57686e5a34e17c1309452fd3f1
Issue-ID: AAI-575
Signed-off-by: aishkashyap <as00476394@techmahindra.com>
aai-resources/src/main/java/org/onap/aai/rest/tools/ModelVersionTransformer.java

index 52fe859..490fdc6 100644 (file)
@@ -79,7 +79,7 @@ public class ModelVersionTransformer extends RESTAPI {
        protected static String authPolicyFunctionName = "REST";
        private ModelType introspectorFactoryType = ModelType.MOXY;
        private QueryStyle queryStyle = QueryStyle.TRAVERSAL;
-
+       protected static String MODEL_ELEMENTS = "model-elements";
 
        /**
         * POST for model transformation.
@@ -180,11 +180,11 @@ public class ModelVersionTransformer extends RESTAPI {
                        modelVerObj.setValue("model-version", oldModelVersion);
 
 
-                       if (obj.hasProperty("model-elements")) { 
-                               Introspector oldModelElements = obj.getWrappedValue("model-elements");
+                       if (obj.hasProperty(MODEL_ELEMENTS)) { 
+                               Introspector oldModelElements = obj.getWrappedValue(MODEL_ELEMENTS);
                                if (oldModelElements != null) {
-                                       Introspector newModelElements = modelVerObj.newIntrospectorInstanceOfProperty("model-elements");
-                                       modelVerObj.setValue("model-elements", newModelElements.getUnderlyingObject());
+                                       Introspector newModelElements = modelVerObj.newIntrospectorInstanceOfProperty(MODEL_ELEMENTS);
+                                       modelVerObj.setValue(MODEL_ELEMENTS, newModelElements.getUnderlyingObject());
                                        repackModelElements(oldModelElements, newModelElements, modelVersionIdToModelInvariantIdMap);
                                }
                        }
@@ -315,11 +315,11 @@ public class ModelVersionTransformer extends RESTAPI {
                                }
                        }
 
-                       if (oldModelElement.hasProperty("model-elements")) {
-                               Introspector nextOldModelElements = oldModelElement.getWrappedValue("model-elements");
+                       if (oldModelElement.hasProperty(MODEL_ELEMENTS)) {
+                               Introspector nextOldModelElements = oldModelElement.getWrappedValue(MODEL_ELEMENTS);
                                if (nextOldModelElements != null) {
-                                       Introspector nextNewModelElements = newModelElement.newIntrospectorInstanceOfProperty("model-elements");
-                                       newModelElement.setValue("model-elements", nextNewModelElements.getUnderlyingObject());
+                                       Introspector nextNewModelElements = newModelElement.newIntrospectorInstanceOfProperty(MODEL_ELEMENTS);
+                                       newModelElement.setValue(MODEL_ELEMENTS, nextNewModelElements.getUnderlyingObject());
                                        repackModelElements(nextOldModelElements, nextNewModelElements, modelVersionIdToModelInvariantIdMap);
                                }
                        }