This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch CAMEL-21311 in repository https://gitbox.apache.org/repos/asf/camel.git
commit c68535b945fb9e580114fa008a9ffd629ac2aa52 Author: Andrea Cosentino <[email protected]> AuthorDate: Tue Oct 8 10:44:00 2024 +0200 CAMEL-21311 - NATS: Automatically added nats:// prefix in servers-parameter blocks the usage of NATS' built-in Websocket support Signed-off-by: Andrea Cosentino <[email protected]> --- .../camel/component/nats/NatsConfiguration.java | 14 ++++-- .../nats/NatsSplitServersMultiprotocolTest.java | 57 ++++++++++++++++++++++ 2 files changed, 68 insertions(+), 3 deletions(-) diff --git a/components/camel-nats/src/main/java/org/apache/camel/component/nats/NatsConfiguration.java b/components/camel-nats/src/main/java/org/apache/camel/component/nats/NatsConfiguration.java index fcaa386a432..7190f51b4a1 100644 --- a/components/camel-nats/src/main/java/org/apache/camel/component/nats/NatsConfiguration.java +++ b/components/camel-nats/src/main/java/org/apache/camel/component/nats/NatsConfiguration.java @@ -417,7 +417,7 @@ public class NatsConfiguration { return builder; } - private String splitServers() { + protected String splitServers() { StringBuilder servers = new StringBuilder(); String prefix = "nats://"; @@ -427,9 +427,17 @@ public class NatsConfiguration { String[] pieces = srvspec.split(","); for (int i = 0; i < pieces.length; i++) { if (i < pieces.length - 1) { - servers.append(prefix).append(pieces[i]).append(','); + if (pieces[i].contains("://")) { + servers.append(pieces[i]).append(','); + } else { + servers.append(prefix).append(pieces[i]).append(','); + } } else { - servers.append(prefix).append(pieces[i]); + if (pieces[i].contains("://")) { + servers.append(pieces[i]); + } else { + servers.append(prefix).append(pieces[i]); + } } } return servers.toString(); diff --git a/components/camel-nats/src/test/java/org/apache/camel/component/nats/NatsSplitServersMultiprotocolTest.java b/components/camel-nats/src/test/java/org/apache/camel/component/nats/NatsSplitServersMultiprotocolTest.java new file mode 100644 index 00000000000..30f94f20e0f --- /dev/null +++ b/components/camel-nats/src/test/java/org/apache/camel/component/nats/NatsSplitServersMultiprotocolTest.java @@ -0,0 +1,57 @@ +/* + * 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.nats; + +import org.junit.Assert; +import org.junit.jupiter.api.Test; + +/** + * Test NATS consumer stop happens cleanly. See https://issues.apache.org/jira/browse/CAMEL-15834. + */ +public class NatsSplitServersMultiprotocolTest { + @Test + public void testMultiServers() throws Exception { + NatsConfiguration conf = new NatsConfiguration(); + conf.setServers("nats://localhost:1234,localhost:6574,ws://localhost:2134"); + String serv = conf.splitServers(); + Assert.assertEquals(serv, "nats://localhost:1234,nats://localhost:6574,ws://localhost:2134"); + } + + @Test + public void testWssProtocols() throws Exception { + NatsConfiguration conf = new NatsConfiguration(); + conf.setServers("wss://localhost:1234,wss://localhost:6574,wss://localhost:2134"); + String serv = conf.splitServers(); + Assert.assertEquals(serv, "wss://localhost:1234,wss://localhost:6574,wss://localhost:2134"); + } + + @Test + public void testWsProtocols() throws Exception { + NatsConfiguration conf = new NatsConfiguration(); + conf.setServers("ws://localhost:1234,ws://localhost:6574,ws://localhost:2134"); + String serv = conf.splitServers(); + Assert.assertEquals(serv, "ws://localhost:1234,ws://localhost:6574,ws://localhost:2134"); + } + + @Test + public void testNoProtocols() throws Exception { + NatsConfiguration conf = new NatsConfiguration(); + conf.setServers("localhost:1234,localhost:6574,localhost:2134"); + String serv = conf.splitServers(); + Assert.assertEquals(serv, "nats://localhost:1234,nats://localhost:6574,nats://localhost:2134"); + } +}
