| Commit in servicemix/base/src on MAIN | |||
| main/java/org/servicemix/components/cache/CacheComponent.java | +4 | -12 | 1.3 -> 1.4 |
| main/java/org/servicemix/components/util/ComponentSupport.java | +7 | -7 | 1.6 -> 1.7 |
| /CopyTransformer.java | +4 | -7 | 1.3 -> 1.4 |
| /EchoComponent.java | +2 | -2 | 1.2 -> 1.3 |
| /TraceComponent.java | +7 | -8 | 1.2 -> 1.3 |
| main/java/org/servicemix/components/validation/ValidateComponent.java | +3 | -12 | 1.3 -> 1.4 |
| main/java/org/servicemix/components/xsql/XSQLComponent.java | +7 | -11 | 1.3 -> 1.4 |
| test/java/org/servicemix/components/xsql/XSQLTest.java | +2 | -2 | 1.2 -> 1.3 |
| +36 | -61 | ||
fix for SM-43 - thanks for the heads up from Eric Crampton. Refactor to avoid typeos and now am more specific about property names as we have several kinds of transformer
servicemix/base/src/main/java/org/servicemix/components/cache
diff -u -r1.3 -r1.4 --- CacheComponent.java 2 Aug 2005 12:50:19 -0000 1.3 +++ CacheComponent.java 30 Aug 2005 11:29:52 -0000 1.4 @@ -36,7 +36,7 @@
* Implements a caching layer on top of a service invocation to avoid calling an expensive remote service too often. * The cache can be a simple Map based cache or a full <a href="">JCache</a> instance. *
- * @version $Revision: 1.3 $
+ * @version $Revision: 1.4 $
*/
public class CacheComponent extends TransformComponentSupport {
@@ -44,7 +44,6 @@
private Map cache;
private _expression_ keyExpression = KEY_PROPERTY_EXPRESSION;
- private MessageTransformer tranformer = CopyTransformer.getInstance();
public Map getCache() {
return cache;
@@ -62,13 +61,6 @@
this.keyExpression = keyExpression;
}
- public MessageTransformer getTranformer() {
- return tranformer;
- }
-
- public void setTranformer(MessageTransformer tranformer) {
- this.tranformer = tranformer;
- }
// Implementation methods
//-------------------------------------------------------------------------
@@ -84,14 +76,14 @@
if (key != null) {
NormalizedMessage message = (NormalizedMessage) cache.get(key);
if (message != null) {
- getTranformer().transform(exchange, message, out);
+ getMessageTransformer().transform(exchange, message, out);
return true;
}
}
InOut inOut = getExchangeFactory().createInOutExchange();
NormalizedMessage request = inOut.createMessage();
- getTranformer().transform(exchange, in, request);
+ getMessageTransformer().transform(exchange, in, request);
inOut.setInMessage(request);
getDeliveryChannel().sendSync(inOut);
@@ -105,7 +97,7 @@
fail(exchange, error);
}
else if (response != null) {
- getTranformer().transform(exchange, response, out);
+ getMessageTransformer().transform(exchange, response, out);
if (key != null) {
cache.put(key, response);
servicemix/base/src/main/java/org/servicemix/components/util
diff -u -r1.6 -r1.7 --- ComponentSupport.java 5 Aug 2005 08:13:32 -0000 1.6 +++ ComponentSupport.java 30 Aug 2005 11:29:52 -0000 1.7 @@ -40,13 +40,13 @@
/** * A useful base class for developers wishing to implement a JBI Component. *
- * @version $Revision: 1.6 $
+ * @version $Revision: 1.7 $
*/
public abstract class ComponentSupport extends PojoSupport implements Component {
private ComponentLifeCycle lifeCycle;
private ServiceUnitManager serviceManager;
- private MessageTransformer tranformer = CopyTransformer.getInstance();
+ private MessageTransformer messageTransformer = CopyTransformer.getInstance();
protected ComponentSupport() {
}
@@ -162,12 +162,12 @@
return message;
}
- public MessageTransformer getTranformer() {
- return tranformer;
+ public MessageTransformer getMessageTransformer() {
+ return messageTransformer;
}
- public void setTranformer(MessageTransformer tranformer) {
- this.tranformer = tranformer;
+ public void setMessageTransformer(MessageTransformer transformer) {
+ this.messageTransformer = transformer;
}
/**
@@ -251,7 +251,7 @@
protected void forwardToExchange(MessageExchange exchange, InOnly outExchange, NormalizedMessage in) throws MessagingException {
NormalizedMessage out = outExchange.createMessage();
outExchange.setInMessage(out);
- getTranformer().transform(exchange, in, out);
+ getMessageTransformer().transform(exchange, in, out);
done(outExchange);
}
servicemix/base/src/main/java/org/servicemix/components/util
diff -u -r1.3 -r1.4 --- CopyTransformer.java 5 Aug 2005 08:13:32 -0000 1.3 +++ CopyTransformer.java 30 Aug 2005 11:29:52 -0000 1.4 @@ -19,7 +19,6 @@
import org.servicemix.jbi.jaxp.SourceTransformer; import org.servicemix.jbi.jaxp.StringSource;
-import org.xml.sax.SAXException;
import javax.jbi.messaging.MessageExchange; import javax.jbi.messaging.MessagingException;
@@ -27,25 +26,23 @@
import javax.xml.transform.Source; import javax.xml.transform.TransformerException; import javax.xml.transform.stream.StreamSource;
-import javax.xml.parsers.ParserConfigurationException;
import java.util.Iterator;
-import java.io.IOException;
/** * A simple transformer which copies the properties and content from the source message to the destination message. *
- * @version $Revision: 1.3 $
+ * @version $Revision: 1.4 $
*/
public class CopyTransformer implements MessageTransformer {
private static final CopyTransformer instance = new CopyTransformer();
- private SourceTransformer transformer = new SourceTransformer();
+ private SourceTransformer sourceTransformer = new SourceTransformer();
/**
* Returns the singleton instance
*
- * @return
+ * @return the singleton instance
*/
public static CopyTransformer getInstance() {
return instance;
@@ -58,7 +55,7 @@
if (content instanceof StreamSource && !(content instanceof StringSource)) {
// lets avoid stream open exceptions by using a temporary format
try {
- content = transformer.toDOMSource(from);
+ content = sourceTransformer.toDOMSource(from);
}
catch (TransformerException e) {
throw new MessagingException(e);
servicemix/base/src/main/java/org/servicemix/components/util
diff -u -r1.2 -r1.3 --- EchoComponent.java 18 Aug 2005 17:12:47 -0000 1.2 +++ EchoComponent.java 30 Aug 2005 11:29:52 -0000 1.3 @@ -27,13 +27,13 @@
/** * A simple, yet useful component for testing synchronous flows. Echos back Exchanges *
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
*/
public class EchoComponent extends TransformComponentSupport implements MessageExchangeListener {
private static final Log log = LogFactory.getLog(EchoComponent.class);
protected boolean transform(MessageExchange exchange, NormalizedMessage in, NormalizedMessage out) throws MessagingException {
- getTranformer().transform(exchange, in, out);
+ getMessageTransformer().transform(exchange, in, out);
log.info("Echoed back message: " + out);
return true;
}
servicemix/base/src/main/java/org/servicemix/components/util
diff -u -r1.2 -r1.3 --- TraceComponent.java 22 Jun 2005 16:52:19 -0000 1.2 +++ TraceComponent.java 30 Aug 2005 11:29:52 -0000 1.3 @@ -21,7 +21,6 @@
import org.apache.commons.logging.LogFactory; import org.servicemix.jbi.jaxp.SourceTransformer; import org.servicemix.MessageExchangeListener;
-import org.servicemix.MessageExchangeListener;
import javax.jbi.messaging.MessageExchange; import javax.jbi.messaging.MessagingException;
@@ -32,13 +31,13 @@
* A simple tracing component which can be placed inside a pipeline * to trace the message exchange though the component. *
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
*/
public class TraceComponent extends ComponentSupport implements MessageExchangeListener {
private Log log = LogFactory.getLog(TraceComponent.class);
- private SourceTransformer transformer = new SourceTransformer();
+ private SourceTransformer sourceTransformer = new SourceTransformer();
public Log getLog() {
return log;
@@ -48,12 +47,12 @@
this.log = log;
}
- public SourceTransformer getTransformer() {
- return transformer;
+ public SourceTransformer getSourceTransformer() {
+ return sourceTransformer;
}
- public void setTransformer(SourceTransformer transformer) {
- this.transformer = transformer;
+ public void setSourceTransformer(SourceTransformer sourceTransformer) {
+ this.sourceTransformer = sourceTransformer;
}
public void onMessageExchange(MessageExchange exchange) throws MessagingException {
@@ -65,7 +64,7 @@
else {
log.info("Exchange: " + exchange + " received IN message: " + message);
try {
- log.info("Body is: " + transformer.toString(message.getContent()));
+ log.info("Body is: " + sourceTransformer.toString(message.getContent()));
}
catch (TransformerException e) {
log.error("Failed to turn message body into text: " + e, e);
servicemix/base/src/main/java/org/servicemix/components/validation
diff -u -r1.3 -r1.4 --- ValidateComponent.java 2 Aug 2005 12:50:19 -0000 1.3 +++ ValidateComponent.java 30 Aug 2005 11:29:52 -0000 1.4 @@ -43,14 +43,13 @@
* and returning a fault if the document does not conform to the schema * otherwise the message is passed on its way. *
- * @version $Revision: 1.3 $
+ * @version $Revision: 1.4 $
*/
public class ValidateComponent extends TransformComponentSupport {
private Schema schema;
private String schemaLanguage = "http://www.w3.org/2001/XMLSchema";
private Source schemaSource;
private Resource schemaResource;
- private MessageTransformer tranformer = CopyTransformer.getInstance();
public Schema getSchema() {
return schema;
@@ -83,15 +82,7 @@
public void setSchemaResource(Resource schemaResource) {
this.schemaResource = schemaResource;
}
-
- public MessageTransformer getTranformer() {
- return tranformer;
- }
-
- public void setTranformer(MessageTransformer tranformer) {
- this.tranformer = tranformer;
- }
-
+
protected void init() throws JBIException {
super.init();
@@ -131,7 +122,7 @@
throw new FaultException("Failed to validate against schema: " + schema, exchange, fault);
}
else {
- getTranformer().transform(exchange, in, out);
+ getMessageTransformer().transform(exchange, in, out);
return true;
}
}
servicemix/base/src/main/java/org/servicemix/components/xsql
diff -u -r1.3 -r1.4 --- XSQLComponent.java 2 Aug 2005 12:50:19 -0000 1.3 +++ XSQLComponent.java 30 Aug 2005 11:29:52 -0000 1.4 @@ -17,14 +17,11 @@
**/ package org.servicemix.components.xsql;
-import org.servicemix.components.util.ComponentSupport;
import org.servicemix.components.util.TransformComponentSupport; import org.servicemix.MessageExchangeListener;
-import org.servicemix.jbi.NoInMessageAvailableException;
import org.servicemix.jbi.jaxp.SourceTransformer; import org.w3c.dom.Document; import org.springframework.core.io.Resource;
-import org.xml.sax.SAXException;
import oracle.xml.xsql.XSQLConnectionManagerFactory; import oracle.xml.xsql.XSQLRequest; import oracle.xml.parser.v2.XMLDocument;
@@ -39,20 +36,19 @@
import javax.xml.transform.sax.SAXResult; import javax.xml.transform.TransformerException; import java.net.URL;
-import java.io.IOException;
/** * A JBI component for interacting with * <a href="">Oracle XSQL</a> *
- * @version $Revision: 1.3 $
+ * @version $Revision: 1.4 $
*/
public class XSQLComponent extends TransformComponentSupport implements MessageExchangeListener {
private XSQLConnectionManagerFactory connectionManagerFactory;
private URL baseURL;
private XMLDocument xsql;
private Resource xsqlResource;
- private SourceTransformer transformer = new SourceTransformer();
+ private SourceTransformer sourceTransformer = new SourceTransformer();
protected void init() throws JBIException {
super.init();
@@ -104,12 +100,12 @@
this.xsqlResource = xsqlResource;
}
- public SourceTransformer getTransformer() {
- return transformer;
+ public SourceTransformer getSourceTransformer() {
+ return sourceTransformer;
}
- public void setTransformer(SourceTransformer transformer) {
- this.transformer = transformer;
+ public void setSourceTransformer(SourceTransformer sourceTransformer) {
+ this.sourceTransformer = sourceTransformer;
}
// Implementation methods
@@ -133,7 +129,7 @@
try {
DocumentBuilder builder = new DocumentBuilder();
SAXResult result = new SAXResult(builder);
- transformer.toResult(in.getContent(), result);
+ sourceTransformer.toResult(in.getContent(), result);
return builder.getDocument();
}
catch (TransformerException e) {
servicemix/base/src/test/java/org/servicemix/components/xsql
diff -u -r1.2 -r1.3 --- XSQLTest.java 12 Jul 2005 09:04:00 -0000 1.2 +++ XSQLTest.java 30 Aug 2005 11:29:52 -0000 1.3 @@ -40,7 +40,7 @@
import java.sql.SQLException; /**
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
*/
public class XSQLTest extends TestSupport {
protected DataSource dataSource;
@@ -90,7 +90,7 @@
protected void setUp() throws Exception {
super.setUp();
- dataSource = (DataSource) context.getBean("dataSource");
+ dataSource = (DataSource) getBean("dataSource");
template = new JdbcTemplate(dataSource);
// lets create a schema
