X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ONAP-PAP-REST%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fpolicy%2Fpap%2Fxacml%2Frest%2Fcontroller%2FDictionaryImportController.java;h=c79f203cde02d9598c0af2b98a6ca445f9271cb6;hb=49048e277bba438cf6486c1229b53f608a7af114;hp=0b487010cbbd7e06e71e667e9d363ca54f805754;hpb=0c8425b25c093f638351a14f84a7b1df731cd0de;p=policy%2Fengine.git

diff --git a/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/controller/DictionaryImportController.java b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/controller/DictionaryImportController.java
index 0b487010c..c79f203cd 100644
--- a/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/controller/DictionaryImportController.java
+++ b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/controller/DictionaryImportController.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * ONAP-PAP-REST
  * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -296,7 +296,7 @@ public class DictionaryImportController {
 			if(dictionaryName.startsWith("ClosedLoopService")){
 				dictionaryImportExists = true;
 				for(int i = 1; i< dictSheet.size(); i++){
-					ClosedLoopD2Services attribute = new ClosedLoopD2Services("",  userId);
+					ClosedLoopD2Services attribute = new ClosedLoopD2Services();
 					UserInfo userinfo = new UserInfo();
 					userinfo.setUserLoginId(userId);
 					attribute.setUserCreatedBy(userinfo);
@@ -486,7 +486,7 @@ public class DictionaryImportController {
 			if(dictionaryName.startsWith("PrefixList")){
 				dictionaryImportExists = true;
 				for(int i = 1; i< dictSheet.size(); i++){
-					PrefixList attribute = new PrefixList("",  userId);
+					PrefixList attribute = new PrefixList();
 					String[] rows = dictSheet.get(i);
 					for (int j=0 ; j<rows.length; j++ ){
 						if(("prefixListName").equalsIgnoreCase(dictSheet.get(0)[j]) || ("PrefixList Name").equalsIgnoreCase(dictSheet.get(0)[j])){
@@ -505,7 +505,7 @@ public class DictionaryImportController {
 			if(dictionaryName.startsWith("SecurityZone")){
 				dictionaryImportExists = true;
 				for(int i = 1; i< dictSheet.size(); i++){
-					SecurityZone attribute = new SecurityZone("",  userId);
+					SecurityZone attribute = new SecurityZone();
 					String[] rows = dictSheet.get(i);
 					for (int j=0 ; j<rows.length; j++ ){
 						if(("zoneName").equalsIgnoreCase(dictSheet.get(0)[j]) || ("Zone Name").equalsIgnoreCase(dictSheet.get(0)[j])){
@@ -521,7 +521,7 @@ public class DictionaryImportController {
 			if(dictionaryName.startsWith("Zone")){
 				dictionaryImportExists = true;
 				for(int i = 1; i< dictSheet.size(); i++){
-					Zone attribute = new Zone("",  userId);
+					Zone attribute = new Zone();
 					String[] rows = dictSheet.get(i);
 					for (int j=0 ; j<rows.length; j++ ){
 						if(("zoneName").equalsIgnoreCase(dictSheet.get(0)[j]) || ("Zone Name").equalsIgnoreCase(dictSheet.get(0)[j])){
@@ -537,7 +537,7 @@ public class DictionaryImportController {
 			if(dictionaryName.startsWith("ServiceList")){
 				dictionaryImportExists = true;
 				for(int i = 1; i< dictSheet.size(); i++){
-					ServiceList attribute = new ServiceList("",  userId);
+					ServiceList attribute = new ServiceList();
 					String[] rows = dictSheet.get(i);
 					for (int j=0 ; j<rows.length; j++ ){
 						if(("serviceName").equalsIgnoreCase(dictSheet.get(0)[j]) || ("Service Name").equalsIgnoreCase(dictSheet.get(0)[j])){
@@ -565,7 +565,7 @@ public class DictionaryImportController {
 			if(dictionaryName.startsWith("ServiceGroup")){
 				dictionaryImportExists = true;
 				for(int i = 1; i< dictSheet.size(); i++){
-					GroupServiceList attribute = new GroupServiceList("",  userId);
+					GroupServiceList attribute = new GroupServiceList();
 					String[] rows = dictSheet.get(i);
 					for (int j=0 ; j<rows.length; j++ ){
 						if(("name").equalsIgnoreCase(dictSheet.get(0)[j]) || ("Group Name").equalsIgnoreCase(dictSheet.get(0)[j])){
@@ -581,7 +581,7 @@ public class DictionaryImportController {
 			if(dictionaryName.startsWith("AddressGroup")){
 				dictionaryImportExists = true;
 				for(int i = 1; i< dictSheet.size(); i++){
-					AddressGroup attribute = new AddressGroup("",  userId);
+					AddressGroup attribute = new AddressGroup();
 					String[] rows = dictSheet.get(i);
 					for (int j=0 ; j<rows.length; j++ ){
 						if(("name").equalsIgnoreCase(dictSheet.get(0)[j]) || ("Group Name").equalsIgnoreCase(dictSheet.get(0)[j])){
@@ -600,7 +600,7 @@ public class DictionaryImportController {
 			if(dictionaryName.startsWith("ProtocolList")){
 				dictionaryImportExists = true;
 				for(int i = 1; i< dictSheet.size(); i++){
-					ProtocolList attribute = new ProtocolList("",  userId);
+					ProtocolList attribute = new ProtocolList();
 					String[] rows = dictSheet.get(i);
 					for (int j=0 ; j<rows.length; j++ ){
 						if(("protocolName").equalsIgnoreCase(dictSheet.get(0)[j]) || ("Protocol Name").equalsIgnoreCase(dictSheet.get(0)[j])){
@@ -616,7 +616,7 @@ public class DictionaryImportController {
 			if(dictionaryName.startsWith("ActionList")){
 				dictionaryImportExists = true;
 				for(int i = 1; i< dictSheet.size(); i++){
-					ActionList attribute = new ActionList("",  userId);
+					ActionList attribute = new ActionList();
 					String[] rows = dictSheet.get(i);
 					for (int j=0 ; j<rows.length; j++ ){
 						if(("actionName").equalsIgnoreCase(dictSheet.get(0)[j]) || ("Action Name").equalsIgnoreCase(dictSheet.get(0)[j])){