[POLICY-73] replace openecomp for policy-engine

Change-Id: I54072f6bcd388c0e05562614ee89b4ae7ad67004
Signed-off-by: Guo Ruijing <ruijing.guo@intel.com>
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>

1 files changed, 0 insertions, 1305 deletions

diff --git a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/components/FirewallConfigPolicy.java b/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/components/FirewallConfigPolicy.java
deleted file mode 100644
index 9f780fd28..000000000
--- a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/components/FirewallConfigPolicy.java
+++ /dev/null
@@ -1,1305 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ECOMP-PAP-REST
- * ================================================================================
- * 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.pap.xacml.rest.components;
-
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.StringReader;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.nio.charset.Charset;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.sql.SQLException;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.json.Json;
-import javax.json.JsonArray;
-import javax.json.JsonObject;
-import javax.json.JsonReader;
-import javax.persistence.EntityManager;
-import javax.persistence.Query;
-
-import org.apache.commons.io.FilenameUtils;
-import org.openecomp.policy.common.logging.eelf.MessageCodes;
-import org.openecomp.policy.common.logging.eelf.PolicyLogger;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
-import org.openecomp.policy.pap.xacml.rest.XACMLPapServlet;
-import org.openecomp.policy.pap.xacml.rest.daoimpl.CommonClassDaoImpl;
-import org.openecomp.policy.rest.adapter.PolicyRestAdapter;
-import org.openecomp.policy.rest.jpa.ActionList;
-import org.openecomp.policy.rest.jpa.AddressGroup;
-import org.openecomp.policy.rest.jpa.GroupServiceList;
-import org.openecomp.policy.rest.jpa.PolicyEntity;
-import org.openecomp.policy.rest.jpa.PortList;
-import org.openecomp.policy.rest.jpa.PrefixList;
-import org.openecomp.policy.rest.jpa.ProtocolList;
-import org.openecomp.policy.rest.jpa.ServiceList;
-import org.openecomp.policy.rest.jpa.TermList;
-import org.openecomp.policy.rest.jpa.UserInfo;
-
-import com.att.research.xacml.std.IdentifierImpl;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.github.fge.jackson.JsonLoader;
-import com.github.fge.jsonpatch.diff.JsonDiff;
-
-import oasis.names.tc.xacml._3_0.core.schema.wd_17.AdviceExpressionType;
-import oasis.names.tc.xacml._3_0.core.schema.wd_17.AdviceExpressionsType;
-import oasis.names.tc.xacml._3_0.core.schema.wd_17.AllOfType;
-import oasis.names.tc.xacml._3_0.core.schema.wd_17.AnyOfType;
-import oasis.names.tc.xacml._3_0.core.schema.wd_17.AttributeAssignmentExpressionType;
-import oasis.names.tc.xacml._3_0.core.schema.wd_17.AttributeDesignatorType;
-import oasis.names.tc.xacml._3_0.core.schema.wd_17.AttributeValueType;
-import oasis.names.tc.xacml._3_0.core.schema.wd_17.EffectType;
-import oasis.names.tc.xacml._3_0.core.schema.wd_17.MatchType;
-import oasis.names.tc.xacml._3_0.core.schema.wd_17.ObjectFactory;
-import oasis.names.tc.xacml._3_0.core.schema.wd_17.PolicyType;
-import oasis.names.tc.xacml._3_0.core.schema.wd_17.RuleType;
-import oasis.names.tc.xacml._3_0.core.schema.wd_17.TargetType;
-
-public class FirewallConfigPolicy extends Policy {
-
-	private static final Logger LOGGER = FlexLogger.getLogger(FirewallConfigPolicy.class);
-
-	public FirewallConfigPolicy() {
-		super();
-	}
-
-	public FirewallConfigPolicy(PolicyRestAdapter policyAdapter) {
-		this.policyAdapter = policyAdapter;
-		this.policyAdapter.setConfigType(policyAdapter.getConfigType());
-	}
-
-	// Saving the Configurations file at server location for config policy.
-	protected void saveConfigurations(String policyName, String jsonBody) {
-		String configurationName = policyName;
-		FileWriter fw = null;
-		try{
-			if(configurationName.endsWith(".xml")){
-				configurationName = configurationName.replace(".xml", "");
-			}
-			fw = new FileWriter(CONFIG_HOME + File.separator + configurationName + ".json");
-			BufferedWriter bw = new BufferedWriter(fw);
-			bw.write(jsonBody);
-			bw.close();
-			if (LOGGER.isDebugEnabled()) {
-				LOGGER.debug("Configuration is succesfully saved");
-			}
-		} catch (IOException e) {
-			LOGGER.error("Exception Occured"+e);
-		}finally{
-			try{
-				if(fw != null){
-					fw.close();
-				}
-			}catch(Exception e){
-				LOGGER.error("Exception Occured"+e);
-			}
-		}
-	}
-
-	//Utility to read json data from the existing file to a string
-	static String readFile(String path, Charset encoding) throws IOException {
-		byte[] encoded = Files.readAllBytes(Paths.get(path));
-		return new String(encoded, encoding);
-	}
-
-	@Override
-	public Map<String, String> savePolicies() throws Exception {
-		Map<String, String> successMap = new HashMap<>();
-		if(isPolicyExists()){
-			successMap.put("EXISTS", "This Policy already exist on the PAP");
-			return successMap;
-		}
-		if(!isPreparedToSave()){
-			prepareToSave();
-		}
-
-		// Until here we prepared the data and here calling the method to create xml.
-		Path newPolicyPath = null;
-		newPolicyPath = Paths.get(policyAdapter.getNewFileName());
-		Boolean dbIsUpdated = false;
-		if (policyAdapter.getApiflag() != null && "admin".equalsIgnoreCase(policyAdapter.getApiflag())){
-			if (policyAdapter.isEditPolicy()) {
-				dbIsUpdated = updateFirewallDictionaryData(policyAdapter.getJsonBody(), policyAdapter.getPrevJsonBody());
-			} else {
-				dbIsUpdated = insertFirewallDicionaryData(policyAdapter.getJsonBody());
-			}
-		} else {
-			dbIsUpdated = true;
-		}
-
-		if(dbIsUpdated) {
-			successMap = createPolicy(newPolicyPath,getCorrectPolicyDataObject());	
-		} else {
-			PolicyLogger.error("Failed to Update the Database Dictionary Tables.");
-
-			//remove the new json file 
-			String jsonBody = policyAdapter.getPrevJsonBody();
-			if (jsonBody!=null){
-				saveConfigurations(policyName, jsonBody);
-			} else {
-				saveConfigurations(policyName, "");
-			}
-			successMap.put("fwdberror", "DB UPDATE");
-		}
-
-		return successMap;		
-	}
-
-	//This is the method for preparing the policy for saving.  We have broken it out
-	//separately because the fully configured policy is used for multiple things
-	@Override
-	public boolean prepareToSave() throws Exception{
-
-		if(isPreparedToSave()){
-			//we have already done this
-			return true;
-		}
-
-		int version = 0;
-		String policyID = policyAdapter.getPolicyID();
-		version = policyAdapter.getHighestVersion();
-
-		// Create the Instance for pojo, PolicyType object is used in marshaling.
-		if ("Config".equals(policyAdapter.getPolicyType())) {
-			PolicyType policyConfig = new PolicyType();
-
-			policyConfig.setVersion(Integer.toString(version));
-			policyConfig.setPolicyId(policyID);
-			policyConfig.setTarget(new TargetType());
-			policyAdapter.setData(policyConfig);
-		}
-		policyName = policyAdapter.getNewFileName();
-
-		//String oldPolicyName = policyName.replace(".xml", "");
-		String scope = policyName.substring(0, policyName.indexOf('.'));
-		String dbPolicyName = policyName.substring(policyName.indexOf('.')+1).replace(".xml", "");
-
-		int oldversion = Integer.parseInt(dbPolicyName.substring(dbPolicyName.lastIndexOf('.')+1));
-		dbPolicyName = dbPolicyName.substring(0, dbPolicyName.lastIndexOf('.')+1);
-		if(oldversion > 1){
-			oldversion = oldversion - 1; 
-			dbPolicyName = dbPolicyName + oldversion + ".xml";
-		}
-		EntityManager em = XACMLPapServlet.getEmf().createEntityManager();
-		Query createPolicyQuery = em.createQuery("SELECT p FROM PolicyEntity p WHERE p.scope=:scope AND p.policyName=:policyName");			
-		createPolicyQuery.setParameter("scope", scope);
-		createPolicyQuery.setParameter("policyName", dbPolicyName);
-		List<?> createPolicyQueryList = createPolicyQuery.getResultList();
-		if(!createPolicyQueryList.isEmpty()){
-			PolicyEntity entitydata = (PolicyEntity) createPolicyQueryList.get(0);
-			policyAdapter.setPrevJsonBody(entitydata.getConfigurationData().getConfigBody());
-		}
-		em.close();
-		if (policyAdapter.getData() != null) {
-			String jsonBody = policyAdapter.getJsonBody();
-			saveConfigurations(policyName, jsonBody);
-
-			// Make sure the filename ends with an extension
-			if (!policyName.endsWith(".xml")) {
-				policyName = policyName + ".xml";
-			}
-
-			PolicyType configPolicy = (PolicyType) policyAdapter.getData();
-
-			configPolicy.setDescription(policyAdapter.getPolicyDescription());
-
-			configPolicy.setRuleCombiningAlgId(policyAdapter.getRuleCombiningAlgId());
-
-			AllOfType allOfOne = new AllOfType();
-			String fileName = policyAdapter.getNewFileName();
-			String name = fileName.substring(fileName.lastIndexOf('\\') + 1, fileName.length());
-			if ((name == null) || (name.equals(""))) {
-				name = fileName.substring(fileName.lastIndexOf('/') + 1, fileName.length());
-			}
-			allOfOne.getMatch().add(createMatch("PolicyName", name));
-			AllOfType allOf = new AllOfType();
-
-			// Match for ConfigName
-			allOf.getMatch().add(createMatch("ConfigName", policyAdapter.getConfigName()));
-			// Match for riskType
-			allOf.getMatch().add(createDynamicMatch("RiskType", policyAdapter.getRiskType()));
-			// Match for riskLevel
-			allOf.getMatch().add(createDynamicMatch("RiskLevel", String.valueOf(policyAdapter.getRiskLevel())));
-			// Match for riskguard
-			allOf.getMatch().add(createDynamicMatch("guard", policyAdapter.getGuard()));
-			// Match for ttlDate
-			allOf.getMatch().add(createDynamicMatch("TTLDate", policyAdapter.getTtlDate()));
-			AnyOfType anyOf = new AnyOfType();
-			anyOf.getAllOf().add(allOfOne);
-			anyOf.getAllOf().add(allOf);
-
-			TargetType target = new TargetType();
-			target.getAnyOf().add(anyOf);
-
-			// Adding the target to the policy element
-			configPolicy.setTarget((TargetType) target);
-
-			RuleType rule = new RuleType();
-			rule.setRuleId(policyAdapter.getRuleID());
-			rule.setEffect(EffectType.PERMIT);
-
-			// Create Target in Rule
-			AllOfType allOfInRule = new AllOfType();
-
-			// Creating match for ACCESS in rule target
-			MatchType accessMatch = new MatchType();
-			AttributeValueType accessAttributeValue = new AttributeValueType();
-			accessAttributeValue.setDataType(STRING_DATATYPE);
-			accessAttributeValue.getContent().add("ACCESS");
-			accessMatch.setAttributeValue(accessAttributeValue);
-			AttributeDesignatorType accessAttributeDesignator = new AttributeDesignatorType();
-			URI accessURI = null;
-			try {
-				accessURI = new URI(ACTION_ID);
-			} catch (URISyntaxException e) {
-				PolicyLogger.error(MessageCodes.ERROR_DATA_ISSUE, e, "FirewallConfigPolicy", "Exception creating ACCESS URI");
-			}
-			accessAttributeDesignator.setCategory(CATEGORY_ACTION);
-			accessAttributeDesignator.setDataType(STRING_DATATYPE);
-			accessAttributeDesignator.setAttributeId(new IdentifierImpl(accessURI).stringValue());
-			accessMatch.setAttributeDesignator(accessAttributeDesignator);
-			accessMatch.setMatchId(FUNCTION_STRING_EQUAL_IGNORE);
-
-			// Creating Config Match in rule Target
-			MatchType configMatch = new MatchType();
-			AttributeValueType configAttributeValue = new AttributeValueType();
-			configAttributeValue.setDataType(STRING_DATATYPE);
-
-			configAttributeValue.getContent().add("Config");
-
-			configMatch.setAttributeValue(configAttributeValue);
-			AttributeDesignatorType configAttributeDesignator = new AttributeDesignatorType();
-			URI configURI = null;
-			try {
-				configURI = new URI(RESOURCE_ID);
-			} catch (URISyntaxException e) {
-				PolicyLogger.error(MessageCodes.ERROR_DATA_ISSUE, e, "FirewallConfigPolicy", "Exception creating Config URI");
-			}
-
-			configAttributeDesignator.setCategory(CATEGORY_RESOURCE);
-			configAttributeDesignator.setDataType(STRING_DATATYPE);
-			configAttributeDesignator.setAttributeId(new IdentifierImpl(configURI).stringValue());
-			configMatch.setAttributeDesignator(configAttributeDesignator);
-			configMatch.setMatchId(FUNCTION_STRING_EQUAL_IGNORE);
-
-			allOfInRule.getMatch().add(accessMatch);
-			allOfInRule.getMatch().add(configMatch);
-
-			AnyOfType anyOfInRule = new AnyOfType();
-			anyOfInRule.getAllOf().add(allOfInRule);
-
-			TargetType targetInRule = new TargetType();
-			targetInRule.getAnyOf().add(anyOfInRule);
-
-			rule.setTarget(targetInRule);
-			rule.setAdviceExpressions(getAdviceExpressions(version, policyName));
-
-			configPolicy.getCombinerParametersOrRuleCombinerParametersOrVariableDefinition().add(rule);
-			policyAdapter.setPolicyData(configPolicy);
-
-		} else {
-			PolicyLogger.error("Unsupported data object." + policyAdapter.getData().getClass().getCanonicalName());
-		}
-		setPreparedToSave(true);
-		return true;
-	}
-
-	// Data required for Advice part is setting here.
-	private AdviceExpressionsType getAdviceExpressions(int version, String fileName) {
-
-		//Firewall Config ID Assignment
-		AdviceExpressionsType advices = new AdviceExpressionsType();
-		AdviceExpressionType advice = new AdviceExpressionType();
-		advice.setAdviceId("firewallConfigID");
-		advice.setAppliesTo(EffectType.PERMIT);
-		// For Configuration
-		AttributeAssignmentExpressionType assignment1 = new AttributeAssignmentExpressionType();
-		assignment1.setAttributeId("type");
-		assignment1.setCategory(CATEGORY_RESOURCE);
-		assignment1.setIssuer("");
-		AttributeValueType configNameAttributeValue = new AttributeValueType();
-		configNameAttributeValue.setDataType(STRING_DATATYPE);
-		configNameAttributeValue.getContent().add("Configuration");
-		assignment1.setExpression(new ObjectFactory().createAttributeValue(configNameAttributeValue));
-		advice.getAttributeAssignmentExpression().add(assignment1);
-
-		// For Config file Url if configurations are provided.
-		//URL ID Assignment
-		AttributeAssignmentExpressionType assignment2 = new AttributeAssignmentExpressionType();
-		assignment2.setAttributeId("URLID");
-		assignment2.setCategory(CATEGORY_RESOURCE);
-		assignment2.setIssuer("");
-		AttributeValueType AttributeValue = new AttributeValueType();
-		AttributeValue.setDataType(URI_DATATYPE);
-		if (policyName.endsWith(".xml")) {
-			policyName = policyName.substring(0, policyName.lastIndexOf(".xml"));
-		}
-		String content = CONFIG_URL + "/Config/" + policyName + ".json";
-
-		AttributeValue.getContent().add(content);
-		assignment2.setExpression(new ObjectFactory().createAttributeValue(AttributeValue));
-		advice.getAttributeAssignmentExpression().add(assignment2);
-
-		//Policy Name Assignment
-		AttributeAssignmentExpressionType assignment3 = new AttributeAssignmentExpressionType();
-		assignment3.setAttributeId("PolicyName");
-		assignment3.setCategory(CATEGORY_RESOURCE);
-		assignment3.setIssuer("");
-		AttributeValueType attributeValue3 = new AttributeValueType();
-		attributeValue3.setDataType(STRING_DATATYPE);
-		fileName = FilenameUtils.removeExtension(fileName);
-		fileName = fileName + ".xml";
-		String name = fileName.substring(fileName.lastIndexOf("\\") + 1, fileName.length());
-		if ((name == null) || (name.equals(""))) {
-			name = fileName.substring(fileName.lastIndexOf("/") + 1, fileName.length());
-		}
-		attributeValue3.getContent().add(name);
-		assignment3.setExpression(new ObjectFactory().createAttributeValue(attributeValue3));
-		advice.getAttributeAssignmentExpression().add(assignment3);
-
-		//Version Number Assignment
-		AttributeAssignmentExpressionType assignment4 = new AttributeAssignmentExpressionType();
-		assignment4.setAttributeId("VersionNumber");
-		assignment4.setCategory(CATEGORY_RESOURCE);
-		assignment4.setIssuer("");
-		AttributeValueType configNameAttributeValue4 = new AttributeValueType();
-		configNameAttributeValue4.setDataType(STRING_DATATYPE);
-		configNameAttributeValue4.getContent().add(Integer.toString(version));
-		assignment4.setExpression(new ObjectFactory().createAttributeValue(configNameAttributeValue4));
-		advice.getAttributeAssignmentExpression().add(assignment4);
-
-		//Ecomp Name Assignment
-		AttributeAssignmentExpressionType assignment5 = new AttributeAssignmentExpressionType();
-		assignment5.setAttributeId("matching:" + ECOMPID);
-		assignment5.setCategory(CATEGORY_RESOURCE);
-		assignment5.setIssuer("");
-		AttributeValueType configNameAttributeValue5 = new AttributeValueType();
-		configNameAttributeValue5.setDataType(STRING_DATATYPE);
-		assignment5.setExpression(new ObjectFactory().createAttributeValue(configNameAttributeValue5));
-		advice.getAttributeAssignmentExpression().add(assignment5);
-
-		//Config Name Assignment
-		AttributeAssignmentExpressionType assignment6 = new AttributeAssignmentExpressionType();
-		assignment6.setAttributeId("matching:" + CONFIGID);
-		assignment6.setCategory(CATEGORY_RESOURCE);
-		assignment6.setIssuer("");
-		AttributeValueType configNameAttributeValue6 = new AttributeValueType();
-		configNameAttributeValue6.setDataType(STRING_DATATYPE);
-		configNameAttributeValue6.getContent().add(policyAdapter.getConfigName());
-		assignment6.setExpression(new ObjectFactory().createAttributeValue(configNameAttributeValue6));
-		advice.getAttributeAssignmentExpression().add(assignment6);
-
-		//Risk Attributes
-		AttributeAssignmentExpressionType assignment7 = new AttributeAssignmentExpressionType();
-		assignment7.setAttributeId("RiskType");
-		assignment7.setCategory(CATEGORY_RESOURCE);
-		assignment7.setIssuer("");
-
-		AttributeValueType configNameAttributeValue7 = new AttributeValueType();
-		configNameAttributeValue7.setDataType(STRING_DATATYPE);
-		configNameAttributeValue7.getContent().add(policyAdapter.getRiskType());
-		assignment7.setExpression(new ObjectFactory().createAttributeValue(configNameAttributeValue7));
-
-		advice.getAttributeAssignmentExpression().add(assignment7);
-
-		AttributeAssignmentExpressionType assignment8 = new AttributeAssignmentExpressionType();
-		assignment8.setAttributeId("RiskLevel");
-		assignment8.setCategory(CATEGORY_RESOURCE);
-		assignment8.setIssuer("");
-
-		AttributeValueType configNameAttributeValue8 = new AttributeValueType();
-		configNameAttributeValue8.setDataType(STRING_DATATYPE);
-		configNameAttributeValue8.getContent().add(policyAdapter.getRiskLevel());
-		assignment8.setExpression(new ObjectFactory().createAttributeValue(configNameAttributeValue8));
-
-		advice.getAttributeAssignmentExpression().add(assignment8);	
-
-		AttributeAssignmentExpressionType assignment9 = new AttributeAssignmentExpressionType();
-		assignment9.setAttributeId("guard");
-		assignment9.setCategory(CATEGORY_RESOURCE);
-		assignment9.setIssuer("");
-
-		AttributeValueType configNameAttributeValue9 = new AttributeValueType();
-		configNameAttributeValue9.setDataType(STRING_DATATYPE);
-		configNameAttributeValue9.getContent().add(policyAdapter.getGuard());
-		assignment9.setExpression(new ObjectFactory().createAttributeValue(configNameAttributeValue9));
-
-		advice.getAttributeAssignmentExpression().add(assignment9);
-
-		AttributeAssignmentExpressionType assignment10 = new AttributeAssignmentExpressionType();
-		assignment10.setAttributeId("TTLDate");
-		assignment10.setCategory(CATEGORY_RESOURCE);
-		assignment10.setIssuer("");
-
-		AttributeValueType configNameAttributeValue10 = new AttributeValueType();
-		configNameAttributeValue10.setDataType(STRING_DATATYPE);
-		configNameAttributeValue10.getContent().add(policyAdapter.getTtlDate());
-		assignment10.setExpression(new ObjectFactory().createAttributeValue(configNameAttributeValue10));
-
-		advice.getAttributeAssignmentExpression().add(assignment10);
-		advices.getAdviceExpression().add(advice);
-		return advices;
-	}
-
-
-	private Boolean insertFirewallDicionaryData (String jsonBody) throws SQLException {
-		CommonClassDaoImpl dbConnection = new CommonClassDaoImpl();
-		JsonObject json = null;
-		if (jsonBody != null) {
-
-			//Read jsonBody to JsonObject
-			json = stringToJson(jsonBody);
-
-			JsonArray firewallRules = null;
-			JsonArray serviceGroup = null;
-			JsonArray addressGroup = null;
-			//insert data into tables
-			try {
-				firewallRules = json.getJsonArray("firewallRuleList");
-				serviceGroup = json.getJsonArray("serviceGroups");
-				addressGroup = json.getJsonArray("addressGroups");	
-				/*
-				 * Inserting firewallRuleList data into the Terms, SecurityZone, and Action tables
-				 */
-				if (firewallRules != null) {
-					for(int i = 0;i<firewallRules.size();i++) {
-						/*
-						 * Populate ArrayLists with values from the JSON
-						 */
-						//create the JSON object from the JSON Array for each iteration through the for loop
-						JsonObject ruleListobj = firewallRules.getJsonObject(i);
-
-						//get values from JSON fields of firewallRulesList Array
-						String ruleName = ruleListobj.get("ruleName").toString();
-						String action = ruleListobj.get("action").toString();
-						String description = ruleListobj.get("description").toString();
-						List<Object> result = dbConnection.getDataById(TermList.class, "termName", ruleName);
-						if(result != null && !result.isEmpty()){
-							TermList termEntry = (TermList) result.get(0);
-							dbConnection.delete(termEntry);
-						}
-						
-						//getting fromZone Array field from the firewallRulesList
-						JsonArray fromZoneArray = ruleListobj.getJsonArray("fromZones");
-						String fromZoneString = null;
-
-						for (int fromZoneIndex = 0;fromZoneIndex<fromZoneArray.size(); fromZoneIndex++) {
-							String value = fromZoneArray.get(fromZoneIndex).toString();
-							value = value.replace("\"", "");
-							if (fromZoneString != null) {
-								fromZoneString = fromZoneString.concat(",").concat(value);
-							} else {
-								fromZoneString = value;
-							}
-						}
-						String fromZoneInsert = "'"+fromZoneString+"'";
-
-						//getting toZone Array field from the firewallRulesList
-						JsonArray toZoneArray = ruleListobj.getJsonArray("toZones");
-						String toZoneString = null;
-						for (int toZoneIndex = 0; toZoneIndex<toZoneArray.size(); toZoneIndex++) {
-							String value = toZoneArray.get(toZoneIndex).toString();
-							value = value.replace("\"", "");
-							if (toZoneString != null) {
-								toZoneString = toZoneString.concat(",").concat(value);
-							} else {
-								toZoneString = value;
-							}
-						}
-						String toZoneInsert = "'"+toZoneString+"'";
-
-						//getting sourceList Array fields from the firewallRulesList
-						JsonArray srcListArray = ruleListobj.getJsonArray("sourceList");
-						String srcListString = null;
-						for (int srcListIndex = 0; srcListIndex< srcListArray.size(); srcListIndex++) {
-							JsonObject srcListObj = srcListArray.getJsonObject(srcListIndex);
-							String type = srcListObj.get("type").toString().replace("\"", "");
-
-							String value = null;
-							if(type.equals("REFERENCE")||type.equals("GROUP")){
-								value = srcListObj.get("name").toString();
-							} else if (type.equalsIgnoreCase("ANY")){
-								value = null;
-							} else {
-								value = srcListObj.get("value").toString();
-							}
-
-							if (value!=null){
-								value = value.replace("\"", "");
-							}
-
-							if (srcListString != null) {
-								srcListString = srcListString.concat(",").concat(value);
-
-							} else {
-								srcListString = value;
-							}
-
-						}
-						String srcListInsert = "'"+srcListString+"'";
-
-						//getting destinationList Array fields from the firewallRulesList
-						JsonArray destListArray = ruleListobj.getJsonArray("destinationList");
-						String destListString = null;
-						for (int destListIndex = 0; destListIndex <destListArray.size(); destListIndex++) {
-							JsonObject destListObj = destListArray.getJsonObject(destListIndex);
-							String type = destListObj.get("type").toString().replace("\"", "");
-
-							String value = null;
-							if(type.equals("REFERENCE")||type.equals("GROUP")){
-								value = destListObj.get("name").toString();
-							} else if (type.equalsIgnoreCase("ANY")){
-								value = null;
-							} else {
-								value = destListObj.get("value").toString();
-							}
-
-							if (value!=null){
-								value = value.replace("\"", "");
-							}
-
-							if (destListString != null) {
-								destListString = destListString.concat(",").concat(value);
-							} else {
-								destListString = value;
-							}
-						}
-						String destListInsert = "'"+destListString+"'";
-
-						//getting destServices Array fields from the firewallRulesList
-						JsonArray destServicesArray = ruleListobj.getJsonArray("destServices");
-						String destPortListString = null;
-						for (int destPortListIndex = 0; destPortListIndex < destServicesArray.size(); destPortListIndex++) {
-							JsonObject destServicesObj = destServicesArray.getJsonObject(destPortListIndex);
-							String type = destServicesObj.get("type").toString().replace("\"", "");
-
-							String value = null;
-							if(type.equals("REFERENCE")||type.equals("GROUP")){
-								value = destServicesObj.get("name").toString();
-							} else if (type.equalsIgnoreCase("ANY")){
-								value = null;
-							} else {
-								value = destServicesObj.get("value").toString();
-							}
-
-							if (value!=null){
-								value = value.replace("\"", "");
-							}
-
-							if (destPortListString != null) {
-								destPortListString = destPortListString.concat(",").concat(value);
-							} else {
-								destPortListString = value;
-							}
-						}
-						String destPortListInsert = "'"+destPortListString+"'";					
-
-						/*
-						 * Create Queries to INSERT data into database tables and execute 
-						 */	
-						UserInfo userInfo = new UserInfo();
-						userInfo.setUserLoginId("API");
-						userInfo.setUserName("API");
-						
-						TermList termEntry = new TermList();
-						termEntry.setTermName(ruleName);
-						termEntry.setSrcIPList(srcListInsert);
-						termEntry.setDestIPList(destListInsert);
-						termEntry.setProtocolList("null");
-						termEntry.setPortList("null");
-						termEntry.setSrcPortList("null");
-						termEntry.setDestPortList(destPortListInsert);
-						termEntry.setAction(action);
-						termEntry.setDescription(description);
-						termEntry.setFromZones(fromZoneInsert);
-						termEntry.setToZones(toZoneInsert);
-						termEntry.setUserCreatedBy(userInfo);
-						dbConnection.save(termEntry);
-						
-						ActionList actionEntry = new ActionList();
-						actionEntry.setActionName(action);
-						actionEntry.setDescription(action);
-						dbConnection.save(actionEntry);
-					}
-				}
-
-				/*
-				 * Inserting serviceGroups data into the ServiceGroup, ServiceList, ProtocolList, and PortList tables
-				 */
-				if (serviceGroup != null) {
-					for(int i = 0; i < serviceGroup.size() ; i++) {
-						/*
-						 * Populate ArrayLists with values from the JSON
-						 */
-						//create the JSON object from the JSON Array for each iteration through the for loop
-						JsonObject svcGroupListobj = serviceGroup.getJsonObject(i);
-
-						String serviceListName = svcGroupListobj.get("name").toString();
-						String description = null;
-						if (svcGroupListobj.containsKey("description")){
-							description = svcGroupListobj.get("description").toString();
-						}
-
-						//getting members Array from the serviceGroup
-						JsonArray membersArray = svcGroupListobj.getJsonArray("members");
-
-						//String type = svcGroupListobj.get("type").toString();
-						Boolean isServiceGroup = false;
-						if (membersArray!=null){
-							String membersType = membersArray.getJsonObject(0).get("type").toString();
-							if (membersType.contains("REFERENCE")) {
-								isServiceGroup = true;
-							}
-						}
-
-						//Insert values into GROUPSERVICELIST table if name begins with Group 
-						if (isServiceGroup) {
-							String name = null;
-							for (int membersIndex = 0; membersIndex< membersArray.size(); membersIndex++) {
-								JsonObject membersObj = membersArray.getJsonObject(membersIndex);
-								//String value = membersObj.get("name").toString();
-								String type = membersObj.get("type").toString().replace("\"", "");
-
-								String value = null;
-								if(type.equals("REFERENCE")||type.equals("GROUP")||type.equals("SERVICE")){
-									value = membersObj.get("name").toString();
-								} else if (type.equalsIgnoreCase("ANY")){
-									value = null;
-								} else {
-									value = membersObj.get("value").toString();
-								}
-
-								if(value != null){
-									value = value.replace("\"", "");
-								}
-
-								if (name != null) {
-									name = name.concat(",").concat(value);
-								} else {
-									name = value;
-								}
-							}
-							String nameInsert = "'"+name+"'";		
-							GroupServiceList groupServiceEntry = new GroupServiceList();
-							groupServiceEntry.setGroupName(serviceListName);
-							groupServiceEntry.setServiceList(nameInsert);
-							dbConnection.save(groupServiceEntry);
-						} else { //Insert JSON data serviceList table, protollist table, and portlist table
-							String type = svcGroupListobj.get("type").toString();
-							String transportProtocol = svcGroupListobj.get("transportProtocol").toString();
-							String ports = svcGroupListobj.get("ports").toString();
-
-							/*
-							 * Create Queries to INSERT data into database table and execute 
-							 */
-							ServiceList serviceListEntry = new ServiceList();
-							serviceListEntry.setServiceName(serviceListName);
-							serviceListEntry.setServiceDescription(description);
-							serviceListEntry.setServiceType(type);
-							serviceListEntry.setServiceTransProtocol(transportProtocol);
-							serviceListEntry.setServiceAppProtocol("null");
-							serviceListEntry.setServicePorts(ports);
-							dbConnection.save(serviceListEntry);
-							
-							ProtocolList protocolEntry = new ProtocolList();
-							protocolEntry.setProtocolName(transportProtocol);
-							protocolEntry.setDescription(transportProtocol);
-							dbConnection.save(protocolEntry);
-							
-							PortList portListEntry = new PortList();
-							portListEntry.setPortName(ports);
-							portListEntry.setDescription(ports);
-							dbConnection.save(portListEntry);
-						}
-					}
-				}
-
-				/*
-				 * Inserting addressGroup data into the ADDRESSGROUP table
-				 */
-				if (addressGroup != null) {
-					for(int i = 0; i < addressGroup.size(); i++) {
-						/*
-						 * Populate ArrayLists with values from the JSON
-						 */
-						//create the JSON object from the JSON Array for each iteration through the for loop
-						JsonObject addressGroupObj = addressGroup.getJsonObject(i);
-
-						//create JSON array for members
-						JsonArray membersArray = addressGroupObj.getJsonArray("members");
-						String addressGroupName = addressGroupObj.get("name").toString();
-
-						String description = null;
-						if (addressGroupObj.containsKey("description")){
-							description = addressGroupObj.get("description").toString();
-						}
-
-						String prefixIP = null;
-						String type = null;
-						for (int membersIndex = 0; membersIndex < membersArray.size(); membersIndex++) {
-							JsonObject membersObj = membersArray.getJsonObject(membersIndex);
-							//String value = membersObj.get("value").toString();
-							type = membersObj.get("type").toString().replace("\"", "");
-
-							String value = null;
-							if(type.equals("REFERENCE")||type.equals("GROUP")||type.equals("SERVICE")){
-								value = membersObj.get("name").toString();
-							} else if (type.equalsIgnoreCase("ANY")){
-								value = null;
-							} else {
-								value = membersObj.get("value").toString();
-							}
-
-							if(value != null){
-								value = value.replace("\"", "");
-							}
-
-							if (prefixIP != null) {
-								prefixIP = prefixIP.concat(",").concat(value);
-							} else {
-								prefixIP = value;
-							}
-						}
-						String prefixList = "'"+prefixIP+"'";
-
-						Boolean isAddressGroup = type.contains("REFERENCE");
-
-						if (isAddressGroup) {								
-							AddressGroup addressGroupEntry = new AddressGroup();
-							addressGroupEntry.setGroupName(addressGroupName);
-							addressGroupEntry.setDescription(description);
-							addressGroupEntry.setServiceList(prefixList);
-							dbConnection.save(addressGroupEntry);
-						} else {
-							PrefixList prefixListEntry = new PrefixList();
-							prefixListEntry.setPrefixListName(addressGroupName);
-							prefixListEntry.setDescription(description);
-							prefixListEntry.setPrefixListValue(prefixList);
-							dbConnection.save(prefixListEntry);
-						}
-					}
-				}
-
-				/*
-				 * Remove duplicate values from 'lookup' dictionary tables
-				 */
-				//ProtocolList Table
-				String protoDelete = "DELETE FROM protocollist USING protocollist, protocollist p1 "
-						+ "WHERE protocollist.id > p1.id AND protocollist.protocolname = p1.protocolname;";
-				dbConnection.updateQuery(protoDelete);
-
-				//PortList Table
-				String portListDelete = "DELETE FROM portlist USING portlist, portlist p1 "
-						+ "WHERE portlist.id > p1.id AND portlist.portname = p1.portname; ";
-				dbConnection.updateQuery(portListDelete);
-
-				//PrefixList Table
-				String prefixListDelete = "DELETE FROM prefixlist USING prefixlist, prefixlist p1 "
-						+ "WHERE prefixlist.id > p1.id AND prefixlist.pl_name = p1.pl_name AND "
-						+ "prefixlist.pl_value = p1.pl_value AND prefixlist.description = p1.description; ";
-				dbConnection.updateQuery(prefixListDelete);
-
-				//GroupServiceList
-				String groupServiceDelete = "DELETE FROM groupservicelist USING groupservicelist, groupservicelist g1 "
-						+ "WHERE groupservicelist.id > g1.id AND groupservicelist.name = g1.name AND "
-						+ "groupservicelist.serviceList = g1.serviceList; ";
-				dbConnection.updateQuery(groupServiceDelete);
-			}catch (Exception e) {
-				PolicyLogger.error(MessageCodes.EXCEPTION_ERROR, e, "FirewallConfigPolicy", "Exception getting Json values");
-				return false;
-			} 
-			return true;
-
-		} else {
-			return false;
-		}
-
-	}
-
-
-	private Boolean updateFirewallDictionaryData(String jsonBody, String prevJsonBody) {
-		CommonClassDaoImpl dbConnection = new CommonClassDaoImpl();
-		JsonObject oldJson = null;
-		JsonObject newJson = null;
-
-		if (jsonBody != null || prevJsonBody != null) {
-
-			oldJson = stringToJson(prevJsonBody);
-			newJson = stringToJson(jsonBody);
-
-			//if no changes to the json then return true
-			if (oldJson != null && oldJson.equals(newJson)) {
-				return true;
-			}
-
-			JsonArray firewallRules = null;
-			JsonArray serviceGroup = null;
-			JsonArray addressGroup = null;
-
-			firewallRules = newJson.getJsonArray("firewallRuleList");
-			serviceGroup = newJson.getJsonArray("serviceGroups");
-			addressGroup = newJson.getJsonArray("addressGroups");	
-
-			//insert data into tables
-			try {
-				JsonNode jsonDiff = createPatch(jsonBody, prevJsonBody);
-
-				for (int i = 0; i<jsonDiff.size(); i++) {
-					//String path = jsonDiff.get(i).asText();
-					String jsonpatch = jsonDiff.get(i).toString();
-
-					JsonObject patchObj = stringToJson(jsonpatch);
-
-					String path = patchObj.get("path").toString().replace('"', ' ').trim();
-
-					if (path.contains("firewallRuleList")) {
-						/*
-						 * Inserting firewallRuleList data into the Terms, SecurityZone, and Action tables
-						 */
-						for(int ri = 0; ri < firewallRules.size(); ri++) {
-							/*
-							 * Populate ArrayLists with values from the JSON
-							 */
-							//create the JSON object from the JSON Array for each iteration through the for loop
-							JsonObject ruleListobj = firewallRules.getJsonObject(ri);
-
-							//get values from JSON fields of firewallRulesList Array
-							String ruleName = ruleListobj.get("ruleName").toString().replace('"', '\'');
-							String action = ruleListobj.get("action").toString().replace('"', '\'');
-							String description = ruleListobj.get("description").toString().replace('"', '\'');
-
-							List<Object> result = dbConnection.getDataById(TermList.class, "termName", ruleName);
-							if(result != null && !result.isEmpty()){
-								TermList termEntry = (TermList) result.get(0);
-								dbConnection.delete(termEntry);
-							}
-
-							//getting fromZone Array field from the firewallRulesList
-							JsonArray fromZoneArray = ruleListobj.getJsonArray("fromZones");
-							String fromZoneString = null;
-
-							for (int fromZoneIndex = 0; fromZoneIndex<fromZoneArray.size() ; fromZoneIndex++) {
-								String value = fromZoneArray.get(fromZoneIndex).toString();
-								value = value.replace("\"", "");
-
-								if (fromZoneString != null) {
-									fromZoneString = fromZoneString.concat(",").concat(value);
-
-								} else {
-									fromZoneString = value;
-								}
-
-							}
-							String fromZoneInsert = "'"+fromZoneString+"'";
-
-							//getting toZone Array field from the firewallRulesList
-							JsonArray toZoneArray = ruleListobj.getJsonArray("toZones");
-							String toZoneString = null;
-
-
-							for (int toZoneIndex = 0; toZoneIndex < toZoneArray.size(); toZoneIndex++) {
-								String value = toZoneArray.get(toZoneIndex).toString();
-								value = value.replace("\"", "");
-
-								if (toZoneString != null) {
-									toZoneString = toZoneString.concat(",").concat(value);
-
-								} else {
-									toZoneString = value;
-								}
-
-							}
-							String toZoneInsert = "'"+toZoneString+"'";
-							//getting sourceList Array fields from the firewallRulesList
-							JsonArray srcListArray = ruleListobj.getJsonArray("sourceList");
-							String srcListString = null;
-							for (int srcListIndex = 0; srcListIndex<srcListArray.size(); srcListIndex++) {
-								JsonObject srcListObj = srcListArray.getJsonObject(srcListIndex);
-								String type = srcListObj.get("type").toString().replace("\"", "");
-
-								String value = null;
-								if(type.equals("REFERENCE")||type.equals("GROUP")){
-									value = srcListObj.get("name").toString();
-								} else if (type.equalsIgnoreCase("ANY")){
-									value = null;
-								} else {
-									value = srcListObj.get("value").toString();
-								}
-
-								if(value != null){
-									value = value.replace("\"", "");
-								}
-
-								if (srcListString != null) {
-									srcListString = srcListString.concat(",").concat(value);
-
-								} else {
-									srcListString = value;
-								}
-
-							}
-							String srcListInsert = "'"+srcListString+"'";
-
-							//getting destinationList Array fields from the firewallRulesList
-							JsonArray destListArray = ruleListobj.getJsonArray("destinationList");
-							String destListString = null;
-							for (int destListIndex = 0; destListIndex<destListArray.size(); destListIndex ++) {
-								JsonObject destListObj = destListArray.getJsonObject(destListIndex);
-								String type = destListObj.get("type").toString().replace("\"", "");
-
-								String value = null;
-								if(type.equals("REFERENCE")||type.equals("GROUP")){
-									value = destListObj.get("name").toString();
-								} else if (type.equalsIgnoreCase("ANY")){
-									value = null;
-								} else {
-									value = destListObj.get("value").toString();
-								}
-
-								if(value != null){
-									value = value.replace("\"", "");
-								}
-
-								if (destListString != null) {
-									destListString = destListString.concat(",").concat(value);
-								} else {
-									destListString = value;
-								}
-							}
-							String destListInsert = "'"+destListString+"'";
-
-							//getting destServices Array fields from the firewallRulesList
-							JsonArray destServicesArray = ruleListobj.getJsonArray("destServices");
-							String destPortListString = null;
-							for (int destPortListIndex = 0; destPortListIndex < destServicesArray.size(); destPortListIndex++) {
-								JsonObject destServicesObj = destServicesArray.getJsonObject(destPortListIndex);
-								String type = destServicesObj.get("type").toString().replace("\"", "");
-
-								String value = null;
-								if(type.equals("REFERENCE")||type.equals("GROUP")){
-									value = destServicesObj.get("name").toString();
-								} else if (type.equalsIgnoreCase("ANY")){
-									value = null;
-								} else {
-									value = destServicesObj.get("value").toString();
-								}
-
-								if(value != null){
-									value = value.replace("\"", "");
-								}
-
-								if (destPortListString != null) {
-									destPortListString = destPortListString.concat(",").concat(value);
-								} else {
-									destPortListString = value;
-								}
-							}
-							String destPortListInsert = "'"+destPortListString+"'";					
-
-							/*
-							 * Create Queries to INSERT data into database tables and execute 
-							 */
-							UserInfo userInfo = new UserInfo();
-							userInfo.setUserLoginId("API");
-							userInfo.setUserName("API");
-							
-							TermList termEntry = new TermList();
-							termEntry.setTermName(ruleName);
-							termEntry.setSrcIPList(srcListInsert);
-							termEntry.setDestIPList(destListInsert);
-							termEntry.setProtocolList("null");
-							termEntry.setPortList("null");
-							termEntry.setSrcPortList("null");
-							termEntry.setDestPortList(destPortListInsert);
-							termEntry.setAction(action);
-							termEntry.setDescription(description);
-							termEntry.setFromZones(fromZoneInsert);
-							termEntry.setToZones(toZoneInsert);
-							termEntry.setUserCreatedBy(userInfo);
-							dbConnection.save(termEntry);
-							
-							List<Object> actionResult = dbConnection.getDataById(ActionList.class, "actionName", action);
-							if(actionResult == null || actionResult.isEmpty()){
-								ActionList actionEntry = new ActionList();
-								actionEntry.setActionName(action);
-								actionEntry.setDescription(action);
-								dbConnection.save(actionEntry);	
-							}
-						}
-					}
-
-					if (path.contains("serviceGroups")) {
-						/*
-						 * Inserting serviceGroups data into the ServiceGroup, ServiceList, ProtocolList, and PortList tables
-						 */
-						for(int si = 0; si < serviceGroup.size(); si++) {
-							/*
-							 * Populate ArrayLists with values from the JSON
-							 */
-							//create the JSON object from the JSON Array for each iteration through the for loop
-							JsonObject svcGroupListobj = serviceGroup.getJsonObject(si);
-
-							String groupName = svcGroupListobj.get("name").toString().replace('"', '\''); 
-
-							String description = null;
-							if (svcGroupListobj.containsKey("description")){
-								description = svcGroupListobj.get("description").toString().replace('"', '\'');
-							}
-
-							JsonArray membersArray = svcGroupListobj.getJsonArray("members");
-
-							Boolean isServiceGroup = false;
-							if (membersArray!=null){
-								String membersType = membersArray.getJsonObject(0).get("type").toString();
-								if (membersType.contains("REFERENCE")) {
-									isServiceGroup = true;
-								}
-							}
-
-							//Insert values into GROUPSERVICELIST table if name begins with Group 
-							if (isServiceGroup) {
-								List<Object> result = dbConnection.getDataById(GroupServiceList.class, "name", groupName);
-								if(result != null && !result.isEmpty()){
-									GroupServiceList groupEntry = (GroupServiceList) result.get(0);
-									dbConnection.delete(groupEntry);
-								}
-			
-								String name = null;
-								for (int membersIndex = 0; membersIndex < membersArray.size(); membersIndex++) {
-									JsonObject membersObj = membersArray.getJsonObject(membersIndex);
-									String type = membersObj.get("type").toString().replace("\"", "");
-
-									String value = null;
-									if(type.equals("REFERENCE")||type.equals("GROUP")||type.equals("SERVICE")){
-										value = membersObj.get("name").toString();
-									} else if (type.equalsIgnoreCase("ANY")){
-										value = null;
-									} else {
-										value = membersObj.get("value").toString();
-									}
-
-									if(value != null){
-										value = value.replace("\"", "");
-									}
-
-									if (name != null) {
-										name = name.concat(",").concat(value);
-									} else {
-										name = value;
-									}
-								}
-								String nameInsert = "'"+name+"'";	
-								GroupServiceList groupServiceEntry = new GroupServiceList();
-								groupServiceEntry.setGroupName(groupName);
-								groupServiceEntry.setServiceList(nameInsert);
-								dbConnection.save(groupServiceEntry);
-							} else { //Insert JSON data serviceGroup table, protocollist table, and portlist table
-								String type = svcGroupListobj.get("type").toString().replace('"', '\'');
-								String transportProtocol = svcGroupListobj.get("transportProtocol").toString().replace('"', '\'');
-								String ports = svcGroupListobj.get("ports").toString().replace('"', '\'');
-								
-								List<Object> result = dbConnection.getDataById(ServiceList.class, "name", groupName);
-								if(result != null && !result.isEmpty()){
-									ServiceList serviceEntry = (ServiceList) result.get(0);
-									dbConnection.delete(serviceEntry);
-								}
-								
-								ServiceList serviceListEntry = new ServiceList();
-								serviceListEntry.setServiceName(groupName);
-								serviceListEntry.setServiceDescription(description);
-								serviceListEntry.setServiceType(type);
-								serviceListEntry.setServiceTransProtocol(transportProtocol);
-								serviceListEntry.setServiceAppProtocol("null");
-								serviceListEntry.setServicePorts(ports);
-								dbConnection.save(serviceListEntry);
-								
-								List<Object> protocolResult = dbConnection.getDataById(ProtocolList.class, "protocolName", transportProtocol);
-								if(protocolResult == null || protocolResult.isEmpty()){
-									ProtocolList protocolEntry = new ProtocolList();
-									protocolEntry.setProtocolName(transportProtocol);
-									protocolEntry.setDescription(transportProtocol);
-									dbConnection.save(protocolEntry);
-								}
-								
-								List<Object> portResult = dbConnection.getDataById(PortList.class, "portName", ports);
-								if(portResult == null || portResult.isEmpty()){
-									PortList portEntry = new PortList();
-									portEntry.setPortName(ports);
-									portEntry.setDescription(ports);
-									dbConnection.save(portEntry);
-								}
-							}
-						}
-					}
-
-					if (path.contains("addressGroups")) {
-						/*
-						 * Inserting addressGroup data into the ADDRESSGROUP table
-						 */
-						for(int ai=0; ai < addressGroup.size() ; ai++) {
-
-							/*
-							 * Populate ArrayLists with values from the JSON
-							 */
-							//create the JSON object from the JSON Array for each iteration through the for loop
-							JsonObject addressGroupObj = addressGroup.getJsonObject(ai);
-
-							//create JSON array for members
-							JsonArray membersArray = addressGroupObj.getJsonArray("members");
-							String addressGroupName = addressGroupObj.get("name").toString().replace('"', '\'');
-
-							String description = null;
-							if (addressGroupObj.containsKey("description")){
-								description = addressGroupObj.get("description").toString().replace('"', '\'');
-							}
-
-							String prefixIP = null;
-							String type = null;
-							for (int membersIndex=0; membersIndex < membersArray.size(); membersIndex++) {
-								JsonObject membersObj = membersArray.getJsonObject(membersIndex);
-								type = membersObj.get("type").toString().replace("\"", "");
-
-								String value = null;
-								if(type.equals("REFERENCE")||type.equals("GROUP")||type.equals("SERVICE")){
-									value = membersObj.get("name").toString();
-								} else if (type.equalsIgnoreCase("ANY")){
-									value = null;
-								} else {
-									value = membersObj.get("value").toString();
-								}
-
-								if(value != null){
-									value = value.replace("\"", "");
-								}
-
-								if (prefixIP != null) {
-									prefixIP = prefixIP.concat(",").concat(value);
-								} else {
-									prefixIP = value;
-								}
-							}
-							
-							String prefixList = "'"+prefixIP+"'";
-							Boolean isAddressGroup = type.contains("REFERENCE");
-
-							if (isAddressGroup) {	
-								List<Object> result = dbConnection.getDataById(AddressGroup.class, "name", addressGroupName);
-								if(result != null && !result.isEmpty()){
-									AddressGroup addressGroupEntry = (AddressGroup) result.get(0);
-									dbConnection.delete(addressGroupEntry);
-								}
-								AddressGroup newAddressGroup = new AddressGroup();
-								newAddressGroup.setGroupName(addressGroupName);
-								newAddressGroup.setDescription(description);
-								newAddressGroup.setServiceList(prefixList);
-								dbConnection.save(newAddressGroup);
-							} else {
-								List<Object> result = dbConnection.getDataById(PrefixList.class, "prefixListName", addressGroupName);
-								if(result != null && !result.isEmpty()){
-									PrefixList prefixListEntry = (PrefixList) result.get(0);
-									dbConnection.delete(prefixListEntry);
-								}
-								PrefixList newPrefixList = new PrefixList();
-								newPrefixList.setPrefixListName(addressGroupName);
-								newPrefixList.setDescription(description);
-								newPrefixList.setPrefixListValue(prefixList);
-								dbConnection.save(newPrefixList);
-							}
-						}						
-					}
-				}
-
-				/*
-				 * Remove duplicate values from 'lookup' dictionary tables
-				 */
-				//ProtocolList Table
-				String protoDelete = "DELETE FROM protocollist USING protocollist, protocollist p1 "
-						+ "WHERE protocollist.id > p1.id AND protocollist.protocolname = p1.protocolname;";
-				dbConnection.updateQuery(protoDelete);
-
-				//PortList Table
-				String portListDelete = "DELETE FROM portlist USING portlist, portlist p1 "
-						+ "WHERE portlist.id > p1.id AND portlist.portname = p1.portname; ";
-				dbConnection.updateQuery(portListDelete);
-
-				//PrefixList Table
-				String prefixListDelete = "DELETE FROM prefixlist USING prefixlist, prefixlist p1 "
-						+ "WHERE prefixlist.id > p1.id AND prefixlist.pl_name = p1.pl_name AND "
-						+ "prefixlist.pl_value = p1.pl_value AND prefixlist.description = p1.description; ";
-				dbConnection.updateQuery(prefixListDelete);
-
-				//GroupServiceList
-				String groupServiceDelete = "DELETE FROM groupservicelist USING groupservicelist, groupservicelist g1 "
-						+ "WHERE groupservicelist.id > g1.id AND groupservicelist.name = g1.name AND "
-						+ "groupservicelist.serviceList = g1.serviceList; ";
-				dbConnection.updateQuery(groupServiceDelete);
-			}catch (Exception e) {
-				PolicyLogger.error(MessageCodes.EXCEPTION_ERROR, e, "FirewallConfigPolicy", "Exception executing Firewall queries");
-				return false;
-			}
-			return true;
-		} else {
-			return false;
-		}
-
-	}
-
-	private JsonObject stringToJson(String jsonString) {
-		JsonObject json = null;
-		if (jsonString != null) {
-			//Read jsonBody to JsonObject
-			StringReader in = null;
-			in = new StringReader(jsonString);
-
-			JsonReader jsonReader = Json.createReader(in);
-			json = jsonReader.readObject();
-			jsonReader.close();
-		}
-		return json;
-	}
-
-	private JsonNode createPatch(String json, String oldJson) {
-		JsonNode oldJason = null;
-		JsonNode updatedJason = null;
-
-		try {
-			oldJason = JsonLoader.fromString(oldJson);
-			updatedJason = JsonLoader.fromString(json);
-		} catch (IOException e) {
-			LOGGER.error("Exception Occured"+e);
-		}
-		return JsonDiff.asJson(oldJason, updatedJason);
-	}
-
-	@Override
-	public Object getCorrectPolicyDataObject() {
-		return policyAdapter.getPolicyData();
-	}
-
-}
\ No newline at end of file