Polish code

astefanutti · Jan 13, 2016 · bc43efb · bc43efb
1 parent 8be3afc
commit bc43efb
Show file tree

Hide file tree

Showing 38 changed files with 162 additions and 99 deletions.
diff --git a/envs/se/src/main/java/org/apache/camel/cdi/se/bean/InjectedEndpointRoute.java b/envs/se/src/main/java/org/apache/camel/cdi/se/bean/InjectedEndpointRoute.java
@@ -16,7 +16,6 @@
  */
 package org.apache.camel.cdi.se.bean;
 
-
 import org.apache.camel.cdi.Uri;
 import org.apache.camel.Endpoint;
 import org.apache.camel.builder.RouteBuilder;

diff --git a/envs/se/src/main/java/org/apache/camel/cdi/se/bean/InjectedTypeConverterRoute.java b/envs/se/src/main/java/org/apache/camel/cdi/se/bean/InjectedTypeConverterRoute.java
@@ -16,7 +16,6 @@
  */
 package org.apache.camel.cdi.se.bean;
 
-
 import org.apache.camel.cdi.se.pojo.TypeConverterOutput;
 import org.apache.camel.builder.RouteBuilder;
 

diff --git a/envs/se/src/main/java/org/apache/camel/cdi/se/bean/ManualStartupCamelContext.java b/envs/se/src/main/java/org/apache/camel/cdi/se/bean/ManualStartupCamelContext.java
@@ -16,7 +16,6 @@
  */
 package org.apache.camel.cdi.se.bean;
 
-
 import org.apache.camel.impl.DefaultCamelContext;
 import org.apache.camel.util.ObjectHelper;
 

diff --git a/envs/se/src/main/java/org/apache/camel/cdi/se/bean/MockAnnotationRoute.java b/envs/se/src/main/java/org/apache/camel/cdi/se/bean/MockAnnotationRoute.java
@@ -1,20 +1,18 @@
-/*
- * *
- *  * 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.
- *  * The ASF licenses this file to You under the Apache License, Version 2.0
- *  * (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
- *  *
- *  * Unless required by applicable law or agreed to in writing, software
- *  * distributed under the License is distributed on an "AS IS" BASIS,
- *  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  * See the License for the specific language governing permissions and
- *  * limitations under the License.
+/**
+ * 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.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (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
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package org.apache.camel.cdi.se.bean;
 

diff --git a/envs/se/src/main/java/org/apache/camel/cdi/se/bean/PropertyEndpointRoute.java b/envs/se/src/main/java/org/apache/camel/cdi/se/bean/PropertyEndpointRoute.java
@@ -16,16 +16,15 @@
  */
 package org.apache.camel.cdi.se.bean;
 
-
 import org.apache.camel.builder.RouteBuilder;
 
 public class PropertyEndpointRoute extends RouteBuilder {
 
     @Override
     public void configure() {
         from("direct:{{from}}")
-        .routeId("route")
-        .setHeader("header").simple("properties:header.message")
-        .to("{{to}}");
+            .routeId("route")
+            .setHeader("header").simple("properties:header.message")
+            .to("{{to}}");
     }
 }
diff --git a/envs/se/src/main/java/org/apache/camel/cdi/se/pojo/TypeConverterInput.java b/envs/se/src/main/java/org/apache/camel/cdi/se/pojo/TypeConverterInput.java
@@ -16,7 +16,6 @@
  */
 package org.apache.camel.cdi.se.pojo;
 
