Author: ningjiang
Date: Tue Sep 4 03:32:14 2012
New Revision: 1380442
URL: http://svn.apache.org/viewvc?rev=1380442&view=rev
Log:
Fixed the CS errors of camel-cdi
Modified:
camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/component/cdi/internal/BeanAdapter.java
camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/component/cdi/internal/CamelExtension.java
camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/component/cdi/internal/CamelFactory.java
camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/component/cdi/internal/DelegateInjectionTarget.java
camel/trunk/components/camel-cdi/src/test/java/org/apache/camel/cdi/CamelEndpointInjectTest.java
camel/trunk/components/camel-cdi/src/test/java/org/apache/camel/cdi/ConsumeStubbedEndpointTest.java
camel/trunk/components/camel-cdi/src/test/java/org/apache/camel/cdi/ConsumeTest.java
camel/trunk/components/camel-cdi/src/test/java/org/apache/camel/cdi/EndpointNamedInjectTest.java
camel/trunk/components/camel-cdi/src/test/java/org/apache/camel/cdi/EndpointPropertyInjectTest.java
camel/trunk/components/camel-cdi/src/test/java/org/apache/camel/cdi/EndpointUriInjectTest.java
camel/trunk/components/camel-cdi/src/test/java/org/apache/camel/cdi/InjectCamelAnnotationsTest.java
camel/trunk/components/camel-cdi/src/test/java/org/apache/camel/cdi/support/CamelEndpointInjectedBean.java
camel/trunk/components/camel-cdi/src/test/java/org/apache/camel/cdi/support/CheeseComponentFactory.java
camel/trunk/components/camel-cdi/src/test/java/org/apache/camel/cdi/support/EndpointInjectedBean.java
camel/trunk/components/camel-cdi/src/test/java/org/apache/camel/cdi/support/EndpointUriInjectedBean.java
camel/trunk/components/camel-cdi/src/test/java/org/apache/camel/cdi/support/EndpointUriPropertyInjectedBean.java
camel/trunk/components/camel-cdi/src/test/java/org/apache/camel/cdi/support/MockEndpointInjectedBean.java
camel/trunk/components/camel-cdi/src/test/java/org/apache/camel/cdi/support/NamedEndpointBean.java
Modified:
camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/component/cdi/internal/BeanAdapter.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/component/cdi/internal/BeanAdapter.java?rev=1380442&r1=1380441&r2=1380442&view=diff
==============================================================================
---
camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/component/cdi/internal/BeanAdapter.java
(original)
+++
camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/component/cdi/internal/BeanAdapter.java
Tue Sep 4 03:32:14 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,
@@ -21,7 +20,6 @@ import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.List;
-import javax.enterprise.inject.spi.Bean;
import org.apache.camel.EndpointInject;
import org.apache.camel.Produce;
@@ -42,8 +40,8 @@ public class BeanAdapter {
* Returns true if this adapter is empty (i.e. has no custom adapter code)
*/
public boolean isEmpty() {
- return consumeMethods.isEmpty() && produceMethods.isEmpty() &&
produceFields.isEmpty() &&
- endpointMethods.isEmpty() && endpointFields.isEmpty();
+ return consumeMethods.isEmpty() && produceMethods.isEmpty() &&
produceFields.isEmpty()
+ && endpointMethods.isEmpty() && endpointFields.isEmpty();
}
public void addConsumeMethod(Method method) {
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=1380442&r1=1380441&r2=1380442&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
Tue Sep 4 03:32:14 2012
@@ -68,7 +68,7 @@ public class CamelExtension implements E
* @throws Exception In case of exceptions.
*/
protected void contextAwareness(@Observes
ProcessAnnotatedType<CamelContextAware> process)
- throws Exception {
+ throws Exception {
AnnotatedType<CamelContextAware> annotatedType =
process.getAnnotatedType();
Class<CamelContextAware> javaClass = annotatedType.getJavaClass();
if (CamelContextAware.class.isAssignableFrom(javaClass)) {
Modified:
camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/component/cdi/internal/CamelFactory.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/component/cdi/internal/CamelFactory.java?rev=1380442&r1=1380441&r2=1380442&view=diff
==============================================================================
---
camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/component/cdi/internal/CamelFactory.java
(original)
+++
camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/component/cdi/internal/CamelFactory.java
Tue Sep 4 03:32:14 2012
@@ -24,7 +24,6 @@ import javax.inject.Inject;
import org.apache.camel.CamelContext;
import org.apache.camel.Endpoint;
-import org.apache.camel.EndpointInject;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.cdi.Mock;
import org.apache.camel.cdi.Uri;
@@ -51,7 +50,6 @@ public class CamelFactory {
return CamelContextHelper.getMandatoryEndpoint(camelContext, uri,
MockEndpoint.class);
}
- @SuppressWarnings("unchecked")
@Produces
@Uri("")
public Endpoint createEndpoint(InjectionPoint point, BeanManager
beanManager) {
Modified:
camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/component/cdi/internal/DelegateInjectionTarget.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/component/cdi/internal/DelegateInjectionTarget.java?rev=1380442&r1=1380441&r2=1380442&view=diff
==============================================================================
---
camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/component/cdi/internal/DelegateInjectionTarget.java
(original)
+++
camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/component/cdi/internal/DelegateInjectionTarget.java
Tue Sep 4 03:32:14 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/components/camel-cdi/src/test/java/org/apache/camel/cdi/CamelEndpointInjectTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cdi/src/test/java/org/apache/camel/cdi/CamelEndpointInjectTest.java?rev=1380442&r1=1380441&r2=1380442&view=diff
==============================================================================
---
camel/trunk/components/camel-cdi/src/test/java/org/apache/camel/cdi/CamelEndpointInjectTest.java
(original)
+++
camel/trunk/components/camel-cdi/src/test/java/org/apache/camel/cdi/CamelEndpointInjectTest.java
Tue Sep 4 03:32:14 2012
@@ -19,9 +19,7 @@ package org.apache.camel.cdi;
import javax.inject.Inject;
import org.apache.camel.Endpoint;
-import org.apache.camel.ProducerTemplate;
import org.apache.camel.cdi.support.CamelEndpointInjectedBean;
-import org.apache.camel.cdi.support.ProduceInjectedBean;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.Test;
Modified:
camel/trunk/components/camel-cdi/src/test/java/org/apache/camel/cdi/ConsumeStubbedEndpointTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cdi/src/test/java/org/apache/camel/cdi/ConsumeStubbedEndpointTest.java?rev=1380442&r1=1380441&r2=1380442&view=diff
==============================================================================
---
camel/trunk/components/camel-cdi/src/test/java/org/apache/camel/cdi/ConsumeStubbedEndpointTest.java
(original)
+++
camel/trunk/components/camel-cdi/src/test/java/org/apache/camel/cdi/ConsumeStubbedEndpointTest.java
Tue Sep 4 03:32:14 2012
@@ -16,15 +16,11 @@
*/
package org.apache.camel.cdi;
-import javax.enterprise.inject.Produces;
import javax.inject.Inject;
-import javax.inject.Named;
-import org.apache.camel.Component;
import org.apache.camel.Consume;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.component.stub.StubComponent;
import org.junit.Test;
/**
Modified:
camel/trunk/components/camel-cdi/src/test/java/org/apache/camel/cdi/ConsumeTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cdi/src/test/java/org/apache/camel/cdi/ConsumeTest.java?rev=1380442&r1=1380441&r2=1380442&view=diff
==============================================================================
---
camel/trunk/components/camel-cdi/src/test/java/org/apache/camel/cdi/ConsumeTest.java
(original)
+++
camel/trunk/components/camel-cdi/src/test/java/org/apache/camel/cdi/ConsumeTest.java
Tue Sep 4 03:32:14 2012
@@ -19,7 +19,6 @@ package org.apache.camel.cdi;
import javax.inject.Inject;
import org.apache.camel.Consume;
-import org.apache.camel.Produce;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.Test;
Modified:
camel/trunk/components/camel-cdi/src/test/java/org/apache/camel/cdi/EndpointNamedInjectTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cdi/src/test/java/org/apache/camel/cdi/EndpointNamedInjectTest.java?rev=1380442&r1=1380441&r2=1380442&view=diff
==============================================================================
---
camel/trunk/components/camel-cdi/src/test/java/org/apache/camel/cdi/EndpointNamedInjectTest.java
(original)
+++
camel/trunk/components/camel-cdi/src/test/java/org/apache/camel/cdi/EndpointNamedInjectTest.java
Tue Sep 4 03:32:14 2012
@@ -20,8 +20,6 @@ import javax.inject.Inject;
import javax.inject.Named;
import org.apache.camel.Endpoint;
-import org.apache.camel.cdi.support.EndpointInjectedBean;
-import org.apache.camel.component.mock.MockEndpoint;
import org.junit.Test;
/**
Modified:
camel/trunk/components/camel-cdi/src/test/java/org/apache/camel/cdi/EndpointPropertyInjectTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cdi/src/test/java/org/apache/camel/cdi/EndpointPropertyInjectTest.java?rev=1380442&r1=1380441&r2=1380442&view=diff
==============================================================================
---
camel/trunk/components/camel-cdi/src/test/java/org/apache/camel/cdi/EndpointPropertyInjectTest.java
(original)
+++
camel/trunk/components/camel-cdi/src/test/java/org/apache/camel/cdi/EndpointPropertyInjectTest.java
Tue Sep 4 03:32:14 2012
@@ -21,7 +21,6 @@ import javax.inject.Inject;
import org.apache.camel.Endpoint;
import org.apache.camel.cdi.support.EndpointUriPropertyInjectedBean;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Ignore;
import org.junit.Test;
/**
Modified:
camel/trunk/components/camel-cdi/src/test/java/org/apache/camel/cdi/EndpointUriInjectTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cdi/src/test/java/org/apache/camel/cdi/EndpointUriInjectTest.java?rev=1380442&r1=1380441&r2=1380442&view=diff
==============================================================================
---
camel/trunk/components/camel-cdi/src/test/java/org/apache/camel/cdi/EndpointUriInjectTest.java
(original)
+++
camel/trunk/components/camel-cdi/src/test/java/org/apache/camel/cdi/EndpointUriInjectTest.java
Tue Sep 4 03:32:14 2012
@@ -19,7 +19,6 @@ package org.apache.camel.cdi;
import javax.inject.Inject;
import org.apache.camel.Endpoint;
-import org.apache.camel.cdi.support.EndpointInjectedBean;
import org.apache.camel.cdi.support.EndpointUriInjectedBean;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.Test;
Modified:
camel/trunk/components/camel-cdi/src/test/java/org/apache/camel/cdi/InjectCamelAnnotationsTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cdi/src/test/java/org/apache/camel/cdi/InjectCamelAnnotationsTest.java?rev=1380442&r1=1380441&r2=1380442&view=diff
==============================================================================
---
camel/trunk/components/camel-cdi/src/test/java/org/apache/camel/cdi/InjectCamelAnnotationsTest.java
(original)
+++
camel/trunk/components/camel-cdi/src/test/java/org/apache/camel/cdi/InjectCamelAnnotationsTest.java
Tue Sep 4 03:32:14 2012
@@ -31,10 +31,10 @@ import org.junit.Test;
public class InjectCamelAnnotationsTest extends CdiContextTestSupport {
- @EndpointInject(uri="direct:inject")
+ @EndpointInject(uri = "direct:inject")
Endpoint directInjectEndpoint;
- @EndpointInject(uri="mock:result")
+ @EndpointInject(uri = "mock:result")
MockEndpoint mockResultEndpoint;
@Produce(uri = "direct:inject")
Modified:
camel/trunk/components/camel-cdi/src/test/java/org/apache/camel/cdi/support/CamelEndpointInjectedBean.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cdi/src/test/java/org/apache/camel/cdi/support/CamelEndpointInjectedBean.java?rev=1380442&r1=1380441&r2=1380442&view=diff
==============================================================================
---
camel/trunk/components/camel-cdi/src/test/java/org/apache/camel/cdi/support/CamelEndpointInjectedBean.java
(original)
+++
camel/trunk/components/camel-cdi/src/test/java/org/apache/camel/cdi/support/CamelEndpointInjectedBean.java
Tue Sep 4 03:32:14 2012
@@ -16,18 +16,16 @@
*/
package org.apache.camel.cdi.support;
-import javax.inject.Inject;
-
import org.apache.camel.Endpoint;
import org.apache.camel.EndpointInject;
import org.apache.camel.component.mock.MockEndpoint;
public class CamelEndpointInjectedBean {
- @EndpointInject(uri="direct:inject")
+ @EndpointInject(uri = "direct:inject")
Endpoint endpoint;
- @EndpointInject(uri="mock:result")
+ @EndpointInject(uri = "mock:result")
MockEndpoint mockEndpoint;
public Endpoint getEndpoint() {
Modified:
camel/trunk/components/camel-cdi/src/test/java/org/apache/camel/cdi/support/CheeseComponentFactory.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cdi/src/test/java/org/apache/camel/cdi/support/CheeseComponentFactory.java?rev=1380442&r1=1380441&r2=1380442&view=diff
==============================================================================
---
camel/trunk/components/camel-cdi/src/test/java/org/apache/camel/cdi/support/CheeseComponentFactory.java
(original)
+++
camel/trunk/components/camel-cdi/src/test/java/org/apache/camel/cdi/support/CheeseComponentFactory.java
Tue Sep 4 03:32:14 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/components/camel-cdi/src/test/java/org/apache/camel/cdi/support/EndpointInjectedBean.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cdi/src/test/java/org/apache/camel/cdi/support/EndpointInjectedBean.java?rev=1380442&r1=1380441&r2=1380442&view=diff
==============================================================================
---
camel/trunk/components/camel-cdi/src/test/java/org/apache/camel/cdi/support/EndpointInjectedBean.java
(original)
+++
camel/trunk/components/camel-cdi/src/test/java/org/apache/camel/cdi/support/EndpointInjectedBean.java
Tue Sep 4 03:32:14 2012
@@ -16,8 +16,6 @@
*/
package org.apache.camel.cdi.support;
-import javax.inject.Inject;
-
import org.apache.camel.Endpoint;
import org.apache.camel.EndpointInject;
Modified:
camel/trunk/components/camel-cdi/src/test/java/org/apache/camel/cdi/support/EndpointUriInjectedBean.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cdi/src/test/java/org/apache/camel/cdi/support/EndpointUriInjectedBean.java?rev=1380442&r1=1380441&r2=1380442&view=diff
==============================================================================
---
camel/trunk/components/camel-cdi/src/test/java/org/apache/camel/cdi/support/EndpointUriInjectedBean.java
(original)
+++
camel/trunk/components/camel-cdi/src/test/java/org/apache/camel/cdi/support/EndpointUriInjectedBean.java
Tue Sep 4 03:32:14 2012
@@ -19,7 +19,6 @@ package org.apache.camel.cdi.support;
import javax.inject.Inject;
import org.apache.camel.Endpoint;
-import org.apache.camel.EndpointInject;
import org.apache.camel.cdi.Uri;
/**
Modified:
camel/trunk/components/camel-cdi/src/test/java/org/apache/camel/cdi/support/EndpointUriPropertyInjectedBean.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cdi/src/test/java/org/apache/camel/cdi/support/EndpointUriPropertyInjectedBean.java?rev=1380442&r1=1380441&r2=1380442&view=diff
==============================================================================
---
camel/trunk/components/camel-cdi/src/test/java/org/apache/camel/cdi/support/EndpointUriPropertyInjectedBean.java
(original)
+++
camel/trunk/components/camel-cdi/src/test/java/org/apache/camel/cdi/support/EndpointUriPropertyInjectedBean.java
Tue Sep 4 03:32:14 2012
@@ -16,11 +16,8 @@
*/
package org.apache.camel.cdi.support;
-import javax.inject.Inject;
-
import org.apache.camel.Endpoint;
import org.apache.camel.EndpointInject;
-import org.apache.camel.cdi.Uri;
/**
*/
Modified:
camel/trunk/components/camel-cdi/src/test/java/org/apache/camel/cdi/support/MockEndpointInjectedBean.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cdi/src/test/java/org/apache/camel/cdi/support/MockEndpointInjectedBean.java?rev=1380442&r1=1380441&r2=1380442&view=diff
==============================================================================
---
camel/trunk/components/camel-cdi/src/test/java/org/apache/camel/cdi/support/MockEndpointInjectedBean.java
(original)
+++
camel/trunk/components/camel-cdi/src/test/java/org/apache/camel/cdi/support/MockEndpointInjectedBean.java
Tue Sep 4 03:32:14 2012
@@ -18,7 +18,6 @@ package org.apache.camel.cdi.support;
import javax.inject.Inject;
-import org.apache.camel.EndpointInject;
import org.apache.camel.cdi.Mock;
import org.apache.camel.component.mock.MockEndpoint;
Modified:
camel/trunk/components/camel-cdi/src/test/java/org/apache/camel/cdi/support/NamedEndpointBean.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cdi/src/test/java/org/apache/camel/cdi/support/NamedEndpointBean.java?rev=1380442&r1=1380441&r2=1380442&view=diff
==============================================================================
---
camel/trunk/components/camel-cdi/src/test/java/org/apache/camel/cdi/support/NamedEndpointBean.java
(original)
+++
camel/trunk/components/camel-cdi/src/test/java/org/apache/camel/cdi/support/NamedEndpointBean.java
Tue Sep 4 03:32:14 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,
