X-Git-Url: https://gerrit.onap.org/r/gitweb?p=policy%2Fengine.git;a=blobdiff_plain;f=ONAP-PAP-REST%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fpolicy%2Fpap%2Fxacml%2Frest%2Fcomponents%2FCreateNewMicroServiceModel.java;h=ea5e8aa431a7e25a3530223af4c4385e2dec25cc;hp=9b8854ff86bfb853281e4e31e2f764fecede07be;hb=refs%2Fchanges%2F84%2F98384%2F3;hpb=1e61676b77dd09659027b8984f050df7e8538526

diff --git a/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/components/CreateNewMicroServiceModel.java b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/components/CreateNewMicroServiceModel.java
index 9b8854ff8..ea5e8aa43 100644
--- a/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/components/CreateNewMicroServiceModel.java
+++ b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/components/CreateNewMicroServiceModel.java
@@ -4,6 +4,7 @@
  * ================================================================================
  * Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved.
  * Modified Copyright (C) 2018 Samsung Electronics Co., Ltd.
+ * Modifications Copyright (C) 2019 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -164,7 +165,7 @@ public class CreateNewMicroServiceModel {
             returnReferenceList.put(modelName, utils.getReferenceAttributes());
             msAttributes.setRefAttribute(returnReferenceList);
 
-            if (!PolicyDBDao.isNullOrEmpty(utils.getListConstraints())) {
+            if (!PolicyDbDao.isNullOrEmpty(utils.getListConstraints())) {
                 LinkedHashMap<String, String> enumList = new LinkedHashMap<>();
                 String[] listArray = utils.getListConstraints().split("#");
                 for (String str : listArray) {
@@ -274,7 +275,7 @@ public class CreateNewMicroServiceModel {
             newModel.setDependency("[]");
             if (mainClass.getSubClass() != null) {
                 String value = new Gson().toJson(mainClass.getSubClass());
-                newModel.setSub_attributes(value);
+                newModel.setSubAttributes(value);
             }
 
             if (mainClass.getAttribute() != null) {
@@ -288,7 +289,7 @@ public class CreateNewMicroServiceModel {
                 String refAttributes = mainClass.getRefAttribute().toString().replace("{", "").replace("}", "");
                 int equalsIndex = refAttributes.indexOf("=");
                 String refAttributesAfterFirstEquals = refAttributes.substring(equalsIndex + 1);
-                this.newModel.setRef_attributes(refAttributesAfterFirstEquals);
+                this.newModel.setRefAttributes(refAttributesAfterFirstEquals);
             }
 
             if (mainClass.getEnumType() != null) {
@@ -327,14 +328,14 @@ public class CreateNewMicroServiceModel {
             }
             subAttribute = utils.createSubAttributes(dependency, classMap, this.newModel.getModelName());
 
-            this.newModel.setSub_attributes(subAttribute);
+            this.newModel.setSubAttributes(subAttribute);
             if (mainClass.getAttribute() != null && !mainClass.getAttribute().isEmpty()) {
                 this.newModel.setAttributes(mainClass.getAttribute().toString().replace("{", "").replace("}", ""));
             }
 
             if (mainClass.getRefAttribute() != null && !mainClass.getRefAttribute().isEmpty()) {
                 this.newModel
-                        .setRef_attributes(mainClass.getRefAttribute().toString().replace("{", "").replace("}", ""));
+                        .setRefAttributes(mainClass.getRefAttribute().toString().replace("{", "").replace("}", ""));
             }
 
             if (mainClass.getEnumType() != null && !mainClass.getEnumType().isEmpty()) {
@@ -367,8 +368,8 @@ public class CreateNewMicroServiceModel {
             model.setDependency(this.newModel.getDependency());
             model.setDescription(this.newModel.getDescription());
             model.setEnumValues(this.newModel.getEnumValues());
-            model.setRef_attributes(this.newModel.getRef_attributes());
-            model.setSub_attributes(this.newModel.getSub_attributes());
+            model.setRefAttributes(this.newModel.getRefAttributes());
+            model.setSubAttributes(this.newModel.getSubAttributes());
             model.setDataOrderInfo(this.newModel.getDataOrderInfo());
             model.setDecisionModel(this.newModel.isDecisionModel());
             model.setRuleFormation(this.newModel.getRuleFormation());