[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>

3 files changed, 0 insertions, 1146 deletions

diff --git a/ECOMP-XACML/src/main/java/org/openecomp/policy/xacml/util/MetricsUtil.java b/ECOMP-XACML/src/main/java/org/openecomp/policy/xacml/util/MetricsUtil.java
deleted file mode 100644
index 45a51a191..000000000
--- a/ECOMP-XACML/src/main/java/org/openecomp/policy/xacml/util/MetricsUtil.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ECOMP-XACML
- * ================================================================================
- * 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.xacml.util;
-
-public class MetricsUtil {
-	
-	public static class AvgLatency {
-		private long cumLatency = 0;
-		private long count = 0;
-		
-		public void compute(long latency) {
-			cumLatency += latency;
-			count++;
-		}
-		
-		public long avg() {
-			if (count == 0)
-				return 0;
-			
-			return (cumLatency / count);
-		}
-		
-		public void reset() {
-			cumLatency = 0;
-			count = 0;
-		}
-	}
-
-	public static class MinLatency {
-		private long min = Long.MAX_VALUE;
-		
-		public synchronized void compute(long ts) {
-			if (ts < min)
-				min = ts;
-		}
-		
-		public long min() {
-			return min;
-		}
-		
-		public void reset() {
-			min = Long.MAX_VALUE;
-		}
-	}
-
-	public static class MaxLatency {
-		private long max = Long.MIN_VALUE;
-		
-		public synchronized void compute(long ts) {
-			if (ts > max)
-				max = ts;
-		}
-		
-		public long max() {
-			return max;
-		}
-		
-		public void reset() {
-			max = Long.MIN_VALUE;
-		}
-	}
-
-}
diff --git a/ECOMP-XACML/src/main/java/org/openecomp/policy/xacml/util/XACMLPolicyScanner.java b/ECOMP-XACML/src/main/java/org/openecomp/policy/xacml/util/XACMLPolicyScanner.java
deleted file mode 100644
index 7b91426b5..000000000
--- a/ECOMP-XACML/src/main/java/org/openecomp/policy/xacml/util/XACMLPolicyScanner.java
+++ /dev/null
@@ -1,722 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ECOMP-XACML
- * ================================================================================
- * 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.xacml.util;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.List;
-
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.Unmarshaller;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-import org.openecomp.policy.common.logging.eelf.MessageCodes;
-import org.openecomp.policy.common.logging.eelf.PolicyLogger;
-
-import com.att.research.xacml.api.AttributeAssignment;
-import com.att.research.xacml.std.IdentifierImpl;
-import com.att.research.xacml.std.StdAttribute;
-import com.att.research.xacml.std.StdAttributeAssignment;
-import com.att.research.xacml.std.StdAttributeValue;
-import com.att.research.xacml.std.StdMutableAdvice;
-import com.att.research.xacml.std.StdMutableObligation;
-import com.att.research.xacml.util.XACMLPolicyScanner.Callback;
-import com.att.research.xacml.util.XACMLPolicyScanner.CallbackResult;
-
-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.AttributeSelectorType;
-import oasis.names.tc.xacml._3_0.core.schema.wd_17.AttributeValueType;
-import oasis.names.tc.xacml._3_0.core.schema.wd_17.ConditionType;
-import oasis.names.tc.xacml._3_0.core.schema.wd_17.IdReferenceType;
-import oasis.names.tc.xacml._3_0.core.schema.wd_17.MatchType;
-import oasis.names.tc.xacml._3_0.core.schema.wd_17.ObligationExpressionType;
-import oasis.names.tc.xacml._3_0.core.schema.wd_17.ObligationExpressionsType;
-import oasis.names.tc.xacml._3_0.core.schema.wd_17.PolicySetType;
-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;
-import oasis.names.tc.xacml._3_0.core.schema.wd_17.VariableDefinitionType;
-
-/**
- * class XACMLPolicyScanner
- * 
- * This class traverses the hierarchy of a XACML 3.0 policy. You can optionally pass a Callback class
- * and override any desired methods to retrieve information from a policy. 
- * 
- *
- */
-public class XACMLPolicyScanner {
-	
-	private static final Log logger				= LogFactory.getLog(XACMLPolicyScanner.class);
-	private Object policyObject = null;
-	private Callback callback = null;
-	
-	public XACMLPolicyScanner(Path filename, Callback callback) {
-		try (InputStream is = Files.newInputStream(filename)) {
-			this.policyObject = XACMLPolicyScanner.readPolicy(is);
-		} catch (IOException e) {
-			PolicyLogger.error(MessageCodes.ERROR_DATA_ISSUE, e, "XACMLPolicyScanner", "Failed to read policy");
-		}
-		this.callback = callback;
-	}
-	
-	public XACMLPolicyScanner(InputStream filename, Callback callback) {
-		try (InputStream is = filename) {
-			this.policyObject = XACMLPolicyScanner.readPolicy(is);
-		} catch (IOException e) {
-			PolicyLogger.error(MessageCodes.ERROR_DATA_ISSUE, e, "XACMLPolicyScanner", "Failed to read policy");
-		}
-		this.callback = callback;
-	}
-	
-	public XACMLPolicyScanner(PolicySetType policySet, Callback callback) {
-		this.policyObject = policySet;
-		this.callback = callback;
-	}
-	
-	public XACMLPolicyScanner(PolicySetType policySet) {
-		this(policySet, null);
-	}
-	
-	public XACMLPolicyScanner(PolicyType policy, Callback callback) {
-		this.policyObject = policy;
-		this.callback = callback;
-	}
-	
-	public XACMLPolicyScanner(PolicyType policy) {
-		this(policy, null);
-	}
-	
-	/**
-	 * Sets the callback interface to be used.
-	 * 
-	 * @param cb
-	 */
-	public void setCallback(Callback cb) {
-		this.callback = cb;
-	}
-	
-	/**
-	 * Saves the given callback object then calls the scan() method.
-	 * 
-	 * @param cb
-	 * @return
-	 */
-	public Object scan(Callback cb) {
-		this.callback = cb;
-		return this.scan();
-	}
-	
-	/**
-	 * 
-	 * This begins the scanning of the contained object.
-	 * 
-	 * @return - The PolicySet/Policy that was scanned.
-	 */
-	public Object scan() {
-		if (this.policyObject == null) {
-			return null;
-		}
-		if (this.callback != null) {
-			if (this.callback.onBeginScan(this.policyObject) == CallbackResult.STOP) {
-				return this.policyObject;
-			}
-		}
-		if (this.policyObject instanceof PolicyType) {
-			this.scanPolicy(null, (PolicyType) this.policyObject);
-		} else if (this.policyObject instanceof PolicySetType) {
-			this.scanPolicySet(null, (PolicySetType) this.policyObject);
-		} else {
-			PolicyLogger.error(MessageCodes.ERROR_PROCESS_FLOW + "Unknown class type: " + this.policyObject.getClass().getCanonicalName());
-		}
-		if (this.callback != null) {
-			this.callback.onFinishScan(this.policyObject);
-		}
-		return this.policyObject;
-	}
-	
-	/**
-	 * This performs the scan of a PolicySet
-	 * 
-	 * @param parent - Its parent PolicySet. Can be null if this is the root.
-	 * @param policySet - The PolicySet object.
-	 * @return CallbackResult - CONTINUE to continue, STOP to terminate scanning.
-	 */
-	/**
-	 * @param parent
-	 * @param policySet
-	 * @return
-	 */
-	protected CallbackResult scanPolicySet(PolicySetType parent, PolicySetType policySet) {
-		if (logger.isTraceEnabled()) {
-			logger.trace("scanning policy set: " + policySet.getPolicySetId() + " " + policySet.getDescription());
-		}
-		if (this.callback != null) {
-			if (this.callback.onPreVisitPolicySet(parent, policySet) == CallbackResult.STOP) {
-				return CallbackResult.STOP;
-			}
-		}
-		//
-		// Scan its info
-		//
-		if (this.scanTarget(policySet, policySet.getTarget()) == CallbackResult.STOP) {
-			return CallbackResult.STOP;
-		}
-		if (this.scanObligations(policySet, policySet.getObligationExpressions()) == CallbackResult.STOP) {
-			return CallbackResult.STOP;
-		}
-		if (this.scanAdvice(policySet, policySet.getAdviceExpressions()) == CallbackResult.STOP) {
-			return CallbackResult.STOP;
-		}
-		//
-		// Iterate the policy sets and/or policies
-		//
-		List<JAXBElement<?>> list = policySet.getPolicySetOrPolicyOrPolicySetIdReference();
-		for (JAXBElement<?> element: list) {
-			if (element.getName().getLocalPart().equals("PolicySet")) {
-				if (this.scanPolicySet(policySet, (PolicySetType)element.getValue()) == CallbackResult.STOP) {
-					return CallbackResult.STOP;
-				}
-			} else if (element.getName().getLocalPart().equals("Policy")) {
-				if (this.scanPolicy(policySet, (PolicyType)element.getValue()) == CallbackResult.STOP) {
-					return CallbackResult.STOP;
-				}
-			} else if (element.getValue() instanceof IdReferenceType) {
-				if (element.getName().getLocalPart().equals("PolicySetIdReference")) {
-					
-				} else if (element.getName().getLocalPart().equals("PolicyIdReference")) {
-					
-				}
-			} else {
-				logger.warn("generating policy sets found unsupported element: " + element.getName().getNamespaceURI());
-			}
-		}
-		if (this.callback != null) {
-			if (this.callback.onPostVisitPolicySet(parent, policySet) == CallbackResult.STOP) {
-				return CallbackResult.STOP;
-			}
-		}
-		return CallbackResult.CONTINUE;
-	}
-	
-	/**
-	 * 
-	 * This performs scanning of the Policy object.
-	 * 
-	 * @param parent - The parent PolicySet of the policy. This can be null if this is a root Policy.
-	 * @param policy - The policy being scanned.
-	 * @return CallbackResult - CONTINUE to continue, STOP to terminate scanning.
-	 */
-	protected CallbackResult scanPolicy(PolicySetType parent, PolicyType policy) {
-		if (logger.isTraceEnabled()) {
-			logger.trace("scanning policy: " + policy.getPolicyId() + " " + policy.getDescription());
-		}
-		if (this.callback != null) {
-			if (this.callback.onPreVisitPolicy(parent, policy) == CallbackResult.STOP) {
-				return CallbackResult.STOP;
-			}
-		}
-		//
-		// Scan its info
-		//
-		if (this.scanTarget(policy, policy.getTarget()) == CallbackResult.STOP) {
-			return CallbackResult.STOP;
-		}
-		if (this.scanVariables(policy, policy.getCombinerParametersOrRuleCombinerParametersOrVariableDefinition()) == CallbackResult.STOP) {
-			return CallbackResult.STOP;
-		}
-		if (this.scanObligations(policy, policy.getObligationExpressions()) == CallbackResult.STOP) {
-			return CallbackResult.STOP;
-		}
-		if (this.scanAdvice(policy, policy.getAdviceExpressions()) == CallbackResult.STOP) {
-			return CallbackResult.STOP;
-		}
-		//
-		// Iterate the rules
-		//
-		List<Object> list = policy.getCombinerParametersOrRuleCombinerParametersOrVariableDefinition();
-		for (Object o: list) {
-			if (o instanceof RuleType) {
-				RuleType rule = (RuleType) o;
-				if (logger.isTraceEnabled()) {
-					logger.trace("scanning rule: " + rule.getRuleId() + " " + rule.getDescription());
-				}
-				if (this.callback != null) {
-					if (this.callback.onPreVisitRule(policy, rule) == CallbackResult.STOP) {
-						return CallbackResult.STOP;
-					}
-				}
-				if (this.scanTarget(rule, rule.getTarget()) == CallbackResult.STOP) {
-					return CallbackResult.STOP;
-				}
-				if (this.scanConditions(rule, rule.getCondition()) == CallbackResult.STOP) {
-					return CallbackResult.STOP;
-				}
-				if (this.scanObligations(rule, rule.getObligationExpressions()) == CallbackResult.STOP) {
-					return CallbackResult.STOP;
-				}
-				if (this.scanAdvice(rule, rule.getAdviceExpressions()) == CallbackResult.STOP) {
-					return CallbackResult.STOP;
-				}
-				if (this.callback != null) {
-					if (this.callback.onPostVisitRule(policy, rule) == CallbackResult.STOP) {
-						return CallbackResult.STOP;
-					}
-				}
-			} else if (o instanceof VariableDefinitionType) {
-				if (this.callback != null) {
-					if (this.callback.onVariable(policy, (VariableDefinitionType) o) == CallbackResult.STOP) {
-						return CallbackResult.STOP;
-					}
-				}
-			} else {
-				if (logger.isDebugEnabled()) {
-					logger.debug("scanning policy rules found unsupported object:" + o.toString());
-				}
-			}
-		}
-		if (this.callback != null) {
-			if (this.callback.onPostVisitPolicy(parent, policy) == CallbackResult.STOP) {
-				return CallbackResult.STOP;
-			}
-		}
-		return CallbackResult.CONTINUE;
-	}
-	
-	/**
-	 * Scans the given target for attributes. Its sole purpose is to return attributes found.
-	 * 
-	 * @param parent - The parent PolicySet/Policy/Rule for the target.
-	 * @param target - The target.
-	 * @return CallbackResult - CONTINUE to continue, STOP to terminate scanning.
-	 */
-	protected CallbackResult scanTarget(Object parent, TargetType target) {
-		if (target == null) {
-			return CallbackResult.CONTINUE;
-		}
-		List<AnyOfType> anyOfList = target.getAnyOf();
-		if (anyOfList != null) {
-			Iterator<AnyOfType> iterAnyOf = anyOfList.iterator();
-			while (iterAnyOf.hasNext()) {
-				AnyOfType anyOf = iterAnyOf.next();
-				List<AllOfType> allOfList = anyOf.getAllOf();
-				if (allOfList != null) {
-					Iterator<AllOfType> iterAllOf = allOfList.iterator();
-					while (iterAllOf.hasNext()) {
-						AllOfType allOf = iterAllOf.next();
-						List<MatchType> matchList = allOf.getMatch();
-						if (matchList != null) {
-							Iterator<MatchType> iterMatch = matchList.iterator();
-							while (iterMatch.hasNext()) {
-								MatchType match = iterMatch.next();
-								//
-								// Finally down to the actual attribute
-								//
-								StdAttribute attribute = null;
-								AttributeValueType value = match.getAttributeValue();
-								if (match.getAttributeDesignator() != null && value != null) {
-									AttributeDesignatorType designator = match.getAttributeDesignator();
-									//
-									// The content may be tricky
-									//
-									attribute = new StdAttribute(new IdentifierImpl(designator.getCategory()),
-																			new IdentifierImpl(designator.getAttributeId()),
-																			new StdAttributeValue<List<?>>(new IdentifierImpl(value.getDataType()), value.getContent()),
-																			designator.getIssuer(),
-																			false);
-								} else if (match.getAttributeSelector() != null && value != null) {
-									AttributeSelectorType selector = match.getAttributeSelector();
-									attribute = new StdAttribute(new IdentifierImpl(selector.getCategory()),
-																			new IdentifierImpl(selector.getContextSelectorId()),
-																			new StdAttributeValue<List<?>>(new IdentifierImpl(value.getDataType()), value.getContent()),
-																			null,
-																			false);
-								} else {
-									logger.warn("NULL designator/selector or value for match.");
-								}
-								if (attribute != null && this.callback != null) {
-									if (this.callback.onAttribute(parent, target, attribute) == CallbackResult.STOP) {
-										return CallbackResult.STOP;
-									}
-								}
-							}
-						}
-					}
-				}
-			}
-		}
-		return CallbackResult.CONTINUE;
-	}
-	
-	/**
-	 * Scan the list of obligations.
-	 * 
-	 * @param parent - The parent PolicySet/Policy/Rule for the obligation.
-	 * @param obligationExpressionsType - All the obligation expressions.
-	 * @return CallbackResult - CONTINUE to continue, STOP to terminate scanning.
-	 */
-	protected CallbackResult scanObligations(Object parent, ObligationExpressionsType obligationExpressionsType) {
-		if (obligationExpressionsType == null) {
-			return CallbackResult.CONTINUE;
-		}
-		List<ObligationExpressionType> expressions = obligationExpressionsType.getObligationExpression();
-		if (expressions == null || expressions.size() == 0) {
-			return CallbackResult.CONTINUE;
-		}
-		for (ObligationExpressionType expression : expressions) {
-			StdMutableObligation ob = new StdMutableObligation(new IdentifierImpl(expression.getObligationId()));
-			List<AttributeAssignmentExpressionType> assignments = expression.getAttributeAssignmentExpression();
-			if (assignments != null) {
-				for (AttributeAssignmentExpressionType assignment : assignments) {
-					// category is optional and may be null
-					IdentifierImpl categoryId = null;
-					if (assignment.getCategory() != null) {
-						categoryId = new IdentifierImpl(assignment.getCategory());
-					}
-					AttributeAssignment attribute = new StdAttributeAssignment(
-												categoryId,
-												new IdentifierImpl(assignment.getAttributeId()),
-												assignment.getIssuer(),
-												new StdAttributeValue<Object>(null, null)
-												);
-					ob.addAttributeAssignment(attribute);
-				}
-			}
-			if (this.callback != null) {
-				if (this.callback.onObligation(parent, expression, ob) == CallbackResult.STOP) {
-					return CallbackResult.STOP;
-				}
-			}
-		}
-		return CallbackResult.CONTINUE;
-	}
-
-	/**
-	 * 
-	 * Scans the list of advice expressions returning each individually.
-	 * 
-	 * @param parent - The parent PolicySet/Policy/Rule for the advice.
-	 * @param adviceExpressionstype - The list of advice expressions.
-	 * @return CallbackResult - CONTINUE to continue, STOP to terminate scanning.
-	 */
-	protected CallbackResult scanAdvice(Object parent, AdviceExpressionsType adviceExpressionstype) {
-		if (adviceExpressionstype == null) {
-			return CallbackResult.CONTINUE;
-		}
-		List<AdviceExpressionType> expressions = adviceExpressionstype.getAdviceExpression();
-		if (expressions == null || expressions.size() == 0) {
-			return CallbackResult.CONTINUE;
-		}
-		for (AdviceExpressionType expression : expressions) {
-			StdMutableAdvice ob = new StdMutableAdvice(new IdentifierImpl(expression.getAdviceId()));
-			List<AttributeAssignmentExpressionType> assignments = expression.getAttributeAssignmentExpression();
-			if (assignments != null) {
-				for (AttributeAssignmentExpressionType assignment : assignments) {
-					IdentifierImpl categoryId = null;
-					if (assignment.getCategory() != null) {
-						categoryId = new IdentifierImpl(assignment.getCategory());
-					}
-					AttributeAssignment attribute = new StdAttributeAssignment(
-												categoryId,
-												new IdentifierImpl(assignment.getAttributeId()),
-												assignment.getIssuer(),
-												new StdAttributeValue<Object>(null, null)
-												);
-					ob.addAttributeAssignment(attribute);
-				}
-			}
-			if (this.callback != null) {
-				if (this.callback.onAdvice(parent, expression, ob) == CallbackResult.STOP) {
-					return CallbackResult.STOP;
-				}
-			}
-		}
-		return CallbackResult.CONTINUE;
-	}
-	
-	/**
-	 * Scans the list of variable definitions.
-	 * 
-	 * @param policy - Policy object containing the variable definition.
-	 * @param list - List of variable definitions.
-	 * @return CallbackResult - CONTINUE to continue, STOP to terminate scanning.
-	 */
-	protected CallbackResult scanVariables(PolicyType policy, List<Object> list) {
-		if (list == null) {
-			return CallbackResult.CONTINUE;
-		}
-		for (Object o : list) {
-			if (o instanceof VariableDefinitionType) {
-				if (this.callback != null) {
-					if (this.callback.onVariable(policy, (VariableDefinitionType) o) == CallbackResult.STOP) {
-						return CallbackResult.STOP;
-					}
-				}
-			}
-		}
-		
-		return CallbackResult.CONTINUE;
-	}
-	
-	/**
-	 * Scans the list of conditions.
-	 * 
-	 * @param rule
-	 * @param condition
-	 * @return
-	 */
-	protected CallbackResult scanConditions(RuleType rule, ConditionType condition) {
-		if (condition != null) {
-			if (this.callback != null) {
-				if (this.callback.onCondition(rule, condition) == CallbackResult.STOP) {
-					return CallbackResult.STOP;
-				}
-			}
-		}
-		return CallbackResult.CONTINUE;
-	}
-	
-	/**
-	 * Reads the XACML XML policy file in and returns the version contained in the root Policy/PolicySet element.
-	 * 
-	 * @param policy - The policy file.
-	 * @return - The version string from the file (uninterpreted)
-	 * @throws IOException 
-	 */
-	public static String	getVersion(Path policy) throws IOException {
-		Object data = null;
-		try (InputStream is = Files.newInputStream(policy)) {
-			data = XACMLPolicyScanner.readPolicy(is);
-		} catch (IOException e) {
-			PolicyLogger.error(MessageCodes.ERROR_DATA_ISSUE, e, "XACMLPolicyScanner", "Failed to read policy");
-			throw e;
-		}
-		if (data == null) {
-			logger.warn("Version is null.");
-			return null;
-		}
-		return getVersion(data);
-	}
-		
-	/**
-	 * Reads the Policy/PolicySet element object and returns its current version.
-	 * 
-	 * @param data - Either a PolicySet or Policy XACML type object.
-	 * @return - The integer version value. -1 if it doesn't exist or was un-parsable.
-	 */
-	public static String	getVersion(Object data) {
-		String version = null;
-		try {
-			if (data instanceof PolicySetType) {
-				version = ((PolicySetType)data).getVersion();
-			} else if (data instanceof PolicyType) {
-				version = ((PolicyType)data).getVersion();
-			} else {
-				if (data != null) {
-					PolicyLogger.error(MessageCodes.ERROR_DATA_ISSUE + "Expecting a PolicySet/Policy/Rule object. Got: " + data.getClass().getCanonicalName());
-				}
-				return null;
-			}
-			if (version != null && version.length() > 0) {
-				return version;
-			} else {
-				logger.warn("No version set in policy");
-			}
-		} catch (NumberFormatException e) {
-			PolicyLogger.error(MessageCodes.ERROR_DATA_ISSUE, e, "XACMLPolicyScanner", "Invalid version contained in policy: " + version);
-			return null;
-		}
-		return null;
-	}
-	
-	/**
-	 * Returns the Policy or PolicySet ID.
-	 * 
-	 * @param data - A XACML 3.0 Policy or PolicySet element object.
-	 * @return The policy/policyset's policy ID
-	 */
-	public static String getID(Object data) {
-		if (data instanceof PolicySetType) {
-			return ((PolicySetType)data).getPolicySetId();
-		} else if (data instanceof PolicyType) {
-			return ((PolicyType)data).getPolicyId();
-		} else {
-			PolicyLogger.error(MessageCodes.ERROR_DATA_ISSUE + "Expecting a PolicySet/Policy/Rule object. Got: " + data.getClass().getCanonicalName());
-			return null;
-		}
-	}
-	
-	public static List<String> getCreatedByModifiedBy(Path policyPath) throws IOException{
-		String createdBy = "";
-		String modifiedBy= "";
-		String cValue = "@CreatedBy:";
-		String mValue = "@ModifiedBy:";
-		for(String line: Files.readAllLines(policyPath)){
-			line = line.replaceAll("\\s+", "");
-			if(line.isEmpty()){
-				continue;
-			}
-			if(line.contains("<Description>") && line.contains(cValue) && line.contains(mValue)){
-				createdBy = line.substring(line.indexOf(cValue) + cValue.length(), line.lastIndexOf(cValue));
-				modifiedBy = line.substring(line.indexOf(mValue) + mValue.length(), line.lastIndexOf(mValue));
-				break;
-			}
-		}
-		return Arrays.asList(createdBy, modifiedBy);
-	}
-	
-	//get the Created Name of the User on reading the Xml file
-	public static String getCreatedBy(Path policyPath) throws IOException{
-		String userId = "";
-		String value = "@CreatedBy:";
-		for(String line: Files.readAllLines(policyPath)){
-			line = line.replaceAll("\\s+", "");
-			if(line.isEmpty()){
-				continue;
-			}
-			if(line.contains("<Description>") && line.contains(value)){
-				userId = line.substring(line.indexOf(value) + value.length(), line.lastIndexOf(value));
-				break;
-			}
-		}
-		return userId;
-	}
-	
-	//get the Modified Name of the User on reading the Xml file
-	public static String getModifiedBy(Path policyPath) throws IOException{
-		String modifiedBy = "";
-		String value = "@ModifiedBy:";
-		for(String line: Files.readAllLines(policyPath)){
-			line = line.replaceAll("\\s+", "");
-			if(line.isEmpty()){
-				continue;
-			}
-			if(line.contains("<Description>") && line.contains(value)){
-				modifiedBy = line.substring(line.indexOf(value) + value.length(), line.lastIndexOf(value));
-				break;
-			}
-		}
-		return modifiedBy;
-	}
-
-	/**
-	 * readPolicy - does the work to read in policy data from a file.
-	 * 
-	 * @param policy - The path to the policy file.
-	 * @return - The policy data object. This *should* be either a PolicySet or a Policy.
-	 */
-	public static Object readPolicy(InputStream is) {
-		try {
-			//
-			// Create a DOM parser
-			//
-			DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
-		    dbf.setNamespaceAware(true);
-		    DocumentBuilder db = dbf.newDocumentBuilder();
-		    //
-		    // Parse the policy file
-		    //
-		    Document doc = db.parse(is);
-		    //
-		    // Because there is no root defined in xacml,
-		    // find the first element
-		    //
-			NodeList nodes = doc.getChildNodes();
-			Node node = nodes.item(0);
-			Element e = null;
-			if (node.getNodeType() == Node.ELEMENT_NODE) {
-				e = (Element) node;
-				//
-				// Is it a 3.0 policy?
-				//
-				if (e.getNamespaceURI().equals("urn:oasis:names:tc:xacml:3.0:core:schema:wd-17")) {
-					//
-					// A policyset or policy could be the root
-					//
-					if (e.getNodeName().endsWith("Policy")) {
-						//
-						// Now we can create the context for the policy set
-						// and unmarshall the policy into a class.
-						//
-						JAXBContext context = JAXBContext.newInstance(PolicyType.class);
-						Unmarshaller um = context.createUnmarshaller();
-						JAXBElement<PolicyType> root = um.unmarshal(e, PolicyType.class);
-						//
-						// Here is our policy set class
-						//
-						return root.getValue();
-					} else if (e.getNodeName().endsWith("PolicySet")) {
-						//
-						// Now we can create the context for the policy set
-						// and unmarshall the policy into a class.
-						//
-						JAXBContext context = JAXBContext.newInstance(PolicySetType.class);
-						Unmarshaller um = context.createUnmarshaller();
-						JAXBElement<PolicySetType> root = um.unmarshal(e, PolicySetType.class);
-						//
-						// Here is our policy set class
-						//
-						return root.getValue();
-					} else {
-						if (logger.isDebugEnabled()) {
-							logger.debug("Not supported yet: " + e.getNodeName());
-						}
-					}
-				} else {
-					logger.warn("unsupported namespace: " + e.getNamespaceURI());
-				}
-			} else {
-				if (logger.isDebugEnabled()) {
-					logger.debug("No root element contained in policy " + 
-								" Name: " + node.getNodeName() + " type: " + node.getNodeType() + 
-								" Value: " + node.getNodeValue());
-				}
-			}
-		} catch (Exception e) {
-			PolicyLogger.error(MessageCodes.ERROR_SCHEMA_INVALID, e, "XACMLPolicyScanner", "Exception in readPolicy");
-		}
-		return null;
-	}
-
-	/**
-	 * @return the policyObject
-	 */
-	public Object getPolicyObject() {
-		return policyObject;
-	}
-}
diff --git a/ECOMP-XACML/src/main/java/org/openecomp/policy/xacml/util/XACMLPolicyWriter.java b/ECOMP-XACML/src/main/java/org/openecomp/policy/xacml/util/XACMLPolicyWriter.java
deleted file mode 100644
index 3706bda3f..000000000
--- a/ECOMP-XACML/src/main/java/org/openecomp/policy/xacml/util/XACMLPolicyWriter.java
+++ /dev/null
@@ -1,344 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ECOMP-XACML
- * ================================================================================
- * 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.xacml.util;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.Iterator;
-import java.util.List;
-
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Marshaller;
-import javax.xml.bind.Unmarshaller;
-
-import org.openecomp.policy.common.logging.eelf.MessageCodes;
-import org.openecomp.policy.common.logging.eelf.PolicyLogger;
-
-
-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.AttributeValueType;
-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.ObligationExpressionType;
-import oasis.names.tc.xacml._3_0.core.schema.wd_17.ObligationExpressionsType;
-import oasis.names.tc.xacml._3_0.core.schema.wd_17.PolicySetType;
-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;
-
-/**
- * Helper static class for policy writing.
- * 
- *
- */
-public class XACMLPolicyWriter {
-
-	/**
-	 * Helper static class that does the work to write a policy set to a file on disk.
-	 * 
-	 *
-	 */
-	public static Path writePolicyFile(Path filename, PolicySetType policySet) {
-		JAXBElement<PolicySetType> policySetElement = new ObjectFactory().createPolicySet(policySet);		
-		try {
-			JAXBContext context = JAXBContext.newInstance(PolicySetType.class);
-			Marshaller m = context.createMarshaller();
-			m.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, Boolean.TRUE);
-			m.marshal(policySetElement, filename.toFile());
-
-			if (Files.exists(filename)) {
-				return filename;
-			} else {
-				PolicyLogger.error(MessageCodes.ERROR_DATA_ISSUE + "File does not exist after marshalling.");
-				return null;
-			}
-
-		} catch (JAXBException e) {
-			PolicyLogger.error(MessageCodes.ERROR_DATA_ISSUE, e, "XACMLPolicyWriter", "writePolicyFile failed");
-			return null;
-		}
-	}
-
-	/**
-	 * Helper static class that does the work to write a policy set to an output stream.
-	 * 
-	 *
-	 */
-	public static void writePolicyFile(OutputStream os, PolicySetType policySet) {
-		JAXBElement<PolicySetType> policySetElement = new ObjectFactory().createPolicySet(policySet);
-		try {
-			JAXBContext context = JAXBContext.newInstance(PolicySetType.class);
-			Marshaller m = context.createMarshaller();
-			m.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, Boolean.TRUE);
-			m.marshal(policySetElement, os);
-		} catch (JAXBException e) {
-			PolicyLogger.error(MessageCodes.ERROR_DATA_ISSUE, e, "XACMLPolicyWriter", "writePolicyFile failed");
-		}
-	}
-
-	/**
-	 * Helper static class that does the work to write a policy to a file on disk.
-	 * 
-	 *
-	 */
-	public static Path writePolicyFile(Path filename, PolicyType policy) {
-		JAXBElement<PolicyType> policyElement = new ObjectFactory().createPolicy(policy);		
-		try {
-			JAXBContext context = JAXBContext.newInstance(PolicyType.class);
-			Marshaller m = context.createMarshaller();
-			m.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, Boolean.TRUE);
-			m.marshal(policyElement, filename.toFile());
-
-			if (Files.exists(filename)) {
-				return filename;
-			} else {
-				PolicyLogger.error(MessageCodes.ERROR_DATA_ISSUE + "File does not exist after marshalling.");
-				return null;
-			}
-
-		} catch (JAXBException e) {
-			PolicyLogger.error(MessageCodes.ERROR_DATA_ISSUE, e, "XACMLPolicyWriter", "writePolicyFile failed");
-			return null;
-		}		
-	}
-
-
-	/**
-	 * Helper static class that does the work to write a policy to a file on disk.
-	 * 
-	 *
-	 */
-	public static InputStream getXmlAsInputStream(PolicyType policy) {
-		JAXBElement<PolicyType> policyElement = new ObjectFactory().createPolicy(policy);		
-		try {
-			ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();			
-			JAXBContext context = JAXBContext.newInstance(PolicyType.class);
-			Marshaller m = context.createMarshaller();
-			m.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, Boolean.TRUE);
-			m.marshal(policyElement, byteArrayOutputStream);
-			ByteArrayInputStream byteArrayInputStream = new ByteArrayInputStream(byteArrayOutputStream.toByteArray());
-
-			return byteArrayInputStream;
-
-		} catch (JAXBException e) {
-			PolicyLogger.error(MessageCodes.ERROR_DATA_ISSUE, e, "XACMLPolicyWriter", "writePolicyFile failed");
-			return null;
-		}		
-	}
-	/**
-	 * Helper static class that does the work to write a policy set to an output stream.
-	 * 
-	 *
-	 */
-	public static void writePolicyFile(OutputStream os, PolicyType policy) {
-		JAXBElement<PolicyType> policySetElement = new ObjectFactory().createPolicy(policy);		
-		try {
-			JAXBContext context = JAXBContext.newInstance(PolicyType.class);
-			Marshaller m = context.createMarshaller();
-			m.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, Boolean.TRUE);
-			m.marshal(policySetElement, os);
-		} catch (JAXBException e) {
-			PolicyLogger.error(MessageCodes.ERROR_DATA_ISSUE, e, "XACMLPolicyWriter", "writePolicyFile failed");
-		}
-	}
-	
-	@SuppressWarnings({ "unchecked", "rawtypes" })
-	public static String changeFileNameInXmlWhenRenamePolicy(Path filename) {
-
-		PolicyType policyType = null;
-		String extension = "";
-		String domain = null;
-		String repository = "repository";
-		if(filename.toString().contains("Config_")){
-			domain = filename.toString().substring(filename.toString().indexOf(repository) + (repository.toString().length()+1), filename.toString().indexOf("Config_"));		
-		}else if(filename.toString().contains("Action_")){
-			domain = filename.toString().substring(filename.toString().indexOf(repository) + (repository.toString().length()+1), filename.toString().indexOf("Action_"));
-		}else if(filename.toString().contains("Decision_")){
-			domain = filename.toString().substring(filename.toString().indexOf(repository) + (repository.toString().length()+1), filename.toString().indexOf("Decision_"));
-		}
-		if(domain.contains(File.separator)){
-			domain =	domain.replace(File.separator, ".");
-		}
-		try {
-			JAXBContext context = JAXBContext.newInstance(PolicyType.class);
-			Unmarshaller m = context.createUnmarshaller();
-			JAXBElement<PolicyType> policyElement = (JAXBElement<PolicyType>) m.unmarshal(filename.toFile());
-			policyType = policyElement.getValue();
-			if (policyType != null) {
-				TargetType targetType = policyType.getTarget();
-				List<AnyOfType> anyOfTypes = targetType.getAnyOf();
-				for( Iterator anyOfIte = anyOfTypes.iterator(); anyOfIte.hasNext(); ){
-					AnyOfType anyOfType = (AnyOfType) anyOfIte.next();
-					List<AllOfType> allOf = anyOfType.getAllOf();
-					for( Iterator allOfIte = allOf.iterator(); allOfIte.hasNext(); ){
-						AllOfType allOfType = (AllOfType) allOfIte.next();
-						List<MatchType> match = allOfType.getMatch();						
-						for( Iterator matchIte = match.iterator(); matchIte.hasNext();) {							
-							MatchType  matchType = (MatchType) matchIte.next();
-							if(matchType.getAttributeDesignator().getAttributeId().equals("PolicyName")){
-								AttributeValueType attributeValueType = matchType.getAttributeValue();
-								List<Object> contents = attributeValueType.getContent();
-								if (contents != null && contents.size() > 0) {
-									String value = (String) contents.get(0);
-									String version = value;
-									version = version.substring(0, version.lastIndexOf("."));
-									version = version.substring(version.lastIndexOf("."));
-									if(filename.toString().contains("Config_")){
-										value = value.substring(0, value.indexOf("Config_"));
-									}else{
-										value = value.substring(0, value.indexOf("Decision_"));
-									}
-									String tmp = filename.getFileName()+"";
-									String newName = tmp.substring(0, tmp.lastIndexOf("."));
-									attributeValueType.getContent().clear();
-									attributeValueType.getContent().add(domain + newName  + "." + "xml");
-								}	
-							}
-						}
-					}
-				}
-				if(filename.toString().contains("Config_") || filename.toString().contains("Action_")){	
-					List<Object> objects = policyType.getCombinerParametersOrRuleCombinerParametersOrVariableDefinition();
-					if (objects != null && objects.size() > 0) {
-						for (Iterator ite = objects.iterator(); ite.hasNext();) {
-
-							RuleType  ruleType = (RuleType ) ite.next();
-							AdviceExpressionsType adviceExpressionsType = ruleType.getAdviceExpressions();
-							if (adviceExpressionsType != null) {
-								List<AdviceExpressionType> adviceExpressionTypes = adviceExpressionsType.getAdviceExpression();
-								if (adviceExpressionTypes != null && adviceExpressionTypes.size() > 0) {
-									for (Iterator iterator = adviceExpressionTypes
-											.iterator(); iterator.hasNext();) {
-										AdviceExpressionType adviceExpressionType = (AdviceExpressionType) iterator
-												.next();
-										if (adviceExpressionType.getAdviceId() != null && !adviceExpressionType.getAdviceId().equals("") && (adviceExpressionType.getAdviceId().equals("configID")
-												|| adviceExpressionType.getAdviceId().equals("faultID") || adviceExpressionType.getAdviceId().equals("PMID")||adviceExpressionType.getAdviceId().equals("firewallConfigID") 
-												|| adviceExpressionType.getAdviceId().equals("MSID")) || adviceExpressionType.getAdviceId().equals("GocID")||adviceExpressionType.getAdviceId().equals("GocHPID")||adviceExpressionType.getAdviceId().equals("BRMSRAWID")
-												||adviceExpressionType.getAdviceId().equals("BRMSPARAMID")|| adviceExpressionType.getAdviceId().equals("HPSuppID") || adviceExpressionType.getAdviceId().equals("HPFlapID") || adviceExpressionType.getAdviceId().equals("HPOverID"))
-										{
-											List<AttributeAssignmentExpressionType> attributeAssignmentExpressionTypes = adviceExpressionType.getAttributeAssignmentExpression();
-											if (attributeAssignmentExpressionTypes != null && attributeAssignmentExpressionTypes.size() > 0) {
-												for (Iterator iterator2 = attributeAssignmentExpressionTypes
-														.iterator(); iterator2.hasNext();) {
-													AttributeAssignmentExpressionType attributeAssignmentExpressionType = (AttributeAssignmentExpressionType) iterator2
-															.next();
-													if (attributeAssignmentExpressionType.getAttributeId().equals("URLID")) {
-														JAXBElement<AttributeValueType> attributeValueType = (JAXBElement<AttributeValueType>) attributeAssignmentExpressionType.getExpression();
-														AttributeValueType attributeValueType1 = attributeValueType.getValue();
-														String configUrl = "$URL";
-														String urlVal = (String) attributeValueType1.getContent().get(0);   
-														String origExtension = urlVal.substring(urlVal.lastIndexOf('.')+1).trim();
-														extension = origExtension;
-														attributeValueType1.getContent().clear();
-														String txtFileName = filename.getFileName().toString();
-														txtFileName = txtFileName.substring(0, txtFileName.lastIndexOf(".")+1) + origExtension;
-														txtFileName = configUrl+ File.separator + "Config" + File.separator + domain + txtFileName;
-														attributeValueType1.getContent().add(txtFileName);	
-													} else if (attributeAssignmentExpressionType.getAttributeId().equals("PolicyName")) {
-														JAXBElement<AttributeValueType> attributeValueType = (JAXBElement<AttributeValueType>) attributeAssignmentExpressionType.getExpression();
-														AttributeValueType attributeValueType1 = attributeValueType.getValue();
-														List<Object> contents = attributeValueType1.getContent();
-														if (contents != null && contents.size() > 0) {
-															String value = (String) contents.get(0);
-															String version = value;
-															version = version.substring(0, version.lastIndexOf("."));
-															version = version.substring(version.lastIndexOf("."));
-															value = value.substring(0, value.indexOf("Config_"));
-															String tmp = filename.getFileName()+"";
-															String newName = tmp.substring(0, tmp.lastIndexOf("."));
-															attributeValueType1.getContent().clear();
-															attributeValueType1.getContent().add(domain + newName + "." + "xml");
-														}										
-
-													}
-
-												}
-											}
-										}
-									}
-								}
-							}
-						}
-						if (objects != null && objects.size() > 0) {
-							for (Iterator ite1 = objects.iterator(); ite1.hasNext();) {
-
-								RuleType  ruleType1 = (RuleType ) ite1.next();
-								ObligationExpressionsType obligationExpressionsType = ruleType1.getObligationExpressions();
-								if (obligationExpressionsType != null) {
-									List<ObligationExpressionType> obligationExpressionType = obligationExpressionsType.getObligationExpression();
-									if (obligationExpressionType != null && obligationExpressionType.size() > 0) {
-										for (Iterator iterator = obligationExpressionType
-												.iterator(); iterator.hasNext();) {
-											ObligationExpressionType obligationExpressionTypes = (ObligationExpressionType) iterator
-													.next();
-											if (obligationExpressionTypes.getObligationId() != null && !obligationExpressionTypes.getObligationId().equals("")) {
-												List<AttributeAssignmentExpressionType> attributeAssignmentExpressionTypes = obligationExpressionTypes.getAttributeAssignmentExpression();
-												if (attributeAssignmentExpressionTypes != null && attributeAssignmentExpressionTypes.size() > 0) {
-													for (Iterator iterator2 = attributeAssignmentExpressionTypes
-															.iterator(); iterator2.hasNext();) {
-														AttributeAssignmentExpressionType attributeAssignmentExpressionType = (AttributeAssignmentExpressionType) iterator2
-																.next();
-														if (attributeAssignmentExpressionType.getAttributeId().equals("body")) {
-															JAXBElement<AttributeValueType> attributeValueType = (JAXBElement<AttributeValueType>) attributeAssignmentExpressionType.getExpression();
-															AttributeValueType attributeValueType1 = attributeValueType.getValue();
-															String configUrl = "$URL";
-															String urlVal = (String) attributeValueType1.getContent().get(0);    	
-															String origExtension = urlVal.substring(urlVal.lastIndexOf('.')+1).trim();
-															extension = "json";
-															attributeValueType1.getContent().clear();
-															String txtFileName = filename.getFileName().toString();
-															txtFileName = txtFileName.substring(0, txtFileName.lastIndexOf(".")+1) + origExtension;
-															txtFileName = configUrl+ File.separator + "Action" + File.separator + domain + txtFileName;
-															attributeValueType1.getContent().add(txtFileName);	
-														} 
-
-													}
-												}
-
-											}
-
-										}
-									}
-								}
-							}
-						}
-					}
-				}
-				writePolicyFile(filename, policyType);
-			}
-		}catch (JAXBException e) {
-			PolicyLogger.error(MessageCodes.ERROR_DATA_ISSUE, e, "XACMLPolicyWriter", "writePolicyFile failed");
-		}	
-
-		return extension;
-	}
-
-}