X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ONAP-PAP-REST%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fpolicy%2Fpap%2Fxacml%2Frest%2Fcomponents%2FDecisionPolicy.java;h=5e2bb58ff71c411a288d590f98c53ddfa0af5e1a;hb=a654d6f4986f9151ee58cec93388c5d006ac17e8;hp=03fbe076379f16d2a559b5f11758ad61aec15230;hpb=e957a1d9a9fa6bd0f9f8348d1e864c09cfe2cb92;p=policy%2Fengine.git diff --git a/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/components/DecisionPolicy.java b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/components/DecisionPolicy.java index 03fbe0763..5e2bb58ff 100644 --- a/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/components/DecisionPolicy.java +++ b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/components/DecisionPolicy.java @@ -2,7 +2,7 @@ * ============LICENSE_START======================================================= * ONAP-PAP-REST * ================================================================================ - * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2017-2019 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. @@ -20,6 +20,9 @@ package org.onap.policy.pap.xacml.rest.components; +import com.att.research.xacml.api.XACML3; +import com.att.research.xacml.api.pap.PAPException; +import com.att.research.xacml.std.IdentifierImpl; import java.io.ByteArrayInputStream; import java.io.File; import java.io.IOException; @@ -36,8 +39,7 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.UUID; -import javax.persistence.EntityManager; -import javax.persistence.Query; + import org.apache.commons.lang3.StringEscapeUtils; import org.onap.policy.common.logging.eelf.MessageCodes; import org.onap.policy.common.logging.eelf.PolicyLogger; @@ -51,7 +53,6 @@ import org.onap.policy.controlloop.policy.guard.Guard; import org.onap.policy.controlloop.policy.guard.GuardPolicy; import org.onap.policy.controlloop.policy.guard.MatchParameters; import org.onap.policy.controlloop.policy.guard.builder.ControlLoopGuardBuilder; -import org.onap.policy.pap.xacml.rest.XACMLPapServlet; import org.onap.policy.rest.adapter.PolicyRestAdapter; import org.onap.policy.rest.dao.CommonClassDao; import org.onap.policy.rest.jpa.DecisionSettings; @@ -60,9 +61,8 @@ import org.onap.policy.utils.PolicyUtils; import org.onap.policy.xacml.api.XACMLErrorConstants; import org.onap.policy.xacml.std.pip.engines.aaf.AAFEngine; import org.onap.policy.xacml.util.XACMLPolicyScanner; -import com.att.research.xacml.api.XACML3; -import com.att.research.xacml.api.pap.PAPException; -import com.att.research.xacml.std.IdentifierImpl; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; 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; @@ -82,6 +82,8 @@ import oasis.names.tc.xacml._3_0.core.schema.wd_17.TargetType; import oasis.names.tc.xacml._3_0.core.schema.wd_17.VariableDefinitionType; import oasis.names.tc.xacml._3_0.core.schema.wd_17.VariableReferenceType; + +@Component public class DecisionPolicy extends Policy { private static final Logger LOGGER = FlexLogger.getLogger(DecisionPolicy.class); @@ -92,6 +94,7 @@ public class DecisionPolicy extends Policy { public static final String GUARD_BL_YAML = "GUARD_BL_YAML"; public static final String GUARD_MIN_MAX = "GUARD_MIN_MAX"; public static final String RAINY_DAY = "Rainy_Day"; + public static final String MS_MODEL = "MicroService_Model"; private static final String XACML_GUARD_TEMPLATE = "Decision_GuardPolicyTemplate.xml"; private static final String XACML_BLGUARD_TEMPLATE = "Decision_GuardBLPolicyTemplate.xml"; private static final String XACML_GUARD_MIN_MAX_TEMPLATE = "Decision_GuardMinMaxPolicyTemplate.xml"; @@ -107,13 +110,18 @@ public class DecisionPolicy extends Policy { List dynamicFieldTwoRuleAlgorithms = new LinkedList<>(); List dataTypeList = new LinkedList<>(); - private CommonClassDao commonClassDao; + private static CommonClassDao commonClassDao; public DecisionPolicy() { super(); } - public DecisionPolicy(PolicyRestAdapter policyAdapter, CommonClassDao commonClassDao) { + @Autowired + public DecisionPolicy(CommonClassDao commonClassDao) { + DecisionPolicy.commonClassDao = commonClassDao; + } + + public DecisionPolicy(PolicyRestAdapter policyAdapter) { this.policyAdapter = policyAdapter; this.commonClassDao = commonClassDao; } @@ -447,19 +455,7 @@ public class DecisionPolicy extends Policy { } private DecisionSettings findDecisionSettingsBySettingId(String settingId) { - DecisionSettings decisionSetting = null; - - EntityManager em = XACMLPapServlet.getEmf().createEntityManager(); - Query getDecisionSettings = em.createNamedQuery("DecisionSettings.findAll"); - List decisionSettingsList = getDecisionSettings.getResultList(); - - for (Object id : decisionSettingsList) { - decisionSetting = (DecisionSettings) id; - if (decisionSetting.getXacmlId().equals(settingId)) { - break; - } - } - return decisionSetting; + return (DecisionSettings) commonClassDao.getEntityItem(DecisionSettings.class, "xacml_id", settingId); } private void createRule(PolicyType decisionPolicy, boolean permitRule) { @@ -702,76 +698,29 @@ public class DecisionPolicy extends Policy { // check the index for the label. for (String labelAttr : dynamicLabelRuleAlgorithms) { if (labelAttr.equals(value1Label)) { - String value1 = dynamicFieldOneRuleAlgorithms.get(index); - populateDataTypeList(value1); + String attributeId = dynamicFieldOneRuleAlgorithms.get(index); + populateDataTypeList(attributeId); // check if the row contains label again for (String labelValue : dynamicLabelRuleAlgorithms) { - if (labelValue.equals(value1)) { + if (labelValue.equals(attributeId)) { return getCompoundDecisionApply(index); } } // Getting the values from the form. String functionKey = dynamicFieldComboRuleAlgorithms.get(index); - String value2 = dynamicFieldTwoRuleAlgorithms.get(index); + String attributeValue = dynamicFieldTwoRuleAlgorithms.get(index); decisionApply.setFunctionId(getFunctionDefinitionId(functionKey)); // if two text field are rule attributes. - if ((value1.contains(RULE_VARIABLE)) && (value2.contains(RULE_VARIABLE))) { - ApplyType innerDecisionApply1 = new ApplyType(); - ApplyType innerDecisionApply2 = new ApplyType(); - AttributeDesignatorType attributeDesignator1 = new AttributeDesignatorType(); - AttributeDesignatorType attributeDesignator2 = new AttributeDesignatorType(); - // If selected function is Integer function set integer functionID - if (functionKey.toLowerCase().contains("integer")) { - innerDecisionApply1.setFunctionId(FUNTION_INTEGER_ONE_AND_ONLY); - innerDecisionApply2.setFunctionId(FUNTION_INTEGER_ONE_AND_ONLY); - attributeDesignator1.setDataType(INTEGER_DATATYPE); - attributeDesignator2.setDataType(INTEGER_DATATYPE); - } else { - // If selected function is not a Integer function set String functionID - innerDecisionApply1.setFunctionId(FUNCTION_STRING_ONE_AND_ONLY); - innerDecisionApply2.setFunctionId(FUNCTION_STRING_ONE_AND_ONLY); - attributeDesignator1.setDataType(STRING_DATATYPE); - attributeDesignator2.setDataType(STRING_DATATYPE); - } - attributeDesignator1.setCategory(CATEGORY_RESOURCE); - attributeDesignator2.setCategory(CATEGORY_RESOURCE); - // Here set actual field values - attributeDesignator1 - .setAttributeId(value1.contains("resource:") ? value1.substring(9) : value1.substring(8)); - attributeDesignator2 - .setAttributeId(value1.contains("resource:") ? value1.substring(9) : value1.substring(8)); - innerDecisionApply1.getExpression() - .add(new ObjectFactory().createAttributeDesignator(attributeDesignator1)); - innerDecisionApply2.getExpression() - .add(new ObjectFactory().createAttributeDesignator(attributeDesignator2)); - decisionApply.getExpression().add(new ObjectFactory().createApply(innerDecisionApply1)); - decisionApply.getExpression().add(new ObjectFactory().createApply(innerDecisionApply2)); + if ((attributeId.contains(RULE_VARIABLE)) && (attributeValue.contains(RULE_VARIABLE))) { + applyTwoTextFieldRuleAttribute(decisionApply, attributeId, functionKey); } else { // if either of one text field is rule attribute. - if (!value1.startsWith("S_")) { - ApplyType innerDecisionApply = new ApplyType(); - AttributeDesignatorType attributeDesignator = new AttributeDesignatorType(); - AttributeValueType decisionConditionAttributeValue = new AttributeValueType(); - - if (functionKey.toLowerCase().contains("integer")) { - innerDecisionApply.setFunctionId(FUNTION_INTEGER_ONE_AND_ONLY); - decisionConditionAttributeValue.setDataType(INTEGER_DATATYPE); - attributeDesignator.setDataType(INTEGER_DATATYPE); - } else { - innerDecisionApply.setFunctionId(FUNCTION_STRING_ONE_AND_ONLY); - decisionConditionAttributeValue.setDataType(STRING_DATATYPE); - attributeDesignator.setDataType(STRING_DATATYPE); - } - - String attributeId = null; - String attributeValue = null; - - // Find which textField has rule attribute and set it as - // attributeId and the other as attributeValue. - attributeId = value1; - attributeValue = value2; + if (!attributeId.startsWith("S_")) { + ApplyType innerDecisionApply = generateApplyTypeDataType(functionKey); + AttributeDesignatorType attributeDesignator = generateAttributeDesignatorDataType(functionKey); + AttributeValueType decisionConditionAttributeValue = generateAttributeValueTypeDataType(functionKey); if (attributeId != null) { attributeDesignator.setCategory(CATEGORY_RESOURCE); @@ -784,15 +733,15 @@ public class DecisionPolicy extends Policy { .add(new ObjectFactory().createAttributeValue(decisionConditionAttributeValue)); decisionApply.getExpression().add(new ObjectFactory().createApply(innerDecisionApply)); } else { - value1 = value1.substring(2, value1.length()); + attributeId = attributeId.substring(2, attributeId.length()); VariableReferenceType variableReferenceType = new VariableReferenceType(); - variableReferenceType.setVariableId(value1); + variableReferenceType.setVariableId(attributeId); String dataType = dataTypeList.get(index); AttributeValueType decisionConditionAttributeValue = new AttributeValueType(); decisionConditionAttributeValue.setDataType(dataType); - decisionConditionAttributeValue.getContent().add(value2); + decisionConditionAttributeValue.getContent().add(attributeValue); decisionApply.getExpression() .add(new ObjectFactory().createVariableReference(variableReferenceType)); decisionApply.getExpression() @@ -875,11 +824,68 @@ public class DecisionPolicy extends Policy { public String getFunctionDefinitionId(String key) { FunctionDefinition object = - (FunctionDefinition) commonClassDao.getDataById(FunctionDefinition.class, "shortname", key); + (FunctionDefinition) commonClassDao.getEntityItem(FunctionDefinition.class, "short_name", key); if (object != null) { return object.getXacmlid(); } return null; } + private AttributeDesignatorType generateAttributeDesignatorDataType(String functionKey) { + AttributeDesignatorType attributeDesignator = new AttributeDesignatorType(); + switch(functionKey.toLowerCase()) + { + case "integer": + attributeDesignator.setDataType(INTEGER_DATATYPE); + break; + default: + attributeDesignator.setDataType(STRING_DATATYPE); + } + return attributeDesignator; + } + + private ApplyType generateApplyTypeDataType(String functionKey) { + ApplyType applyType = new ApplyType(); + switch(functionKey.toLowerCase()) + { + case "integer": + applyType.setFunctionId(FUNTION_INTEGER_ONE_AND_ONLY); + break; + default: + applyType.setFunctionId(FUNCTION_STRING_ONE_AND_ONLY); + } + return applyType; + } + + private AttributeValueType generateAttributeValueTypeDataType(String functionKey) { + AttributeValueType applyType = new AttributeValueType(); + switch(functionKey.toLowerCase()) + { + case "integer": + applyType.setDataType(INTEGER_DATATYPE); + break; + default: + applyType.setDataType(STRING_DATATYPE); + } + return applyType; + } + + private void applyTwoTextFieldRuleAttribute(ApplyType decisionApply, String value1, String functionKey) { + decisionApply.getExpression().add(new ObjectFactory().createApply(generateApplyTypeDataType(value1, functionKey))); + decisionApply.getExpression().add(new ObjectFactory().createApply(generateApplyTypeDataType(value1, functionKey))); + } + + private ApplyType generateApplyTypeDataType(String value1, String functionKey) { + ApplyType innerApply = generateApplyTypeDataType(functionKey); + AttributeDesignatorType attributeDesignator = generateAttributeDesignatorDataType(functionKey); + + attributeDesignator.setCategory(CATEGORY_RESOURCE); + // Here set actual field values + attributeDesignator + .setAttributeId(value1.contains("resource:") ? value1.substring(9) : value1.substring(8)); + innerApply.getExpression() + .add(new ObjectFactory().createAttributeDesignator(attributeDesignator)); + return innerApply; + } + }