From 4ae4002366ded3f4b19cd96f403d8b418fcf00a1 Mon Sep 17 00:00:00 2001 From: rfeng Date: Fri, 16 Oct 2009 05:42:26 +0000 Subject: This is to change the Monitor to be request scoped for most of the cases: Refactor the ArtifactProcessor/ModelResolver to take a ProcessorContext that holds context such as Monitor, Contribution for the contribution/artifact processing methods Refactor the Builder to take a BuilderContext that holds context such as Monitor, Definitions, Base binding mapping for the building methods Change the processor/resolver/builder implementation classes to not cache the Monitor git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@825773 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/tuscany/sca/policy/xml/ws/WSPolicyProcessor.java | 10 +++++----- .../apache/tuscany/sca/policy/xml/ws/TestModelResolver.java | 7 ++++--- .../apache/tuscany/sca/policy/xml/ws/TestPolicyProcessor.java | 7 ++++--- .../tuscany/sca/policy/xml/ws/WSPolicyProcessorTestCase.java | 6 +++--- 4 files changed, 16 insertions(+), 14 deletions(-) (limited to 'java/sca/modules/policy-xml-ws/src') diff --git a/java/sca/modules/policy-xml-ws/src/main/java/org/apache/tuscany/sca/policy/xml/ws/WSPolicyProcessor.java b/java/sca/modules/policy-xml-ws/src/main/java/org/apache/tuscany/sca/policy/xml/ws/WSPolicyProcessor.java index 96b5b5d713..760ce7c8da 100644 --- a/java/sca/modules/policy-xml-ws/src/main/java/org/apache/tuscany/sca/policy/xml/ws/WSPolicyProcessor.java +++ b/java/sca/modules/policy-xml-ws/src/main/java/org/apache/tuscany/sca/policy/xml/ws/WSPolicyProcessor.java @@ -36,10 +36,10 @@ import org.apache.tuscany.sca.contribution.processor.BaseStAXArtifactProcessor; import org.apache.tuscany.sca.contribution.processor.ContributionReadException; import org.apache.tuscany.sca.contribution.processor.ContributionResolveException; import org.apache.tuscany.sca.contribution.processor.ContributionWriteException; +import org.apache.tuscany.sca.contribution.processor.ProcessorContext; import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor; import org.apache.tuscany.sca.contribution.resolver.ModelResolver; import org.apache.tuscany.sca.core.FactoryExtensionPoint; -import org.apache.tuscany.sca.monitor.Monitor; /** @@ -56,7 +56,7 @@ public class WSPolicyProcessor extends BaseStAXArtifactProcessor implements StAX public WSPolicyProcessor() { } - public WSPolicyProcessor(FactoryExtensionPoint modelFactories, Monitor monitor) { + public WSPolicyProcessor(FactoryExtensionPoint modelFactories) { } public QName getArtifactType() { @@ -67,7 +67,7 @@ public class WSPolicyProcessor extends BaseStAXArtifactProcessor implements StAX return org.apache.neethi.Policy.class; } - public org.apache.neethi.Policy read(XMLStreamReader reader) throws ContributionReadException, XMLStreamException { + public org.apache.neethi.Policy read(XMLStreamReader reader, ProcessorContext context) throws ContributionReadException, XMLStreamException { org.apache.neethi.Policy wsPolicy = null; int event = reader.getEventType(); @@ -81,7 +81,7 @@ public class WSPolicyProcessor extends BaseStAXArtifactProcessor implements StAX return wsPolicy; } - public void write(org.apache.neethi.Policy wsPolicy, XMLStreamWriter writer) throws ContributionWriteException, XMLStreamException { + public void write(org.apache.neethi.Policy wsPolicy, XMLStreamWriter writer, ProcessorContext context) throws ContributionWriteException, XMLStreamException { // Write an writer.writeStartElement(WS_POLICY_NS, WS_POLICY); @@ -91,7 +91,7 @@ public class WSPolicyProcessor extends BaseStAXArtifactProcessor implements StAX writer.writeEndElement(); } - public void resolve(org.apache.neethi.Policy wsPolicy, ModelResolver resolver) throws ContributionResolveException { + public void resolve(org.apache.neethi.Policy wsPolicy, ModelResolver resolver, ProcessorContext context) throws ContributionResolveException { } diff --git a/java/sca/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/ws/TestModelResolver.java b/java/sca/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/ws/TestModelResolver.java index 57e3fe8d3a..8e904615c8 100644 --- a/java/sca/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/ws/TestModelResolver.java +++ b/java/sca/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/ws/TestModelResolver.java @@ -22,6 +22,7 @@ package org.apache.tuscany.sca.policy.xml.ws; import java.util.HashMap; import java.util.Map; +import org.apache.tuscany.sca.contribution.processor.ProcessorContext; import org.apache.tuscany.sca.contribution.resolver.ModelResolver; @@ -38,7 +39,7 @@ public class TestModelResolver implements ModelResolver { public TestModelResolver() { } - public T resolveModel(Class modelClass, T unresolved) { + public T resolveModel(Class modelClass, T unresolved, ProcessorContext context) { Object resolved = map.get(unresolved); if (resolved != null) { @@ -52,11 +53,11 @@ public class TestModelResolver implements ModelResolver { } } - public void addModel(Object resolved) { + public void addModel(Object resolved, ProcessorContext context) { map.put(resolved, resolved); } - public Object removeModel(Object resolved) { + public Object removeModel(Object resolved, ProcessorContext context) { return map.remove(resolved); } diff --git a/java/sca/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/ws/TestPolicyProcessor.java b/java/sca/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/ws/TestPolicyProcessor.java index 12a90f5c37..954ae00d42 100644 --- a/java/sca/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/ws/TestPolicyProcessor.java +++ b/java/sca/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/ws/TestPolicyProcessor.java @@ -26,6 +26,7 @@ import javax.xml.stream.XMLStreamWriter; import org.apache.tuscany.sca.contribution.processor.ContributionReadException; import org.apache.tuscany.sca.contribution.processor.ContributionResolveException; import org.apache.tuscany.sca.contribution.processor.ContributionWriteException; +import org.apache.tuscany.sca.contribution.processor.ProcessorContext; import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor; import org.apache.tuscany.sca.contribution.resolver.ModelResolver; @@ -39,11 +40,11 @@ public class TestPolicyProcessor implements StAXArtifactProcessor { return new QName("http://schemas.xmlsoap.org/ws/2004/09/policy", "PolicyAttachment"); } - public Object read(XMLStreamReader arg0) throws ContributionReadException, XMLStreamException { + public Object read(XMLStreamReader arg0, ProcessorContext context) throws ContributionReadException, XMLStreamException { return new MockPolicyImplOne(); } - public void write(Object arg0, XMLStreamWriter arg1) throws ContributionWriteException, + public void write(Object arg0, XMLStreamWriter arg1, ProcessorContext context) throws ContributionWriteException, XMLStreamException { } @@ -52,7 +53,7 @@ public class TestPolicyProcessor implements StAXArtifactProcessor { return Object.class; } - public void resolve(Object arg0, ModelResolver arg1) throws ContributionResolveException { + public void resolve(Object arg0, ModelResolver arg1, ProcessorContext context) throws ContributionResolveException { } diff --git a/java/sca/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/ws/WSPolicyProcessorTestCase.java b/java/sca/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/ws/WSPolicyProcessorTestCase.java index 907a50984c..47cf0e5c2f 100644 --- a/java/sca/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/ws/WSPolicyProcessorTestCase.java +++ b/java/sca/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/ws/WSPolicyProcessorTestCase.java @@ -27,10 +27,10 @@ import javax.xml.namespace.QName; import javax.xml.stream.XMLInputFactory; import javax.xml.stream.XMLStreamReader; -import org.apache.tuscany.sca.policy.xml.ws.WSPolicyProcessor; - import junit.framework.TestCase; +import org.apache.tuscany.sca.contribution.processor.ProcessorContext; + /** * Test reading SCA XML assembly documents. * @@ -93,7 +93,7 @@ public class WSPolicyProcessorTestCase extends TestCase { name = reader.getName(); if(WSPolicyProcessor.WS_POLICY_QNAME.equals(name)) { - artifact = processor.read(reader); + artifact = processor.read(reader, new ProcessorContext()); } break; -- cgit v1.2.3