This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-4.10.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-4.10.x by this push:
new 1006b9c920e camel-lumberjack is remote
1006b9c920e is described below
commit 1006b9c920ea52158a2ed8150c21d32e73b66177
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Sat Apr 19 09:22:51 2025 +0200
camel-lumberjack is remote
---
.../camel/catalog/components/lumberjack.json | 2 +-
.../camel/component/lumberjack/lumberjack.json | 2 +-
.../component/lumberjack/LumberjackEndpoint.java | 7 +--
.../component/lumberjack/io/LumberjackServer.java | 10 ++--
.../LumberjackComponentLifecycleTest.java | 60 ----------------------
5 files changed, 8 insertions(+), 73 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/lumberjack.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/lumberjack.json
index 9be2dc9679a..d8675c8821a 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/lumberjack.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/lumberjack.json
@@ -21,7 +21,7 @@
"producerOnly": false,
"lenientProperties": false,
"browsable": false,
- "remote": false
+ "remote": true
},
"componentProperties": {
"bridgeErrorHandler": { "index": 0, "kind": "property", "displayName":
"Bridge Error Handler", "group": "consumer", "label": "consumer", "required":
false, "type": "boolean", "javaType": "boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": false, "description":
"Allows for bridging the consumer to the Camel routing Error Handler, which
mean any exceptions (if possible) occurred while the Camel consumer is trying
to pickup incoming messages, or the like [...]
diff --git
a/components/camel-lumberjack/src/generated/resources/META-INF/org/apache/camel/component/lumberjack/lumberjack.json
b/components/camel-lumberjack/src/generated/resources/META-INF/org/apache/camel/component/lumberjack/lumberjack.json
index 9be2dc9679a..d8675c8821a 100644
---
a/components/camel-lumberjack/src/generated/resources/META-INF/org/apache/camel/component/lumberjack/lumberjack.json
+++
b/components/camel-lumberjack/src/generated/resources/META-INF/org/apache/camel/component/lumberjack/lumberjack.json
@@ -21,7 +21,7 @@
"producerOnly": false,
"lenientProperties": false,
"browsable": false,
- "remote": false
+ "remote": true
},
"componentProperties": {
"bridgeErrorHandler": { "index": 0, "kind": "property", "displayName":
"Bridge Error Handler", "group": "consumer", "label": "consumer", "required":
false, "type": "boolean", "javaType": "boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": false, "description":
"Allows for bridging the consumer to the Camel routing Error Handler, which
mean any exceptions (if possible) occurred while the Camel consumer is trying
to pickup incoming messages, or the like [...]
diff --git
a/components/camel-lumberjack/src/main/java/org/apache/camel/component/lumberjack/LumberjackEndpoint.java
b/components/camel-lumberjack/src/main/java/org/apache/camel/component/lumberjack/LumberjackEndpoint.java
index f1506680d05..98d0c0645e6 100644
---
a/components/camel-lumberjack/src/main/java/org/apache/camel/component/lumberjack/LumberjackEndpoint.java
+++
b/components/camel-lumberjack/src/main/java/org/apache/camel/component/lumberjack/LumberjackEndpoint.java
@@ -35,7 +35,7 @@ import org.apache.camel.support.jsse.SSLContextParameters;
* Receive logs messages using the Lumberjack protocol.
*/
@UriEndpoint(firstVersion = "2.18.0", scheme = "lumberjack", title =
"Lumberjack", syntax = "lumberjack:host:port",
- remote = false, consumerOnly = true, category = {
Category.MONITORING })
+ consumerOnly = true, category = { Category.MONITORING })
public class LumberjackEndpoint extends DefaultEndpoint {
@UriPath(description = "Network interface on which to listen for
Lumberjack")
@Metadata(required = true)
@@ -52,11 +52,6 @@ public class LumberjackEndpoint extends DefaultEndpoint {
this.port = port;
}
- @Override
- public boolean isRemote() {
- return false;
- }
-
@Override
public LumberjackComponent getComponent() {
return (LumberjackComponent) super.getComponent();
diff --git
a/components/camel-lumberjack/src/main/java/org/apache/camel/component/lumberjack/io/LumberjackServer.java
b/components/camel-lumberjack/src/main/java/org/apache/camel/component/lumberjack/io/LumberjackServer.java
index a680e0e05ec..bdcf90a52ae 100644
---
a/components/camel-lumberjack/src/main/java/org/apache/camel/component/lumberjack/io/LumberjackServer.java
+++
b/components/camel-lumberjack/src/main/java/org/apache/camel/component/lumberjack/io/LumberjackServer.java
@@ -78,11 +78,11 @@ public final class LumberjackServer {
ChannelHandler initializer = new
LumberjackChannelInitializer(sslContext, executorService, messageProcessor);
// Bootstrap the netty server
- ServerBootstrap serverBootstrap = new ServerBootstrap() //
- .group(bossGroup, workerGroup) //
- .channel(NioServerSocketChannel.class) //
- .option(ChannelOption.SO_BACKLOG, 100) //
- .childHandler(initializer); //
+ ServerBootstrap serverBootstrap = new ServerBootstrap()
+ .group(bossGroup, workerGroup)
+ .channel(NioServerSocketChannel.class)
+ .option(ChannelOption.SO_BACKLOG, 100)
+ .childHandler(initializer);
// Connect the socket
channel = serverBootstrap.bind(host, port).sync().channel();
diff --git
a/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/LumberjackComponentLifecycleTest.java
b/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/LumberjackComponentLifecycleTest.java
deleted file mode 100644
index a530c480039..00000000000
---
a/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/LumberjackComponentLifecycleTest.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * 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.component.lumberjack;
-
-import org.apache.camel.ServiceStatus;
-import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.AvailablePortFinder;
-import org.apache.camel.test.junit5.CamelTestSupport;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.Timeout;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-public class LumberjackComponentLifecycleTest extends CamelTestSupport {
- private static int port;
-
- @BeforeAll
- public static void beforeClass() {
- port = AvailablePortFinder.getNextAvailable();
- }
-
- @Override
- protected RouteBuilder createRouteBuilder() {
- return new RouteBuilder() {
- public void configure() {
- // Lumberjack configured with a specific port
- from("lumberjack:0.0.0.0:" + port).to("mock:output");
- }
- };
- }
-
- @Test
- @Timeout(30)
- public void shouldRestart() {
- // Given a started context
- assertEquals(ServiceStatus.Started, context.getStatus());
-
- // When restarting it
- context.stop();
- context.start();
-
- // Then the context is started
- assertEquals(ServiceStatus.Started, context.getStatus());
- }
-}
