You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by bv...@apache.org on 2012/12/01 00:37:56 UTC
svn commit: r1415887 - in /camel/trunk:
camel-core/src/test/java/org/apache/camel/component/file/strategy/
components/camel-aws/src/test/java/org/apache/camel/component/aws/cw/
components/camel-aws/src/test/java/org/apache/camel/component/aws/cw/integr...
Author: bvahdat
Date: Fri Nov 30 23:37:49 2012
New Revision: 1415887
URL: http://svn.apache.org/viewvc?rev=1415887&view=rev
Log:
Polished.
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/strategy/MarkerFileExclusiveReadLockStrategyReadLockFailedTest.java
camel/trunk/components/camel-aws/src/test/java/org/apache/camel/component/aws/cw/CwComponentTest.java
camel/trunk/components/camel-aws/src/test/java/org/apache/camel/component/aws/cw/integration/CwComponentIntegrationTest.java
camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintContainerRegistry.java
camel/trunk/components/camel-cache/src/test/java/org/apache/camel/processor/cache/CacheBasedBodyReplacerTest.java
camel/trunk/components/camel-cache/src/test/java/org/apache/camel/processor/cache/CacheBasedTokenReplacerTest.java
camel/trunk/components/camel-cache/src/test/java/org/apache/camel/processor/cache/CacheBasedXPathElementReplacerTest.java
camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiPackageScanClassResolver.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerWithTryCatchTest.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfOneWayRouteTest.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfJavaMtomProducerPayloadTest.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomConsumerPayloadModeTest.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomConsumerTest.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomDisabledProducerPayloadModeTest.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomPOJOProducerTest.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomProducerPayloadModeTest.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomRouterPayloadModeTest.java
camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http/HttpEndpointOptionsNotChangeComponentTest.java
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsAsyncStartListenerTest.java
camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailComponent.java
camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConsumer.java
camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/NowSearchTerm.java
camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/CronScheduledRoutePolicyTest.java
camel/trunk/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/BatchMessage.java
camel/trunk/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsConsumer.java
camel/trunk/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsEndpoint.java
camel/trunk/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsProducer.java
camel/trunk/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/consumer/AbstractMessageHandler.java
camel/trunk/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/consumer/InOnlyMessageHandler.java
camel/trunk/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/consumer/InOutMessageHandler.java
camel/trunk/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/ConnectionFactoryResource.java
camel/trunk/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/IllegalHeaderException.java
camel/trunk/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/ObjectPool.java
camel/trunk/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/SessionAcknowledgementType.java
camel/trunk/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/producer/InOnlyProducer.java
camel/trunk/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/producer/InOutProducer.java
camel/trunk/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/tx/BatchTransactionCommitStrategy.java
camel/trunk/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/tx/SessionTransactionSynchronization.java
camel/trunk/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SimpleJmsComponentTest.java
camel/trunk/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/it/ConnectionResourceIT.java
camel/trunk/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/jms/ObjectPoolTest.java
camel/trunk/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/InOutQueueProducerAsyncLoadTest.java
camel/trunk/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/InOutQueueProducerSyncLoadTest.java
camel/trunk/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/InOutQueueProducerTest.java
camel/trunk/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/InOutTempQueueProducerTest.java
camel/trunk/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/support/MyInOutTestConsumer.java
camel/trunk/examples/camel-example-tracer/src/main/java/org/apache/camel/example/tracer/FixedDerbyDialect.java
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/strategy/MarkerFileExclusiveReadLockStrategyReadLockFailedTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/strategy/MarkerFileExclusiveReadLockStrategyReadLockFailedTest.java?rev=1415887&r1=1415886&r2=1415887&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/strategy/MarkerFileExclusiveReadLockStrategyReadLockFailedTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/strategy/MarkerFileExclusiveReadLockStrategyReadLockFailedTest.java Fri Nov 30 23:37:49 2012
@@ -22,8 +22,6 @@ import org.apache.camel.ContextTestSuppo
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* Tests the MarkerFileExclusiveReadLockStrategy in a multi-threaded scenario.
Modified: camel/trunk/components/camel-aws/src/test/java/org/apache/camel/component/aws/cw/CwComponentTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-aws/src/test/java/org/apache/camel/component/aws/cw/CwComponentTest.java?rev=1415887&r1=1415886&r2=1415887&view=diff
==============================================================================
--- camel/trunk/components/camel-aws/src/test/java/org/apache/camel/component/aws/cw/CwComponentTest.java (original)
+++ camel/trunk/components/camel-aws/src/test/java/org/apache/camel/component/aws/cw/CwComponentTest.java Fri Nov 30 23:37:49 2012
@@ -41,7 +41,7 @@ public class CwComponentTest extends Cam
@Test
public void sendMetricFromHeaderValues() throws Exception {
- Exchange exchange = template.send("direct:start", ExchangePattern.InOnly, new Processor() {
+ template.send("direct:start", ExchangePattern.InOnly, new Processor() {
public void process(Exchange exchange) throws Exception {
exchange.getIn().setHeader(CwConstants.METRIC_NAMESPACE, "camel.apache.org/overriden");
exchange.getIn().setHeader(CwConstants.METRIC_NAME, "OverridenMetric");
@@ -64,7 +64,7 @@ public class CwComponentTest extends Cam
@Test
public void sendManuallyCreatedMetric() throws Exception {
- Exchange exchange = template.send("direct:start", ExchangePattern.InOnly, new Processor() {
+ template.send("direct:start", ExchangePattern.InOnly, new Processor() {
public void process(Exchange exchange) throws Exception {
MetricDatum metricDatum = new MetricDatum()
.withMetricName("errorCount")
@@ -84,7 +84,7 @@ public class CwComponentTest extends Cam
@Test
public void useDefaultValuesForMetricUnitAndMetricValue() throws Exception {
- Exchange exchange = template.send("direct:start", ExchangePattern.InOnly, new Processor() {
+ template.send("direct:start", ExchangePattern.InOnly, new Processor() {
public void process(Exchange exchange) throws Exception {
exchange.getIn().setHeader(CwConstants.METRIC_NAME, "errorCount");
}
Modified: camel/trunk/components/camel-aws/src/test/java/org/apache/camel/component/aws/cw/integration/CwComponentIntegrationTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-aws/src/test/java/org/apache/camel/component/aws/cw/integration/CwComponentIntegrationTest.java?rev=1415887&r1=1415886&r2=1415887&view=diff
==============================================================================
--- camel/trunk/components/camel-aws/src/test/java/org/apache/camel/component/aws/cw/integration/CwComponentIntegrationTest.java (original)
+++ camel/trunk/components/camel-aws/src/test/java/org/apache/camel/component/aws/cw/integration/CwComponentIntegrationTest.java Fri Nov 30 23:37:49 2012
@@ -16,7 +16,6 @@
*/
package org.apache.camel.component.aws.cw.integration;
-import java.util.Date;
import org.apache.camel.EndpointInject;
import org.apache.camel.Exchange;
@@ -30,7 +29,7 @@ import org.junit.Ignore;
import org.junit.Test;
-//@Ignore("Must be manually tested. Provide your own accessKey and secretKey!")
+@Ignore("Must be manually tested. Provide your own accessKey and secretKey!")
public class CwComponentIntegrationTest extends CamelTestSupport {
@EndpointInject(uri = "mock:result")
@@ -40,7 +39,7 @@ public class CwComponentIntegrationTest
public void sendInOnly() throws Exception {
mock.expectedMessageCount(1);
- Exchange exchange = template.send("direct:start", ExchangePattern.InOnly, new Processor() {
+ template.send("direct:start", ExchangePattern.InOnly, new Processor() {
public void process(Exchange exchange) throws Exception {
exchange.getIn().setHeader(CwConstants.METRIC_NAME, "ExchangesCompleted");
exchange.getIn().setHeader(CwConstants.METRIC_VALUE, "2.0");
Modified: camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintContainerRegistry.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintContainerRegistry.java?rev=1415887&r1=1415886&r2=1415887&view=diff
==============================================================================
--- camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintContainerRegistry.java (original)
+++ camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintContainerRegistry.java Fri Nov 30 23:37:49 2012
@@ -67,7 +67,6 @@ public class BlueprintContainerRegistry
return lookupByType(blueprintContainer, type);
}
- @SuppressWarnings("unchecked")
public static <T> Map<String, T> lookupByType(BlueprintContainer blueprintContainer, Class<T> type) {
Bundle bundle = (Bundle) blueprintContainer.getComponentInstance("blueprintBundle");
Map<String, T> objects = new LinkedHashMap<String, T>();
Modified: camel/trunk/components/camel-cache/src/test/java/org/apache/camel/processor/cache/CacheBasedBodyReplacerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cache/src/test/java/org/apache/camel/processor/cache/CacheBasedBodyReplacerTest.java?rev=1415887&r1=1415886&r2=1415887&view=diff
==============================================================================
--- camel/trunk/components/camel-cache/src/test/java/org/apache/camel/processor/cache/CacheBasedBodyReplacerTest.java (original)
+++ camel/trunk/components/camel-cache/src/test/java/org/apache/camel/processor/cache/CacheBasedBodyReplacerTest.java Fri Nov 30 23:37:49 2012
@@ -29,7 +29,6 @@ import org.apache.camel.builder.RouteBui
import org.apache.camel.component.BaseCacheTest;
import org.apache.camel.component.cache.CacheConstants;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: camel/trunk/components/camel-cache/src/test/java/org/apache/camel/processor/cache/CacheBasedTokenReplacerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cache/src/test/java/org/apache/camel/processor/cache/CacheBasedTokenReplacerTest.java?rev=1415887&r1=1415886&r2=1415887&view=diff
==============================================================================
--- camel/trunk/components/camel-cache/src/test/java/org/apache/camel/processor/cache/CacheBasedTokenReplacerTest.java (original)
+++ camel/trunk/components/camel-cache/src/test/java/org/apache/camel/processor/cache/CacheBasedTokenReplacerTest.java Fri Nov 30 23:37:49 2012
@@ -29,7 +29,6 @@ import org.apache.camel.builder.RouteBui
import org.apache.camel.component.BaseCacheTest;
import org.apache.camel.component.cache.CacheConstants;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: camel/trunk/components/camel-cache/src/test/java/org/apache/camel/processor/cache/CacheBasedXPathElementReplacerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cache/src/test/java/org/apache/camel/processor/cache/CacheBasedXPathElementReplacerTest.java?rev=1415887&r1=1415886&r2=1415887&view=diff
==============================================================================
--- camel/trunk/components/camel-cache/src/test/java/org/apache/camel/processor/cache/CacheBasedXPathElementReplacerTest.java (original)
+++ camel/trunk/components/camel-cache/src/test/java/org/apache/camel/processor/cache/CacheBasedXPathElementReplacerTest.java Fri Nov 30 23:37:49 2012
@@ -29,7 +29,6 @@ import org.apache.camel.builder.RouteBui
import org.apache.camel.component.BaseCacheTest;
import org.apache.camel.component.cache.CacheConstants;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiPackageScanClassResolver.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiPackageScanClassResolver.java?rev=1415887&r1=1415886&r2=1415887&view=diff
==============================================================================
--- camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiPackageScanClassResolver.java (original)
+++ camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiPackageScanClassResolver.java Fri Nov 30 23:37:49 2012
@@ -84,7 +84,6 @@ public class OsgiPackageScanClassResolve
}
}
- @SuppressWarnings("unchecked")
private Set<String> getImplementationsInBundle(PackageScanFilter test, String packageName) {
Bundle[] bundles;
if (bundle.getBundleContext() != null) {
Modified: camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerWithTryCatchTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerWithTryCatchTest.java?rev=1415887&r1=1415886&r2=1415887&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerWithTryCatchTest.java (original)
+++ camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerWithTryCatchTest.java Fri Nov 30 23:37:49 2012
@@ -17,22 +17,13 @@
package org.apache.camel.component.cxf;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
-
-import javax.servlet.ServletRequest;
import org.apache.camel.Exchange;
import org.apache.camel.Message;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.cxf.common.message.CxfConstants;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.apache.cxf.BusFactory;
-import org.apache.cxf.endpoint.Client;
-import org.apache.cxf.frontend.ClientFactoryBean;
-import org.apache.cxf.frontend.ClientProxyFactoryBean;
import org.junit.Test;
Modified: camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfOneWayRouteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfOneWayRouteTest.java?rev=1415887&r1=1415886&r2=1415887&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfOneWayRouteTest.java (original)
+++ camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfOneWayRouteTest.java Fri Nov 30 23:37:49 2012
@@ -18,28 +18,14 @@
package org.apache.camel.component.cxf;
import java.io.ByteArrayOutputStream;
-import java.util.List;
-import java.util.concurrent.TimeUnit;
import javax.xml.namespace.QName;
import javax.xml.ws.Service;
-import org.apache.camel.CamelContext;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
-import org.apache.camel.builder.ErrorHandlerBuilder;
-import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.impl.DefaultCamelContext;
-import org.apache.camel.model.OnExceptionDefinition;
-import org.apache.camel.processor.ErrorHandler;
-import org.apache.camel.processor.exceptionpolicy.ExceptionPolicyStrategy;
-import org.apache.camel.spi.RouteContext;
-import org.apache.camel.spring.SpringCamelContext;
import org.apache.camel.test.junit4.CamelSpringTestSupport;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.apache.cxf.frontend.ClientFactoryBean;
-import org.apache.cxf.frontend.ClientProxyFactoryBean;
import org.apache.hello_world_soap_http.Greeter;
import org.junit.Before;
import org.junit.Test;
Modified: camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfJavaMtomProducerPayloadTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfJavaMtomProducerPayloadTest.java?rev=1415887&r1=1415886&r2=1415887&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfJavaMtomProducerPayloadTest.java (original)
+++ camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfJavaMtomProducerPayloadTest.java Fri Nov 30 23:37:49 2012
@@ -22,7 +22,6 @@ import javax.xml.ws.Holder;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
-import org.apache.camel.component.cxf.TestHelper;
import org.junit.Test;
public class CxfJavaMtomProducerPayloadTest extends CxfMtomConsumerTest {
Modified: camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomConsumerPayloadModeTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomConsumerPayloadModeTest.java?rev=1415887&r1=1415886&r2=1415887&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomConsumerPayloadModeTest.java (original)
+++ camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomConsumerPayloadModeTest.java Fri Nov 30 23:37:49 2012
@@ -38,7 +38,6 @@ import org.apache.camel.ExchangePattern;
import org.apache.camel.Processor;
import org.apache.camel.component.cxf.CXFTestSupport;
import org.apache.camel.component.cxf.CxfPayload;
-import org.apache.camel.component.cxf.TestHelper;
import org.apache.camel.converter.jaxp.XmlConverter;
import org.apache.cxf.binding.soap.SoapHeader;
import org.apache.cxf.helpers.DOMUtils;
Modified: camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomConsumerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomConsumerTest.java?rev=1415887&r1=1415886&r2=1415887&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomConsumerTest.java (original)
+++ camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomConsumerTest.java Fri Nov 30 23:37:49 2012
@@ -31,7 +31,6 @@ import org.apache.camel.Message;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.cxf.CXFTestSupport;
-import org.apache.camel.component.cxf.TestHelper;
import org.apache.camel.cxf.mtom_feature.Hello;
import org.apache.camel.cxf.mtom_feature.HelloService;
import org.apache.camel.test.junit4.CamelTestSupport;
Modified: camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomDisabledProducerPayloadModeTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomDisabledProducerPayloadModeTest.java?rev=1415887&r1=1415886&r2=1415887&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomDisabledProducerPayloadModeTest.java (original)
+++ camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomDisabledProducerPayloadModeTest.java Fri Nov 30 23:37:49 2012
@@ -40,7 +40,6 @@ import org.apache.camel.Exchange;
import org.apache.camel.ExchangePattern;
import org.apache.camel.Processor;
import org.apache.camel.component.cxf.CxfPayload;
-import org.apache.camel.component.cxf.TestHelper;
import org.apache.camel.cxf.mtom_feature.Hello;
import org.apache.cxf.attachment.AttachmentDataSource;
import org.apache.cxf.binding.soap.SoapHeader;
Modified: camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomPOJOProducerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomPOJOProducerTest.java?rev=1415887&r1=1415886&r2=1415887&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomPOJOProducerTest.java (original)
+++ camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomPOJOProducerTest.java Fri Nov 30 23:37:49 2012
@@ -31,7 +31,6 @@ import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.component.cxf.CXFTestSupport;
-import org.apache.camel.component.cxf.TestHelper;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
Modified: camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomProducerPayloadModeTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomProducerPayloadModeTest.java?rev=1415887&r1=1415886&r2=1415887&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomProducerPayloadModeTest.java (original)
+++ camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomProducerPayloadModeTest.java Fri Nov 30 23:37:49 2012
@@ -40,7 +40,6 @@ import org.apache.camel.ExchangePattern;
import org.apache.camel.Processor;
import org.apache.camel.component.cxf.CXFTestSupport;
import org.apache.camel.component.cxf.CxfPayload;
-import org.apache.camel.component.cxf.TestHelper;
import org.apache.camel.converter.jaxp.XmlConverter;
import org.apache.cxf.binding.soap.SoapHeader;
import org.apache.cxf.helpers.DOMUtils;
Modified: camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomRouterPayloadModeTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomRouterPayloadModeTest.java?rev=1415887&r1=1415886&r2=1415887&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomRouterPayloadModeTest.java (original)
+++ camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomRouterPayloadModeTest.java Fri Nov 30 23:37:49 2012
@@ -30,7 +30,6 @@ import junit.framework.Assert;
import org.apache.camel.CamelContext;
import org.apache.camel.component.cxf.CXFTestSupport;
-import org.apache.camel.component.cxf.TestHelper;
import org.apache.camel.cxf.mtom_feature.Hello;
import org.apache.camel.cxf.mtom_feature.HelloService;
import org.junit.After;
Modified: camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http/HttpEndpointOptionsNotChangeComponentTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http/HttpEndpointOptionsNotChangeComponentTest.java?rev=1415887&r1=1415886&r2=1415887&view=diff
==============================================================================
--- camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http/HttpEndpointOptionsNotChangeComponentTest.java (original)
+++ camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http/HttpEndpointOptionsNotChangeComponentTest.java Fri Nov 30 23:37:49 2012
@@ -83,9 +83,6 @@ public class HttpEndpointOptionsNotChang
}
private static class MyHeaderFilterStrategy extends HttpHeaderFilterStrategy {
- MyHeaderFilterStrategy() {
- super();
- }
}
}
Modified: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsAsyncStartListenerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsAsyncStartListenerTest.java?rev=1415887&r1=1415886&r2=1415887&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsAsyncStartListenerTest.java (original)
+++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsAsyncStartListenerTest.java Fri Nov 30 23:37:49 2012
@@ -19,8 +19,6 @@ package org.apache.camel.component.jms;
import javax.jms.ConnectionFactory;
import org.apache.camel.CamelContext;
-import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.junit4.CamelTestSupport;
Modified: camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailComponent.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailComponent.java?rev=1415887&r1=1415886&r2=1415887&view=diff
==============================================================================
--- camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailComponent.java (original)
+++ camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailComponent.java Fri Nov 30 23:37:49 2012
@@ -17,7 +17,6 @@
package org.apache.camel.component.mail;
import java.net.URI;
-import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
Modified: camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConsumer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConsumer.java?rev=1415887&r1=1415886&r2=1415887&view=diff
==============================================================================
--- camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConsumer.java (original)
+++ camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConsumer.java Fri Nov 30 23:37:49 2012
@@ -27,7 +27,6 @@ import javax.mail.Header;
import javax.mail.Message;
import javax.mail.MessagingException;
import javax.mail.Store;
-import javax.mail.search.FlagTerm;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
@@ -38,9 +37,6 @@ import org.apache.camel.util.ObjectHelpe
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import static org.apache.camel.component.mail.SearchTermBuilder.*;
-import static org.apache.camel.component.mail.SearchTermBuilder.Op.and;
-
/**
* A {@link org.apache.camel.Consumer Consumer} which consumes messages from JavaMail using a
* {@link javax.mail.Transport Transport} and dispatches them to the {@link Processor}
Modified: camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/NowSearchTerm.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/NowSearchTerm.java?rev=1415887&r1=1415886&r2=1415887&view=diff
==============================================================================
--- camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/NowSearchTerm.java (original)
+++ camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/NowSearchTerm.java Fri Nov 30 23:37:49 2012
@@ -29,6 +29,7 @@ import javax.mail.search.DateTerm;
*/
public class NowSearchTerm extends ComparisonTerm {
+ private static final long serialVersionUID = 1L;
private final int comparison;
private final boolean sentDate;
private final long offset;
Modified: camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/CronScheduledRoutePolicyTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/CronScheduledRoutePolicyTest.java?rev=1415887&r1=1415886&r2=1415887&view=diff
==============================================================================
--- camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/CronScheduledRoutePolicyTest.java (original)
+++ camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/CronScheduledRoutePolicyTest.java Fri Nov 30 23:37:49 2012
@@ -24,7 +24,6 @@ import org.apache.camel.SuspendableServi
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.quartz.QuartzComponent;
-import org.apache.camel.impl.ServiceSupport;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.apache.camel.util.ServiceHelper;
import org.junit.Test;
Modified: camel/trunk/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/BatchMessage.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/BatchMessage.java?rev=1415887&r1=1415886&r2=1415887&view=diff
==============================================================================
--- camel/trunk/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/BatchMessage.java (original)
+++ camel/trunk/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/BatchMessage.java Fri Nov 30 23:37:49 2012
@@ -33,7 +33,6 @@ public class BatchMessage<T> {
* @param headers may be null
*/
public BatchMessage(T payload, Map<String, Object> headers) {
- super();
if (payload == null) {
throw new IllegalArgumentException("Payload may not be null");
} else {
Modified: camel/trunk/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsConsumer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsConsumer.java?rev=1415887&r1=1415886&r2=1415887&view=diff
==============================================================================
--- camel/trunk/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsConsumer.java (original)
+++ camel/trunk/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsConsumer.java Fri Nov 30 23:37:49 2012
@@ -67,7 +67,7 @@ public class SjmsConsumer extends Defaul
@Override
protected MessageConsumerResources createObject() throws Exception {
MessageConsumerResources model = null;
- if (isTransacted() || getSjmsEndpoint().getExchangePattern().equals(ExchangePattern.InOut)) {
+ if (isTransacted() || getEndpoint().getExchangePattern().equals(ExchangePattern.InOut)) {
model = createConsumerWithDedicatedSession();
} else {
model = createConsumerListener();
@@ -108,13 +108,11 @@ public class SjmsConsumer extends Defaul
private final MessageConsumer messageConsumer;
public MessageConsumerResources(MessageConsumer messageConsumer) {
- super();
this.session = null;
this.messageConsumer = messageConsumer;
}
public MessageConsumerResources(Session session, MessageConsumer messageConsumer) {
- super();
this.session = session;
this.messageConsumer = messageConsumer;
}
@@ -213,10 +211,10 @@ public class SjmsConsumer extends Defaul
protected MessageListener createMessageHandler(Session session) {
TransactionCommitStrategy commitStrategy = null;
- if (this.getTransactionCommitStrategy() != null) {
- commitStrategy = this.getTransactionCommitStrategy();
- } else if (this.getTransactionBatchCount() > 0) {
- commitStrategy = new BatchTransactionCommitStrategy(this.getTransactionBatchCount());
+ if (getTransactionCommitStrategy() != null) {
+ commitStrategy = getTransactionCommitStrategy();
+ } else if (getTransactionBatchCount() > 0) {
+ commitStrategy = new BatchTransactionCommitStrategy(getTransactionBatchCount());
} else {
commitStrategy = new DefaultTransactionCommitStrategy();
}
@@ -230,7 +228,7 @@ public class SjmsConsumer extends Defaul
}
AbstractMessageHandler messageHandler;
- if (getSjmsEndpoint().getExchangePattern().equals(ExchangePattern.InOnly)) {
+ if (getEndpoint().getExchangePattern().equals(ExchangePattern.InOnly)) {
if (isTransacted()) {
messageHandler = new InOnlyMessageHandler(getEndpoint(), executor, synchronization);
} else {
@@ -251,20 +249,16 @@ public class SjmsConsumer extends Defaul
return messageHandler;
}
- protected SjmsEndpoint getSjmsEndpoint() {
- return (SjmsEndpoint)this.getEndpoint();
- }
-
protected ConnectionResource getConnectionResource() {
- return getSjmsEndpoint().getConnectionResource();
+ return getEndpoint().getConnectionResource();
}
protected SessionPool getSessionPool() {
- return getSjmsEndpoint().getSessions();
+ return getEndpoint().getSessions();
}
public int getAcknowledgementMode() {
- return getSjmsEndpoint().getAcknowledgementMode().intValue();
+ return getEndpoint().getAcknowledgementMode().intValue();
}
/**
@@ -273,7 +267,7 @@ public class SjmsConsumer extends Defaul
* @return true if transacted, otherwise false
*/
public boolean isTransacted() {
- return getSjmsEndpoint().isTransacted();
+ return getEndpoint().isTransacted();
}
/**
@@ -282,7 +276,7 @@ public class SjmsConsumer extends Defaul
* @return true if synchronous
*/
public boolean isSynchronous() {
- return getSjmsEndpoint().isSynchronous();
+ return getEndpoint().isSynchronous();
}
/**
@@ -291,7 +285,7 @@ public class SjmsConsumer extends Defaul
* @return String
*/
public String getDestinationName() {
- return getSjmsEndpoint().getDestinationName();
+ return getEndpoint().getDestinationName();
}
/**
@@ -300,7 +294,7 @@ public class SjmsConsumer extends Defaul
* @return the consumerCount
*/
public int getConsumerCount() {
- return getSjmsEndpoint().getConsumerCount();
+ return getEndpoint().getConsumerCount();
}
/**
@@ -310,14 +304,14 @@ public class SjmsConsumer extends Defaul
* @return the topic true if consumer is a JMS Topic, default is false
*/
public boolean isTopic() {
- return getSjmsEndpoint().isTopic();
+ return getEndpoint().isTopic();
}
/**
* Gets the JMS Message selector syntax.
*/
public String getMessageSelector() {
- return getSjmsEndpoint().getMessageSelector();
+ return getEndpoint().getMessageSelector();
}
/**
@@ -326,7 +320,7 @@ public class SjmsConsumer extends Defaul
* @return the durableSubscriptionId
*/
public String getDurableSubscriptionId() {
- return getSjmsEndpoint().getDurableSubscriptionId();
+ return getEndpoint().getDurableSubscriptionId();
}
/**
@@ -335,7 +329,7 @@ public class SjmsConsumer extends Defaul
* @return the transactionCommitStrategy
*/
public TransactionCommitStrategy getTransactionCommitStrategy() {
- return getSjmsEndpoint().getTransactionCommitStrategy();
+ return getEndpoint().getTransactionCommitStrategy();
}
/**
@@ -345,7 +339,7 @@ public class SjmsConsumer extends Defaul
* @return the transactionBatchCount
*/
public int getTransactionBatchCount() {
- return getSjmsEndpoint().getTransactionBatchCount();
+ return getEndpoint().getTransactionBatchCount();
}
/**
@@ -354,6 +348,6 @@ public class SjmsConsumer extends Defaul
* @return long
*/
public long getTransactionBatchTimeout() {
- return getSjmsEndpoint().getTransactionBatchTimeout();
+ return getEndpoint().getTransactionBatchTimeout();
}
}
Modified: camel/trunk/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsEndpoint.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsEndpoint.java?rev=1415887&r1=1415886&r2=1415887&view=diff
==============================================================================
--- camel/trunk/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsEndpoint.java (original)
+++ camel/trunk/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsEndpoint.java Fri Nov 30 23:37:49 2012
@@ -22,7 +22,6 @@ import org.apache.camel.ExchangePattern;
import org.apache.camel.MultipleConsumersSupport;
import org.apache.camel.Processor;
import org.apache.camel.Producer;
-import org.apache.camel.RuntimeCamelException;
import org.apache.camel.component.sjms.jms.ConnectionResource;
import org.apache.camel.component.sjms.jms.KeyFormatStrategy;
import org.apache.camel.component.sjms.jms.SessionAcknowledgementType;
@@ -59,7 +58,6 @@ public class SjmsEndpoint extends Defaul
private TransactionCommitStrategy transactionCommitStrategy;
public SjmsEndpoint() {
- super();
}
public SjmsEndpoint(String uri, Component component) {
@@ -109,7 +107,7 @@ public class SjmsEndpoint extends Defaul
@Override
public Producer createProducer() throws Exception {
SjmsProducer producer = null;
- if (this.getExchangePattern().equals(ExchangePattern.InOnly)) {
+ if (getExchangePattern().equals(ExchangePattern.InOnly)) {
producer = new InOnlyProducer(this);
} else {
producer = new InOutProducer(this);
@@ -140,20 +138,16 @@ public class SjmsEndpoint extends Defaul
return answer;
}
- public SjmsComponent getSjmsComponent() {
- return (SjmsComponent)this.getComponent();
- }
-
public ConnectionResource getConnectionResource() {
- return this.getSjmsComponent().getConnectionResource();
+ return getComponent().getConnectionResource();
}
public HeaderFilterStrategy getSjmsHeaderFilterStrategy() {
- return getSjmsComponent().getHeaderFilterStrategy();
+ return getComponent().getHeaderFilterStrategy();
}
public KeyFormatStrategy getJmsKeyFormatStrategy() {
- return getSjmsComponent().getKeyFormatStrategy();
+ return getComponent().getKeyFormatStrategy();
}
/**
Modified: camel/trunk/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsProducer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsProducer.java?rev=1415887&r1=1415886&r2=1415887&view=diff
==============================================================================
--- camel/trunk/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsProducer.java (original)
+++ camel/trunk/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsProducer.java Fri Nov 30 23:37:49 2012
@@ -86,7 +86,6 @@ public abstract class SjmsProducer exten
}
public MessageProducerResources(Session session, MessageProducer messageProducer, TransactionCommitStrategy commitStrategy) {
- super();
this.session = session;
this.messageProducer = messageProducer;
this.commitStrategy = commitStrategy;
Modified: camel/trunk/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/consumer/AbstractMessageHandler.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/consumer/AbstractMessageHandler.java?rev=1415887&r1=1415886&r2=1415887&view=diff
==============================================================================
--- camel/trunk/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/consumer/AbstractMessageHandler.java (original)
+++ camel/trunk/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/consumer/AbstractMessageHandler.java Fri Nov 30 23:37:49 2012
@@ -59,7 +59,6 @@ public abstract class AbstractMessageHan
}
public AbstractMessageHandler(Endpoint endpoint, ExecutorService executor, Synchronization synchronization) {
- super();
this.synchronization = synchronization;
this.endpoint = endpoint;
this.executor = executor;
Modified: camel/trunk/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/consumer/InOnlyMessageHandler.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/consumer/InOnlyMessageHandler.java?rev=1415887&r1=1415886&r2=1415887&view=diff
==============================================================================
--- camel/trunk/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/consumer/InOnlyMessageHandler.java (original)
+++ camel/trunk/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/consumer/InOnlyMessageHandler.java Fri Nov 30 23:37:49 2012
@@ -63,7 +63,7 @@ public class InOnlyMessageHandler extend
// must process synchronous if transacted or configured to
// do so
if (log.isDebugEnabled()) {
- log.debug("Synchronous processing: Message[{}], Destination[{}] ", exchange.getIn().getBody(), this.getEndpoint().getEndpointUri());
+ log.debug("Synchronous processing: Message[{}], Destination[{}] ", exchange.getIn().getBody(), getEndpoint().getEndpointUri());
}
try {
AsyncProcessorHelper.process(getProcessor(), exchange);
@@ -74,7 +74,7 @@ public class InOnlyMessageHandler extend
}
} else {
// process asynchronous using the async routing engine
- log.debug("Aynchronous processing: Message[{}], Destination[{}] ", exchange.getIn().getBody(), this.getEndpoint().getEndpointUri());
+ log.debug("Aynchronous processing: Message[{}], Destination[{}] ", exchange.getIn().getBody(), getEndpoint().getEndpointUri());
boolean sync = false;
sync = AsyncProcessorHelper.process(getProcessor(), exchange, callback);
Modified: camel/trunk/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/consumer/InOutMessageHandler.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/consumer/InOutMessageHandler.java?rev=1415887&r1=1415886&r2=1415887&view=diff
==============================================================================
--- camel/trunk/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/consumer/InOutMessageHandler.java (original)
+++ camel/trunk/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/consumer/InOutMessageHandler.java Fri Nov 30 23:37:49 2012
@@ -116,7 +116,7 @@ public class InOutMessageHandler extends
if (isTransacted() || isSynchronous()) {
// must process synchronous if transacted or configured to
// do so
- log.debug("Synchronous processing: Message[{}], Destination[{}] ", exchange.getIn().getBody(), this.getEndpoint().getEndpointUri());
+ log.debug("Synchronous processing: Message[{}], Destination[{}] ", exchange.getIn().getBody(), getEndpoint().getEndpointUri());
try {
AsyncProcessorHelper.process(getProcessor(), exchange);
} catch (Exception e) {
@@ -126,7 +126,7 @@ public class InOutMessageHandler extends
}
} else {
// process asynchronous using the async routing engine
- log.debug("Aynchronous processing: Message[{}], Destination[{}] ", exchange.getIn().getBody(), this.getEndpoint().getEndpointUri());
+ log.debug("Aynchronous processing: Message[{}], Destination[{}] ", exchange.getIn().getBody(), getEndpoint().getEndpointUri());
boolean sync = AsyncProcessorHelper.process(getProcessor(), exchange, callback);
if (!sync) {
// will be done async so return now
@@ -177,7 +177,6 @@ public class InOutMessageHandler extends
private MessageProducer localProducer;
public MessageHanderAsyncCallback(Exchange exchange, MessageProducer localProducer) {
- super();
this.exchange = exchange;
this.localProducer = localProducer;
}
Modified: camel/trunk/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/ConnectionFactoryResource.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/ConnectionFactoryResource.java?rev=1415887&r1=1415886&r2=1415887&view=diff
==============================================================================
--- camel/trunk/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/ConnectionFactoryResource.java (original)
+++ camel/trunk/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/ConnectionFactoryResource.java Fri Nov 30 23:37:49 2012
@@ -34,7 +34,6 @@ public class ConnectionFactoryResource e
* Default Constructor
*/
public ConnectionFactoryResource() {
- super();
}
/**
@@ -76,12 +75,12 @@ public class ConnectionFactoryResource e
@Override
public Connection borrowConnection() throws Exception {
- return this.borrowObject();
+ return borrowObject();
}
@Override
public Connection borrowConnection(long timeout) throws Exception {
- return this.borrowObject(timeout);
+ return borrowObject(timeout);
}
@Override
Modified: camel/trunk/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/IllegalHeaderException.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/IllegalHeaderException.java?rev=1415887&r1=1415886&r2=1415887&view=diff
==============================================================================
--- camel/trunk/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/IllegalHeaderException.java (original)
+++ camel/trunk/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/IllegalHeaderException.java Fri Nov 30 23:37:49 2012
@@ -30,7 +30,6 @@ public class IllegalHeaderException exte
/**
*/
public IllegalHeaderException() {
- super();
}
/**
Modified: camel/trunk/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/ObjectPool.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/ObjectPool.java?rev=1415887&r1=1415886&r2=1415887&view=diff
==============================================================================
--- camel/trunk/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/ObjectPool.java (original)
+++ camel/trunk/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/ObjectPool.java Fri Nov 30 23:37:49 2012
@@ -118,7 +118,7 @@ public abstract class ObjectPool<T> {
* @throws Exception
*/
public void returnObject(T object) throws Exception {
- this.objects.add(object);
+ objects.add(object);
}
/**
Modified: camel/trunk/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/SessionAcknowledgementType.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/SessionAcknowledgementType.java?rev=1415887&r1=1415886&r2=1415887&view=diff
==============================================================================
--- camel/trunk/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/SessionAcknowledgementType.java (original)
+++ camel/trunk/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/SessionAcknowledgementType.java Fri Nov 30 23:37:49 2012
@@ -35,6 +35,6 @@ public enum SessionAcknowledgementType {
}
public int intValue() {
- return this.intValue;
+ return intValue;
}
}
Modified: camel/trunk/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/producer/InOnlyProducer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/producer/InOnlyProducer.java?rev=1415887&r1=1415886&r2=1415887&view=diff
==============================================================================
--- camel/trunk/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/producer/InOnlyProducer.java (original)
+++ camel/trunk/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/producer/InOnlyProducer.java Fri Nov 30 23:37:49 2012
@@ -55,8 +55,8 @@ public class InOnlyProducer extends Sjms
TransactionCommitStrategy commitStrategy = null;
Session session = null;
if (isEndpointTransacted()) {
- if (this.getCommitStrategy() != null) {
- commitStrategy = this.getCommitStrategy();
+ if (getCommitStrategy() != null) {
+ commitStrategy = getCommitStrategy();
} else {
commitStrategy = new DefaultTransactionCommitStrategy();
}
Modified: camel/trunk/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/producer/InOutProducer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/producer/InOutProducer.java?rev=1415887&r1=1415886&r2=1415887&view=diff
==============================================================================
--- camel/trunk/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/producer/InOutProducer.java (original)
+++ camel/trunk/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/producer/InOutProducer.java Fri Nov 30 23:37:49 2012
@@ -149,7 +149,6 @@ public class InOutProducer extends SjmsP
* @param messageConsumer
*/
public MessageConsumerResource(Session session, MessageConsumer messageConsumer, Destination replyToDestination) {
- super();
this.session = session;
this.messageConsumer = messageConsumer;
this.replyToDestination = replyToDestination;
@@ -178,7 +177,6 @@ public class InOutProducer extends SjmsP
* @param exchanger
*/
public InternalTempDestinationListener(Exchanger<Object> exchanger) {
- super();
this.exchanger = exchanger;
}
Modified: camel/trunk/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/tx/BatchTransactionCommitStrategy.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/tx/BatchTransactionCommitStrategy.java?rev=1415887&r1=1415886&r2=1415887&view=diff
==============================================================================
--- camel/trunk/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/tx/BatchTransactionCommitStrategy.java (original)
+++ camel/trunk/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/tx/BatchTransactionCommitStrategy.java Fri Nov 30 23:37:49 2012
@@ -35,7 +35,6 @@ public class BatchTransactionCommitStrat
* @param count
*/
public BatchTransactionCommitStrategy(int count) {
- super();
this.count = count;
}
Modified: camel/trunk/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/tx/SessionTransactionSynchronization.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/tx/SessionTransactionSynchronization.java?rev=1415887&r1=1415886&r2=1415887&view=diff
==============================================================================
--- camel/trunk/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/tx/SessionTransactionSynchronization.java (original)
+++ camel/trunk/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/tx/SessionTransactionSynchronization.java Fri Nov 30 23:37:49 2012
@@ -52,7 +52,7 @@ public class SessionTransactionSynchroni
if (commitStrategy.rollback(exchange)) {
log.debug("Processing failure of Exchange id:{}", exchange.getExchangeId());
if (session != null && session.getTransacted()) {
- this.session.rollback();
+ session.rollback();
}
}
} catch (Exception e) {
@@ -72,7 +72,7 @@ public class SessionTransactionSynchroni
if (commitStrategy.commit(exchange)) {
log.debug("Processing completion of Exchange id:{}", exchange.getExchangeId());
if (session != null && session.getTransacted()) {
- this.session.commit();
+ session.commit();
}
}
} catch (Exception e) {
Modified: camel/trunk/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SimpleJmsComponentTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SimpleJmsComponentTest.java?rev=1415887&r1=1415886&r2=1415887&view=diff
==============================================================================
--- camel/trunk/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SimpleJmsComponentTest.java (original)
+++ camel/trunk/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SimpleJmsComponentTest.java Fri Nov 30 23:37:49 2012
@@ -26,7 +26,7 @@ public class SimpleJmsComponentTest exte
@Test
public void testHelloWorld() throws Exception {
- SjmsComponent component = (SjmsComponent)this.context.getComponent("sjms");
+ SjmsComponent component = context.getComponent("sjms", SjmsComponent.class);
assertNotNull(component);
}
Modified: camel/trunk/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/it/ConnectionResourceIT.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/it/ConnectionResourceIT.java?rev=1415887&r1=1415886&r2=1415887&view=diff
==============================================================================
--- camel/trunk/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/it/ConnectionResourceIT.java (original)
+++ camel/trunk/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/it/ConnectionResourceIT.java Fri Nov 30 23:37:49 2012
@@ -112,7 +112,6 @@ public class ConnectionResourceIT extend
private PooledConnectionFactory pcf;
public AMQConnectionResource(String connectString, int maxConnections) {
- super();
pcf = new PooledConnectionFactory(connectString);
pcf.setMaxConnections(maxConnections);
pcf.start();
Modified: camel/trunk/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/jms/ObjectPoolTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/jms/ObjectPoolTest.java?rev=1415887&r1=1415886&r2=1415887&view=diff
==============================================================================
--- camel/trunk/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/jms/ObjectPoolTest.java (original)
+++ camel/trunk/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/jms/ObjectPoolTest.java Fri Nov 30 23:37:49 2012
@@ -171,7 +171,6 @@ public class ObjectPoolTest {
class TestPool extends ObjectPool<MyPooledObject> {
public TestPool() {
- super();
}
public TestPool(int poolSize) {
@@ -190,7 +189,7 @@ public class ObjectPoolTest {
}
- class MyPooledObject {
+ static class MyPooledObject {
private int objectId = -1;
public MyPooledObject(int objectId) {
@@ -205,7 +204,7 @@ public class ObjectPoolTest {
}
}
- class BadTestPool extends ObjectPool<Object> {
+ static class BadTestPool extends ObjectPool<Object> {
@Override
protected Object createObject() throws Exception {
throw new Exception();
@@ -213,8 +212,6 @@ public class ObjectPoolTest {
@Override
protected void destroyObject(Object t) throws Exception {
- // TODO Auto-generated method stub
-
}
}
Modified: camel/trunk/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/InOutQueueProducerAsyncLoadTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/InOutQueueProducerAsyncLoadTest.java?rev=1415887&r1=1415886&r2=1415887&view=diff
==============================================================================
--- camel/trunk/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/InOutQueueProducerAsyncLoadTest.java (original)
+++ camel/trunk/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/InOutQueueProducerAsyncLoadTest.java Fri Nov 30 23:37:49 2012
@@ -129,10 +129,6 @@ public class InOutQueueProducerAsyncLoad
protected class MyMessageListener implements MessageListener {
private MessageProducer mp;
- public MyMessageListener() {
- super();
- }
-
@Override
public void onMessage(Message message) {
try {
Modified: camel/trunk/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/InOutQueueProducerSyncLoadTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/InOutQueueProducerSyncLoadTest.java?rev=1415887&r1=1415886&r2=1415887&view=diff
==============================================================================
--- camel/trunk/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/InOutQueueProducerSyncLoadTest.java (original)
+++ camel/trunk/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/InOutQueueProducerSyncLoadTest.java Fri Nov 30 23:37:49 2012
@@ -129,10 +129,6 @@ public class InOutQueueProducerSyncLoadT
protected class MyMessageListener implements MessageListener {
private MessageProducer mp;
- public MyMessageListener() {
- super();
- }
-
@Override
public void onMessage(Message message) {
try {
Modified: camel/trunk/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/InOutQueueProducerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/InOutQueueProducerTest.java?rev=1415887&r1=1415886&r2=1415887&view=diff
==============================================================================
--- camel/trunk/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/InOutQueueProducerTest.java (original)
+++ camel/trunk/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/InOutQueueProducerTest.java Fri Nov 30 23:37:49 2012
@@ -117,7 +117,6 @@ public class InOutQueueProducerTest exte
* @param response
*/
public MyMessageListener(String request, String response) {
- super();
this.requestText = request;
this.responseText = response;
}
Modified: camel/trunk/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/InOutTempQueueProducerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/InOutTempQueueProducerTest.java?rev=1415887&r1=1415886&r2=1415887&view=diff
==============================================================================
--- camel/trunk/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/InOutTempQueueProducerTest.java (original)
+++ camel/trunk/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/InOutTempQueueProducerTest.java Fri Nov 30 23:37:49 2012
@@ -91,7 +91,6 @@ public class InOutTempQueueProducerTest
* @param response
*/
public MyMessageListener(String request, String response) {
- super();
this.requestText = request;
this.responseText = response;
}
Modified: camel/trunk/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/support/MyInOutTestConsumer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/support/MyInOutTestConsumer.java?rev=1415887&r1=1415886&r2=1415887&view=diff
==============================================================================
--- camel/trunk/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/support/MyInOutTestConsumer.java (original)
+++ camel/trunk/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/support/MyInOutTestConsumer.java Fri Nov 30 23:37:49 2012
@@ -58,8 +58,8 @@ public class MyInOutTestConsumer impleme
Destination adminQueue = session.createQueue(clientQueueName);
//Setup a message producer to send message to the queue the server is consuming from
- this.producer = session.createProducer(adminQueue);
- this.producer.setDeliveryMode(DeliveryMode.NON_PERSISTENT);
+ producer = session.createProducer(adminQueue);
+ producer.setDeliveryMode(DeliveryMode.NON_PERSISTENT);
//Create a temporary queue that this client will listen for responses on then create a consumer
//that consumes message from this temporary queue...for a real application a client should reuse
@@ -83,9 +83,9 @@ public class MyInOutTestConsumer impleme
//same correlation ID can be used for all the messages...if there is more than one outstanding
//message to the server you would presumably want to associate the correlation ID with this
//message somehow...a Map works good
- String correlationId = this.createRandomString();
+ String correlationId = createRandomString();
txtMessage.setJMSCorrelationID(correlationId);
- this.producer.send(txtMessage);
+ producer.send(txtMessage);
} catch (JMSException e) {
//Handle the exception appropriately
}
Modified: camel/trunk/examples/camel-example-tracer/src/main/java/org/apache/camel/example/tracer/FixedDerbyDialect.java
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-tracer/src/main/java/org/apache/camel/example/tracer/FixedDerbyDialect.java?rev=1415887&r1=1415886&r2=1415887&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-tracer/src/main/java/org/apache/camel/example/tracer/FixedDerbyDialect.java (original)
+++ camel/trunk/examples/camel-example-tracer/src/main/java/org/apache/camel/example/tracer/FixedDerbyDialect.java Fri Nov 30 23:37:49 2012
@@ -27,7 +27,6 @@ import org.hibernate.dialect.DerbyDialec
public class FixedDerbyDialect extends DerbyDialect {
public FixedDerbyDialect() {
- super();
registerColumnType(Types.CLOB, "clob");
}
}