Author: davsclaus
Date: Mon May 12 05:12:52 2008
New Revision: 655487
URL: http://svn.apache.org/viewvc?rev=655487&view=rev
Log:
CAMEL-433
- using the new getAndRemoveParameter programming best practice
And:
- polished javadoc
- added debug guards for logging
- fixed wrong logger in an abstract class
Modified:
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/ResourceBasedComponent.java
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/ResourceBasedEndpoint.java
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/test/TestComponent.java
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/test/TestEndpoint.java
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/xslt/XsltComponent.java
Modified:
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/ResourceBasedComponent.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/ResourceBasedComponent.java?rev=655487&r1=655486&r2=655487&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/ResourceBasedComponent.java
(original)
+++
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/ResourceBasedComponent.java
Mon May 12 05:12:52 2008
@@ -17,7 +17,6 @@
package org.apache.camel.component;
import org.apache.camel.Exchange;
-import org.apache.camel.component.validator.ValidatorComponent;
import org.apache.camel.impl.DefaultComponent;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -30,7 +29,7 @@
* @version $Revision$
*/
public abstract class ResourceBasedComponent extends
DefaultComponent<Exchange> {
- protected static final transient Log LOG =
LogFactory.getLog(ValidatorComponent.class);
+ protected final transient Log LOG = LogFactory.getLog(getClass());
private ResourceLoader resourceLoader = new DefaultResourceLoader();
public ResourceLoader getResourceLoader() {
@@ -48,6 +47,6 @@
} else {
return resource;
}
-
}
+
}
Modified:
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/ResourceBasedEndpoint.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/ResourceBasedEndpoint.java?rev=655487&r1=655486&r2=655487&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/ResourceBasedEndpoint.java
(original)
+++
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/ResourceBasedEndpoint.java
Mon May 12 05:12:52 2008
@@ -17,9 +17,7 @@
package org.apache.camel.component;
import org.apache.camel.Component;
-import org.apache.camel.Exchange;
import org.apache.camel.Processor;
-import org.apache.camel.component.validator.ValidatorComponent;
import org.apache.camel.impl.ProcessorEndpoint;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -34,15 +32,16 @@
* @version $Revision$
*/
public abstract class ResourceBasedEndpoint extends ProcessorEndpoint {
- protected static final transient Log LOG =
LogFactory.getLog(ValidatorComponent.class);
- private ResourceLoader resourceLoader = new DefaultResourceLoader();
+ protected final transient Log LOG = LogFactory.getLog(getClass());
private final String resourceUri;
+ private ResourceLoader resourceLoader = new DefaultResourceLoader();
private Resource resource;
public ResourceBasedEndpoint(String endpointUri, Component component,
String resourceUri, Processor processor) {
super(endpointUri, component, processor);
this.resourceUri = resourceUri;
}
+
public Resource getResource() {
if (resource == null) {
resource = getResourceLoader().getResource(resourceUri);
Modified:
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/test/TestComponent.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/test/TestComponent.java?rev=655487&r1=655486&r2=655487&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/test/TestComponent.java
(original)
+++
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/test/TestComponent.java
Mon May 12 05:12:52 2008
@@ -31,6 +31,7 @@
* @version $Revision$
*/
public class TestComponent extends DefaultComponent<Exchange> {
+
public Endpoint<Exchange> createEndpoint(String uri) throws Exception {
// lets not use the normal parameter handling so that all parameters
are sent to the nested endpoint
@@ -46,4 +47,5 @@
Endpoint endpoint =
CamelContextHelper.getMandatoryEndpoint(getCamelContext(), remaining);
return new TestEndpoint(uri, this, endpoint);
}
+
}
\ No newline at end of file
Modified:
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/test/TestEndpoint.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/test/TestEndpoint.java?rev=655487&r1=655486&r2=655487&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/test/TestEndpoint.java
(original)
+++
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/test/TestEndpoint.java
Mon May 12 05:12:52 2008
@@ -47,7 +47,9 @@
}
public void start() throws Exception {
- LOG.debug("Consuming expected messages from: " +
expectedMessageEndpoint);
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Consuming expected messages from: " +
expectedMessageEndpoint);
+ }
final List expectedBodies = new ArrayList();
EndpointHelper.pollEndpoint(expectedMessageEndpoint, new Processor() {
public void process(Exchange exchange) throws Exception {
@@ -56,7 +58,9 @@
}
}, timeout);
- LOG.debug("Received: " + expectedBodies.size() + " expected message(s)
from: " + expectedMessageEndpoint);
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Received: " + expectedBodies.size() + " expected
message(s) from: " + expectedMessageEndpoint);
+ }
expectedBodiesReceived(expectedBodies);
}
@@ -64,7 +68,7 @@
}
/**
- * This method allows us to convert or cooerce the expected message body
into some other type
+ * This method allows us to convert or coerce the expected message body
into some other type
*/
protected Object getInBody(Exchange exchange) {
return exchange.getIn().getBody();
Modified:
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/xslt/XsltComponent.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/xslt/XsltComponent.java?rev=655487&r1=655486&r2=655487&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/xslt/XsltComponent.java
(original)
+++
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/xslt/XsltComponent.java
Mon May 12 05:12:52 2008
@@ -52,7 +52,7 @@
// lets allow the converter to be configured
XmlConverter converter = null;
- String converterName = (String) parameters.remove("converter");
+ String converterName = getAndRemoveParameter(parameters, "converter",
String.class);
if (converterName != null) {
converter = mandatoryLookup(converterName, XmlConverter.class);
}
