From d05ae63e242b63d30b23d99448e6501636001e28 Mon Sep 17 00:00:00 2001 From: rfeng Date: Wed, 14 Oct 2009 16:18:42 +0000 Subject: Remove unused policy utils and add new one git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@825176 13f79535-47bb-0310-9956-ffa450edef68 --- java/sca/modules/assembly-xml/META-INF/MANIFEST.MF | 2 - .../assembly/xml/CompositeDocumentProcessor.java | 25 -- .../sca/policy/xml/ReadDocumentTestCase.java | 3 +- .../sca/policy/util/PolicyComputationUtils.java | 370 --------------------- .../tuscany/sca/policy/util/PolicyHelper.java | 97 ++++++ .../sca/policy/util/PolicyValidationException.java | 38 --- .../sca/policy/util/PolicyValidationUtils.java | 98 ------ 7 files changed, 98 insertions(+), 535 deletions(-) delete mode 100644 java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/util/PolicyComputationUtils.java create mode 100644 java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHelper.java delete mode 100644 java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/util/PolicyValidationException.java delete mode 100644 java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/util/PolicyValidationUtils.java (limited to 'java/sca/modules') diff --git a/java/sca/modules/assembly-xml/META-INF/MANIFEST.MF b/java/sca/modules/assembly-xml/META-INF/MANIFEST.MF index f3ed6233e0..210611129b 100644 --- a/java/sca/modules/assembly-xml/META-INF/MANIFEST.MF +++ b/java/sca/modules/assembly-xml/META-INF/MANIFEST.MF @@ -63,8 +63,6 @@ Import-Package: javax.xml.namespace, org.apache.tuscany.sca.interfacedef.impl;version="2.0.0", org.apache.tuscany.sca.monitor;version="2.0.0", org.apache.tuscany.sca.policy;version="2.0.0", - org.apache.tuscany.sca.policy.impl;version="2.0.0", - org.apache.tuscany.sca.policy.util;version="2.0.0", org.w3c.dom, org.xml.sax;resolution:=optional Bundle-SymbolicName: org.apache.tuscany.sca.assembly.xml diff --git a/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeDocumentProcessor.java b/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeDocumentProcessor.java index bb3e88e8fb..c9b029a7ba 100644 --- a/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeDocumentProcessor.java +++ b/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeDocumentProcessor.java @@ -19,14 +19,11 @@ package org.apache.tuscany.sca.assembly.xml; -import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; import java.net.URI; import java.net.URL; -import java.util.Collection; -import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.stream.XMLInputFactory; import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamReader; @@ -41,8 +38,6 @@ import org.apache.tuscany.sca.contribution.processor.ValidatingXMLInputFactory; import org.apache.tuscany.sca.contribution.resolver.ModelResolver; import org.apache.tuscany.sca.core.FactoryExtensionPoint; import org.apache.tuscany.sca.monitor.Monitor; -import org.apache.tuscany.sca.policy.PolicySet; -import org.apache.tuscany.sca.policy.util.PolicyComputationUtils; /** * A composite processor. @@ -51,8 +46,6 @@ import org.apache.tuscany.sca.policy.util.PolicyComputationUtils; */ public class CompositeDocumentProcessor extends BaseAssemblyProcessor implements URLArtifactProcessor { private XMLInputFactory inputFactory; - private DocumentBuilderFactory documentBuilderFactory; - private Collection domainPolicySets = null; private Monitor monitor; /** @@ -66,7 +59,6 @@ public class CompositeDocumentProcessor extends BaseAssemblyProcessor implements Monitor monitor) { super(modelFactories, staxProcessor, monitor); this.inputFactory = modelFactories.getFactory(ValidatingXMLInputFactory.class); - this.documentBuilderFactory = modelFactories.getFactory(DocumentBuilderFactory.class); this.monitor = monitor; } @@ -103,23 +95,6 @@ public class CompositeDocumentProcessor extends BaseAssemblyProcessor implements monitor.setArtifactName(uri.toString()); } //end if - byte[] transformedArtifactContent; - try { - if ( domainPolicySets != null ) { - transformedArtifactContent = - PolicyComputationUtils.addApplicablePolicySets(scdlStream, domainPolicySets, documentBuilderFactory); - scdlStream = new ByteArrayInputStream(transformedArtifactContent); - } - } catch ( IOException e ) { - ContributionReadException ce = new ContributionReadException("Exception reading " + uri, e); - error("ContributionReadException", scdlStream, ce); - throw ce; - } catch ( Exception e ) { - ContributionReadException ce = new ContributionReadException("Exception reading " + uri, e); - error("ContributionReadException", scdlStream, ce); - //throw ce; - } - XMLStreamReader reader = inputFactory.createXMLStreamReader(scdlStream); reader.nextTag(); diff --git a/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/policy/xml/ReadDocumentTestCase.java b/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/policy/xml/ReadDocumentTestCase.java index fd11a944c7..ec19584dbd 100644 --- a/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/policy/xml/ReadDocumentTestCase.java +++ b/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/policy/xml/ReadDocumentTestCase.java @@ -54,7 +54,6 @@ import org.apache.tuscany.sca.policy.Intent; import org.apache.tuscany.sca.policy.IntentMap; import org.apache.tuscany.sca.policy.PolicySet; import org.apache.tuscany.sca.policy.Qualifier; -import org.apache.tuscany.sca.policy.impl.ImplementationTypeImpl; import org.junit.Before; import org.junit.Test; @@ -142,7 +141,7 @@ public class ReadDocumentTestCase { } else if (artifact instanceof BindingType) { BindingType bindingType = (BindingType)artifact; bindingTypesTable.put(bindingType.getType(), bindingType); - } else if (artifact instanceof ImplementationTypeImpl) { + } else if (artifact instanceof ImplementationType) { ImplementationType implType = (ImplementationType)artifact; implTypesTable.put(implType.getType(), implType); } diff --git a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/util/PolicyComputationUtils.java b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/util/PolicyComputationUtils.java deleted file mode 100644 index fe61ce707c..0000000000 --- a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/util/PolicyComputationUtils.java +++ /dev/null @@ -1,370 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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. - */ - -package org.apache.tuscany.sca.policy.util; - -import static javax.xml.XMLConstants.XMLNS_ATTRIBUTE_NS_URI; - -import java.io.InputStream; -import java.io.StringWriter; -import java.security.AccessController; -import java.security.PrivilegedActionException; -import java.security.PrivilegedExceptionAction; -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; - -import javax.xml.namespace.NamespaceContext; -import javax.xml.parsers.DocumentBuilder; -import javax.xml.parsers.DocumentBuilderFactory; -import javax.xml.transform.Result; -import javax.xml.transform.Source; -import javax.xml.transform.Transformer; -import javax.xml.transform.TransformerConfigurationException; -import javax.xml.transform.TransformerException; -import javax.xml.transform.TransformerFactory; -import javax.xml.transform.dom.DOMSource; -import javax.xml.transform.stream.StreamResult; -import javax.xml.xpath.XPathConstants; -import javax.xml.xpath.XPathExpression; -import javax.xml.xpath.XPathExpressionException; - -import org.apache.tuscany.sca.policy.ExtensionType; -import org.apache.tuscany.sca.policy.Intent; -import org.apache.tuscany.sca.policy.PolicySet; -import org.w3c.dom.Document; -import org.w3c.dom.Element; -import org.w3c.dom.Node; -import org.w3c.dom.NodeList; - -/** - * Utility methods used during computation of PolicyIntents and PolicySets sets - * - * @version $Rev$ $Date$ - */ -public class PolicyComputationUtils { - private static final String POLICYSET_PREFIX = "tp_"; - private static final String APPLICABLE_POLICYSET_ATTR_NS = "http://tuscany.apache.org/xmlns/sca/1.1"; - private static final String APPLICABLE_POLICYSET_ATTR = "applicablePolicySets"; - private static final String POLICY_SETS_ATTR = "policySets"; - private static final String APPLICABLE_POLICYSET_ATTR_PREFIX = "tuscany"; - private static final String SCA11_NS = "http://docs.oasis-open.org/ns/opencsa/sca/200903"; - - /** - * This method unconditionally adds intents from the source list to the target list. - * It is used for intermediate intent inheritance between promotion levels - * (e.g. between a composite service and a component service). It does not check - * whether there are conflicting (mutually exclusive) intents. This is because - * promotion cannot override intents. If the resulting target list has conflicting - * intents, this will be detected later during policy computation. - */ - public static void addInheritedIntents(List sourceList, List targetList) { - if (sourceList != null) { - targetList.addAll(sourceList); - } - } - - public static void addInheritedPolicySets(List sourceList, - List targetList, - boolean checkOverrides) { - // check overrides is true when policysets are to be copied from - // componentType to component level - if (checkOverrides) { - // aggregate all the provided intents present in the target - List targetProvidedIntents = new ArrayList(); - for (PolicySet policySet : targetList) { - targetProvidedIntents.addAll(policySet.getProvidedIntents()); - } - - // for every policy set in the source check if it provides one of - // the intents that is - // already provided by the policysets in the destination and do not - // copy them. - for (PolicySet policySet : sourceList) { - for (Intent sourceProvidedIntent : policySet.getProvidedIntents()) { - if (!targetProvidedIntents.contains(sourceProvidedIntent)) { - targetList.add(policySet); - } - } - } - } else { - targetList.addAll(sourceList); - } - } - - /** - * This method is used to inherit intents and policy sets between hierarchical levels - * within the same composite (e.g. between a component and its services and references). - * In this case the source intents and policy sets provide defaults which are inherited - * into the target lists only when there is no conflict. For example consider a component - * with 3 references. The component level requires intent 'propagatesTransaction'. - * Reference 1 and 2 do not specify an intent, but reference 3 requires 'suspendsTransaction'. - * In this case the 'propagatesTransaction' intent is inherited by reference 1 and 2 - * but not by reference 3. - */ - public static void addDefaultPolicies(List sourceIntents, - List sourcePolicySets, - List targetIntents, - List targetPolicySets) { - // form a list of all intents required by the target - List combinedTargetIntents = new ArrayList(); - combinedTargetIntents.addAll(findAndExpandProfileIntents(targetIntents)); - for (PolicySet targetPolicySet : targetPolicySets) { - combinedTargetIntents.addAll(findAndExpandProfileIntents(targetPolicySet.getProvidedIntents())); - } - - // inherit intents in the source list that do not conflict with intents already in the target list - for (Intent sourceIntent : findAndExpandProfileIntents(sourceIntents)) { - boolean conflict = false; - for (Intent excluded : sourceIntent.getExcludedIntents()) { - if (combinedTargetIntents.contains(excluded)) { - conflict = true; - break; - } - } - if (!conflict) { - targetIntents.add(sourceIntent); - } - } - - // inherit policy sets in the source list that do not conflict with policy sets or intents - // in the target list - for (PolicySet sourcePolicySet : sourcePolicySets) { - boolean conflict = false; - List providedIntents = findAndExpandProfileIntents(sourcePolicySet.getProvidedIntents()); - checkConflict: for (Intent intent : providedIntents) { - for (Intent excluded : intent.getExcludedIntents()) { - if (combinedTargetIntents.contains(excluded)) { - conflict = true; - break checkConflict; - } - } - } - if (!conflict) - targetPolicySets.add(sourcePolicySet); - } - - } - - public static void checkForMutuallyExclusiveIntents(List intents, - List policySets, - ExtensionType intentAttachPointType, - String id) throws PolicyValidationException { - // gather all intents (keeping track of where they come from) - Map combinedIntents = new HashMap(); - for (PolicySet policySet : policySets) { - for (Intent providedIntent : findAndExpandProfileIntents(policySet.getProvidedIntents())) { - combinedIntents.put(providedIntent, policySet); - } - } - for (Intent intent : intents) { - combinedIntents.put(intent, null); - } - - // check for conflicts - for (Intent intent : combinedIntents.keySet()) { - for (Intent excluded : intent.getExcludedIntents()) { - if (combinedIntents.keySet().contains(excluded)) { - String sIntent1, sIntent2; - if (combinedIntents.get(intent) == null) - sIntent1 = intent.getName().toString(); - else - sIntent1 = - intent.getName().toString() + " in policy set " - + combinedIntents.get(intent).getName().toString(); - if (combinedIntents.get(excluded) == null) - sIntent2 = excluded.getName().toString(); - else - sIntent2 = - excluded.getName().toString() + " in policy set " - + combinedIntents.get(excluded).getName().toString(); - throw new PolicyValidationException(intentAttachPointType.getType() + " for " - + id - + " uses mutually-exclusive intents " - + sIntent1 - + " and " - + sIntent2); - } - } - } - } - - public static void expandProfileIntents(List intents) { - List expandedIntents = null; - if (intents.size() > 0) { - expandedIntents = findAndExpandProfileIntents(intents); - intents.clear(); - intents.addAll(expandedIntents); - } - } - - public static List findAndExpandProfileIntents(List intents) { - List expandedIntents = new ArrayList(); - for (Intent intent : intents) { - if (!intent.getRequiredIntents().isEmpty()) { - List requiredIntents = intent.getRequiredIntents(); - expandedIntents.addAll(findAndExpandProfileIntents(requiredIntents)); - } else { - expandedIntents.add(intent); - } - } - return expandedIntents; - } - - private static byte[] addApplicablePolicySets(Document doc, Collection policySets) - throws XPathExpressionException, TransformerConfigurationException, TransformerException { - - for (PolicySet policySet : policySets) { - if (policySet.getAppliesTo() != null) { - addApplicablePolicySets(policySet, doc); - } - } - - StringWriter sw = new StringWriter(); - final Source domSource = new DOMSource(doc); - final Result finalResult = new StreamResult(sw); - final Transformer transformer = TransformerFactory.newInstance().newTransformer(); - // transformer.setOutputProperty("omit-xml-declaration", "yes"); - // Allow priviledged access to let transformers read property files. Requires - // PropertyPermission in security policy. - try { - AccessController.doPrivileged(new PrivilegedExceptionAction() { - public Object run() throws TransformerException { - transformer.transform(domSource, finalResult); - return null; - } - }); - } catch (PrivilegedActionException e) { - throw (TransformerException)e.getException(); - } - - return sw.toString().getBytes(); - } - - private static void addApplicablePolicySets(PolicySet policySet, Document doc) throws XPathExpressionException { - XPathExpression expression = policySet.getAppliesToXPathExpression(); - NodeList result = (NodeList)expression.evaluate(doc, XPathConstants.NODESET); - - if (result != null) { - for (int counter = 0; counter < result.getLength(); ++counter) { - Node aResultNode = result.item(counter); - - String applicablePolicySets = null; - - String policySetPrefix = declareNamespace((Element)aResultNode, policySet.getName().getNamespaceURI()); - String appPolicyAttrPrefix = declareNamespace((Element)aResultNode, APPLICABLE_POLICYSET_ATTR_NS); - if (aResultNode.getAttributes().getNamedItemNS(APPLICABLE_POLICYSET_ATTR_NS, APPLICABLE_POLICYSET_ATTR) != null) { - applicablePolicySets = - aResultNode.getAttributes().getNamedItemNS(APPLICABLE_POLICYSET_ATTR_NS, - APPLICABLE_POLICYSET_ATTR).getNodeValue(); - } - - if (applicablePolicySets != null && applicablePolicySets.length() > 0) { - applicablePolicySets = - applicablePolicySets + " " + policySetPrefix + ":" + policySet.getName().getLocalPart(); - } else { - applicablePolicySets = policySetPrefix + ":" + policySet.getName().getLocalPart(); - } - - ((Element)aResultNode).setAttributeNS(APPLICABLE_POLICYSET_ATTR_NS, appPolicyAttrPrefix + ":" - + APPLICABLE_POLICYSET_ATTR, applicablePolicySets); - } - } - } - - public static byte[] addApplicablePolicySets(InputStream is, - Collection domainPolicySets, - DocumentBuilderFactory documentBuilderFactory) throws Exception { - documentBuilderFactory.setNamespaceAware(true); - DocumentBuilder db = documentBuilderFactory.newDocumentBuilder(); - Document doc = db.parse(is); - is.close(); - return addApplicablePolicySets(doc, domainPolicySets); - } - - private static class DOMNamespaceContext implements NamespaceContext { - private Node node; - - /** - * @param node - */ - public DOMNamespaceContext(Node node) { - super(); - this.node = node; - } - - public String getNamespaceURI(String prefix) { - return node.lookupNamespaceURI(prefix); - } - - public String getPrefix(String namespaceURI) { - return node.lookupPrefix(namespaceURI); - } - - public Iterator getPrefixes(String namespaceURI) { - return null; - } - - } - - private static String declareNamespace(Element element, String ns) { - if (ns == null) { - ns = ""; - } - Node node = element; - String prefix = ""; - boolean declared = false; - while (node != null && node.getNodeType() == Node.ELEMENT_NODE) { - if (node.lookupPrefix(ns) != null) { - prefix = node.lookupPrefix(ns); - declared = true; - break; - } else { - /*NamedNodeMap attrs = node.getAttributes(); - if (attrs == null) { - break; - } - Node attr = attrs.getNamedItem(qname); - if (attr != null) { - declared = ns.equals(attr.getNodeValue()); - break; - }*/ - node = node.getParentNode(); - } - } - if (!declared) { - // Find an available prefix - for (int i = 1;; i++) { - prefix = POLICYSET_PREFIX + i; - if (element.lookupNamespaceURI(prefix) == null) { - break; - } - } - String qname = "xmlns:" + prefix; - org.w3c.dom.Attr attr = element.getOwnerDocument().createAttributeNS(XMLNS_ATTRIBUTE_NS_URI, qname); - attr.setValue(ns); - element.setAttributeNodeNS(attr); - } - return prefix; - } - -} diff --git a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHelper.java b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHelper.java new file mode 100644 index 0000000000..f87938a5cb --- /dev/null +++ b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHelper.java @@ -0,0 +1,97 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you 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. + */ + +package org.apache.tuscany.sca.policy.util; + +import java.util.ArrayList; +import java.util.Collection; + +import javax.xml.namespace.QName; + +import org.apache.tuscany.sca.definitions.Definitions; +import org.apache.tuscany.sca.policy.Intent; +import org.apache.tuscany.sca.policy.PolicyExpression; +import org.apache.tuscany.sca.policy.PolicySet; +import org.apache.tuscany.sca.policy.PolicySubject; + +/** + * A utility that helps to navigate the policy model + */ +public class PolicyHelper { + public PolicySet getPolicySet(PolicySubject subject, QName policySetName) { + for (PolicySet ps : subject.getPolicySets()) { + if (ps.getName().equals(policySetName)) { + return ps; + } + } + return null; + } + + public Intent getIntent(Definitions subject, QName intentName) { + for (Intent i : subject.getIntents()) { + if (i.getName().equals(intentName)) { + return i; + } + } + return null; + } + + public PolicySet getPolicySet(Definitions subject, QName policySetName) { + for (PolicySet ps : subject.getPolicySets()) { + if (ps.getName().equals(policySetName)) { + return ps; + } + } + return null; + } + + public Intent getIntent(PolicySubject subject, QName intentName) { + for (Intent i : subject.getRequiredIntents()) { + if (i.getName().equals(intentName)) { + return i; + } + } + return null; + } + + public Collection getPolicyExpressions(PolicySubject subject, QName policyName) { + Collection policies = new ArrayList(); + for (PolicySet ps : subject.getPolicySets()) { + for (PolicyExpression exp : ps.getPolicies()) { + if (exp.getName().equals(policyName)) { + policies.add(exp); + } + } + } + return policies; + } + + public Collection getPolicies(PolicySubject subject, QName policyName) { + Collection policies = new ArrayList(); + for (PolicySet ps : subject.getPolicySets()) { + for (PolicyExpression exp : ps.getPolicies()) { + if (exp.getName().equals(policyName)) { + policies.add(exp.getPolicy()); + } + } + } + return policies; + } + +} diff --git a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/util/PolicyValidationException.java b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/util/PolicyValidationException.java deleted file mode 100644 index 3ed4eac5a2..0000000000 --- a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/util/PolicyValidationException.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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. - */ - -package org.apache.tuscany.sca.policy.util; - -/** - * Exception to be throw for invalid policy intents / policysets - * - * @version $Rev$ $Date$ - */ -public class PolicyValidationException extends Exception { - private static final long serialVersionUID = 506979037642587755L; - - public PolicyValidationException(String message) { - super(message); - } - - public PolicyValidationException(Throwable e) { - super(e); - } - -} diff --git a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/util/PolicyValidationUtils.java b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/util/PolicyValidationUtils.java deleted file mode 100644 index 616eab5737..0000000000 --- a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/util/PolicyValidationUtils.java +++ /dev/null @@ -1,98 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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. - */ - -package org.apache.tuscany.sca.policy.util; - -import java.util.List; - -import org.apache.tuscany.sca.policy.ExtensionType; -import org.apache.tuscany.sca.policy.Intent; -import org.apache.tuscany.sca.policy.PolicySet; -import org.apache.tuscany.sca.policy.PolicySubject; - -/** - * @version $Rev$ $Date$ - */ -public class PolicyValidationUtils { - - public static boolean isConstrained(ExtensionType constrained, ExtensionType attachPointType) { - return (attachPointType != null - && (attachPointType.equals(constrained)) || (attachPointType.getBaseType().equals(constrained))); - } - - public static void validateIntents(PolicySubject attachPoint, ExtensionType attachPointType) - throws PolicyValidationException { - boolean found = false; - if (attachPointType != null) { - // validate intents specified against the parent (binding / - // implementation) - found = false; - for (Intent intent : attachPoint.getRequiredIntents()) { - if (!intent.isUnresolved()) { - for (ExtensionType constrained : intent.getConstrainedTypes()) { - if (isConstrained(constrained, attachPointType)) { - found = true; - break; - } - } - - if (!found) { - throw new PolicyValidationException("Policy Intent '" + intent.getName() - + "' does not constrain extension type " - + attachPointType.getType()); - } - } else { - throw new PolicyValidationException("Policy Intent '" + intent.getName() - + "' is not defined in this domain "); - } - } - } - } - - public static void validatePolicySets(PolicySubject subject) throws PolicyValidationException { - // validatePolicySets(subject, subject.getType(), subject.getAttachedPolicySets()); - } - - public static void validatePolicySets(PolicySubject subject, ExtensionType attachPointType) - throws PolicyValidationException { - validatePolicySets(subject, attachPointType, subject.getPolicySets()); - } - - public static void validatePolicySets(PolicySubject subject, - ExtensionType attachPointType, - List applicablePolicySets) throws PolicyValidationException { - // Since the applicablePolicySets in a subject will already - // have the list of policysets that might ever be applicable to this attachPoint, - // just check if the defined policysets feature in the list of applicable - // policysets - for (PolicySet definedPolicySet : subject.getPolicySets()) { - if (!definedPolicySet.isUnresolved()) { - if (!applicablePolicySets.contains(definedPolicySet)) { - throw new PolicyValidationException("Policy Set '" + definedPolicySet.getName() - + "' does not apply to extension type " - + attachPointType.getType()); - } - } else { - throw new PolicyValidationException("Policy Set '" + definedPolicySet.getName() - + "' is not defined in this domain "); - - } - } - } -} -- cgit v1.2.3