Author: veithen
Date: Mon Jan 8 10:44:26 2018
New Revision: 1820547
URL: http://svn.apache.org/viewvc?rev=1820547&view=rev
Log:
Normalize whitespace.
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisBinding.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisBindingOperation.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisEndpoint.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisMessage.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisService.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/OutInAxisOperation.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/RobustOutOnlyAxisOperation.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisBinding.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisBinding.java?rev=1820547&r1=1820546&r2=1820547&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisBinding.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisBinding.java
Mon Jan 8 10:44:26 2018
@@ -238,7 +238,7 @@ public class AxisBinding extends AxisDes
}
WSDLSerializationUtil.addWSDLDocumentationElement(this,
bindingElement, omFactory, wsdl);
WSDLSerializationUtil.addPoliciesAsExtensibleElement(this,
- bindingElement);
+ bindingElement);
return bindingElement;
}
@@ -274,7 +274,7 @@ public class AxisBinding extends AxisDes
}
public Iterator<AxisBindingOperation> getChildren(){
- return (Iterator<AxisBindingOperation>) super.getChildren();
+ return (Iterator<AxisBindingOperation>) super.getChildren();
}
@Override
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisBindingOperation.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisBindingOperation.java?rev=1820547&r1=1820546&r2=1820547&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisBindingOperation.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisBindingOperation.java
Mon Jan 8 10:44:26 2018
@@ -44,263 +44,263 @@ import org.apache.neethi.PolicyComponent
*/
public class AxisBindingOperation extends AxisDescription {
- private AxisOperation axisOperation;
+ private AxisOperation axisOperation;
- private QName name;
+ private QName name;
- private Map<String, AxisBindingMessage> faults;
+ private Map<String, AxisBindingMessage> faults;
- private Map<String, Object> options;
+ private Map<String, Object> options;
- public AxisBindingOperation() {
- options = new HashMap<String, Object>();
- faults = new HashMap<String, AxisBindingMessage>();
- }
-
- public ArrayList<AxisBindingMessage> getFaults() {
- return new ArrayList<AxisBindingMessage>(faults.values());
- }
-
- public AxisBindingMessage getFault(String name) {
- return (AxisBindingMessage) faults.get(name);
- }
-
- public void addFault(AxisBindingMessage fault) {
- this.faults.put(fault.getName(), fault);
- }
-
- public QName getName() {
- return name;
- }
-
- public void setName(QName name) {
- this.name = name;
- }
-
- public AxisOperation getAxisOperation() {
- return axisOperation;
- }
-
- public void setAxisOperation(AxisOperation axisOperation) {
- this.axisOperation = axisOperation;
- }
-
- public void setProperty(String name, Object value) {
- options.put(name, value);
- }
-
- public Object getProperty(String name) {
- Object property = this.options.get(name);
-
- AxisBinding parent;
- if (property == null && (parent = getAxisBinding()) != null) {
- property = parent.getProperty(name);
- }
-
- if (property == null) {
- property =
WSDL20DefaultValueHolder.getDefaultValue(name);
- }
-
- return property;
- }
-
- public Object getKey() {
- return name;
- }
-
- public void engageModule(AxisModule axisModule) throws AxisFault {
- throw new UnsupportedOperationException("Sorry we do not
support this");
- }
-
- public boolean isEngaged(String moduleName) {
- throw new UnsupportedOperationException(
- "axisMessage.isEngaged() is not supported");
-
- }
-
- /**
- * Generates the bindingOperation element
- *
- * @param wsdl
- * The WSDL namespace
- * @param tns
- * The targetnamespace
- * @param wsoap
- * The SOAP namespace (WSDL 2.0)
- * @param whttp
- * The HTTP namespace (WSDL 2.0)
- * @param type
- * Indicates whether the binding is SOAP or HTTP
- * @param namespaceMap
- * the service's namespace map (prefix -> namespace)
- * @param serviceName
- * the name of the service
- * @return The generated binding element
- */
- public OMElement toWSDL20(OMNamespace wsdl, OMNamespace tns,
- OMNamespace wsoap, OMNamespace whttp, String type,
- Map<String, String> namespaceMap, String serviceName) {
- String property;
- OMFactory omFactory = OMAbstractFactory.getOMFactory();
- OMElement bindingOpElement = omFactory.createOMElement(
- WSDL2Constants.OPERATION_LOCAL_NAME, wsdl);
- bindingOpElement.addAttribute(omFactory.createOMAttribute(
- WSDL2Constants.ATTRIBUTE_REF, null,
tns.getPrefix() + ":"
- + this.name.getLocalPart()));
-
- if (WSDL2Constants.URI_WSDL2_SOAP.equals(type)
- || Constants.URI_SOAP11_HTTP.equals(type)
- || Constants.URI_SOAP12_HTTP.equals(type)) {
- // SOAP Binding specific properties
- property = (String) this.options
- .get(WSDL2Constants.ATTR_WSOAP_ACTION);
- if (property != null) {
-
bindingOpElement.addAttribute(omFactory.createOMAttribute(
-
WSDL2Constants.ATTRIBUTE_ACTION, wsoap, property));
- }
- ArrayList soapModules = (ArrayList) this.options
- .get(WSDL2Constants.ATTR_WSOAP_MODULE);
- if (soapModules != null && soapModules.size() > 0) {
-
WSDLSerializationUtil.addSOAPModuleElements(omFactory,
- soapModules, wsoap,
bindingOpElement);
- }
- property = (String)
this.options.get(WSDL2Constants.ATTR_WSOAP_MEP);
- if (property != null) {
-
bindingOpElement.addAttribute(omFactory.createOMAttribute(
- WSDL2Constants.ATTRIBUTE_MEP,
wsoap, property));
- }
- } else if (WSDL2Constants.URI_WSDL2_HTTP.equals(type)) {
-
- // HTTP Binding specific properties
- property = (String) this.options
-
.get(WSDL2Constants.ATTR_WHTTP_INPUT_SERIALIZATION);
- if (property != null) {
-
bindingOpElement.addAttribute(omFactory.createOMAttribute(
-
WSDL2Constants.ATTRIBUTE_INPUT_SERIALIZATION, whttp,
- property));
- }
- property = (String) this.options
-
.get(WSDL2Constants.ATTR_WHTTP_OUTPUT_SERIALIZATION);
- if (property != null) {
-
bindingOpElement.addAttribute(omFactory.createOMAttribute(
-
WSDL2Constants.ATTRIBUTE_OUTPUT_SERIALIZATION, whttp,
- property));
- }
- property = (String) this.options
-
.get(WSDL2Constants.ATTR_WHTTP_FAULT_SERIALIZATION);
- if (property != null) {
-
bindingOpElement.addAttribute(omFactory.createOMAttribute(
-
WSDL2Constants.ATTRIBUTE_FAULT_SERIALIZATION, whttp,
- property));
- }
- Boolean ignoreUncited = (Boolean) this.options
-
.get(WSDL2Constants.ATTR_WHTTP_IGNORE_UNCITED);
- if (ignoreUncited != null) {
-
bindingOpElement.addAttribute(omFactory.createOMAttribute(
-
WSDL2Constants.ATTRIBUTE_IGNORE_UNCITED, whttp,
- ignoreUncited.toString()));
- }
- property = (String) this.options
- .get(WSDL2Constants.ATTR_WHTTP_METHOD);
- if (property != null) {
-
bindingOpElement.addAttribute(omFactory.createOMAttribute(
-
WSDL2Constants.ATTRIBUTE_METHOD, whttp, property));
- }
- }
-
- // Common properties
- property = (String) this.options
- .get(WSDL2Constants.ATTR_WHTTP_LOCATION);
- if (property != null) {
-
bindingOpElement.addAttribute(omFactory.createOMAttribute(
- WSDL2Constants.ATTRIBUTE_LOCATION,
whttp, property));
- }
- property = (String) this.options
-
.get(WSDL2Constants.ATTR_WHTTP_CONTENT_ENCODING);
- if (property != null) {
- bindingOpElement
-
.addAttribute(omFactory.createOMAttribute(
-
WSDL2Constants.ATTRIBUTE_CONTENT_ENCODING, whttp,
- property));
- }
- property = (String) this.options
-
.get(WSDL2Constants.ATTR_WHTTP_QUERY_PARAMETER_SEPARATOR);
- if (property != null) {
-
bindingOpElement.addAttribute(omFactory.createOMAttribute(
-
WSDL2Constants.ATTRIBUTE_QUERY_PARAMETER_SEPERATOR, whttp,
- property));
- }
-
- // Add the input element
- AxisBindingMessage inMessage = (AxisBindingMessage) this
- .getChild(WSDLConstants.MESSAGE_LABEL_IN_VALUE);
- if (inMessage != null) {
- bindingOpElement.addChild(inMessage.toWSDL20(wsdl, tns,
wsoap,
- whttp, namespaceMap));
- }
-
- // Add the output element
- AxisBindingMessage outMessage = (AxisBindingMessage) this
-
.getChild(WSDLConstants.MESSAGE_LABEL_OUT_VALUE);
- if (outMessage != null) {
- bindingOpElement.addChild(outMessage.toWSDL20(wsdl,
tns, wsoap,
- whttp, namespaceMap));
- }
-
- // Add any fault elements
- if (faults != null && faults.size() > 0) {
- Collection<AxisBindingMessage> faultValues =
faults.values();
- Iterator<AxisBindingMessage> iterator =
faultValues.iterator();
- while (iterator.hasNext()) {
- AxisBindingMessage faultMessage =
(AxisBindingMessage) iterator
- .next();
-
bindingOpElement.addChild(faultMessage.toWSDL20(wsdl, tns,
- wsoap, whttp, namespaceMap));
- }
- }
- WSDLSerializationUtil.addWSDLDocumentationElement(this,
- bindingOpElement, omFactory, wsdl);
- WSDLSerializationUtil.addPoliciesAsExtensibleElement(this,
- bindingOpElement);
- return bindingOpElement;
- }
+ public AxisBindingOperation() {
+ options = new HashMap<String, Object>();
+ faults = new HashMap<String, AxisBindingMessage>();
+ }
+
+ public ArrayList<AxisBindingMessage> getFaults() {
+ return new ArrayList<AxisBindingMessage>(faults.values());
+ }
+
+ public AxisBindingMessage getFault(String name) {
+ return (AxisBindingMessage) faults.get(name);
+ }
+
+ public void addFault(AxisBindingMessage fault) {
+ this.faults.put(fault.getName(), fault);
+ }
+
+ public QName getName() {
+ return name;
+ }
+
+ public void setName(QName name) {
+ this.name = name;
+ }
+
+ public AxisOperation getAxisOperation() {
+ return axisOperation;
+ }
+
+ public void setAxisOperation(AxisOperation axisOperation) {
+ this.axisOperation = axisOperation;
+ }
+
+ public void setProperty(String name, Object value) {
+ options.put(name, value);
+ }
+
+ public Object getProperty(String name) {
+ Object property = this.options.get(name);
+
+ AxisBinding parent;
+ if (property == null && (parent = getAxisBinding()) != null) {
+ property = parent.getProperty(name);
+ }
+
+ if (property == null) {
+ property = WSDL20DefaultValueHolder.getDefaultValue(name);
+ }
+
+ return property;
+ }
+
+ public Object getKey() {
+ return name;
+ }
+
+ public void engageModule(AxisModule axisModule) throws AxisFault {
+ throw new UnsupportedOperationException("Sorry we do not support
this");
+ }
+
+ public boolean isEngaged(String moduleName) {
+ throw new UnsupportedOperationException(
+ "axisMessage.isEngaged() is not supported");
+
+ }
- public Policy getEffectivePolicy() {
-
+ /**
+ * Generates the bindingOperation element
+ *
+ * @param wsdl
+ * The WSDL namespace
+ * @param tns
+ * The targetnamespace
+ * @param wsoap
+ * The SOAP namespace (WSDL 2.0)
+ * @param whttp
+ * The HTTP namespace (WSDL 2.0)
+ * @param type
+ * Indicates whether the binding is SOAP or HTTP
+ * @param namespaceMap
+ * the service's namespace map (prefix -> namespace)
+ * @param serviceName
+ * the name of the service
+ * @return The generated binding element
+ */
+ public OMElement toWSDL20(OMNamespace wsdl, OMNamespace tns,
+ OMNamespace wsoap, OMNamespace whttp, String type,
+ Map<String, String> namespaceMap, String serviceName) {
+ String property;
+ OMFactory omFactory = OMAbstractFactory.getOMFactory();
+ OMElement bindingOpElement = omFactory.createOMElement(
+ WSDL2Constants.OPERATION_LOCAL_NAME, wsdl);
+ bindingOpElement.addAttribute(omFactory.createOMAttribute(
+ WSDL2Constants.ATTRIBUTE_REF, null, tns.getPrefix() + ":"
+ + this.name.getLocalPart()));
+
+ if (WSDL2Constants.URI_WSDL2_SOAP.equals(type)
+ || Constants.URI_SOAP11_HTTP.equals(type)
+ || Constants.URI_SOAP12_HTTP.equals(type)) {
+ // SOAP Binding specific properties
+ property = (String) this.options
+ .get(WSDL2Constants.ATTR_WSOAP_ACTION);
+ if (property != null) {
+ bindingOpElement.addAttribute(omFactory.createOMAttribute(
+ WSDL2Constants.ATTRIBUTE_ACTION, wsoap, property));
+ }
+ ArrayList soapModules = (ArrayList) this.options
+ .get(WSDL2Constants.ATTR_WSOAP_MODULE);
+ if (soapModules != null && soapModules.size() > 0) {
+ WSDLSerializationUtil.addSOAPModuleElements(omFactory,
+ soapModules, wsoap, bindingOpElement);
+ }
+ property = (String)
this.options.get(WSDL2Constants.ATTR_WSOAP_MEP);
+ if (property != null) {
+ bindingOpElement.addAttribute(omFactory.createOMAttribute(
+ WSDL2Constants.ATTRIBUTE_MEP, wsoap, property));
+ }
+ } else if (WSDL2Constants.URI_WSDL2_HTTP.equals(type)) {
+
+ // HTTP Binding specific properties
+ property = (String) this.options
+ .get(WSDL2Constants.ATTR_WHTTP_INPUT_SERIALIZATION);
+ if (property != null) {
+ bindingOpElement.addAttribute(omFactory.createOMAttribute(
+ WSDL2Constants.ATTRIBUTE_INPUT_SERIALIZATION, whttp,
+ property));
+ }
+ property = (String) this.options
+ .get(WSDL2Constants.ATTR_WHTTP_OUTPUT_SERIALIZATION);
+ if (property != null) {
+ bindingOpElement.addAttribute(omFactory.createOMAttribute(
+ WSDL2Constants.ATTRIBUTE_OUTPUT_SERIALIZATION, whttp,
+ property));
+ }
+ property = (String) this.options
+ .get(WSDL2Constants.ATTR_WHTTP_FAULT_SERIALIZATION);
+ if (property != null) {
+ bindingOpElement.addAttribute(omFactory.createOMAttribute(
+ WSDL2Constants.ATTRIBUTE_FAULT_SERIALIZATION, whttp,
+ property));
+ }
+ Boolean ignoreUncited = (Boolean) this.options
+ .get(WSDL2Constants.ATTR_WHTTP_IGNORE_UNCITED);
+ if (ignoreUncited != null) {
+ bindingOpElement.addAttribute(omFactory.createOMAttribute(
+ WSDL2Constants.ATTRIBUTE_IGNORE_UNCITED, whttp,
+ ignoreUncited.toString()));
+ }
+ property = (String) this.options
+ .get(WSDL2Constants.ATTR_WHTTP_METHOD);
+ if (property != null) {
+ bindingOpElement.addAttribute(omFactory.createOMAttribute(
+ WSDL2Constants.ATTRIBUTE_METHOD, whttp, property));
+ }
+ }
+
+ // Common properties
+ property = (String) this.options
+ .get(WSDL2Constants.ATTR_WHTTP_LOCATION);
+ if (property != null) {
+ bindingOpElement.addAttribute(omFactory.createOMAttribute(
+ WSDL2Constants.ATTRIBUTE_LOCATION, whttp, property));
+ }
+ property = (String) this.options
+ .get(WSDL2Constants.ATTR_WHTTP_CONTENT_ENCODING);
+ if (property != null) {
+ bindingOpElement
+ .addAttribute(omFactory.createOMAttribute(
+ WSDL2Constants.ATTRIBUTE_CONTENT_ENCODING, whttp,
+ property));
+ }
+ property = (String) this.options
+ .get(WSDL2Constants.ATTR_WHTTP_QUERY_PARAMETER_SEPARATOR);
+ if (property != null) {
+ bindingOpElement.addAttribute(omFactory.createOMAttribute(
+ WSDL2Constants.ATTRIBUTE_QUERY_PARAMETER_SEPERATOR, whttp,
+ property));
+ }
+
+ // Add the input element
+ AxisBindingMessage inMessage = (AxisBindingMessage) this
+ .getChild(WSDLConstants.MESSAGE_LABEL_IN_VALUE);
+ if (inMessage != null) {
+ bindingOpElement.addChild(inMessage.toWSDL20(wsdl, tns, wsoap,
+ whttp, namespaceMap));
+ }
+
+ // Add the output element
+ AxisBindingMessage outMessage = (AxisBindingMessage) this
+ .getChild(WSDLConstants.MESSAGE_LABEL_OUT_VALUE);
+ if (outMessage != null) {
+ bindingOpElement.addChild(outMessage.toWSDL20(wsdl, tns, wsoap,
+ whttp, namespaceMap));
+ }
+
+ // Add any fault elements
+ if (faults != null && faults.size() > 0) {
+ Collection<AxisBindingMessage> faultValues = faults.values();
+ Iterator<AxisBindingMessage> iterator = faultValues.iterator();
+ while (iterator.hasNext()) {
+ AxisBindingMessage faultMessage = (AxisBindingMessage) iterator
+ .next();
+ bindingOpElement.addChild(faultMessage.toWSDL20(wsdl, tns,
+ wsoap, whttp, namespaceMap));
+ }
+ }
+ WSDLSerializationUtil.addWSDLDocumentationElement(this,
+ bindingOpElement, omFactory, wsdl);
+ WSDLSerializationUtil.addPoliciesAsExtensibleElement(this,
+ bindingOpElement);
+ return bindingOpElement;
+ }
+
+ public Policy getEffectivePolicy() {
+
Collection<PolicyComponent> policyList = new
ArrayList<PolicyComponent>();
policyList.addAll(getPolicySubject().getAttachedPolicyComponents());
-
- // AxisBinding
- AxisBinding axisBinding = getAxisBinding();
- if (axisBinding != null) {
+
+ // AxisBinding
+ AxisBinding axisBinding = getAxisBinding();
+ if (axisBinding != null) {
policyList.addAll(axisBinding.getPolicySubject().getAttachedPolicyComponents());
- }
+ }
- // AxisEndpoint
- AxisEndpoint axisEndpoint = null;
- if (axisBinding != null) {
- axisEndpoint = axisBinding.getAxisEndpoint();
- }
+ // AxisEndpoint
+ AxisEndpoint axisEndpoint = null;
+ if (axisBinding != null) {
+ axisEndpoint = axisBinding.getAxisEndpoint();
+ }
- if (axisEndpoint != null) {
+ if (axisEndpoint != null) {
policyList.addAll(axisEndpoint.getPolicySubject().getAttachedPolicyComponents());
- }
+ }
-
- if (axisOperation != null) {
+
+ if (axisOperation != null) {
policyList.addAll(axisOperation.getPolicySubject().getAttachedPolicyComponents());
- }
+ }
- return PolicyUtil.getMergedPolicy(policyList, this);
- }
+ return PolicyUtil.getMergedPolicy(policyList, this);
+ }
- public AxisBinding getAxisBinding() {
- return (AxisBinding) parent;
- }
-
- @Override
+ public AxisBinding getAxisBinding() {
+ return (AxisBinding) parent;
+ }
+
+ @Override
public void applyPolicy() throws AxisFault {
- getAxisOperation().applyPolicy();
+ getAxisOperation().applyPolicy();
}
}
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisEndpoint.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisEndpoint.java?rev=1820547&r1=1820546&r2=1820547&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisEndpoint.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisEndpoint.java
Mon Jan 8 10:44:26 2018
@@ -62,7 +62,7 @@ public class AxisEndpoint extends AxisDe
if (endpointURL == null) {
endpointURL = calculateEndpointURL();
}
- return endpointURL;
+ return endpointURL;
}
public void setEndpointURL(String endpointURL) {
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisMessage.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisMessage.java?rev=1820547&r1=1820546&r2=1820547&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisMessage.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisMessage.java
Mon Jan 8 10:44:26 2018
@@ -70,14 +70,14 @@ public class AxisMessage extends AxisDes
private volatile Date lastPolicyCalculatedTime = null;
public String getMessagePartName() {
- return messagePartName;
- }
+ return messagePartName;
+ }
- public void setMessagePartName(String messagePartName) {
- this.messagePartName = messagePartName;
- }
+ public void setMessagePartName(String messagePartName) {
+ this.messagePartName = messagePartName;
+ }
- public AxisMessage() {
+ public AxisMessage() {
soapHeaders = new ArrayList();
handlerChain = new ArrayList<Handler>();
modulerefs = new ArrayList<String>();
@@ -248,65 +248,65 @@ public class AxisMessage extends AxisDes
return effectivePolicy;
}
- public Policy calculateEffectivePolicy() {
- PolicySubject policySubject;
- Collection<PolicyComponent> policyList = new
ArrayList<PolicyComponent>();
-
- // AxisMessage
- policySubject = getPolicySubject();
- policyList.addAll(policySubject.getAttachedPolicyComponents());
-
- // AxisOperation
- AxisOperation axisOperation = getAxisOperation();
- if (axisOperation != null) {
- policyList.addAll(axisOperation.getPolicySubject()
- .getAttachedPolicyComponents());
- }
-
- // AxisService
- AxisService axisService = (axisOperation == null) ? null
- : axisOperation.getAxisService();
- if (axisService != null) {
- policyList.addAll(axisService.getPolicySubject()
- .getAttachedPolicyComponents());
- }
-
- // AxisConfiguration
- AxisConfiguration axisConfiguration = (axisService == null) ?
null
- : axisService.getAxisConfiguration();
- if (axisConfiguration != null) {
- policyList.addAll(axisConfiguration.getPolicySubject()
- .getAttachedPolicyComponents());
- }
-
- Policy result = PolicyUtil.getMergedPolicy(policyList,
axisService);
- return result;
- }
-
- public boolean isPolicyUpdated() {
- // AxisMessage
- if (getPolicySubject().getLastUpdatedTime().after(
+ public Policy calculateEffectivePolicy() {
+ PolicySubject policySubject;
+ Collection<PolicyComponent> policyList = new
ArrayList<PolicyComponent>();
+
+ // AxisMessage
+ policySubject = getPolicySubject();
+ policyList.addAll(policySubject.getAttachedPolicyComponents());
+
+ // AxisOperation
+ AxisOperation axisOperation = getAxisOperation();
+ if (axisOperation != null) {
+ policyList.addAll(axisOperation.getPolicySubject()
+ .getAttachedPolicyComponents());
+ }
+
+ // AxisService
+ AxisService axisService = (axisOperation == null) ? null
+ : axisOperation.getAxisService();
+ if (axisService != null) {
+ policyList.addAll(axisService.getPolicySubject()
+ .getAttachedPolicyComponents());
+ }
+
+ // AxisConfiguration
+ AxisConfiguration axisConfiguration = (axisService == null) ? null
+ : axisService.getAxisConfiguration();
+ if (axisConfiguration != null) {
+ policyList.addAll(axisConfiguration.getPolicySubject()
+ .getAttachedPolicyComponents());
+ }
+
+ Policy result = PolicyUtil.getMergedPolicy(policyList, axisService);
+ return result;
+ }
+
+ public boolean isPolicyUpdated() {
+ // AxisMessage
+ if (getPolicySubject().getLastUpdatedTime().after(
lastPolicyCalculatedTime)) {
- return true;
- }
- // AxisOperation
- AxisOperation axisOperation = (AxisOperation) parent;
- if (axisOperation != null
- &&
axisOperation.getPolicySubject().getLastUpdatedTime().after(
+ return true;
+ }
+ // AxisOperation
+ AxisOperation axisOperation = (AxisOperation) parent;
+ if (axisOperation != null
+ && axisOperation.getPolicySubject().getLastUpdatedTime().after(
lastPolicyCalculatedTime)) {
- return true;
- }
- // AxisService
- AxisService axisService = (axisOperation == null) ? null
- : axisOperation.getAxisService();
- if (axisService != null
- &&
axisService.getPolicySubject().getLastUpdatedTime().after(
+ return true;
+ }
+ // AxisService
+ AxisService axisService = (axisOperation == null) ? null
+ : axisOperation.getAxisService();
+ if (axisService != null
+ && axisService.getPolicySubject().getLastUpdatedTime().after(
lastPolicyCalculatedTime)) {
- return true;
- }
- // AxisConfiguration
- AxisConfiguration axisConfiguration = (axisService == null) ?
null
- : axisService.getAxisConfiguration();
+ return true;
+ }
+ // AxisConfiguration
+ AxisConfiguration axisConfiguration = (axisService == null) ? null
+ : axisService.getAxisConfiguration();
return axisConfiguration != null
&& axisConfiguration.getPolicySubject().getLastUpdatedTime()
.after(lastPolicyCalculatedTime);
