CAMEL-8759 Fixed some minor error that is found by error prone
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/79f30080 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/79f30080 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/79f30080 Branch: refs/heads/master Commit: 79f300802e280b84e357b387d530de040c0dc52e Parents: a7fb943 Author: Willem Jiang <willem.ji...@gmail.com> Authored: Sun May 10 22:26:09 2015 +0800 Committer: Willem Jiang <willem.ji...@gmail.com> Committed: Sun May 10 22:26:24 2015 +0800 ---------------------------------------------------------------------- .../camel/api/management/mbean/ManagedCamelContextMBean.java | 1 + .../java/org/apache/camel/component/seda/SedaComponent.java | 1 + camel-core/src/main/java/org/apache/camel/spi/Container.java | 1 + .../camel/converter/myconverter/PurchaseOrderConverter.java | 2 +- .../camel/component/atmosphere/websocket/TestClient.java | 5 ++--- .../apache/camel/component/aws/swf/SWFActivityConsumer.java | 4 +++- .../apache/camel/component/aws/swf/SWFWorkflowConsumer.java | 7 ++++--- .../camel/core/xml/AbstractCamelEndpointFactoryBean.java | 1 + .../src/main/java/org/apache/camel/component/hl7/AckCode.java | 1 + .../src/main/java/org/apache/camel/component/hl7/HL7.java | 1 + .../org/apache/camel/component/http/helper/HttpHelper.java | 1 + .../org/apache/camel/component/http4/helper/HttpHelper.java | 1 + .../main/java/org/apache/camel/component/jcr/JcrConsumer.java | 3 ++- .../apache/camel/component/kestrel/KestrelSpringXmlTest.java | 2 ++ .../camel/component/xquery/XQueryModuleURIResolver.java | 4 +++- .../org/apache/camel/component/smpp/AbstractSmppCommand.java | 1 + .../spring/ws/ConsumerExceptionPropagationRouteTest.java | 1 + .../java/org/apache/camel/component/ssh/SshConfiguration.java | 2 ++ .../main/java/org/apache/camel/component/ssh/SshEndpoint.java | 2 ++ .../websocket/WebsocketProducerRouteExampleTest.java | 3 ++- .../camel/dataformat/xstream/AbstractXStreamWrapper.java | 1 + 21 files changed, 34 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/79f30080/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedCamelContextMBean.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedCamelContextMBean.java b/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedCamelContextMBean.java index 2ad580b..abf246e 100644 --- a/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedCamelContextMBean.java +++ b/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedCamelContextMBean.java @@ -85,6 +85,7 @@ public interface ManagedCamelContextMBean extends ManagedPerformanceCounterMBean * @deprecated use {@link #getExchangesInflight()} */ @ManagedAttribute(description = "Current number of inflight Exchanges") + @Deprecated Integer getInflightExchanges(); @ManagedAttribute(description = "Total number of routes") http://git-wip-us.apache.org/repos/asf/camel/blob/79f30080/camel-core/src/main/java/org/apache/camel/component/seda/SedaComponent.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/component/seda/SedaComponent.java b/camel-core/src/main/java/org/apache/camel/component/seda/SedaComponent.java index 9163c74..c8084ce 100644 --- a/camel-core/src/main/java/org/apache/camel/component/seda/SedaComponent.java +++ b/camel-core/src/main/java/org/apache/camel/component/seda/SedaComponent.java @@ -92,6 +92,7 @@ public class SedaComponent extends UriEndpointComponent { /** * @deprecated use {@link #getOrCreateQueue(SedaEndpoint, Integer, Boolean, BlockingQueueFactory)} */ + @Deprecated public synchronized QueueReference getOrCreateQueue(SedaEndpoint endpoint, Integer size, Boolean multipleConsumers) { return getOrCreateQueue(endpoint, size, multipleConsumers, null); } http://git-wip-us.apache.org/repos/asf/camel/blob/79f30080/camel-core/src/main/java/org/apache/camel/spi/Container.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/spi/Container.java b/camel-core/src/main/java/org/apache/camel/spi/Container.java index 208edd5..b259f31 100644 --- a/camel-core/src/main/java/org/apache/camel/spi/Container.java +++ b/camel-core/src/main/java/org/apache/camel/spi/Container.java @@ -38,6 +38,7 @@ import org.slf4j.LoggerFactory; * @deprecated use {@link CamelContextTracker} and {@link org.apache.camel.impl.CamelContextTrackerRegistry} */ // [TODO] Remove in 3.0 +@Deprecated public interface Container { /** http://git-wip-us.apache.org/repos/asf/camel/blob/79f30080/camel-core/src/test/java/org/apache/camel/converter/myconverter/PurchaseOrderConverter.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/converter/myconverter/PurchaseOrderConverter.java b/camel-core/src/test/java/org/apache/camel/converter/myconverter/PurchaseOrderConverter.java index 3388184..684552b 100644 --- a/camel-core/src/test/java/org/apache/camel/converter/myconverter/PurchaseOrderConverter.java +++ b/camel-core/src/test/java/org/apache/camel/converter/myconverter/PurchaseOrderConverter.java @@ -51,7 +51,7 @@ public class PurchaseOrderConverter implements TypeConverterAware { String s3 = s.substring(20).trim(); BigDecimal price = new BigDecimal(s2); - price.setScale(2); + price = price.setScale(2); Integer amount = converter.convertTo(Integer.class, s3); http://git-wip-us.apache.org/repos/asf/camel/blob/79f30080/components/camel-atmosphere-websocket/src/test/java/org/apache/camel/component/atmosphere/websocket/TestClient.java ---------------------------------------------------------------------- diff --git a/components/camel-atmosphere-websocket/src/test/java/org/apache/camel/component/atmosphere/websocket/TestClient.java b/components/camel-atmosphere-websocket/src/test/java/org/apache/camel/component/atmosphere/websocket/TestClient.java index ae9df8b..df0b9be 100644 --- a/components/camel-atmosphere-websocket/src/test/java/org/apache/camel/component/atmosphere/websocket/TestClient.java +++ b/components/camel-atmosphere-websocket/src/test/java/org/apache/camel/component/atmosphere/websocket/TestClient.java @@ -18,6 +18,7 @@ package org.apache.camel.component.atmosphere.websocket; import java.io.IOException; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import java.util.concurrent.CountDownLatch; import java.util.concurrent.ExecutionException; @@ -29,8 +30,6 @@ import com.ning.http.client.ws.WebSocket; import com.ning.http.client.ws.WebSocketByteListener; import com.ning.http.client.ws.WebSocketTextListener; import com.ning.http.client.ws.WebSocketUpgradeHandler; - - import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -140,7 +139,7 @@ public class TestClient { @Override public void onMessage(byte[] message) { received.add(message); - LOG.info("[ws] received bytes --> " + message); + LOG.info("[ws] received bytes --> " + Arrays.toString(message)); latch.countDown(); } http://git-wip-us.apache.org/repos/asf/camel/blob/79f30080/components/camel-aws/src/main/java/org/apache/camel/component/aws/swf/SWFActivityConsumer.java ---------------------------------------------------------------------- diff --git a/components/camel-aws/src/main/java/org/apache/camel/component/aws/swf/SWFActivityConsumer.java b/components/camel-aws/src/main/java/org/apache/camel/component/aws/swf/SWFActivityConsumer.java index d5dff14..2f2f60c 100644 --- a/components/camel-aws/src/main/java/org/apache/camel/component/aws/swf/SWFActivityConsumer.java +++ b/components/camel-aws/src/main/java/org/apache/camel/component/aws/swf/SWFActivityConsumer.java @@ -16,6 +16,8 @@ */ package org.apache.camel.component.aws.swf; +import java.util.Arrays; + import com.amazonaws.services.simpleworkflow.flow.worker.GenericActivityWorker; import org.apache.camel.Exchange; import org.apache.camel.Processor; @@ -37,7 +39,7 @@ public class SWFActivityConsumer extends DefaultConsumer { } public Object processActivity(Object[] inputParameters, String taskToken) throws Exception { - LOGGER.debug("Processing activity task: " + inputParameters); + LOGGER.debug("Processing activity task: " + Arrays.toString(inputParameters)); Exchange exchange = endpoint.createExchange(inputParameters, SWFConstants.EXECUTE_ACTION); exchange.getIn().setHeader(SWFConstants.TASK_TOKEN, taskToken); http://git-wip-us.apache.org/repos/asf/camel/blob/79f30080/components/camel-aws/src/main/java/org/apache/camel/component/aws/swf/SWFWorkflowConsumer.java ---------------------------------------------------------------------- diff --git a/components/camel-aws/src/main/java/org/apache/camel/component/aws/swf/SWFWorkflowConsumer.java b/components/camel-aws/src/main/java/org/apache/camel/component/aws/swf/SWFWorkflowConsumer.java index 842917a..9192535 100644 --- a/components/camel-aws/src/main/java/org/apache/camel/component/aws/swf/SWFWorkflowConsumer.java +++ b/components/camel-aws/src/main/java/org/apache/camel/component/aws/swf/SWFWorkflowConsumer.java @@ -16,6 +16,8 @@ */ package org.apache.camel.component.aws.swf; +import java.util.Arrays; + import com.amazonaws.services.simpleworkflow.flow.worker.GenericWorkflowWorker; import org.apache.camel.Exchange; import org.apache.camel.Processor; @@ -23,7 +25,6 @@ import org.apache.camel.impl.DefaultConsumer; import org.apache.camel.util.URISupport; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - import static org.apache.camel.ExchangePattern.InOnly; public class SWFWorkflowConsumer extends DefaultConsumer { @@ -39,7 +40,7 @@ public class SWFWorkflowConsumer extends DefaultConsumer { } public Object processWorkflow(Object[] parameters, long startTime, boolean replaying) throws Exception { - LOGGER.debug("Processing workflow task: " + parameters); + LOGGER.debug("Processing workflow task: " + Arrays.toString(parameters)); Exchange exchange = endpoint.createExchange(parameters, SWFConstants.EXECUTE_ACTION); exchange.getIn().setHeader(SWFConstants.WORKFLOW_START_TIME, startTime); exchange.getIn().setHeader(SWFConstants.WORKFLOW_REPLAYING, replaying); @@ -49,7 +50,7 @@ public class SWFWorkflowConsumer extends DefaultConsumer { } public void signalRecieved(Object[] parameters) throws Exception { - LOGGER.debug("signalRecieved: " + parameters); + LOGGER.debug("signalRecieved: " + Arrays.toString(parameters)); Exchange exchange = endpoint.createExchange(parameters, SWFConstants.SIGNAL_RECEIVED_ACTION); exchange.setPattern(InOnly); http://git-wip-us.apache.org/repos/asf/camel/blob/79f30080/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelEndpointFactoryBean.java ---------------------------------------------------------------------- diff --git a/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelEndpointFactoryBean.java b/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelEndpointFactoryBean.java index 231faa0..72bd289 100644 --- a/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelEndpointFactoryBean.java +++ b/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelEndpointFactoryBean.java @@ -97,6 +97,7 @@ public abstract class AbstractCamelEndpointFactoryBean extends AbstractCamelFact * * @deprecated set the pattern in the uri */ + @Deprecated public void setPattern(ExchangePattern pattern) { this.pattern = pattern; } http://git-wip-us.apache.org/repos/asf/camel/blob/79f30080/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/AckCode.java ---------------------------------------------------------------------- diff --git a/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/AckCode.java b/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/AckCode.java index 493caf2..f3a5710 100644 --- a/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/AckCode.java +++ b/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/AckCode.java @@ -21,6 +21,7 @@ import ca.uhn.hl7v2.AcknowledgmentCode; /** * @deprecated use {@link ca.uhn.hl7v2.AcknowledgmentCode} */ +@Deprecated public enum AckCode { AA(false), CA(false), AR(true), CR(true), AE(true), CE(true); http://git-wip-us.apache.org/repos/asf/camel/blob/79f30080/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL7.java ---------------------------------------------------------------------- diff --git a/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL7.java b/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL7.java index d9e8fdf..8c5e6e7 100644 --- a/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL7.java +++ b/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL7.java @@ -44,6 +44,7 @@ public final class HL7 { /** * @deprecated Use {@link #ack(ca.uhn.hl7v2.AcknowledgmentCode)} */ + @Deprecated public static ValueBuilder ack(AckCode code) { return new ValueBuilder(new AckExpression(code)); } http://git-wip-us.apache.org/repos/asf/camel/blob/79f30080/components/camel-http/src/main/java/org/apache/camel/component/http/helper/HttpHelper.java ---------------------------------------------------------------------- diff --git a/components/camel-http/src/main/java/org/apache/camel/component/http/helper/HttpHelper.java b/components/camel-http/src/main/java/org/apache/camel/component/http/helper/HttpHelper.java index 36374a2..5705d01 100644 --- a/components/camel-http/src/main/java/org/apache/camel/component/http/helper/HttpHelper.java +++ b/components/camel-http/src/main/java/org/apache/camel/component/http/helper/HttpHelper.java @@ -124,6 +124,7 @@ public final class HttpHelper { * @deprecated Camel 3.0 * Please use the one which has the parameter of camel context */ + @Deprecated public static Object deserializeJavaObjectFromStream(InputStream is) throws ClassNotFoundException, IOException { return deserializeJavaObjectFromStream(is, null); } http://git-wip-us.apache.org/repos/asf/camel/blob/79f30080/components/camel-http4/src/main/java/org/apache/camel/component/http4/helper/HttpHelper.java ---------------------------------------------------------------------- diff --git a/components/camel-http4/src/main/java/org/apache/camel/component/http4/helper/HttpHelper.java b/components/camel-http4/src/main/java/org/apache/camel/component/http4/helper/HttpHelper.java index 448e64a..be53c80 100644 --- a/components/camel-http4/src/main/java/org/apache/camel/component/http4/helper/HttpHelper.java +++ b/components/camel-http4/src/main/java/org/apache/camel/component/http4/helper/HttpHelper.java @@ -108,6 +108,7 @@ public final class HttpHelper { * @deprecated Camel 3.0 * Please use the one which has the parameter of camel context */ + @Deprecated public static Object deserializeJavaObjectFromStream(InputStream is) throws ClassNotFoundException, IOException { return deserializeJavaObjectFromStream(is, null); } http://git-wip-us.apache.org/repos/asf/camel/blob/79f30080/components/camel-jcr/src/main/java/org/apache/camel/component/jcr/JcrConsumer.java ---------------------------------------------------------------------- diff --git a/components/camel-jcr/src/main/java/org/apache/camel/component/jcr/JcrConsumer.java b/components/camel-jcr/src/main/java/org/apache/camel/component/jcr/JcrConsumer.java index e2c8711..1c7d4e8 100644 --- a/components/camel-jcr/src/main/java/org/apache/camel/component/jcr/JcrConsumer.java +++ b/components/camel-jcr/src/main/java/org/apache/camel/component/jcr/JcrConsumer.java @@ -16,6 +16,7 @@ */ package org.apache.camel.component.jcr; +import java.util.Arrays; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; @@ -121,7 +122,7 @@ public class JcrConsumer extends DefaultConsumer implements SuspendableService { if (LOG.isDebugEnabled()) { LOG.debug("Adding JCR Event Listener, {}, on {}. eventTypes=" + eventTypes + ", isDeep=" + isDeep - + ", uuid=" + uuid + ", nodeTypeName=" + nodeTypeName + ", noLocal=" + noLocal, eventListener, + + ", uuid=" + Arrays.toString(uuid) + ", nodeTypeName=" + Arrays.toString(nodeTypeName) + ", noLocal=" + noLocal, eventListener, absPath); } http://git-wip-us.apache.org/repos/asf/camel/blob/79f30080/components/camel-kestrel/src/test/java/org/apache/camel/component/kestrel/KestrelSpringXmlTest.java ---------------------------------------------------------------------- diff --git a/components/camel-kestrel/src/test/java/org/apache/camel/component/kestrel/KestrelSpringXmlTest.java b/components/camel-kestrel/src/test/java/org/apache/camel/component/kestrel/KestrelSpringXmlTest.java index cf98287..9f85a57 100644 --- a/components/camel-kestrel/src/test/java/org/apache/camel/component/kestrel/KestrelSpringXmlTest.java +++ b/components/camel-kestrel/src/test/java/org/apache/camel/component/kestrel/KestrelSpringXmlTest.java @@ -23,6 +23,7 @@ import org.apache.camel.EndpointInject; import org.apache.camel.ProducerTemplate; import org.apache.camel.component.mock.MockEndpoint; import org.junit.Ignore; +import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ContextConfiguration; @@ -41,6 +42,7 @@ public class KestrelSpringXmlTest extends AbstractJUnit4SpringContextTests { private ProducerTemplate producerTemplate; @DirtiesContext + @Test public void testProduceAndConsume() throws Exception { List<String> bodies = new ArrayList<String>(); for (int k = 0; k < 10; ++k) { http://git-wip-us.apache.org/repos/asf/camel/blob/79f30080/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryModuleURIResolver.java ---------------------------------------------------------------------- diff --git a/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryModuleURIResolver.java b/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryModuleURIResolver.java index 4ab217c..c052b02 100644 --- a/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryModuleURIResolver.java +++ b/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryModuleURIResolver.java @@ -16,6 +16,8 @@ */ package org.apache.camel.component.xquery; +import java.util.Arrays; + import javax.xml.transform.stream.StreamSource; import net.sf.saxon.lib.ModuleURIResolver; @@ -40,7 +42,7 @@ public class XQueryModuleURIResolver implements ModuleURIResolver { ss[i] = new StreamSource(xqueryComponent.resolveModuleResource(locations[i]).openStream()); } } catch (Exception e) { - throw new XPathException("Error resolving resource: " + locations, e); + throw new XPathException("Error resolving resource: " + Arrays.toString(locations), e); } return ss; } http://git-wip-us.apache.org/repos/asf/camel/blob/79f30080/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/AbstractSmppCommand.java ---------------------------------------------------------------------- diff --git a/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/AbstractSmppCommand.java b/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/AbstractSmppCommand.java index c6ad202..52cfb50 100644 --- a/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/AbstractSmppCommand.java +++ b/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/AbstractSmppCommand.java @@ -95,6 +95,7 @@ public abstract class AbstractSmppCommand implements SmppCommand { * @param optinalParamaters * @return */ + @Deprecated @SuppressWarnings("rawtypes") protected List<OptionalParameter> createOptionalParametersByName(Map<String, String> optinalParamaters) { List<OptionalParameter> optParams = new ArrayList<OptionalParameter>(); http://git-wip-us.apache.org/repos/asf/camel/blob/79f30080/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ConsumerExceptionPropagationRouteTest.java ---------------------------------------------------------------------- diff --git a/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ConsumerExceptionPropagationRouteTest.java b/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ConsumerExceptionPropagationRouteTest.java index 050b24d..47ef52f 100644 --- a/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ConsumerExceptionPropagationRouteTest.java +++ b/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ConsumerExceptionPropagationRouteTest.java @@ -72,6 +72,7 @@ public class ConsumerExceptionPropagationRouteTest extends CamelTestSupport { } @Ignore("For now getEndpointUri does not return the initial uri. Info like the endpoint scheme is lost") + @Test public void testValidUri() throws Exception { String deprecate = "spring-ws:rootqname:{http://www.webserviceX.NET/}GetQuote?endpointMapping=#endpointMapping";; String sanitized = "spring-ws:rootqname:(http://www.webserviceX.NET/)GetQuote?endpointMapping=#endpointMapping"; http://git-wip-us.apache.org/repos/asf/camel/blob/79f30080/components/camel-ssh/src/main/java/org/apache/camel/component/ssh/SshConfiguration.java ---------------------------------------------------------------------- diff --git a/components/camel-ssh/src/main/java/org/apache/camel/component/ssh/SshConfiguration.java b/components/camel-ssh/src/main/java/org/apache/camel/component/ssh/SshConfiguration.java index 4d2921c..c809988 100644 --- a/components/camel-ssh/src/main/java/org/apache/camel/component/ssh/SshConfiguration.java +++ b/components/camel-ssh/src/main/java/org/apache/camel/component/ssh/SshConfiguration.java @@ -205,6 +205,7 @@ public class SshConfiguration implements Cloneable { /** * @deprecated As of version 2.11, replaced by {@link #getCertResource()} */ + @Deprecated public String getCertFilename() { return ((certResource != null) && certResource.startsWith("file:")) ? certResource.substring(5) : null; } @@ -212,6 +213,7 @@ public class SshConfiguration implements Cloneable { /** * @deprecated As of version 2.11, replaced by {@link #setCertResource(String)} */ + @Deprecated public void setCertFilename(String certFilename) { this.certResource = "file:" + certFilename; } http://git-wip-us.apache.org/repos/asf/camel/blob/79f30080/components/camel-ssh/src/main/java/org/apache/camel/component/ssh/SshEndpoint.java ---------------------------------------------------------------------- diff --git a/components/camel-ssh/src/main/java/org/apache/camel/component/ssh/SshEndpoint.java b/components/camel-ssh/src/main/java/org/apache/camel/component/ssh/SshEndpoint.java index 63b2643..8235e1b 100644 --- a/components/camel-ssh/src/main/java/org/apache/camel/component/ssh/SshEndpoint.java +++ b/components/camel-ssh/src/main/java/org/apache/camel/component/ssh/SshEndpoint.java @@ -255,6 +255,7 @@ public class SshEndpoint extends ScheduledPollEndpoint { /** * @deprecated As of version 2.11, replaced by {@link #getCertResource()} */ + @Deprecated public String getCertFilename() { return getConfiguration().getCertFilename(); } @@ -262,6 +263,7 @@ public class SshEndpoint extends ScheduledPollEndpoint { /** * @deprecated As of version 2.11, replaced by {@link #setCertResource(String)} */ + @Deprecated public void setCertFilename(String certFilename) { getConfiguration().setCertFilename(certFilename); } http://git-wip-us.apache.org/repos/asf/camel/blob/79f30080/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketProducerRouteExampleTest.java ---------------------------------------------------------------------- diff --git a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketProducerRouteExampleTest.java b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketProducerRouteExampleTest.java index 0789c2e..50429d9 100644 --- a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketProducerRouteExampleTest.java +++ b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketProducerRouteExampleTest.java @@ -17,6 +17,7 @@ package org.apache.camel.component.websocket; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; @@ -106,7 +107,7 @@ public class WebsocketProducerRouteExampleTest extends CamelTestSupport { @Override public void onMessage(byte[] message) { received.add(message); - log.info("received --> " + message); + log.info("received --> " + Arrays.toString(message)); latch.countDown(); } http://git-wip-us.apache.org/repos/asf/camel/blob/79f30080/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/AbstractXStreamWrapper.java ---------------------------------------------------------------------- diff --git a/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/AbstractXStreamWrapper.java b/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/AbstractXStreamWrapper.java index 0f206fc..2981f66 100644 --- a/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/AbstractXStreamWrapper.java +++ b/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/AbstractXStreamWrapper.java @@ -97,6 +97,7 @@ public abstract class AbstractXStreamWrapper implements DataFormat { /** * @deprecated Use {@link #createXStream(ClassResolver, ClassLoader)} */ + @Deprecated protected XStream createXStream(ClassResolver resolver) { return createXStream(resolver, null); }
