[camel] branch master updated: Camel-Jetty: Fixed CS

[acosentino]

This is an automated email from the ASF dual-hosted git repository.

acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/master by this push:
     new 694d8b9  Camel-Jetty: Fixed CS
694d8b9 is described below

commit 694d8b9b9571366ef3cd76e9196dc64caca69a73
Author: Andrea Cosentino <anco...@gmail.com>
AuthorDate: Wed Mar 24 15:55:23 2021 +0100

    Camel-Jetty: Fixed CS
---
 .../org/apache/camel/component/jetty9/JettyHttpComponent9.java    | 4 ++--
 .../test/java/org/apache/camel/component/jetty/BaseJettyTest.java | 8 ++++----
 .../camel/component/jetty/rest/RestHttpsClientAuthRouteTest.java  | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git 
a/components/camel-jetty/src/main/java/org/apache/camel/component/jetty9/JettyHttpComponent9.java
 
b/components/camel-jetty/src/main/java/org/apache/camel/component/jetty9/JettyHttpComponent9.java
index be7de4e..d7ef71f 100644
--- 
a/components/camel-jetty/src/main/java/org/apache/camel/component/jetty9/JettyHttpComponent9.java
+++ 
b/components/camel-jetty/src/main/java/org/apache/camel/component/jetty9/JettyHttpComponent9.java
@@ -42,6 +42,8 @@ import org.slf4j.LoggerFactory;
 @Component("jetty")
 public class JettyHttpComponent9 extends JettyHttpComponent {
 
+    public static Map<String, Throwable> connectorCreation = new 
ConcurrentHashMap<>();
+
     private static final Logger LOG = 
LoggerFactory.getLogger(JettyHttpComponent9.class);
 
     @Override
@@ -49,8 +51,6 @@ public class JettyHttpComponent9 extends JettyHttpComponent {
         return new JettyHttpEndpoint9(this, endpointUri.toString(), httpUri);
     }
 
-    public static Map<String, Throwable> connectorCreation = new 
ConcurrentHashMap<>();
-
     @Override
     protected AbstractConnector createConnectorJettyInternal(
             Server server, JettyHttpEndpoint endpoint, SslContextFactory 
sslcf) {
diff --git 
a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/BaseJettyTest.java
 
b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/BaseJettyTest.java
index 0686896..ccd16bf 100644
--- 
a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/BaseJettyTest.java
+++ 
b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/BaseJettyTest.java
@@ -33,22 +33,22 @@ public abstract class BaseJettyTest extends 
CamelTestSupport {
 
     public static final String SSL_SYSPROPS = "SslSystemProperties";
 
+    static CopyOnWriteArrayList<String> runningTests = new 
CopyOnWriteArrayList<>();
+
     @RegisterExtension
     protected AvailablePortFinder.Port port1 = AvailablePortFinder.find();
 
     @RegisterExtension
     protected AvailablePortFinder.Port port2 = AvailablePortFinder.find();
 
-    static CopyOnWriteArrayList<String> RUNNING_TESTS = new 
CopyOnWriteArrayList<>();
-
     @BeforeEach
     void addRunningTest() {
-        RUNNING_TESTS.add(getClass().getName());
+        runningTests.add(getClass().getName());
     }
 
     @AfterEach
     void remRunningTest() {
-        RUNNING_TESTS.remove(getClass().getName());
+        runningTests.remove(getClass().getName());
     }
 
     @Override
diff --git 
a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestHttpsClientAuthRouteTest.java
 
b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestHttpsClientAuthRouteTest.java
index 1889830..36aa4a5 100644
--- 
a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestHttpsClientAuthRouteTest.java
+++ 
b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestHttpsClientAuthRouteTest.java
@@ -35,12 +35,12 @@ import org.junit.jupiter.api.extension.RegisterExtension;
 
 public class RestHttpsClientAuthRouteTest extends CamelTestSupport {
 
-    @RegisterExtension
-    AvailablePortFinder.Port port = AvailablePortFinder.find();
-
     @Produce("direct:start")
     protected ProducerTemplate sender;
 
+    @RegisterExtension
+    AvailablePortFinder.Port port = AvailablePortFinder.find();
+
     @Test
     public void testGETClientRoute() throws Exception {
         MockEndpoint mock = getMockEndpoint("mock:result");