You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2020/03/31 08:15:45 UTC
[camel] branch master updated (a8ad2a8 -> 8be2135)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from a8ad2a8 Revert back to azure 8.6.0
new b6a1065 Fixed CS
new 8be2135 Fixed CS and make platform-http create consumer in doInit instead of doStart
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../platform/http/PlatformHttpEndpoint.java | 27 ++++++++++------------
.../WebsocketSSLContextGlobalRouteExampleTest.java | 3 ++-
.../WebsocketSSLContextInUriRouteExampleTest.java | 3 ++-
.../ZooKeeperClusteredRoutePolicyFactoryTest.java | 2 +-
.../cluster/ZooKeeperClusteredRoutePolicyTest.java | 2 +-
5 files changed, 18 insertions(+), 19 deletions(-)
[camel] 02/02: Fixed CS and make platform-http create consumer in
doInit instead of doStart
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 8be2135df6cff9074dee31fe65ce17ada175491d
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Tue Mar 31 10:15:12 2020 +0200
Fixed CS and make platform-http create consumer in doInit instead of doStart
---
.../platform/http/PlatformHttpEndpoint.java | 27 ++++++++++------------
1 file changed, 12 insertions(+), 15 deletions(-)
diff --git a/components/camel-platform-http/src/main/java/org/apache/camel/component/platform/http/PlatformHttpEndpoint.java b/components/camel-platform-http/src/main/java/org/apache/camel/component/platform/http/PlatformHttpEndpoint.java
index ff46508..b3b721a 100644
--- a/components/camel-platform-http/src/main/java/org/apache/camel/component/platform/http/PlatformHttpEndpoint.java
+++ b/components/camel-platform-http/src/main/java/org/apache/camel/component/platform/http/PlatformHttpEndpoint.java
@@ -31,12 +31,9 @@ import org.apache.camel.spi.UriPath;
import org.apache.camel.support.DefaultConsumer;
import org.apache.camel.support.DefaultEndpoint;
import org.apache.camel.support.service.ServiceHelper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
@UriEndpoint(firstVersion = "3.0.0", scheme = "platform-http", title = "Platform HTTP", syntax = "platform-http:path", label = "http", consumerOnly = true)
public class PlatformHttpEndpoint extends DefaultEndpoint implements AsyncEndpoint, HeaderFilterStrategyAware {
- private static final Logger LOGGER = LoggerFactory.getLogger(PlatformHttpEndpoint.class);
@UriPath(description = "The path under which this endpoint serves the HTTP requests")
@Metadata(required = true)
@@ -86,38 +83,38 @@ public class PlatformHttpEndpoint extends DefaultEndpoint implements AsyncEndpoi
private Consumer delegatedConsumer;
@Override
- public PlatformHttpEndpoint getEndpoint () {
+ public PlatformHttpEndpoint getEndpoint() {
return (PlatformHttpEndpoint) super.getEndpoint();
}
@Override
- protected void doStart () throws Exception {
- super.doStart();
-
+ protected void doInit() throws Exception {
+ super.doInit();
delegatedConsumer = getEndpoint().getOrCreateEngine().createConsumer(getEndpoint(), getProcessor());
configureConsumer(delegatedConsumer);
+ }
+ @Override
+ protected void doStart() throws Exception {
+ super.doStart();
ServiceHelper.startService(delegatedConsumer);
}
@Override
- protected void doStop () throws Exception {
+ protected void doStop() throws Exception {
super.doStop();
-
ServiceHelper.stopAndShutdownServices(delegatedConsumer);
}
@Override
- protected void doResume () throws Exception {
+ protected void doResume() throws Exception {
ServiceHelper.resumeService(delegatedConsumer);
-
super.doResume();
}
@Override
- protected void doSuspend () throws Exception {
+ protected void doSuspend() throws Exception {
ServiceHelper.suspendService(delegatedConsumer);
-
super.doSuspend();
}
};
@@ -187,7 +184,7 @@ public class PlatformHttpEndpoint extends DefaultEndpoint implements AsyncEndpoi
PlatformHttpEngine getOrCreateEngine() {
return platformHttpEngine != null
- ? platformHttpEngine
- : ((PlatformHttpComponent)getComponent()).getOrCreateEngine();
+ ? platformHttpEngine
+ : ((PlatformHttpComponent) getComponent()).getOrCreateEngine();
}
}
[camel] 01/02: Fixed CS
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit b6a10650f0e25db0bf108c5de84b8d883667fb34
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Tue Mar 31 10:14:46 2020 +0200
Fixed CS
---
.../component/websocket/WebsocketSSLContextGlobalRouteExampleTest.java | 3 ++-
.../component/websocket/WebsocketSSLContextInUriRouteExampleTest.java | 3 ++-
.../zookeeper/cluster/ZooKeeperClusteredRoutePolicyFactoryTest.java | 2 +-
.../component/zookeeper/cluster/ZooKeeperClusteredRoutePolicyTest.java | 2 +-
4 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketSSLContextGlobalRouteExampleTest.java b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketSSLContextGlobalRouteExampleTest.java
index fa52139..6ae1db3 100644
--- a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketSSLContextGlobalRouteExampleTest.java
+++ b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketSSLContextGlobalRouteExampleTest.java
@@ -16,7 +16,6 @@
*/
package org.apache.camel.component.websocket;
-import javax.net.ssl.SSLContext;
import java.io.IOException;
import java.security.GeneralSecurityException;
import java.util.ArrayList;
@@ -24,6 +23,8 @@ import java.util.List;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
+import javax.net.ssl.SSLContext;
+
import io.netty.handler.ssl.ClientAuth;
import io.netty.handler.ssl.JdkSslContext;
import org.apache.camel.CamelContext;
diff --git a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketSSLContextInUriRouteExampleTest.java b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketSSLContextInUriRouteExampleTest.java
index 808995a..6d41887 100644
--- a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketSSLContextInUriRouteExampleTest.java
+++ b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketSSLContextInUriRouteExampleTest.java
@@ -16,7 +16,6 @@
*/
package org.apache.camel.component.websocket;
-import javax.net.ssl.SSLContext;
import java.io.IOException;
import java.security.GeneralSecurityException;
import java.util.ArrayList;
@@ -24,6 +23,8 @@ import java.util.List;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
+import javax.net.ssl.SSLContext;
+
import io.netty.handler.ssl.ClientAuth;
import io.netty.handler.ssl.JdkSslContext;
import org.apache.camel.builder.RouteBuilder;
diff --git a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cluster/ZooKeeperClusteredRoutePolicyFactoryTest.java b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cluster/ZooKeeperClusteredRoutePolicyFactoryTest.java
index 0c38429..6a4ece9 100644
--- a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cluster/ZooKeeperClusteredRoutePolicyFactoryTest.java
+++ b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cluster/ZooKeeperClusteredRoutePolicyFactoryTest.java
@@ -28,8 +28,8 @@ import java.util.stream.IntStream;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.zookeeper.ZooKeeperContainer;
-import org.apache.camel.impl.cluster.ClusteredRoutePolicyFactory;
import org.apache.camel.impl.DefaultCamelContext;
+import org.apache.camel.impl.cluster.ClusteredRoutePolicyFactory;
import org.junit.Assert;
import org.junit.Test;
import org.slf4j.Logger;
diff --git a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cluster/ZooKeeperClusteredRoutePolicyTest.java b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cluster/ZooKeeperClusteredRoutePolicyTest.java
index fd00323..840332f 100644
--- a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cluster/ZooKeeperClusteredRoutePolicyTest.java
+++ b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cluster/ZooKeeperClusteredRoutePolicyTest.java
@@ -28,8 +28,8 @@ import java.util.stream.IntStream;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.zookeeper.ZooKeeperContainer;
-import org.apache.camel.impl.cluster.ClusteredRoutePolicy;
import org.apache.camel.impl.DefaultCamelContext;
+import org.apache.camel.impl.cluster.ClusteredRoutePolicy;
import org.junit.Assert;
import org.junit.Test;
import org.slf4j.Logger;