Policy 1707 commit to LF

Change-Id: Ibe6f01d92f9a434c040abb05d5386e89d675ae65
Signed-off-by: ITSERVICES\rb7147 <rb7147@att.com>

24 files changed, 0 insertions, 2365 deletions

diff --git a/ecomp-sdk-app/src/main/java/org/openecomp/policy/adapter/AddressGroupJson.java b/ecomp-sdk-app/src/main/java/org/openecomp/policy/adapter/AddressGroupJson.java
deleted file mode 100644
index e60e4061e..000000000
--- a/ecomp-sdk-app/src/main/java/org/openecomp/policy/adapter/AddressGroupJson.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
- * ================================================================================
- * Copyright (C) 2017 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.
- * You may obtain a copy of the License at
- * 
- *      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=========================================================
- */
-
-package org.openecomp.policy.adapter;
-
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class AddressGroupJson {
-
-	protected String name;
-	protected String description;
-	protected List<AddressMembers> members;
-	
-	// name
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String value) {
-		this.name = value;
-	}
-	
-	public boolean equals(Object obj) 
-	{
-		AddressGroupJson servGroupobj=(AddressGroupJson) obj;
-		 if(this.getName().equals(servGroupobj.getName()))
-	        {
-	                return true;
-	        }
-	        return false;
-    }
-	
-	 public int hashCode() {
-	    return Integer.valueOf(name.charAt(0)+(name.charAt(1)));
-	 }
-	
-	// description
-	public String getDescription() {
-		return description;
-	}
-
-	public void setDescription(String value) {
-		this.description = value;
-	}
-	
-	public List<AddressMembers> getMembers() 
-    {
-    	if(members==null)
-    	{
-    		members= new ArrayList<AddressMembers>();
-    	}
-        return this.members;
-    }
-
-	public void setMembers(List<AddressMembers> members) 
-	{
-	        this.members = members;
-	}
-
-}
diff --git a/ecomp-sdk-app/src/main/java/org/openecomp/policy/adapter/AddressJson.java b/ecomp-sdk-app/src/main/java/org/openecomp/policy/adapter/AddressJson.java
deleted file mode 100644
index 372eddf1b..000000000
--- a/ecomp-sdk-app/src/main/java/org/openecomp/policy/adapter/AddressJson.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
- * ================================================================================
- * Copyright (C) 2017 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.
- * You may obtain a copy of the License at
- * 
- *      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=========================================================
- */
-
-package org.openecomp.policy.adapter;
-
-
-public class AddressJson {
-
-	protected String type;
-	protected String value;
-	// type
-	public String getType() {
-		return type;
-	}
-
-	public void setType(String type) {
-		this.type = type;
-	}
-	
-	public String getValue() {
-		return value;
-	}
-
-	public void setValue(String value) {
-		this.value = value;
-	}
-}
diff --git a/ecomp-sdk-app/src/main/java/org/openecomp/policy/adapter/AddressMembers.java b/ecomp-sdk-app/src/main/java/org/openecomp/policy/adapter/AddressMembers.java
deleted file mode 100644
index 3fd22eec6..000000000
--- a/ecomp-sdk-app/src/main/java/org/openecomp/policy/adapter/AddressMembers.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
- * ================================================================================
- * Copyright (C) 2017 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.
- * You may obtain a copy of the License at
- * 
- *      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=========================================================
- */
-
-package org.openecomp.policy.adapter;
-
-
-
-public class AddressMembers {
-   
-    protected String type;
-    protected String value;
-    
-    public String getType() {
-        return type;
-    }
-    
-    public void setType(String type) {
-        this.type = type;
-    }
-
-    public String getValue() {
-        return value;
-    }
-
-    public void setValue(String value) {
-        this.value = value;
-    }
-    
-}
diff --git a/ecomp-sdk-app/src/main/java/org/openecomp/policy/adapter/AutoPushTabAdapter.java b/ecomp-sdk-app/src/main/java/org/openecomp/policy/adapter/AutoPushTabAdapter.java
deleted file mode 100644
index 85f767f26..000000000
--- a/ecomp-sdk-app/src/main/java/org/openecomp/policy/adapter/AutoPushTabAdapter.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
- * ================================================================================
- * Copyright (C) 2017 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.
- * You may obtain a copy of the License at
- * 
- *      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=========================================================
- */
-
-package org.openecomp.policy.adapter;
-
-
-import java.util.ArrayList;
-
-public class AutoPushTabAdapter {
-
-	private ArrayList<Object> pdpDatas;
-	private ArrayList<Object> policyDatas;
-	public ArrayList<Object> getPdpDatas() {
-		return pdpDatas;
-	}
-	public void setPdpDatas(ArrayList<Object> pdpDatas) {
-		this.pdpDatas = pdpDatas;
-	}
-	public ArrayList<Object> getPolicyDatas() {
-		return policyDatas;
-	}
-	public void setPolicyDatas(ArrayList<Object> policyDatas) {
-		this.policyDatas = policyDatas;
-	}
-}
diff --git a/ecomp-sdk-app/src/main/java/org/openecomp/policy/adapter/ClosedLoopFaultBody.java b/ecomp-sdk-app/src/main/java/org/openecomp/policy/adapter/ClosedLoopFaultBody.java
deleted file mode 100644
index cb1ce55a6..000000000
--- a/ecomp-sdk-app/src/main/java/org/openecomp/policy/adapter/ClosedLoopFaultBody.java
+++ /dev/null
@@ -1,280 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
- * ================================================================================
- * Copyright (C) 2017 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.
- * You may obtain a copy of the License at
- * 
- *      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=========================================================
- */
-
-package org.openecomp.policy.adapter;
-
-
-
-public class ClosedLoopFaultBody {
-	
-	private boolean trinity;
-	private boolean vUSP;
-	private boolean mcr;
-	private boolean gama;
-	private boolean vDNS;
-	
-	private String vnfType;
-	private String vServices;
-	private String ECOMPname;
-	
-	private String closedLoopPolicyStatus;
-	private ClosedLoopSignatures triggerSignatures;
-	private String actions;
-	private int timeInterval;
-	private int timeOutvPRO;
-	private int timeOutRuby;
-	private int retrys;
-	private int agingWindow;
-	private String geoLink;
-	private String emailAddress;
-	private ClosedLoopSignatures verificationSignatures;
-	private ClosedLoopPolicyConditions conditions;
-	private ClosedLoopFaultTriggerUISignatures triggerSignaturesUsedForUI;
-	private ClosedLoopFaultTriggerUISignatures verificationSignaturesUsedForUI;
-	private int triggerTimeWindowUsedForUI;
-	private int verfificationTimeWindowUsedForUI;
-	private String pepName;
-	private String pepAction;
-	private String templateVersion;
-	private int trapMaxAgeUsedForUI;
-	
-	
-	public Integer getTrapMaxAgeUsedForUI() {
-		return trapMaxAgeUsedForUI;
-	}
-
-	public void setTrapMaxAgeUsedForUI(int trapMaxAgeUsedForUI) {
-		this.trapMaxAgeUsedForUI = trapMaxAgeUsedForUI;
-	}
-
-	public String getTemplateVersion() {
-		return templateVersion;
-	}
-
-	public void setTemplateVersion(String templateVersion) {
-		this.templateVersion = templateVersion;
-	}
-
-	public Integer getTimeOutvPRO() {
-		return timeOutvPRO;
-	}
-
-	public void setTimeOutvPRO(int timeOutvPRO) {
-		this.timeOutvPRO = timeOutvPRO;
-	}
-	
-	
-	public Integer getTriggerTimeWindowUsedForUI() {
-		return triggerTimeWindowUsedForUI;
-	}
-
-	public String getPepName() {
-		return pepName;
-	}
-
-	public void setPepName(String pepName) {
-		this.pepName = pepName;
-	}
-
-	public String getPepAction() {
-		return pepAction;
-	}
-
-	public void setPepAction(String pepAction) {
-		this.pepAction = pepAction;
-	}
-
-	public void setTriggerTimeWindowUsedForUI(int triggerTimeWindowUsedForUI) {
-		this.triggerTimeWindowUsedForUI = triggerTimeWindowUsedForUI;
-	}
-
-	public Integer getVerfificationTimeWindowUsedForUI() {
-		return verfificationTimeWindowUsedForUI;
-	}
-
-	public void setVerfificationTimeWindowUsedForUI(
-			int verfificationTimeWindowUsedForUI) {
-		this.verfificationTimeWindowUsedForUI = verfificationTimeWindowUsedForUI;
-	}
-
-	public String getECOMPname(){
-		return ECOMPname;
-	}
-	
-	public void setECOMPname(String ECOMPname){
-		this.ECOMPname = ECOMPname;
-	}
-	
-	public String getvServices() {
-		return vServices;
-	}
-	public void setvServices(String vServices) {
-		this.vServices = vServices;
-	}
-	
-	public ClosedLoopFaultTriggerUISignatures getVerificationSignaturesUsedForUI() {
-		return verificationSignaturesUsedForUI;
-	}
-	public void setVerificationSignaturesUsedForUI(
-			ClosedLoopFaultTriggerUISignatures verificationSignaturesUsedForUI) {
-		this.verificationSignaturesUsedForUI = verificationSignaturesUsedForUI;
-	}
-	public ClosedLoopFaultTriggerUISignatures getTriggerSignaturesUsedForUI() {
-		return triggerSignaturesUsedForUI;
-	}
-	public void setTriggerSignaturesUsedForUI(
-			ClosedLoopFaultTriggerUISignatures triggerSignaturesUsedForUI) {
-		this.triggerSignaturesUsedForUI = triggerSignaturesUsedForUI;
-	}
-	public ClosedLoopPolicyConditions getConditions() {
-		return conditions;
-	}
-	public void setConditions(ClosedLoopPolicyConditions conditions) {
-		this.conditions = conditions;
-	}
-
-	public String getVnfType() {
-		return vnfType;
-	}
-	public void setVnfType(String vnfType) {
-		this.vnfType = vnfType;
-	}
-	
-	public Integer getAgingWindow() {
-		return agingWindow;
-	}
-	public void setAgingWindow(int agingWindow) {
-		this.agingWindow = agingWindow;
-	}
-
-	public String getClosedLoopPolicyStatus() {
-		return closedLoopPolicyStatus;
-	}
-	public void setClosedLoopPolicyStatus(
-			String closedLoopPolicyStatus) {
-		this.closedLoopPolicyStatus = closedLoopPolicyStatus;
-	}
-	public ClosedLoopSignatures getTriggerSignatures() {
-		return triggerSignatures;
-	}
-	public void setTriggerSignatures(ClosedLoopSignatures triggerSignatures) {
-		this.triggerSignatures = triggerSignatures;
-	}
-	public String getActions() {
-		return actions;
-	}
-	public void setActions(String actions) {
-		this.actions = actions;
-	}
-	public Integer getTimeInterval() {
-		return timeInterval;
-	}
-	public void setTimeInterval(int timeInterval) {
-		this.timeInterval = timeInterval;
-	}
-	public Integer getTimeOutRuby() {
-		return timeOutRuby;
-	}
-	public void setTimeOutRuby(int timeOutRuby) {
-		this.timeOutRuby = timeOutRuby;
-	}
-	public Integer getRetrys() {
-		return retrys;
-	}
-	public void setRetrys(int retrys) {
-		this.retrys = retrys;
-	}
-	public String getGeoLink() {
-		return geoLink;
-	}
-	public void setGeoLink(String geoLink) {
-		this.geoLink = geoLink;
-	}
-	public String getEmailAddress() {
-		return emailAddress;
-	}
-	public void setEmailAddress(String emailAddress) {
-		this.emailAddress = emailAddress;
-	}
-	public ClosedLoopSignatures getVerificationSignatures() {
-		return verificationSignatures;
-	}
-	public void setVerificationSignatures(
-			ClosedLoopSignatures verificationSignatures) {
-		this.verificationSignatures = verificationSignatures;
-	}
-	
-	/*public ArrayList<String> getD2Services() {
-		return d2Services;
-	}
-
-	public void setD2Services(ArrayList<String> d2Services) {
-		this.d2Services = d2Services;
-	}
-
-	public ArrayList<String> getSiteNames() {
-		return siteNames;
-	}
-
-	public void setSiteNames(ArrayList<String> siteNames) {
-		this.siteNames = siteNames;
-	}*/
-	
-	public boolean isvDNS() {
-		return vDNS;
-	}
-
-	public void setvDNS(boolean vDNS) {
-		this.vDNS = vDNS;
-	}
-	
-	public boolean isTrinity() {
-		return trinity;
-	}
-
-	public void setTrinity(boolean trinity) {
-		this.trinity = trinity;
-	}
-
-	public boolean isvUSP() {
-		return vUSP;
-	}
-
-	public void setvUSP(boolean vUSP) {
-		this.vUSP = vUSP;
-	}
-
-	public boolean isMcr() {
-		return mcr;
-	}
-
-	public void setMcr(boolean mcr) {
-		this.mcr = mcr;
-	}
-
-	public boolean isGama() {
-		return gama;
-	}
-
-	public void setGama(boolean gama) {
-		this.gama = gama;
-	}
-}
-
diff --git a/ecomp-sdk-app/src/main/java/org/openecomp/policy/adapter/ClosedLoopFaultTriggerUISignatures.java b/ecomp-sdk-app/src/main/java/org/openecomp/policy/adapter/ClosedLoopFaultTriggerUISignatures.java
deleted file mode 100644
index 2330496fe..000000000
--- a/ecomp-sdk-app/src/main/java/org/openecomp/policy/adapter/ClosedLoopFaultTriggerUISignatures.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
- * ================================================================================
- * Copyright (C) 2017 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.
- * You may obtain a copy of the License at
- * 
- *      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=========================================================
- */
-
-package org.openecomp.policy.adapter;
-
-
-
-public class ClosedLoopFaultTriggerUISignatures {
-	
-	private String signatures;
-	
-	private String connectSignatures;
-	
-	public String getConnectSignatures() {
-		return connectSignatures;
-	}
-	public void setConnectSignatures(String connectSignatures) {
-		this.connectSignatures = connectSignatures;
-	}
-	public String getSignatures() {
-		return signatures;
-	}
-	public void setSignatures(String signatures) {
-		this.signatures = signatures;
-	}
-	
-}
diff --git a/ecomp-sdk-app/src/main/java/org/openecomp/policy/adapter/ClosedLoopPMBody.java b/ecomp-sdk-app/src/main/java/org/openecomp/policy/adapter/ClosedLoopPMBody.java
deleted file mode 100644
index bbbf5508b..000000000
--- a/ecomp-sdk-app/src/main/java/org/openecomp/policy/adapter/ClosedLoopPMBody.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
- * ================================================================================
- * Copyright (C) 2017 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.
- * You may obtain a copy of the License at
- * 
- *      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=========================================================
- */
-
-package org.openecomp.policy.adapter;
-
-
-import java.util.Map;
-
-public class ClosedLoopPMBody {
-	
-	private boolean trinity;
-	private boolean vUSP;
-	private boolean mcr;
-	private boolean gama;
-	private boolean vDNS;
-	private String geoLink;
-	private String vServices;
-	private String ECOMPname;
-	
-	private String emailAddress;
-	
-	private String serviceTypePolicyName;
-	
-	private Map<String, String> attributes;
-	private String templateVersion;
-	
-	public String getTemplateVersion() {
-		return templateVersion;
-	}
-
-	public void setTemplateVersion(String templateVersion) {
-		this.templateVersion = templateVersion;
-	}
-	
-	public String getECOMPname(){
-		return ECOMPname;
-	}
-	
-	public void setECOMPname(String ECOMPname){
-		this.ECOMPname = ECOMPname;
-	}
-	
-	public String getvServices() {
-		return vServices;
-	}
-
-	public void setvServices(String vServices) {
-		this.vServices = vServices;
-	}
-	
-	public Map<String, String> getAttributes() {
-		return attributes;
-	}
-
-	public void setAttributes(Map<String, String> map) {
-		this.attributes = map;
-	}
-
-	public String getGeoLink() {
-		return geoLink;
-	}
-
-	public void setGeoLink(String geoLink) {
-		this.geoLink = geoLink;
-	}
-
-	public String getEmailAddress() {
-		return emailAddress;
-	}
-
-	public void setEmailAddress(String emailAddress) {
-		this.emailAddress = emailAddress;
-	}
-
-	public String getServiceTypePolicyName() {
-		return serviceTypePolicyName;
-	}
-
-	public void setServiceTypePolicyName(String serviceTypePolicyName) {
-		this.serviceTypePolicyName = serviceTypePolicyName;
-	}
-	
-	public boolean isGama() {
-		return gama;
-	}
-	public void setGama(boolean gama) {
-		this.gama = gama;
-	}
-	public boolean isvDNS() {
-		return vDNS;
-	}
-	public void setvDNS(boolean vDNS) {
-		this.vDNS = vDNS;
-	}
-	
-	public boolean isTrinity() {
-		return trinity;
-	}
-	public void setTrinity(boolean trinity) {
-		this.trinity = trinity;
-	}
-	public boolean isvUSP() {
-		return vUSP;
-	}
-	public void setvUSP(boolean vUSP) {
-		this.vUSP = vUSP;
-	}
-	public boolean isMcr() {
-		return mcr;
-	}
-	public void setMcr(boolean mcr) {
-		this.mcr = mcr;
-	}
-
-}
-
diff --git a/ecomp-sdk-app/src/main/java/org/openecomp/policy/adapter/ClosedLoopPerformanceMetrics.java b/ecomp-sdk-app/src/main/java/org/openecomp/policy/adapter/ClosedLoopPerformanceMetrics.java
deleted file mode 100644
index 25d83169f..000000000
--- a/ecomp-sdk-app/src/main/java/org/openecomp/policy/adapter/ClosedLoopPerformanceMetrics.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
- * ================================================================================
- * Copyright (C) 2017 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.
- * You may obtain a copy of the License at
- * 
- *      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=========================================================
- */
-
-package org.openecomp.policy.adapter;
-
-
-public class ClosedLoopPerformanceMetrics {
-	public static final String CLPM_UIFIELD_ONSET_MESSAGE = "Onset Message";
-	public static final String CLPM_UIJSON_ONSET_MESSAGE = "attributes.OnsetMessage";
-	
-	public static final String CLPM_UIFIELD_POLICY_NAME = "PolicyName";
-	public static final String CLPM_UIJSON_POLICY_NAME = "attributes.PolicyName";
-	
-	public static final String CLPM_UIFIELD_ABATEMENT_MESSAGE = "Abatement Message";
-	public static final String CLPM_UIJSON_ABATEMENT_MESSAGE = "attributes.AbatementMessage";
-	
-	public static final String CLPM_UIFIELD_GEOLINK = "Geo Link";	
-	public static final String CLPM_UIJSON_GEOLINK = "geoLink";
-}
diff --git a/ecomp-sdk-app/src/main/java/org/openecomp/policy/adapter/ClosedLoopPolicy.java b/ecomp-sdk-app/src/main/java/org/openecomp/policy/adapter/ClosedLoopPolicy.java
deleted file mode 100644
index 727c9cba8..000000000
--- a/ecomp-sdk-app/src/main/java/org/openecomp/policy/adapter/ClosedLoopPolicy.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
- * ================================================================================
- * Copyright (C) 2017 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.
- * You may obtain a copy of the License at
- * 
- *      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=========================================================
- */
-
-package org.openecomp.policy.adapter;
-
-
-public class ClosedLoopPolicy {
-	public static final String CLFAULT_UIFIELD_D2_SERVICES_TRINITY = "Hosted Voice (Trinity)";
-	public static final String CLFAULT_UIJSON_D2_SERVICES_TRINITY = "trinity";
-
-	public static final String CLFAULT_UIFIELD_D2_SERVICES_VUSP = "vUSP";
-	public static final String CLFAULT_UIJSON_D2_SERVICES_VUSP = "vUSP";
-
-	public static final String CLFAULT_UIFIELD_D2_SERVICES_MCR = "MCR";
-	public static final String CLFAULT_UIJSON_D2_SERVICES_MCR = "mcr";
-
-	public static final String CLFAULT_UIFIELD_D2_SERVICES_GAMMA = "Gamma";
-	public static final String CLFAULT_UIJSON_D2_SERVICES_GAMMA = "gama";
-
-	public static final String CLFAULT_UIFIELD_D2_SERVICES_VDNS = "vDNS";
-	public static final String CLFAULT_UIJSON_D2_SERVICES_VDNS = "vDNS";
-
-	public static final String CLFAULT_UIFIELD_EMAIL_ADDRESS = "Email Address";
-	public static final String CLFAULT_UIJSON_EMAIL_ADDRESS = "emailAddress";
-
-	public static final String CLFAULT_UIFIELD_TRIGGER_SIGNATURE = "Trigger Signature";
-	public static final String CLFAULT_UIJSON_TRIGGER_SIGNATURE = "triggerSignaturesUsedForUI.signatures";
-
-	public static final String CLFAULT_UIFIELD_VERIFICATION_SIGNATURE = "Verification Signature";
-	public static final String CLFAULT_UIJSON_VERIFICATION_SIGNATURE = "verificationSignaturesUsedForUI.signatures";
-
-	public static final String CLFAULT_UIFIELD_CONNECT_ALL_TRAPS = "Connect All Traps";
-	public static final String CLFAULT_UIJSON_CONNECT_ALL_TRAPS = "triggerSignaturesUsedForUI.connectSignatures";
-
-	public static final String CLFAULT_UIFIELD_CONNECT_ALL_FAULTS = "Connect All Faults";
-	public static final String CLFAULT_UIJSON_CONNECT_ALL_FAULTS = "verificationSignaturesUsedForUI.connectSignatures";
-
-	public static final String CLFAULT_UIFIELD_POLICY_STATUS_ACTIVE = "Active";
-	public static final String CLFAULT_UIJSON_POLICY_STATUS_ACTIVE = "ACTIVE";
-
-	public static final String CLFAULT_UIFIELD_POLICY_STATUS_INACTIVE = "InActive";
-	public static final String CLFAULT_UIJSON_POLICY_STATUS_INACTIVE = "INACTIVE";
-
-}
diff --git a/ecomp-sdk-app/src/main/java/org/openecomp/policy/adapter/ClosedLoopPolicyConditions.java b/ecomp-sdk-app/src/main/java/org/openecomp/policy/adapter/ClosedLoopPolicyConditions.java
deleted file mode 100644
index cdae20e17..000000000
--- a/ecomp-sdk-app/src/main/java/org/openecomp/policy/adapter/ClosedLoopPolicyConditions.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
- * ================================================================================
- * Copyright (C) 2017 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.
- * You may obtain a copy of the License at
- * 
- *      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=========================================================
- */
-
-package org.openecomp.policy.adapter;
-
-
-public enum ClosedLoopPolicyConditions {
-	SEND("DCAE should send event notification"),
-
-	NOTSEND("DCAE should not send event notification");
-	private String name;
-
-	private ClosedLoopPolicyConditions(String name){
-		this.name = name;
-	}
-
-	@Override
-	public String toString(){
-		return this.name;
-	}
-}
-
diff --git a/ecomp-sdk-app/src/main/java/org/openecomp/policy/adapter/ClosedLoopPolicyStatus.java b/ecomp-sdk-app/src/main/java/org/openecomp/policy/adapter/ClosedLoopPolicyStatus.java
deleted file mode 100644
index 7ecd3b053..000000000
--- a/ecomp-sdk-app/src/main/java/org/openecomp/policy/adapter/ClosedLoopPolicyStatus.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
- * ================================================================================
- * Copyright (C) 2017 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.
- * You may obtain a copy of the License at
- * 
- *      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=========================================================
- */
-
-package org.openecomp.policy.adapter;
-
-
-public enum ClosedLoopPolicyStatus {
-	ACTIVE("active"),
-	
-	INACTIVE("inactive")
-	;
-	
-	private String name;
-	
-	private ClosedLoopPolicyStatus(String name){
-		this.name = name;
-	}
-
-	@Override
-	public String toString(){
-		return this.name;
-	}
-}
-
diff --git a/ecomp-sdk-app/src/main/java/org/openecomp/policy/adapter/ClosedLoopSignatures.java b/ecomp-sdk-app/src/main/java/org/openecomp/policy/adapter/ClosedLoopSignatures.java
deleted file mode 100644
index 2eab27eea..000000000
--- a/ecomp-sdk-app/src/main/java/org/openecomp/policy/adapter/ClosedLoopSignatures.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
- * ================================================================================
- * Copyright (C) 2017 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.
- * You may obtain a copy of the License at
- * 
- *      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=========================================================
- */
-
-package org.openecomp.policy.adapter;
-
-
-public class ClosedLoopSignatures {
-
-	private String signatures;
-
-	private int timeWindow;
-	
-	private Integer trapMaxAge;
-	
-	public String getSignatures() {
-		return signatures;
-	}
-	public void setSignatures(String signatures) {
-		this.signatures = signatures;
-	}
-	
-	public Integer getTimeWindow() {
-		return timeWindow;
-	}
-	public void setTimeWindow(Integer timeWindow) {
-		this.timeWindow = timeWindow;
-	}
-	
-	public Integer getTrapMaxAge() {
-		return trapMaxAge;
-	}
-	public void setTrapMaxAge(Integer trapMaxAge) {
-		this.trapMaxAge = trapMaxAge;
-	}
-}
diff --git a/ecomp-sdk-app/src/main/java/org/openecomp/policy/adapter/DeletePolicyCondition.java b/ecomp-sdk-app/src/main/java/org/openecomp/policy/adapter/DeletePolicyCondition.java
deleted file mode 100644
index 4698aa672..000000000
--- a/ecomp-sdk-app/src/main/java/org/openecomp/policy/adapter/DeletePolicyCondition.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
- * ================================================================================
- * Copyright (C) 2017 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.
- * You may obtain a copy of the License at
- * 
- *      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=========================================================
- */
-
-package org.openecomp.policy.adapter;
-
-
-public enum DeletePolicyCondition {
-	ONE("Are you sure you want to delete Current Version of policy"),
-
-	ALL("Are you sure you want to delete All Versions of policy");
-	private String name;
-
-	private DeletePolicyCondition(String name){
-		this.name = name;
-	}
-
-	@Override
-	public String toString(){
-		return this.name;
-	}
-}
diff --git a/ecomp-sdk-app/src/main/java/org/openecomp/policy/adapter/DeployNowJson.java b/ecomp-sdk-app/src/main/java/org/openecomp/policy/adapter/DeployNowJson.java
deleted file mode 100644
index 635431559..000000000
--- a/ecomp-sdk-app/src/main/java/org/openecomp/policy/adapter/DeployNowJson.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
- * ================================================================================
- * Copyright (C) 2017 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.
- * You may obtain a copy of the License at
- * 
- *      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=========================================================
- */
-
-package org.openecomp.policy.adapter;
-
-
-public class DeployNowJson {
-
-	protected boolean deployNow;
-	
-	// deployNow
-	public boolean getDeployNow() {
-		return deployNow;
-	}
-
-	public void setDeployNow(boolean value) {
-		this.deployNow = value;
-	}
-}
diff --git a/ecomp-sdk-app/src/main/java/org/openecomp/policy/adapter/GridData.java b/ecomp-sdk-app/src/main/java/org/openecomp/policy/adapter/GridData.java
deleted file mode 100644
index dfb3e0024..000000000
--- a/ecomp-sdk-app/src/main/java/org/openecomp/policy/adapter/GridData.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
- * ================================================================================
- * Copyright (C) 2017 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.
- * You may obtain a copy of the License at
- * 
- *      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=========================================================
- */
-
-package org.openecomp.policy.adapter;
-
-
-import java.util.ArrayList;
-
-public class GridData {
-	private ArrayList<Object> attributes;
-	private ArrayList<Object> transportProtocols;
-	private ArrayList<Object> appProtocols;
-
-	public ArrayList<Object> getAttributes() {
-		return attributes;
-	}
-
-	public void setAttributes(ArrayList<Object> attributes) {
-		this.attributes = attributes;
-	}
-
-	public ArrayList<Object> getAppProtocols() {
-		return appProtocols;
-	}
-
-	public void setAppProtocols(ArrayList<Object> appProtocols) {
-		this.appProtocols = appProtocols;
-	}
-
-	public ArrayList<Object> getTransportProtocols() {
-		return transportProtocols;
-	}
-
-	public void setTransportProtocols(ArrayList<Object> transportProtocols) {
-		this.transportProtocols = transportProtocols;
-	}
-}
diff --git a/ecomp-sdk-app/src/main/java/org/openecomp/policy/adapter/PolicyAdapter.java b/ecomp-sdk-app/src/main/java/org/openecomp/policy/adapter/PolicyAdapter.java
deleted file mode 100644
index f9a0bd48e..000000000
--- a/ecomp-sdk-app/src/main/java/org/openecomp/policy/adapter/PolicyAdapter.java
+++ /dev/null
@@ -1,619 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
- * ================================================================================
- * Copyright (C) 2017 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.
- * You may obtain a copy of the License at
- * 
- *      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=========================================================
- */
-
-package org.openecomp.policy.adapter;
-
-
-import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.openecomp.policy.rest.jpa.EcompName;
-
-public class PolicyAdapter {
-	
-	private Object data;
-	private String policyName = null;
-	private Path parentPath;	
-	public boolean isEditPolicy = false;
-	private boolean isViewPolicy = false;
-	private Object policyData = null;
-	private String comboPolicyType;
-	private boolean readOnly;
-	
-	//adding new properties for REST interface call when creating Policies
-	private String oldPolicyFileName = null;
-	private String configType = null;
-	private String policyID = null;
-	private String policyType = null;
-	private String configPolicyType = null;
-	private String policyDescription = null;
-	private String ecompName = null;
-	private String configName = null;
-	private String ruleID = null;
-	private String ruleCombiningAlgId = null;
-	private Map<String,String> dynamicFieldConfigAttributes;
-	private Map<String,String> dropDownMap;
-	private Map<String,String> dynamicSettingsMap;
-	private Path gitPath;
-	private String configBodyData = null;
-	private boolean isValidData = false;
-	private boolean draft = false;
-	private String version = null;
-	private String domain = null;
-	private String filterName = null;
-	private String comboConfigPolicyType;
-	private String jsonBody = null;
-	private Map<String,String> brmsParamBody=null;
-	private Integer highestVersion;
-	private String actionPerformer = null;
-	private String actionAttribute = null;
-	private List<String> dynamicRuleAlgorithmLabels;
-	private List<String> dynamicRuleAlgorithmCombo;
-	private List<String> dynamicRuleAlgorithmField1;
-	private List<String> dynamicRuleAlgorithmField2;
-	private List<Object> dynamicVariableList;
-	private List<String> dataTypeList;
-	private String actionBody = null;
-	private String actionDictHeader = null;
-	private String actionDictType = null;
-	private String actionDictUrl = null;
-	private String actionDictMethod = null;
-	private String serviceType = null;
-	private String uuid = null;
-	private String location = null;
-	private String priority = null;
-	private String actionAttributeValue;
-	private String ruleProvider;
-	
-	private EcompName ecompNameField;
-	private Object jsonBodyData;
-	private String dirPath;
-	private String configBodyPath;
-	private ArrayList<Object> attributes;
-	private ArrayList<Object> settings;
-	private ArrayList<Object> ruleAlgorithmschoices;
-	
-	private LinkedHashMap<?, ?> serviceTypePolicyName;
-	private String ruleName;
-	private LinkedHashMap<?, ?>  ruleData;
-	private LinkedHashMap<?,?>   ruleListData;
-	private String clearTimeOut;
-	private String trapMaxAge;
-	private String verificationclearTimeOut;
-	private String fwPolicyType;
-	private ArrayList<Object> fwattributes;
-	private String parentForChild; 
-	public String getFwPolicyType() {
-		return fwPolicyType;
-	}
-	public ArrayList<Object> getFwattributes() {
-		return fwattributes;
-	}
-	public String getParentForChild() {
-		return parentForChild;
-	}
-	public void setFwPolicyType(String fwPolicyType) {
-		this.fwPolicyType = fwPolicyType;
-	}
-	public void setFwattributes(ArrayList<Object> fwattributes) {
-		this.fwattributes = fwattributes;
-	}
-	public void setParentForChild(String parentForChild) {
-		this.parentForChild = parentForChild;
-	}
-	
-	private String riskLevel;
-	private String riskType = null;
-	private String guard = null;
-	private String ttlDate = null;
-	
-	public String getClearTimeOut() {
-		return clearTimeOut;
-	}
-	public void setClearTimeOut(String clearTimeOut) {
-		this.clearTimeOut = clearTimeOut;
-	}
-	public String getTrapMaxAge() {
-		return trapMaxAge;
-	}
-	public void setTrapMaxAge(String trapMaxAge) {
-		this.trapMaxAge = trapMaxAge;
-	}
-	public String getVerificationclearTimeOut() {
-		return verificationclearTimeOut;
-	}
-	public void setVerificationclearTimeOut(String verificationclearTimeOut) {
-		this.verificationclearTimeOut = verificationclearTimeOut;
-	}
-	public LinkedHashMap<?, ?> getRuleListData() {
-		return ruleListData;
-	}
-	public void setRuleListData(LinkedHashMap<?, ?> ruleListData) {
-		this.ruleListData = ruleListData;
-	}
-	private ArrayList<Object> triggerSignatures;
-	private ArrayList<Object> symptomSignatures;
-	private String logicalConnector;
-	private String policyStatus;
-	public String gocServerScope;
-	public Map<String , String> dynamicLayoutMap;
-	private String securityZone;
-	
-	private String policyScope;
-	private String supressionType;
-	
-
-
-	public String getSupressionType() {
-		return supressionType;
-	}
-	public void setSupressionType(String supressionType) {
-		this.supressionType = supressionType;
-	}
-	public Map<String, String> getDynamicLayoutMap() {
-		return dynamicLayoutMap;
-	}
-	public void setDynamicLayoutMap(Map<String, String> dynamicLayoutMap) {
-		this.dynamicLayoutMap = dynamicLayoutMap;
-	}
-	public String getGocServerScope() {
-		return gocServerScope;
-	}
-	public void setGocServerScope(String gocServerScope) {
-		this.gocServerScope = gocServerScope;
-	}
-	public Object getJsonBodyData() {
-		return jsonBodyData;
-	}
-	public void setJsonBodyData(Object jsonBodyData) {
-		this.jsonBodyData = jsonBodyData;
-	}
-	public EcompName getEcompNameField() {
-		return ecompNameField;
-	}
-	public void setEcompNameField(EcompName ecompNameField) {
-		this.ecompNameField = ecompNameField;
-	}
-	public Integer getHighestVersion() {
-		return highestVersion;
-	}
-	public void setHighestVersion(Integer highestVersion) {
-		this.highestVersion = highestVersion;
-	}
-	public String getConfigType() {
-		return configType;
-	}
-	public void setConfigType(String configType) {
-		this.configType = configType;
-	}
-	public String getPolicyID() {
-		return policyID;
-	}
-	public void setPolicyID(String policyID) {
-		this.policyID = policyID;
-	}
-	public String getPolicyType() {
-		return policyType;
-	}
-	public void setPolicyType(String policyType) {
-		this.policyType = policyType;
-	}
-	public String getPolicyDescription() {
-		return policyDescription;
-	}
-	public void setPolicyDescription(String policyDescription) {
-		this.policyDescription = policyDescription;
-	}
-	public String getEcompName() {
-		return ecompName;
-	}
-	public void setEcompName(String ecompName) {
-		this.ecompName = ecompName;
-	}
-	public String getConfigName() {
-		return configName;
-	}
-	public void setConfigName(String configName) {
-		this.configName = configName;
-	}
-	public String getRuleID() {
-		return ruleID;
-	}
-	public void setRuleID(String ruleID) {
-		this.ruleID = ruleID;
-	}
-	public String getRuleCombiningAlgId() {
-		return ruleCombiningAlgId;
-	}
-	public void setRuleCombiningAlgId(String ruleCombiningAlgId) {
-		this.ruleCombiningAlgId = ruleCombiningAlgId;
-	}
-	public Map<String, String> getDynamicFieldConfigAttributes() {
-		return dynamicFieldConfigAttributes;
-	}
-	public void setDynamicFieldConfigAttributes(
-			Map<String, String> dynamicFieldConfigAttributes) {
-		this.dynamicFieldConfigAttributes = dynamicFieldConfigAttributes;
-	}
-	public Path getGitPath() {
-		return gitPath;
-	}
-	public void setGitPath(Path gitPath) {
-		this.gitPath = gitPath;
-	}
-	public Object getData() {
-		return data;
-	}
-	public void setData(Object data) {
-		this.data = data;
-	}
-	public String getPolicyName() {
-		return policyName;
-	}
-	public void setPolicyName(String policyName) {
-		this.policyName = policyName;
-	}
-	public Path getParentPath() {
-		return parentPath;
-	}
-	public void setParentPath(Path parentPath) {
-		this.parentPath = parentPath;
-	}
-	public boolean isEditPolicy() {
-		return isEditPolicy;
-	}
-	public void setEditPolicy(boolean isEditPolicy) {
-		this.isEditPolicy = isEditPolicy;
-	}
-	public boolean isViewPolicy() {
-		return isViewPolicy;
-	}
-	public void setViewPolicy(boolean isViewPolicy) {
-		this.isViewPolicy = isViewPolicy;
-	}
-	public Object getPolicyData() {
-		return policyData;
-	}
-	public void setPolicyData(Object policyData) {
-		this.policyData = policyData;
-	}
-	public String getComboPolicyType() {
-		return comboPolicyType;
-	}
-	public void setComboPolicyType(String comboPolicyType) {
-		this.comboPolicyType = comboPolicyType;
-	}
-	public boolean isReadOnly() {
-		return readOnly;
-	}
-	public void setReadOnly(boolean readOnly) {
-		this.readOnly = readOnly;
-	}
-	public String getConfigBodyData() {
-		return configBodyData;
-	}
-	public void setConfigBodyData(String configBodyData) {
-		this.configBodyData = configBodyData;
-	}
-	public boolean isValidData() {
-		return isValidData;
-	}
-	public void setValidData(boolean isValidData) {
-		this.isValidData = isValidData;
-	}
-	public String getVersion() {
-		return version;
-	}
-	public void setVersion(String version) {
-		this.version = version;
-	}
-	public String getDomainDir() {
-		return domain;
-	}
-	public void setDomainDir(java.lang.String domain) {
-		this.domain = domain;
-		
-	}
-	public String getFilterName() {
-		return filterName;
-	}
-	public void setFilterName(String filterName) {
-		this.filterName = filterName;
-	}
-	public String getComboConfigPolicyType() {
-		return comboConfigPolicyType;
-	}
-	public void setComboConfigPolicyType(String comboConfigPolicyType) {
-		this.comboConfigPolicyType = comboConfigPolicyType;
-	}
-	public Map<String, String> getBRMSParamBody() {
-		return brmsParamBody;
-	}
-	public void setBRMSParamBody(Map<String, String> brmsParamBody) {
-		this.brmsParamBody = brmsParamBody;
-	} 
-	public String getJsonBody() {
-		return jsonBody;
-	}
-	public void setJsonBody(String jsonBody) {
-		this.jsonBody = jsonBody;
-	}
-	public String getConfigPolicyType() {
-		return configPolicyType;
-	}
-	public void setConfigPolicyType(String configPolicyType) {
-		this.configPolicyType = configPolicyType;
-	}
-	public String getActionPerformer() {
-		return actionPerformer;
-	}
-	public void setActionPerformer(String actionPerformer) {
-		this.actionPerformer = actionPerformer;
-	}
-	public String getActionAttribute() {
-		return actionAttribute;
-	}
-	public void setActionAttribute(String actionAttribute) {
-		this.actionAttribute = actionAttribute;
-	}
-	public List<String> getDynamicRuleAlgorithmLabels() {
-		return dynamicRuleAlgorithmLabels;
-	}
-	public void setDynamicRuleAlgorithmLabels(
-			List<String> dynamicRuleAlgorithmLabels) {
-		this.dynamicRuleAlgorithmLabels = dynamicRuleAlgorithmLabels;
-	}
-	public List<String> getDynamicRuleAlgorithmCombo() {
-		return dynamicRuleAlgorithmCombo;
-	}
-	public void setDynamicRuleAlgorithmCombo(
-			List<String> dynamicRuleAlgorithmCombo) {
-		this.dynamicRuleAlgorithmCombo = dynamicRuleAlgorithmCombo;
-	}
-	public List<String> getDynamicRuleAlgorithmField1() {
-		return dynamicRuleAlgorithmField1;
-	}
-	public void setDynamicRuleAlgorithmField1(
-			List<String> dynamicRuleAlgorithmField1) {
-		this.dynamicRuleAlgorithmField1 = dynamicRuleAlgorithmField1;
-	}
-	public List<String> getDynamicRuleAlgorithmField2() {
-		return dynamicRuleAlgorithmField2;
-	}
-	public void setDynamicRuleAlgorithmField2(
-			List<String> dynamicRuleAlgorithmField2) {
-		this.dynamicRuleAlgorithmField2 = dynamicRuleAlgorithmField2;
-	}
-	public String getActionBody() {
-		return actionBody;
-	}
-	public void setActionBody(String actionBody) {
-		this.actionBody = actionBody;
-	}
-	public Map<String,String> getDropDownMap() {
-		return dropDownMap;
-	}
-	public void setDropDownMap(Map<String,String> dropDownMap) {
-		this.dropDownMap = dropDownMap;
-	}
-	public String getActionDictHeader() {
-		return actionDictHeader;
-	}
-	public void setActionDictHeader(String actionDictHeader) {
-		this.actionDictHeader = actionDictHeader;
-	}
-	public String getActionDictType() {
-		return actionDictType;
-	}
-	public void setActionDictType(String actionDictType) {
-		this.actionDictType = actionDictType;
-	}
-	public String getActionDictUrl() {
-		return actionDictUrl;
-	}
-	public void setActionDictUrl(String actionDictUrl) {
-		this.actionDictUrl = actionDictUrl;
-	}
-	public String getActionDictMethod() {
-		return actionDictMethod;
-	}
-	public void setActionDictMethod(String actionDictMethod) {
-		this.actionDictMethod = actionDictMethod;
-	}
-	public boolean isDraft() {
-		return draft;
-	}
-	public void setDraft(boolean draft) {
-		this.draft = draft;
-	}
-	public Map<String,String> getDynamicSettingsMap() {
-		return dynamicSettingsMap;
-	}
-	public void setDynamicSettingsMap(Map<String,String> dynamicSettingsMap) {
-		this.dynamicSettingsMap = dynamicSettingsMap;
-	}
-	public List<Object> getDynamicVariableList() {
-		return dynamicVariableList;
-	}
-	public void setDynamicVariableList(List<Object> dynamicVariableList) {
-		this.dynamicVariableList = dynamicVariableList;
-	}
-	public List<String> getDataTypeList() {
-		return dataTypeList;
-	}
-	public void setDataTypeList(List<String> dataTypeList) {
-		this.dataTypeList = dataTypeList;
-	}
-	public String getOldPolicyFileName() {
-		return oldPolicyFileName;
-	}
-	public void setOldPolicyFileName(String oldPolicyFileName) {
-		this.oldPolicyFileName = oldPolicyFileName;
-	}
-	public String getServiceType() {
-		return serviceType;
-	}
-	public void setServiceType(String serviceType) {
-		this.serviceType = serviceType;
-	}
-	public String getUuid() {
-		return uuid;
-	}
-	public void setUuid(String uuid) {
-		this.uuid = uuid;
-	}
-	public String getLocation() {
-		return location;
-	}
-	public void setLocation(String location) {
-		this.location = location;
-	}
-    public String getPriority() {
-        return priority;
-    }
-    public void setPriority(String priority) {
-        this.priority = priority;
-    }
-	public String getDirPath() {
-		return dirPath;
-	}
-	public void setDirPath(String dirPath) {
-		this.dirPath = dirPath;
-	}
-	public String getConfigBodyPath() {
-		return configBodyPath;
-	}
-	public void setConfigBodyPath(String configBodyPath) {
-		this.configBodyPath = configBodyPath;
-	}
-	public ArrayList<Object> getAttributes() {
-		return attributes;
-	}
-	
-	@SuppressWarnings("unchecked")
-	public void setAttributes(Object attributes) {
-		this.attributes =   (ArrayList<Object>) attributes;
-	}
-	public LinkedHashMap<?, ?> getServiceTypePolicyName() {
-		return serviceTypePolicyName;
-	}
-	public void setServiceTypePolicyName(LinkedHashMap<?, ?> serviceTypePolicyName) {
-		this.serviceTypePolicyName = (LinkedHashMap<?, ?>) serviceTypePolicyName;
-	}
-	public ArrayList<Object> getSettings() {
-		return settings;
-	}
-	public void setSettings(ArrayList<Object> settings) {
-		this.settings = settings;
-	}
-	public String getRuleName() {
-		return ruleName;
-	}
-	public void setRuleName(String ruleName) {
-		this.ruleName = ruleName;
-	}
-	public LinkedHashMap<?, ?>  getRuleData() {
-		return ruleData;
-	}
-	public void setRuleData(LinkedHashMap<?, ?>  ruleData) {
-		this.ruleData = ruleData;
-	}
-	public ArrayList<Object> getTriggerSignatures() {
-		return triggerSignatures;
-	}
-	public void setTriggerSignatures(ArrayList<Object> triggerSignatures) {
-		this.triggerSignatures = triggerSignatures;
-	}
-	public String getLogicalConnector() {
-		return logicalConnector;
-	}
-	public void setLogicalConnector(String logicalConnector) {
-		this.logicalConnector = logicalConnector;
-	}
-	public String getPolicyStatus() {
-		return policyStatus;
-	}
-	public void setPolicyStatus(String policyStatus) {
-		this.policyStatus = policyStatus;
-	}
-	public String getActionAttributeValue() {
-		return actionAttributeValue;
-	}
-	public void setActionAttributeValue(String actionAttributeValue) {
-		this.actionAttributeValue = actionAttributeValue;
-	}
-	public ArrayList<Object> getRuleAlgorithmschoices() {
-		return ruleAlgorithmschoices;
-	}
-	public void setRuleAlgorithmschoices(ArrayList<Object> ruleAlgorithmschoices) {
-		this.ruleAlgorithmschoices = ruleAlgorithmschoices;
-	}
-	public String getSecurityZone() {
-		return securityZone;
-	}
-	public void setSecurityZone(String securityZone) {
-		this.securityZone = securityZone;
-	}
-	public ArrayList<Object> getSymptomSignatures() {
-		return symptomSignatures;
-	}
-	public void setSymptomSignatures(ArrayList<Object> symptomSignatures) {
-		this.symptomSignatures = symptomSignatures;
-	}
-	public String getPolicyScope() {
-		return policyScope;
-	}
-	public void setPolicyScope(String policyScope) {
-		this.policyScope = policyScope;
-	}
-	public String getRuleProvider() {
-		return ruleProvider;
-	}
-	public void setRuleProvider(String ruleProvider) {
-		this.ruleProvider = ruleProvider;
-	}
-	public String getRiskLevel() {
-		return riskLevel;
-	}
-	public void setRiskLevel(String riskLevel) {
-		this.riskLevel = riskLevel;
-	}
-	public String getRiskType() {
-		return riskType;
-	}
-	public void setRiskType(String riskType) {
-		this.riskType = riskType;
-	}
-	public String getGuard() {
-		return guard;
-	}
-	public void setGuard(String guard) {
-		this.guard = guard;
-	}
-	public String getTtlDate() {
-		return ttlDate;
-	}
-	public void setTtlDate(String ttlDate) {
-		this.ttlDate = ttlDate;
-	}
-}
diff --git a/ecomp-sdk-app/src/main/java/org/openecomp/policy/adapter/PolicyExportAdapter.java b/ecomp-sdk-app/src/main/java/org/openecomp/policy/adapter/PolicyExportAdapter.java
deleted file mode 100644
index 37ed83d16..000000000
--- a/ecomp-sdk-app/src/main/java/org/openecomp/policy/adapter/PolicyExportAdapter.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
- * ================================================================================
- * Copyright (C) 2017 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.
- * You may obtain a copy of the License at
- * 
- *      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=========================================================
- */
-
-package org.openecomp.policy.adapter;
-
-
-import java.util.ArrayList;
-
-public class PolicyExportAdapter {
-	
-	private ArrayList<Object> policyDatas;
-	
-	public ArrayList<Object> getPolicyDatas() {
-		return policyDatas;
-	}
-	public void setPolicyDatas(ArrayList<Object> policyDatas) {
-		this.policyDatas = policyDatas;
-	}
-}
diff --git a/ecomp-sdk-app/src/main/java/org/openecomp/policy/adapter/PrefixIPList.java b/ecomp-sdk-app/src/main/java/org/openecomp/policy/adapter/PrefixIPList.java
deleted file mode 100644
index e2c70e69f..000000000
--- a/ecomp-sdk-app/src/main/java/org/openecomp/policy/adapter/PrefixIPList.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
- * ================================================================================
- * Copyright (C) 2017 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.
- * You may obtain a copy of the License at
- * 
- *      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=========================================================
- */
-
-package org.openecomp.policy.adapter;
-
-
-
-import java.util.ArrayList;
-import java.util.List;
-
-
-public class PrefixIPList {
-    protected String name;
-    protected String description;
-    protected List<AddressMembers> members;
-   /* protected String type;
-    protected String value;*/
-    
-    public String getName() {
-        return name;
-    }
-    
-    public void setName(String name) {
-        this.name = name;
-    }
-    
-    public String getDescription() {
-        return description;
-    }
-    
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public List<AddressMembers> getMembers() 
-    {
-    	if(members==null)
-    	{
-    		members= new ArrayList<AddressMembers>();
-    	}
-        return this.members;
-    }
-
-	public void setMembers(List<AddressMembers> members) 
-	{
-	        this.members = members;
-	}
-    /*public String getValue() {
-        return value;
-    }
-
-   
-    public void setValue(String value) {
-        this.value = value;
-    }*/
-    
-}
diff --git a/ecomp-sdk-app/src/main/java/org/openecomp/policy/adapter/ServiceGroupJson.java b/ecomp-sdk-app/src/main/java/org/openecomp/policy/adapter/ServiceGroupJson.java
deleted file mode 100644
index 1cc34fbb4..000000000
--- a/ecomp-sdk-app/src/main/java/org/openecomp/policy/adapter/ServiceGroupJson.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
- * ================================================================================
- * Copyright (C) 2017 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.
- * You may obtain a copy of the License at
- * 
- *      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=========================================================
- */
-
-package org.openecomp.policy.adapter;
-
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class ServiceGroupJson {
-
-	protected String name;
-	protected String description;
-	protected List<ServiceMembers> members;
-	
-	// name
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String value) {
-		this.name = value;
-	}
-	
-	public boolean equals(Object obj) 
-	{
-		ServiceGroupJson servGroupobj=(ServiceGroupJson) obj;
-		 if(this.getName().equals(servGroupobj.getName()))
-	        {
-	                return true;
-	        }
-	        return false;
-    }
-	
-	 public int hashCode() {
-	    return Integer.valueOf(name.charAt(0)+(name.charAt(1)));
-	 }
-	
-	// description
-	public String getDescription() {
-		return description;
-	}
-
-	public void setDescription(String value) {
-		this.description = value;
-	}
-	
-	public List<ServiceMembers> getMembers() 
-    {
-    	if(members==null)
-    	{
-    		members= new ArrayList<ServiceMembers>();
-    	}
-        return this.members;
-    }
-
-	public void setMembers(List<ServiceMembers> members) 
-	{
-	        this.members = members;
-	}
-
-}
diff --git a/ecomp-sdk-app/src/main/java/org/openecomp/policy/adapter/ServiceListJson.java b/ecomp-sdk-app/src/main/java/org/openecomp/policy/adapter/ServiceListJson.java
deleted file mode 100644
index 05df303b9..000000000
--- a/ecomp-sdk-app/src/main/java/org/openecomp/policy/adapter/ServiceListJson.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
- * ================================================================================
- * Copyright (C) 2017 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.
- * You may obtain a copy of the License at
- * 
- *      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=========================================================
- */
-
-package org.openecomp.policy.adapter;
-
-
-
-public class ServiceListJson {
-
-	protected String name;
-	protected String description;
-	protected String type;
-	protected String transportProtocol;
-	protected String appProtocol;
-	protected String ports;
-	// name
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String value) {
-		this.name = value;
-	}
-	
-	public boolean equals(Object obj) 
-	{
-		ServiceListJson servobj=(ServiceListJson) obj;
-		 if(this.getName().equals(servobj.getName()))
-	        {
-	                return true;
-	        }
-	        return false;
-    }
-	
-	 public int hashCode() {
-		 if(name!=null){
-	        return Integer.valueOf(name.charAt(0)+(name.charAt(1)));
-		 }else{
-			 return 0;
-		 }
-	 }
-	
-	
-	public String getDescription() {
-		return description;
-	}
-
-	public void setDescription(String description) {
-		this.description = description;
-	}
-
-	// type
-	public String getType() {
-		return type;
-	}
-
-	public void setType(String value) {
-		this.type = value;
-	}
-
-	// transportProtocol
-	public String getTransportProtocol() {
-		return transportProtocol;
-	}
-
-	public void setTransportProtocol(String value) {
-		this.transportProtocol = value;
-	}
-
-	// appProtocol
-	public String getAppProtocol() {
-		return appProtocol;
-	}
-
-	public void setAppProtocol(String value) {
-		this.appProtocol = value;
-	}
-
-	// ports
-	public String getPorts() {
-		return ports;
-	}
-
-	public void setPorts(String value) {
-		this.ports = value;
-	}
-	
-	
-
-}
diff --git a/ecomp-sdk-app/src/main/java/org/openecomp/policy/adapter/ServiceMembers.java b/ecomp-sdk-app/src/main/java/org/openecomp/policy/adapter/ServiceMembers.java
deleted file mode 100644
index a8b1abea5..000000000
--- a/ecomp-sdk-app/src/main/java/org/openecomp/policy/adapter/ServiceMembers.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
- * ================================================================================
- * Copyright (C) 2017 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.
- * You may obtain a copy of the License at
- * 
- *      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=========================================================
- */
-
-package org.openecomp.policy.adapter;
-
-
-
-public class ServiceMembers {
-
-	protected String type;
-	protected String name;
-
-	// type
-	public String getType() {
-		return type;
-	}
-
-	public void setType(String value) {
-		this.type = value;
-	}
-
-	// transportProtocol
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String value) {
-		this.name = value;
-	}
-
-}
diff --git a/ecomp-sdk-app/src/main/java/org/openecomp/policy/adapter/ServicesJson.java b/ecomp-sdk-app/src/main/java/org/openecomp/policy/adapter/ServicesJson.java
deleted file mode 100644
index bdc9232b5..000000000
--- a/ecomp-sdk-app/src/main/java/org/openecomp/policy/adapter/ServicesJson.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
- * ================================================================================
- * Copyright (C) 2017 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.
- * You may obtain a copy of the License at
- * 
- *      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=========================================================
- */
-
-package org.openecomp.policy.adapter;
-
-
-public class ServicesJson {
-
-	protected String type;
-	protected String name;
-	// type
-	public String getType() {
-		return type;
-	}
-
-	public void setType(String type) {
-		this.type = type;
-	}
-	
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String value) {
-		this.name = value;
-	}
-}
diff --git a/ecomp-sdk-app/src/main/java/org/openecomp/policy/adapter/Term.java b/ecomp-sdk-app/src/main/java/org/openecomp/policy/adapter/Term.java
deleted file mode 100644
index 3080f2707..000000000
--- a/ecomp-sdk-app/src/main/java/org/openecomp/policy/adapter/Term.java
+++ /dev/null
@@ -1,201 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
- * ================================================================================
- * Copyright (C) 2017 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.
- * You may obtain a copy of the License at
- * 
- *      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=========================================================
- */
-
-package org.openecomp.policy.adapter;
-
-
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-
-public class Term {
-	
-	String position;
-	protected String ruleName;
-	protected List<String> fromZones;  
-	protected List<String> toZones;
-	protected boolean negateSource; //hardcoded
-	protected boolean negateDestination; //hardcoded
-	protected List<AddressJson> sourceList;
-	protected List<AddressJson> destinationList;
-	protected List<ServicesJson> sourceServices;
-	protected Set<ServicesJson> destServices;
-	protected String action;
-	protected String description;
-	boolean enabled;  //hardcoded
-	boolean log;      //hardcoded
-	
-	//position
-    public String getPosition() {
-        return position;
-    }
-    
-    public void setPosition(String value) {
-        this.position = value;
-    }
-    
-    //RuleName
-    public String getRuleName() {
-        return ruleName;
-    }
-    
-    public void setRuleName(String value) {
-        this.ruleName = value;
-    }
-    
-    //From Zone
-    public  List<String> getFromZones() {
-    	if (fromZones==null)
-    	{
-    		fromZones= new ArrayList<String>();
-    	}
-        return fromZones;
-    }
-    
-    public void setFromZones(List<String> fromZones) {
-        this.fromZones = fromZones;
-    }
-    
-    //To Zone
-    public  List<String> getToZones() {
-    	if (toZones==null)
-    	{
-    		toZones= new ArrayList<String>();
-    	}
-        return toZones;
-    }
-    
-    public void setToZones(List<String> toZones) {
-        this.toZones = toZones;
-    }
-   
-    
-    //Negate Source
-    public boolean getNegateSource() {
-        return negateSource;
-    }
-    
-    public void setNegateSource(boolean negateSource) {
-        this.negateSource = negateSource;
-    }
-    
-    //Negate Destination
-    public boolean getNegateDestination() {
-        return negateDestination;
-    }
-    
-    public void setNegateDestination(boolean negateDestination) {
-        this.negateDestination = negateDestination;
-    }
-    
-    //SourceList
-    public List<AddressJson> getSourceList() 
-    {
-    	if(sourceList==null)
-    	{
-    		sourceList= new ArrayList<AddressJson>();
-    	}
-        return this.sourceList;
-    }
-
-    public void setSourceList(List<AddressJson> srcList) {
-        this.sourceList = srcList;
-    }
-    
-    //Destination List
-    public List<AddressJson> getDestinationList() 
-    {
-    	if(destinationList==null)
-    	{
-    		destinationList= new ArrayList<AddressJson>();
-    	}
-        return this.destinationList;
-    }
-
-    public void setDestinationList(List<AddressJson> destList) {
-        this.destinationList = destList;
-    }
-    
-    //Source Services
-    public List<ServicesJson> getSourceServices() {
-    	if(sourceServices==null)
-    	{
-    		sourceServices= new ArrayList<ServicesJson>();
-    	}
-        return this.sourceServices;
-    }
-
-    public void setSourceServices(List<ServicesJson> sourceServices) {
-        this.sourceServices = sourceServices;
-    }
-	
-    //Destination services. 
-    public Set<ServicesJson> getDestServices() {
-    	if(destServices==null)
-    	{
-    		destServices= new HashSet<ServicesJson>();
-    	}
-        return this.destServices;
-    }
-
-    public void setDestServices(Set<ServicesJson> destServices) {
-        this.destServices = destServices;
-    }
-	 
-	//Action
-    public String getAction() {
-        return action;
-    }
-    
-    public void setAction(String value) {
-        this.action = value;
-    }
-    
-    //description
-    public String getDescription() {
-        return description;
-    }
-    
-    public void setDescription(String desc) {
-        this.description = desc;
-    }
-      
-    //enabled
-    public boolean getEnabled() {
-        return enabled;
-    }
-    
-    public void setEnabled(boolean value) {
-        this.enabled = value;
-    }
-    
-    //Log
-    public boolean getLog() {
-        return log;
-    }
-    
-    public void setLog(boolean value) {
-        this.log = value;
-    }
-
-}
diff --git a/ecomp-sdk-app/src/main/java/org/openecomp/policy/adapter/TermCollector.java b/ecomp-sdk-app/src/main/java/org/openecomp/policy/adapter/TermCollector.java
deleted file mode 100644
index 169ab3637..000000000
--- a/ecomp-sdk-app/src/main/java/org/openecomp/policy/adapter/TermCollector.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
- * ================================================================================
- * Copyright (C) 2017 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.
- * You may obtain a copy of the License at
- * 
- *      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=========================================================
- */
-
-package org.openecomp.policy.adapter;
-
-
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-
-public class TermCollector {
-	String serviceTypeId;
-	String configName;
-	DeployNowJson deploymentOption;
-	String securityZoneId;
-	
-    protected Set<Object> serviceGroups;
-    protected Set<Object> addressGroups;
-    protected List<Term> firewallRuleList;
-    
-    private String primaryParentZoneId;
-    
-	
-	//SecurityTypeId
-    public String getServiceTypeId() {
-        return serviceTypeId;
-    }
-    
-    public void setServiceTypeId(String serviceTypeId) {
-        this.serviceTypeId = serviceTypeId;
-    }
-    
-    //ConfigName
-    public String getConfigName() {
-        return configName;
-    }
-    
-    public void setConfigName(String configName) {
-        this.configName = configName;
-    }
-    
-    //DeploymentControl
-    public DeployNowJson getDeploymentOption() {
-        return deploymentOption;
-    }
-    
-    public void setDeploymentOption(DeployNowJson deploymentOption) {
-        this.deploymentOption = deploymentOption;
-    }
-    
-    //SecurityZoneId
-    public String getSecurityZoneId() {
-        return securityZoneId;
-    }
-    public void setSecurityZoneId(String securityZoneId) {
-        this.securityZoneId = securityZoneId;
-    }
-    
-
-    //ServiceGroup
-    public Set<Object> getServiceGroups() {
-    	if(serviceGroups==null)
-    	{
-    		serviceGroups= new HashSet<Object>();
-    	}
-        return this.serviceGroups;
-    }
-    
-    public void setServiceGroups(Set<Object> servListArray) {
-		this.serviceGroups = servListArray;
-	}
-
-    //AddressGroup
-    public Set<Object> getAddressGroups() {
-    	if(addressGroups==null)
-    	{
-    		addressGroups= new HashSet<Object>();
-    	}
-        return this.addressGroups;
-    }
-
-    public void setAddressGroups(Set<Object> addressGroups) {
-        this.addressGroups = addressGroups;
-    }
-    
-    //FirewallRuleList
-    public List<Term> getFirewallRuleList() {
-    	
-    	if(firewallRuleList==null)
-    	{
-    		firewallRuleList= new ArrayList<Term>();
-    	}
-        return this.firewallRuleList;
-    }
-
-    public void setFirewallRuleList(List<Term> firewallRuleList) {
-        this.firewallRuleList = firewallRuleList;
-    }
-    
-    
-    //primaryParentZoneId
-    public String getPrimaryParentZoneId() {
-		return primaryParentZoneId;
-	}
-
-	public void setPrimaryParentZoneId(String primaryParentZoneId) {
-		this.primaryParentZoneId = primaryParentZoneId;
-	}
-
-	
-
-}