Repository: camel Updated Branches: refs/heads/master 4fc41c459 -> d663114ac
Fix some checkstyle issues in eclipse Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d663114a Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d663114a Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d663114a Branch: refs/heads/master Commit: d663114ac9f07da139279d27ba1e0a8b9d9830cb Parents: 4fc41c4 Author: Daniel Kulp <dk...@apache.org> Authored: Wed Jul 22 12:40:03 2015 -0400 Committer: Daniel Kulp <dk...@apache.org> Committed: Wed Jul 22 12:40:34 2015 -0400 ---------------------------------------------------------------------- .../blueprint/CamelContextFactoryBean.java | 3 +- .../apache/camel/component/cxf/CxfEndpoint.java | 2 +- .../camel/component/cxf/CxfConsumerTest.java | 22 +++++++------- .../component/cxf/SoapMessageProvider.java | 2 +- .../jetty/rest/RestJettyGetToDTest.java | 6 ++-- .../kafka/KafkaConsumerBatchSizeTest.java | 2 +- .../component/netty4/util/SubnetUtils.java | 31 +++++++++++++++----- 7 files changed, 40 insertions(+), 28 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/d663114a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelContextFactoryBean.java ---------------------------------------------------------------------- diff --git a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelContextFactoryBean.java b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelContextFactoryBean.java index 1cdcf19..9584b62 100644 --- a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelContextFactoryBean.java +++ b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelContextFactoryBean.java @@ -136,8 +136,7 @@ public class CamelContextFactoryBean extends AbstractCamelContextFactoryBean<Blu @XmlElement(name = "consumerTemplate", type = CamelConsumerTemplateFactoryBean.class, required = false), @XmlElement(name = "proxy", type = CamelProxyFactoryBean.class, required = false), @XmlElement(name = "export", type = CamelServiceExporterDefinition.class, required = false), - @XmlElement(name = "errorHandler", type = CamelErrorHandlerFactoryBean.class, required = false) - }) + @XmlElement(name = "errorHandler", type = CamelErrorHandlerFactoryBean.class, required = false)}) private List<?> beans; @XmlElement(name = "routeBuilder", required = false) private List<RouteBuilderDefinition> builderRefs = new ArrayList<RouteBuilderDefinition>(); http://git-wip-us.apache.org/repos/asf/camel/blob/d663114a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java ---------------------------------------------------------------------- diff --git a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java index 8ed858e..9f56ccf 100644 --- a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java +++ b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java @@ -421,7 +421,7 @@ public class CxfEndpoint extends DefaultEndpoint implements HeaderFilterStrategy if (factoryBean instanceof JaxWsClientFactoryBean && handlers != null) { AnnotationHandlerChainBuilder - builder = new AnnotationHandlerChainBuilder(); + builder = new AnnotationHandlerChainBuilder(); Method m = factoryBean.getClass().getMethod("getServiceFactory"); JaxWsServiceFactoryBean sf = (JaxWsServiceFactoryBean)m.invoke(factoryBean); @SuppressWarnings("rawtypes") http://git-wip-us.apache.org/repos/asf/camel/blob/d663114a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerTest.java ---------------------------------------------------------------------- diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerTest.java index 9a81596..5d7201e 100644 --- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerTest.java +++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerTest.java @@ -85,18 +85,16 @@ public class CxfConsumerTest extends CamelTestSupport { Map<String, Object> map = new HashMap<String, Object>(); map.put("org.apache.cxf.stax.force-start-document", Boolean.TRUE); exchange.getOut().setHeader(Client.RESPONSE_CONTEXT, map); - } - }) - .when(header(CxfConstants.OPERATION_NAME).isEqualTo(ECHO_BOOLEAN_OPERATION)).process(new Processor() { - public void process(final Exchange exchange) { - Message in = exchange.getIn(); - // Get the parameter list - List<?> parameter = in.getBody(List.class); - // Put the result back - exchange.getOut().setBody(parameter.get(0)); - } - }); - + }}) + .when(header(CxfConstants.OPERATION_NAME).isEqualTo(ECHO_BOOLEAN_OPERATION)).process(new Processor() { + public void process(final Exchange exchange) { + Message in = exchange.getIn(); + // Get the parameter list + List<?> parameter = in.getBody(List.class); + // Put the result back + exchange.getOut().setBody(parameter.get(0)); + } + }); } }; } http://git-wip-us.apache.org/repos/asf/camel/blob/d663114a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/SoapMessageProvider.java ---------------------------------------------------------------------- diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/SoapMessageProvider.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/SoapMessageProvider.java index 9c8423c..d4b0713 100644 --- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/SoapMessageProvider.java +++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/SoapMessageProvider.java @@ -24,7 +24,7 @@ import javax.xml.ws.WebServiceProvider; @WebServiceProvider(portName = "SoapProviderPort", serviceName = "SOAPProviderService", targetNamespace = "http://apache.org/hello_world_soap_http";, - wsdlLocation = "/wsdl/hello_world.wsdl") + wsdlLocation = "/wsdl/hello_world.wsdl") @ServiceMode(value = Service.Mode.MESSAGE) public class SoapMessageProvider implements Provider<SOAPMessage> { http://git-wip-us.apache.org/repos/asf/camel/blob/d663114a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/rest/RestJettyGetToDTest.java ---------------------------------------------------------------------- diff --git a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/rest/RestJettyGetToDTest.java b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/rest/RestJettyGetToDTest.java index 29139c1..ac7bb5c 100644 --- a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/rest/RestJettyGetToDTest.java +++ b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/rest/RestJettyGetToDTest.java @@ -56,9 +56,9 @@ public class RestJettyGetToDTest extends BaseJettyTest { .to("mock:input") .process(new Processor() { public void process(Exchange exchange) throws Exception { - String id = exchange.getIn().getHeader("id", String.class); - exchange.getOut().setBody(id + ";Donald Duck"); - } + String id = exchange.getIn().getHeader("id", String.class); + exchange.getOut().setBody(id + ";Donald Duck"); + } }); } }; http://git-wip-us.apache.org/repos/asf/camel/blob/d663114a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaConsumerBatchSizeTest.java ---------------------------------------------------------------------- diff --git a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaConsumerBatchSizeTest.java b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaConsumerBatchSizeTest.java index 16f9a07..a6f59c0 100644 --- a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaConsumerBatchSizeTest.java +++ b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaConsumerBatchSizeTest.java @@ -44,7 +44,7 @@ public class KafkaConsumerBatchSizeTest extends BaseEmbeddedKafkaTest { // If set the consumerTiemout too small the test will fail in JDK7 + "&consumerTimeoutMs=300" + "&barrierAwaitTimeoutMs=1000" - ) + ) private Endpoint from; @EndpointInject(uri = "mock:result") http://git-wip-us.apache.org/repos/asf/camel/blob/d663114a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/util/SubnetUtils.java ---------------------------------------------------------------------- diff --git a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/util/SubnetUtils.java b/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/util/SubnetUtils.java index 7b29995..b5b43ed 100644 --- a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/util/SubnetUtils.java +++ b/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/util/SubnetUtils.java @@ -93,16 +93,29 @@ public class SubnetUtils { /* Mask to convert unsigned int to a long (i.e. keep 32 bits) */ private static final long UNSIGNED_INT_MASK = 0x0FFFFFFFFL; - private SubnetInfo() { } + private SubnetInfo() { + } - private int netmask() { return netmask; } - private int network() { return network; } - private int address() { return address; } - private int broadcast() { return broadcast; } + private int netmask() { + return netmask; + } + private int network() { + return network; + } + private int address() { + return address; + } + private int broadcast() { + return broadcast; + } // long versions of the values (as unsigned int) which are more suitable for range checking - private long networkLong() { return network & UNSIGNED_INT_MASK; } - private long broadcastLong() { return broadcast & UNSIGNED_INT_MASK; } + private long networkLong() { + return network & UNSIGNED_INT_MASK; + } + private long broadcastLong() { + return broadcast & UNSIGNED_INT_MASK; + } private int low() { return isInclusiveHostCount() ? network() @@ -249,7 +262,9 @@ public class SubnetUtils { * Return a {@link SubnetInfo} instance that contains subnet-specific statistics * @return new instance */ - public final SubnetInfo getInfo() { return new SubnetInfo(); } + public final SubnetInfo getInfo() { + return new SubnetInfo(); + } /* * Initialize the internal fields from the supplied CIDR mask