-
 public class TypeConverterInput {
 
     private String property;

diff --git a/envs/se/src/main/java/org/apache/camel/cdi/se/pojo/TypeConverterOutput.java b/envs/se/src/main/java/org/apache/camel/cdi/se/pojo/TypeConverterOutput.java
@@ -16,7 +16,6 @@
  */
 package org.apache.camel.cdi.se.pojo;
 
-
 public class TypeConverterOutput {
 
     private String property;

diff --git a/envs/se/src/test/java/org/apache/camel/cdi/se/CamelEventEndpointTest.java b/envs/se/src/test/java/org/apache/camel/cdi/se/CamelEventEndpointTest.java
@@ -61,7 +61,10 @@ public static Archive<?> deployment() {
 
     @Test
     public void camelStartedEvent(@Uri("mock:started") MockEndpoint started) {
-        assertThat("Event fired is incorrect!", started.getExchanges(), contains(hasProperty("in", hasProperty("body", instanceOf(CamelContextStartedEvent.class)))));
+        assertThat("Event fired is incorrect!", started.getExchanges(),
+            contains(
+                hasProperty("in",
+                    hasProperty("body", instanceOf(CamelContextStartedEvent.class)))));
     }
 
     @Test

diff --git a/envs/se/src/test/java/org/apache/camel/cdi/se/CamelEventNotifierTest.java b/envs/se/src/test/java/org/apache/camel/cdi/se/CamelEventNotifierTest.java
@@ -102,7 +102,10 @@ private void onCamelContextStoppedEvent(@Observes CamelContextStoppedEvent event
     @Test
     @InSequence(1)
     public void startedCamelContext(List<Class> events) throws Exception {
-        assertThat("Events fired are incorrect", events, Matchers.<Class>contains(CamelContextStartingEvent.class, CamelContextStartedEvent.class));
+        assertThat("Events fired are incorrect", events,
+            Matchers.<Class>contains(
+                CamelContextStartingEvent.class,
+                CamelContextStartedEvent.class));
     }
 
     @Test
@@ -115,14 +118,34 @@ public void sendMessageToInbound(List<Class> events) throws InterruptedException
 
         assertIsSatisfied(2L, TimeUnit.SECONDS, outbound);
 
-        assertThat("Events fired are incorrect", events, Matchers.<Class>contains(CamelContextStartingEvent.class, CamelContextStartedEvent.class, ExchangeSendingEvent.class, ExchangeCreatedEvent.class, ExchangeSendingEvent.class, ExchangeSentEvent.class, ExchangeCompletedEvent.class, ExchangeSentEvent.class));
+        assertThat("Events fired are incorrect", events,
+            Matchers.<Class>contains(
+                CamelContextStartingEvent.class,
+                CamelContextStartedEvent.class,
+                ExchangeSendingEvent.class,
+                ExchangeCreatedEvent.class,
+                ExchangeSendingEvent.class,
+                ExchangeSentEvent.class,
+                ExchangeCompletedEvent.class,
+                ExchangeSentEvent.class));
     }
 
     @Test
     @InSequence(3)
     public void stopCamelContext(CamelContext context, List<Class> events) throws Exception {
         context.stop();
 
-        assertThat("Events fired are incorrect", events, Matchers.<Class>contains(CamelContextStartingEvent.class, CamelContextStartedEvent.class, ExchangeSendingEvent.class, ExchangeCreatedEvent.class, ExchangeSendingEvent.class, ExchangeSentEvent.class, ExchangeCompletedEvent.class, ExchangeSentEvent.class, CamelContextStoppingEvent.class, CamelContextStoppedEvent.class));
+        assertThat("Events fired are incorrect", events,
+            Matchers.<Class>contains(
+                CamelContextStartingEvent.class,
+                CamelContextStartedEvent.class,
+                ExchangeSendingEvent.class,
+                ExchangeCreatedEvent.class,
+                ExchangeSendingEvent.class,
+                ExchangeSentEvent.class,
+                ExchangeCompletedEvent.class,
+                ExchangeSentEvent.class,
+                CamelContextStoppingEvent.class,
+                CamelContextStoppedEvent.class));
     }
 }
diff --git a/envs/se/src/test/java/org/apache/camel/cdi/se/ContextComponentTest.java b/envs/se/src/test/java/org/apache/camel/cdi/se/ContextComponentTest.java
@@ -49,7 +49,8 @@ public static Archive<?> deployment() {
             // Camel CDI
             .addPackage(CdiCamelExtension.class.getPackage())
             // Test classes
-            .addClasses(DefaultCamelContextBean.class,
+            .addClasses(
+                DefaultCamelContextBean.class,
                 FirstNamedCamelContextBean.class,
                 FirstNamedCamelContextRoute.class,
                 SecondNamedCamelContextBean.class,
@@ -77,7 +78,8 @@ public void configure() {
 
     @Test
     @InSequence(2)
-    public void sendMessageToInbound(@Uri("direct:inbound") ProducerTemplate inbound, @Uri("mock:outbound") MockEndpoint outbound) throws InterruptedException {
+    public void sendMessageToInbound(@Uri("direct:inbound") ProducerTemplate inbound,
+                                     @Uri("mock:outbound") MockEndpoint outbound) throws InterruptedException {
         outbound.expectedMessageCount(1);
         outbound.expectedBodiesReceived("first-test");
 

diff --git a/envs/se/src/test/java/org/apache/camel/cdi/se/EndpointInjectTest.java b/envs/se/src/test/java/org/apache/camel/cdi/se/EndpointInjectTest.java
@@ -23,7 +23,6 @@
 import org.apache.camel.component.mock.MockEndpoint;
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
-import org.jboss.arquillian.junit.InSequence;
 import org.jboss.shrinkwrap.api.Archive;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.asset.EmptyAsset;
@@ -59,7 +58,6 @@ public static Archive<?> deployment() {
     private MockEndpoint outbound;
 
     @Test
-    @InSequence(2)
     public void sendMessageToInbound() throws InterruptedException {
         outbound.expectedMessageCount(1);
         outbound.expectedBodiesReceived("test");

diff --git a/envs/se/src/test/java/org/apache/camel/cdi/se/EventEndpointTest.java b/envs/se/src/test/java/org/apache/camel/cdi/se/EventEndpointTest.java
@@ -112,13 +112,13 @@ public static Archive<?> deployment() {
     private ProducerTemplate produceBarQualifier;
 
     @Inject
-    Event<Object> objectEvent;
+    private Event<Object> objectEvent;
 
     @Inject
-    Event<EventPayload<String>> stringPayloadEvent;
+    private Event<EventPayload<String>> stringPayloadEvent;
 
     @Inject
-    Event<EventPayload<Integer>> integerPayloadEvent;
+    private Event<EventPayload<Integer>> integerPayloadEvent;
 
     @Inject
     private EventObserver observer;

diff --git a/envs/se/src/test/java/org/apache/camel/cdi/se/InjectedTypeConverterTest.java b/envs/se/src/test/java/org/apache/camel/cdi/se/InjectedTypeConverterTest.java
@@ -78,7 +78,8 @@ private static PropertiesComponent configuration() {
     }
 
     @Test
-    public void sendMessageToInbound(@Uri("direct:inbound") ProducerTemplate inbound, @Uri("mock:outbound") MockEndpoint outbound) throws InterruptedException {
+    public void sendMessageToInbound(@Uri("direct:inbound") ProducerTemplate inbound,
+                                     @Uri("mock:outbound") MockEndpoint outbound) throws InterruptedException {
         outbound.expectedMessageCount(1);
 
         TypeConverterInput input = new TypeConverterInput();

diff --git a/envs/se/src/test/java/org/apache/camel/cdi/se/MockEndpointTest.java b/envs/se/src/test/java/org/apache/camel/cdi/se/MockEndpointTest.java
@@ -75,9 +75,9 @@ public void verifyCamelContext() {
     public void sendMessageToInbound() throws InterruptedException {
         defaultOutbound.expectedMessageCount(1);
         defaultOutbound.expectedBodiesReceived("test");
-        defaultOutbound.expectedHeaderReceived("foo","bar");
+        defaultOutbound.expectedHeaderReceived("foo", "bar");
 
-        defaultInbound.sendBodyAndHeader("test","foo","bar");
+        defaultInbound.sendBodyAndHeader("test", "foo", "bar");
 
         assertIsSatisfied(2L, TimeUnit.SECONDS, defaultOutbound);
     }

diff --git a/envs/se/src/test/java/org/apache/camel/cdi/se/MultiCamelContextProducerTest.java b/envs/se/src/test/java/org/apache/camel/cdi/se/MultiCamelContextProducerTest.java
@@ -59,7 +59,8 @@ public static Archive<?> deployment() {
             // Camel CDI
             .addPackage(CdiCamelExtension.class.getPackage())
             // Test classes
-            .addClasses(DefaultCamelContextBean.class,
+            .addClasses(
+                DefaultCamelContextBean.class,
                 UriEndpointRoute.class,
                 FirstCamelContextRoute.class)
             // Bean archive deployment descriptor

diff --git a/envs/se/src/test/java/org/apache/camel/cdi/se/MultiCamelContextTest.java b/envs/se/src/test/java/org/apache/camel/cdi/se/MultiCamelContextTest.java
@@ -56,7 +56,8 @@ public static Archive<?> deployment() {
             // Camel CDI
             .addPackage(CdiCamelExtension.class.getPackage())
             // Test classes
-            .addClasses(DefaultCamelContextBean.class,
+            .addClasses(
+                DefaultCamelContextBean.class,
                 UriEndpointRoute.class,
                 FirstCamelContextBean.class,
                 FirstCamelContextRoute.class,

diff --git a/envs/se/src/test/java/org/apache/camel/cdi/se/MultiContextEndpointInjectTest.java b/envs/se/src/test/java/org/apache/camel/cdi/se/MultiContextEndpointInjectTest.java
@@ -53,7 +53,8 @@ public static Archive<?> deployment() {
             // Camel CDI
             .addPackage(CdiCamelExtension.class.getPackage())
             // Test classes
-            .addClasses(DefaultCamelContextBean.class,
+            .addClasses(
+                DefaultCamelContextBean.class,
                 EndpointInjectRoute.class,
                 FirstCamelContextBean.class,
                 FirstCamelContextEndpointInjectRoute.class,

diff --git a/envs/se/src/test/java/org/apache/camel/cdi/se/MultiContextEventEndpointTest.java b/envs/se/src/test/java/org/apache/camel/cdi/se/MultiContextEventEndpointTest.java
@@ -61,7 +61,8 @@ public static Archive<?> deployment() {
             // Camel CDI
             .addPackage(CdiCamelExtension.class.getPackage())
             // Test classes
-            .addClasses(FirstCamelContextBean.class,
+            .addClasses(
+                FirstCamelContextBean.class,
                 FirstCamelContextEventConsumingRoute.class,
                 FirstCamelContextEventProducingRoute.class,
                 SecondCamelContextBean.class,
@@ -92,7 +93,7 @@ public static Archive<?> deployment() {
     private ProducerTemplate secondProduceString;
 
     @Inject
-    Event<Object> objectEvent;
+    private Event<Object> objectEvent;
 
     @Inject
     private EventObserver observer;