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/09/08 12:29:46 UTC
svn commit: r1382276 - in /camel/trunk:
camel-core/src/main/java/org/apache/camel/management/
camel-core/src/test/java/org/apache/camel/impl/
components/camel-cdi/src/main/java/org/apache/camel/component/cdi/internal/
examples/camel-example-cdi/src/mai...
Author: bvahdat
Date: Sat Sep 8 10:29:45 2012
New Revision: 1382276
URL: http://svn.apache.org/viewvc?rev=1382276&view=rev
Log:
Fixed a bunch of CS errors as well as some Eclipse compiler warnings.
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultManagementLifecycleStrategy.java
camel/trunk/camel-core/src/test/java/org/apache/camel/impl/CamelPostProcessorHelperConsumePropertyTest.java
camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/component/cdi/internal/CamelExtension.java
camel/trunk/examples/camel-example-cdi/src/main/java/org/apache/camel/example/cdi/MyRoutes.java
camel/trunk/examples/camel-example-cdi/src/test/java/org/apache/camel/example/cdi/IntegrationTest.java
camel/trunk/tests/camel-itest-cdi/src/main/java/org/apache/camel/itest/cdi/Constants.java
camel/trunk/tests/camel-itest-cdi/src/main/java/org/apache/camel/itest/cdi/MyConfig.java
camel/trunk/tests/camel-itest-cdi/src/main/java/org/apache/camel/itest/cdi/MyRouteBuilder.java
camel/trunk/tests/camel-itest-cdi/src/main/java/org/apache/camel/itest/cdi/RoutesContextA.java
camel/trunk/tests/camel-itest-cdi/src/main/java/org/apache/camel/itest/cdi/RoutesContextB.java
camel/trunk/tests/camel-itest-cdi/src/main/java/org/apache/camel/itest/cdi/RoutesContextC.java
camel/trunk/tests/camel-itest-cdi/src/main/java/org/apache/camel/itest/cdi/RoutesContextD.java
camel/trunk/tests/camel-itest-cdi/src/test/java/org/apache/camel/itest/cdi/IntegrationTest.java
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultManagementLifecycleStrategy.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultManagementLifecycleStrategy.java?rev=1382276&r1=1382275&r2=1382276&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultManagementLifecycleStrategy.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultManagementLifecycleStrategy.java Sat Sep 8 10:29:45 2012
@@ -24,7 +24,6 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
-import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.ThreadPoolExecutor;
import javax.management.JMException;
import javax.management.MalformedObjectNameException;
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/impl/CamelPostProcessorHelperConsumePropertyTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/impl/CamelPostProcessorHelperConsumePropertyTest.java?rev=1382276&r1=1382275&r2=1382276&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/impl/CamelPostProcessorHelperConsumePropertyTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/impl/CamelPostProcessorHelperConsumePropertyTest.java Sat Sep 8 10:29:45 2012
@@ -134,35 +134,30 @@ public class CamelPostProcessorHelperCon
}
@Consume(property = "foo")
- @SuppressWarnings("unused")
public void consumeSomething(String body) {
assertEquals("Hello World", body);
template.sendBody("mock:result", body);
}
@Consume()
- @SuppressWarnings("unused")
public void foo(String body) {
assertEquals("Hello World", body);
template.sendBody("mock:result", body);
}
@Consume()
- @SuppressWarnings("unused")
public void onFoo(String body) {
assertEquals("Hello World", body);
template.sendBody("mock:result", body);
}
@Consume()
- @SuppressWarnings("unused")
public void bar(String body) {
assertEquals("Hello World", body);
template.sendBody("mock:result", body);
}
@Consume()
- @SuppressWarnings("unused")
public void onBar(String body) {
assertEquals("Hello World", body);
template.sendBody("mock:result", body);
Modified: camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/component/cdi/internal/CamelExtension.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/component/cdi/internal/CamelExtension.java?rev=1382276&r1=1382275&r2=1382276&view=diff
==============================================================================
--- camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/component/cdi/internal/CamelExtension.java (original)
+++ camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/component/cdi/internal/CamelExtension.java Sat Sep 8 10:29:45 2012
@@ -216,11 +216,10 @@ public class CamelExtension implements E
/**
* Lets perform injection of all beans which use Camel annotations
*/
- @SuppressWarnings("unchecked")
- public void onInjectionTarget(@Observes ProcessInjectionTarget event) {
- final InjectionTarget injectionTarget = event.getInjectionTarget();
- AnnotatedType annotatedType = event.getAnnotatedType();
- final Class beanClass = annotatedType.getJavaClass();
+ public void onInjectionTarget(@Observes ProcessInjectionTarget<Object> event) {
+ final InjectionTarget<Object> injectionTarget = event.getInjectionTarget();
+ AnnotatedType<Object> annotatedType = event.getAnnotatedType();
+ final Class<Object> beanClass = annotatedType.getJavaClass();
// TODO this is a bit of a hack - what should the bean name be?
final String beanName = injectionTarget.toString();
ContextName contextName = annotatedType.getAnnotation(ContextName.class);
@@ -257,7 +256,7 @@ public class CamelExtension implements E
}
}
- private BeanAdapter createBeanAdapter(Class beanClass, ContextName contextName) {
+ private BeanAdapter createBeanAdapter(Class<?> beanClass, ContextName contextName) {
final BeanAdapter adapter = new BeanAdapter(contextName);
ReflectionHelper.doWithFields(beanClass, new ReflectionHelper.FieldCallback() {
@Override
Modified: camel/trunk/examples/camel-example-cdi/src/main/java/org/apache/camel/example/cdi/MyRoutes.java
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-cdi/src/main/java/org/apache/camel/example/cdi/MyRoutes.java?rev=1382276&r1=1382275&r2=1382276&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-cdi/src/main/java/org/apache/camel/example/cdi/MyRoutes.java (original)
+++ camel/trunk/examples/camel-example-cdi/src/main/java/org/apache/camel/example/cdi/MyRoutes.java Sat Sep 8 10:29:45 2012
@@ -1,5 +1,4 @@
/**
- *
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -7,7 +6,7 @@
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
Modified: camel/trunk/examples/camel-example-cdi/src/test/java/org/apache/camel/example/cdi/IntegrationTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-cdi/src/test/java/org/apache/camel/example/cdi/IntegrationTest.java?rev=1382276&r1=1382275&r2=1382276&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-cdi/src/test/java/org/apache/camel/example/cdi/IntegrationTest.java (original)
+++ camel/trunk/examples/camel-example-cdi/src/test/java/org/apache/camel/example/cdi/IntegrationTest.java Sat Sep 8 10:29:45 2012
@@ -33,7 +33,6 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
/**
*/
Modified: camel/trunk/tests/camel-itest-cdi/src/main/java/org/apache/camel/itest/cdi/Constants.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-cdi/src/main/java/org/apache/camel/itest/cdi/Constants.java?rev=1382276&r1=1382275&r2=1382276&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-cdi/src/main/java/org/apache/camel/itest/cdi/Constants.java (original)
+++ camel/trunk/tests/camel-itest-cdi/src/main/java/org/apache/camel/itest/cdi/Constants.java Sat Sep 8 10:29:45 2012
@@ -1,5 +1,4 @@
/**
- *
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -7,7 +6,7 @@
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,12 +16,17 @@
*/
package org.apache.camel.itest.cdi;
-public class Constants {
- public static Object[] EXPECTED_BODIES_A = {"messageA1", "messageA2"};
- public static Object[] EXPECTED_BODIES_B = {"messageB1", "messageB2"};
- public static Object[] EXPECTED_BODIES_C = {"messageC1", "messageC2"};
- public static Object[] EXPECTED_BODIES_D = {"messageD1", "messageD2"};
+public final class Constants {
+
+ public static final Object[] EXPECTED_BODIES_A = {"messageA1", "messageA2"};
+ public static final Object[] EXPECTED_BODIES_B = {"messageB1", "messageB2"};
+ public static final Object[] EXPECTED_BODIES_C = {"messageC1", "messageC2"};
+ public static final Object[] EXPECTED_BODIES_D = {"messageD1", "messageD2"};
+
+ public static final Object[] EXPECTED_BODIES_E_A = {"messageEa1", "messageEa2"};
+ public static final Object[] EXPECTED_BODIES_E_C = {"messageEc1", "messageEc2"};
+
+ private Constants() {
+ }
- public static Object[] EXPECTED_BODIES_Ea = {"messageEa1", "messageEa2"};
- public static Object[] EXPECTED_BODIES_Ec = {"messageEc1", "messageEc2"};
}
Modified: camel/trunk/tests/camel-itest-cdi/src/main/java/org/apache/camel/itest/cdi/MyConfig.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-cdi/src/main/java/org/apache/camel/itest/cdi/MyConfig.java?rev=1382276&r1=1382275&r2=1382276&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-cdi/src/main/java/org/apache/camel/itest/cdi/MyConfig.java (original)
+++ camel/trunk/tests/camel-itest-cdi/src/main/java/org/apache/camel/itest/cdi/MyConfig.java Sat Sep 8 10:29:45 2012
@@ -1,5 +1,4 @@
/**
- *
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -7,7 +6,7 @@
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
Modified: camel/trunk/tests/camel-itest-cdi/src/main/java/org/apache/camel/itest/cdi/MyRouteBuilder.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-cdi/src/main/java/org/apache/camel/itest/cdi/MyRouteBuilder.java?rev=1382276&r1=1382275&r2=1382276&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-cdi/src/main/java/org/apache/camel/itest/cdi/MyRouteBuilder.java (original)
+++ camel/trunk/tests/camel-itest-cdi/src/main/java/org/apache/camel/itest/cdi/MyRouteBuilder.java Sat Sep 8 10:29:45 2012
@@ -1,5 +1,4 @@
/**
- *
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -7,7 +6,7 @@
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
Modified: camel/trunk/tests/camel-itest-cdi/src/main/java/org/apache/camel/itest/cdi/RoutesContextA.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-cdi/src/main/java/org/apache/camel/itest/cdi/RoutesContextA.java?rev=1382276&r1=1382275&r2=1382276&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-cdi/src/main/java/org/apache/camel/itest/cdi/RoutesContextA.java (original)
+++ camel/trunk/tests/camel-itest-cdi/src/main/java/org/apache/camel/itest/cdi/RoutesContextA.java Sat Sep 8 10:29:45 2012
@@ -1,5 +1,4 @@
/**
- *
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -7,7 +6,7 @@
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -36,11 +35,14 @@ import org.slf4j.LoggerFactory;
public class RoutesContextA extends RouteBuilder {
private static final transient Logger LOG = LoggerFactory.getLogger(RoutesContextA.class);
+ @EndpointInject(uri = "mock:A.b", context = "contextA")
+ public MockEndpoint b;
+
@Inject @Uri(value = "seda:A.a", context = "contextA")
Endpoint a;
- @EndpointInject(uri = "mock:A.b", context = "contextA")
- public MockEndpoint b;
+ @Inject @Uri(value = "seda:A.a", context = "contextA")
+ ProducerTemplate producer;
@Override
public void configure() throws Exception {
@@ -48,9 +50,6 @@ public class RoutesContextA extends Rout
from(a).to(b);
}
- @Inject @Uri(value = "seda:A.a", context = "contextA")
- ProducerTemplate producer;
-
public void sendMessages() {
for (Object expectedBody : Constants.EXPECTED_BODIES_A) {
LOG.info("Sending " + expectedBody + " to " + producer.getDefaultEndpoint());
Modified: camel/trunk/tests/camel-itest-cdi/src/main/java/org/apache/camel/itest/cdi/RoutesContextB.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-cdi/src/main/java/org/apache/camel/itest/cdi/RoutesContextB.java?rev=1382276&r1=1382275&r2=1382276&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-cdi/src/main/java/org/apache/camel/itest/cdi/RoutesContextB.java (original)
+++ camel/trunk/tests/camel-itest-cdi/src/main/java/org/apache/camel/itest/cdi/RoutesContextB.java Sat Sep 8 10:29:45 2012
@@ -1,5 +1,4 @@
/**
- *
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -7,7 +6,7 @@
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -36,11 +35,14 @@ import org.slf4j.LoggerFactory;
public class RoutesContextB extends RouteBuilder {
private static final transient Logger LOG = LoggerFactory.getLogger(RoutesContextB.class);
+ @EndpointInject(uri = "mock:B.b", context = "contextB")
+ public MockEndpoint b;
+
@Inject @Uri(value = "seda:B.a", context = "contextB")
Endpoint a;
- @EndpointInject(uri = "mock:B.b", context = "contextB")
- public MockEndpoint b;
+ @Inject @Uri(value = "seda:B.a", context = "contextB")
+ ProducerTemplate producer;
@Override
public void configure() throws Exception {
@@ -48,9 +50,6 @@ public class RoutesContextB extends Rout
from(a).to(b);
}
- @Inject @Uri(value = "seda:B.a", context = "contextB")
- ProducerTemplate producer;
-
public void sendMessages() {
for (Object expectedBody : Constants.EXPECTED_BODIES_B) {
LOG.info("Sending " + expectedBody + " to " + producer.getDefaultEndpoint());
Modified: camel/trunk/tests/camel-itest-cdi/src/main/java/org/apache/camel/itest/cdi/RoutesContextC.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-cdi/src/main/java/org/apache/camel/itest/cdi/RoutesContextC.java?rev=1382276&r1=1382275&r2=1382276&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-cdi/src/main/java/org/apache/camel/itest/cdi/RoutesContextC.java (original)
+++ camel/trunk/tests/camel-itest-cdi/src/main/java/org/apache/camel/itest/cdi/RoutesContextC.java Sat Sep 8 10:29:45 2012
@@ -1,5 +1,4 @@
/**
- *
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -7,7 +6,7 @@
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -43,14 +42,14 @@ public class RoutesContextC extends Rout
@EndpointInject(uri = "mock:C.b")
MockEndpoint b;
+ @Inject @Uri("seda:C.a")
+ ProducerTemplate producer;
+
@Override
public void configure() throws Exception {
from(a).to(b);
}
- @Inject @Uri("seda:C.a")
- ProducerTemplate producer;
-
public void sendMessages() {
for (Object expectedBody : Constants.EXPECTED_BODIES_C) {
LOG.info("Sending " + expectedBody + " to " + producer.getDefaultEndpoint());
Modified: camel/trunk/tests/camel-itest-cdi/src/main/java/org/apache/camel/itest/cdi/RoutesContextD.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-cdi/src/main/java/org/apache/camel/itest/cdi/RoutesContextD.java?rev=1382276&r1=1382275&r2=1382276&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-cdi/src/main/java/org/apache/camel/itest/cdi/RoutesContextD.java (original)
+++ camel/trunk/tests/camel-itest-cdi/src/main/java/org/apache/camel/itest/cdi/RoutesContextD.java Sat Sep 8 10:29:45 2012
@@ -1,5 +1,4 @@
/**
- *
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -7,7 +6,7 @@
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -43,14 +42,14 @@ public class RoutesContextD extends Rout
@EndpointInject(uri = "mock:D.b")
MockEndpoint b;
+ @Inject @Uri("seda:D.a")
+ ProducerTemplate producer;
+
@Override
public void configure() throws Exception {
from(a).to(b);
}
- @Inject @Uri("seda:D.a")
- ProducerTemplate producer;
-
public void sendMessages() {
for (Object expectedBody : Constants.EXPECTED_BODIES_D) {
LOG.info("Sending " + expectedBody + " to " + producer.getDefaultEndpoint());
Modified: camel/trunk/tests/camel-itest-cdi/src/test/java/org/apache/camel/itest/cdi/IntegrationTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-cdi/src/test/java/org/apache/camel/itest/cdi/IntegrationTest.java?rev=1382276&r1=1382275&r2=1382276&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-cdi/src/test/java/org/apache/camel/itest/cdi/IntegrationTest.java (original)
+++ camel/trunk/tests/camel-itest-cdi/src/test/java/org/apache/camel/itest/cdi/IntegrationTest.java Sat Sep 8 10:29:45 2012
@@ -56,12 +56,12 @@ public class IntegrationTest {
@Inject
RoutesContextD routesD;
- @Inject @Uri(value="seda:foo", context = "contextE")
+ @Inject @Uri(value = "seda:foo", context = "contextE")
ProducerTemplate producerE;
@Test
public void checkContextsHaveCorrectEndpointsAndRoutes() throws Exception {
- Set<Map.Entry<String,CamelContext>> entries = camelContextMap.getCamelContextMap().entrySet();
+ Set<Map.Entry<String, CamelContext>> entries = camelContextMap.getCamelContextMap().entrySet();
for (Map.Entry<String, CamelContext> entry : entries) {
LOG.info("CamelContext " + entry.getKey() + " has endpoints: " + entry.getValue().getEndpointMap()
.keySet());
@@ -110,14 +110,14 @@ public class IntegrationTest {
.getMandatoryEndpoint(contextE, "mock://E.d", MockEndpoint.class);
- mockEb.expectedBodiesReceived(Constants.EXPECTED_BODIES_Ea);
- mockEd.expectedBodiesReceived(Constants.EXPECTED_BODIES_Ec);
+ mockEb.expectedBodiesReceived(Constants.EXPECTED_BODIES_E_A);
+ mockEd.expectedBodiesReceived(Constants.EXPECTED_BODIES_E_C);
- for (Object body : Constants.EXPECTED_BODIES_Ea) {
+ for (Object body : Constants.EXPECTED_BODIES_E_A) {
producerE.sendBody("seda:E.a", body);
}
- for (Object body : Constants.EXPECTED_BODIES_Ec) {
+ for (Object body : Constants.EXPECTED_BODIES_E_C) {
producerE.sendBody("seda:E.c", body);
}