From 6699a9906650a9fd3527c5c2b9120183a1ab69fe Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Thu, 13 Aug 2026 01:08:19 +0200 Subject: [PATCH 1/3] Fix modernizer warnings Upgraded modernizer is flagging a number of old constructs, modernize accordingly. Change-Id: I4dc4569b7af96afe072ac8bd27c419b53e94decd Signed-off-by: Robert Varga --- .../bus/messagelib/RequesterSessionImpl.java | 38 ++++++++----------- .../jsonrpc/bus/messagelib/MockHandler.java | 22 +++++------ .../messagelib/PayloadAwareSorterTest.java | 24 ++++++------ .../jsonrpc/bus/messagelib/PubSubTest.java | 13 ++----- .../jsonrpc/bus/messagelib/ReqRepTest.java | 27 +++++-------- .../jsonrpc/bus/http/HttpReqRepTest.java | 3 +- .../jsonrpc/bus/http/HttpsReqRepTest.java | 3 +- .../jsonrpc/bus/http/WsReqRepTest.java | 3 +- .../jsonrpc/bus/http/WssReqRepTest.java | 3 +- .../jsonrpc/bus/zmq/ReqRepTest.java | 27 +++++-------- .../jsonrpc/dom/codec/AbstractCodecTest.java | 19 +++++----- .../jsonrpc/hmap/HierarchicalEnumHashMap.java | 3 +- .../GovernanceSchemaContextProvider.java | 6 +-- .../hmap/HierarchicalEnumHashMapTest.java | 12 +++--- .../provider/common/AbstractJsonRpcTest.java | 25 ++++++------ .../provider/common/MockGovernance.java | 3 +- .../provider/common/RemoteControlTest.java | 7 ++-- .../opendaylight/jsonrpc/tool/test/Main.java | 5 ++- 18 files changed, 102 insertions(+), 141 deletions(-) diff --git a/bus/messagelib/src/main/java/org/opendaylight/jsonrpc/bus/messagelib/RequesterSessionImpl.java b/bus/messagelib/src/main/java/org/opendaylight/jsonrpc/bus/messagelib/RequesterSessionImpl.java index b1154be6..479b48fc 100644 --- a/bus/messagelib/src/main/java/org/opendaylight/jsonrpc/bus/messagelib/RequesterSessionImpl.java +++ b/bus/messagelib/src/main/java/org/opendaylight/jsonrpc/bus/messagelib/RequesterSessionImpl.java @@ -12,7 +12,6 @@ import static org.opendaylight.jsonrpc.bus.messagelib.MessageLibraryConstants.DE import static org.opendaylight.jsonrpc.bus.messagelib.MessageLibraryConstants.PARAM_PROXY_RETRY_COUNT; import static org.opendaylight.jsonrpc.bus.messagelib.MessageLibraryConstants.PARAM_PROXY_RETRY_DELAY; -import com.google.common.collect.Queues; import com.google.common.primitives.Ints; import com.google.gson.JsonObject; import io.netty.util.concurrent.Future; @@ -20,6 +19,7 @@ import io.netty.util.concurrent.GenericFutureListener; import java.util.List; import java.util.Objects; import java.util.concurrent.BlockingQueue; +import java.util.concurrent.LinkedBlockingDeque; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; import java.util.function.Consumer; @@ -46,7 +46,7 @@ public final class RequesterSessionImpl extends AbstractSession implements Messa private static final Logger LOG = LoggerFactory.getLogger(RequesterSessionImpl.class); private final Requester requester; private final ReplyMessageHandler handler; - private final BlockingQueue responseQueue = Queues.newLinkedBlockingDeque(); + private final BlockingQueue responseQueue = new LinkedBlockingDeque<>(); private final AtomicReference> lastRequest = new AtomicReference<>(null); private final int retryCount; private final long retryDelay; @@ -68,12 +68,11 @@ public final class RequesterSessionImpl extends AbstractSession implements Messa try { PeerContextHolder.set(peerContext); for (final JsonRpcBaseMessage msg : messages) { - if (msg.getType() == JsonRpcMessageType.REPLY) { - handler.handleReply((JsonRpcReplyMessage) msg); - } else { + if (msg.getType() != JsonRpcMessageType.REPLY) { throw new MessageLibraryMismatchException( String.format("Requester received %s message", msg.getType().name())); } + handler.handleReply((JsonRpcReplyMessage) msg); } } finally { PeerContextHolder.remove(); @@ -90,14 +89,11 @@ public final class RequesterSessionImpl extends AbstractSession implements Messa throw new RecoverableTransportException("There is unfinished request on this channel, try again later"); } LOG.debug("Sending request : {}", message); - lastRequest.set(requester.send(message).addListener(new GenericFutureListener>() { - @Override - public void operationComplete(final Future future) throws Exception { - if (future.isSuccess()) { - responseQueue.add(future.get()); - } else { - LOG.warn("Send failed", future.cause()); - } + lastRequest.set(requester.send(message).addListener((GenericFutureListener>) future -> { + if (future.isSuccess()) { + responseQueue.add(future.get()); + } else { + LOG.warn("Send failed", future.cause()); } })); } @@ -110,9 +106,8 @@ public final class RequesterSessionImpl extends AbstractSession implements Messa lastRequest.getAndSet(null).cancel(true); throw new MessageLibraryTimeoutException( String.format("Message was not received within %d milliseconds", timeout)); - } else { - return resp; } + return resp; } catch (InterruptedException e) { Thread.currentThread().interrupt(); } @@ -121,15 +116,14 @@ public final class RequesterSessionImpl extends AbstractSession implements Messa private JsonRpcReplyMessage readReply(String msg) { final List replies = JsonRpcSerializer.fromJson(msg); - if (replies.size() == 1) { - if (replies.get(0).getType() != JsonRpcMessageType.REPLY) { - throw new MessageLibraryMismatchException("Unexpected message : " + replies.get(0)); - } else { - return (JsonRpcReplyMessage) replies.get(0); - } - } else { + if (replies.size() != 1) { throw new MessageLibraryException("Unexpected number of replies (1 required) : " + replies.size()); } + if (replies.get(0).getType() != JsonRpcMessageType.REPLY) { + throw new MessageLibraryMismatchException("Unexpected message : " + replies.get(0)); + } else { + return (JsonRpcReplyMessage) replies.get(0); + } } @Override diff --git a/bus/messagelib/src/test/java/org/opendaylight/jsonrpc/bus/messagelib/MockHandler.java b/bus/messagelib/src/test/java/org/opendaylight/jsonrpc/bus/messagelib/MockHandler.java index 1883e506..82068b36 100644 --- a/bus/messagelib/src/test/java/org/opendaylight/jsonrpc/bus/messagelib/MockHandler.java +++ b/bus/messagelib/src/test/java/org/opendaylight/jsonrpc/bus/messagelib/MockHandler.java @@ -7,8 +7,6 @@ */ package org.opendaylight.jsonrpc.bus.messagelib; -import com.google.common.base.Strings; - public class MockHandler implements AutoCloseable { private int counter = 0; @@ -19,41 +17,41 @@ public class MockHandler implements AutoCloseable { public void method1() { } - public String method_2(int count, String str) { - return Strings.repeat(str, count); + public String method_2(final int count, final String str) { + return str.repeat(count); } - public double methodWithCamelCase(int in) { + public double methodWithCamelCase(final int in) { return Math.pow(2, in); } - public int similar_method_name(String str) { + public int similar_method_name(final String str) { return str.length(); } - public int similarMethodName(String str) { + public int similarMethodName(final String str) { return str.length() + 10; } - public int match_test(String arg1, int arg2, String arg3) { + public int match_test(final String arg1, final int arg2, final String arg3) { counter++; return 1; } - public int match_test(int arg1, String arg2, int arg3) { + public int match_test(final int arg1, final String arg2, final int arg3) { counter++; return 1; } - public String match_test(float arg1, String arg2, String arg3) { + public String match_test(final float arg1, final String arg2, final String arg3) { throw new RuntimeException("Should fail"); } - public int match_test2(int arg1, int arg2) { + public int match_test2(final int arg1, final int arg2) { return 1; } - public int match_test2(String arg1, String arg2) { + public int match_test2(final String arg1, final String arg2) { throw new IllegalStateException("Should fail"); } diff --git a/bus/messagelib/src/test/java/org/opendaylight/jsonrpc/bus/messagelib/PayloadAwareSorterTest.java b/bus/messagelib/src/test/java/org/opendaylight/jsonrpc/bus/messagelib/PayloadAwareSorterTest.java index 97c996d6..e5160542 100644 --- a/bus/messagelib/src/test/java/org/opendaylight/jsonrpc/bus/messagelib/PayloadAwareSorterTest.java +++ b/bus/messagelib/src/test/java/org/opendaylight/jsonrpc/bus/messagelib/PayloadAwareSorterTest.java @@ -9,11 +9,11 @@ package org.opendaylight.jsonrpc.bus.messagelib; import static org.junit.Assert.assertEquals; -import com.google.common.collect.Lists; import com.google.gson.JsonObject; import com.google.gson.JsonPrimitive; import java.lang.reflect.Method; -import java.util.Collections; +import java.util.ArrayList; +import java.util.Arrays; import java.util.Comparator; import java.util.List; import org.junit.Test; @@ -30,11 +30,11 @@ public class PayloadAwareSorterTest { } public static class Service { - public void test(int arg) { + public void test(final int arg) { // NOOP } - public void test(ObjectArg arg) { + public void test(final ObjectArg arg) { // NOOP } } @@ -45,22 +45,22 @@ public class PayloadAwareSorterTest { Method object = Service.class.getDeclaredMethod("test", ObjectArg.class); // object argument Comparator sorter = Util.payloadAwareSorter(new JsonObject()); - List list = Lists.newArrayList(primitive, object); - Collections.sort(list, sorter); + List list = new ArrayList<>(Arrays.asList(primitive, object)); + list.sort(sorter); assertEquals(object, list.get(0)); - list = Lists.newArrayList(object, primitive); - Collections.sort(list, sorter); + list = new ArrayList<>(Arrays.asList(object, primitive)); + list.sort(sorter); assertEquals(object, list.get(0)); // primitive argument sorter = Util.payloadAwareSorter(new JsonPrimitive(10)); - list = Lists.newArrayList(primitive, object); - Collections.sort(list, sorter); + list = new ArrayList<>(Arrays.asList(primitive, object)); + list.sort(sorter); assertEquals(primitive, list.get(0)); - list = Lists.newArrayList(object, primitive); - Collections.sort(list, sorter); + list = new ArrayList<>(Arrays.asList(object, primitive)); + list.sort(sorter); assertEquals(primitive, list.get(0)); } } diff --git a/bus/messagelib/src/test/java/org/opendaylight/jsonrpc/bus/messagelib/PubSubTest.java b/bus/messagelib/src/test/java/org/opendaylight/jsonrpc/bus/messagelib/PubSubTest.java index 4fe1a1bd..9b2bd817 100644 --- a/bus/messagelib/src/test/java/org/opendaylight/jsonrpc/bus/messagelib/PubSubTest.java +++ b/bus/messagelib/src/test/java/org/opendaylight/jsonrpc/bus/messagelib/PubSubTest.java @@ -7,7 +7,6 @@ */ package org.opendaylight.jsonrpc.bus.messagelib; -import com.google.common.collect.Lists; import com.google.gson.JsonObject; import java.util.ArrayList; import java.util.Collection; @@ -19,7 +18,6 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; -import org.opendaylight.jsonrpc.bus.jsonrpc.JsonRpcNotificationMessage; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -37,7 +35,7 @@ public class PubSubTest { @Parameters public static Collection data() { - return Lists.newArrayList(new String[] { "ws" }, new String[] { "zmq" }); + return List.of(new String[] { "ws" }, new String[] { "zmq" }); } public PubSubTest(final String transport) { @@ -64,12 +62,9 @@ public class PubSubTest { final PublisherSession pub = ml.publisher(TestHelper.getBindUri(transport, port), true); for (int i = 0; i < subCount; i++) { final SubscriberSession sub = ml.subscriber(TestHelper.getConnectUri(transport, port), - new NotificationMessageHandler() { - @Override - public void handleNotification(JsonRpcNotificationMessage notification) { - LOG.info("Notification : {}", notification); - latch.countDown(); - } + notification -> { + LOG.info("Notification : {}", notification); + latch.countDown(); }, true); sub.await(); subscribers.add(sub); diff --git a/bus/messagelib/src/test/java/org/opendaylight/jsonrpc/bus/messagelib/ReqRepTest.java b/bus/messagelib/src/test/java/org/opendaylight/jsonrpc/bus/messagelib/ReqRepTest.java index bcaa5bd9..04e12544 100644 --- a/bus/messagelib/src/test/java/org/opendaylight/jsonrpc/bus/messagelib/ReqRepTest.java +++ b/bus/messagelib/src/test/java/org/opendaylight/jsonrpc/bus/messagelib/ReqRepTest.java @@ -7,8 +7,8 @@ */ package org.opendaylight.jsonrpc.bus.messagelib; -import com.google.common.collect.Lists; import java.util.Collection; +import java.util.List; import java.util.concurrent.CountDownLatch; import org.junit.After; import org.junit.Before; @@ -16,9 +16,6 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; -import org.opendaylight.jsonrpc.bus.jsonrpc.JsonRpcReplyMessage; -import org.opendaylight.jsonrpc.bus.jsonrpc.JsonRpcReplyMessage.Builder; -import org.opendaylight.jsonrpc.bus.jsonrpc.JsonRpcRequestMessage; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -36,7 +33,7 @@ public class ReqRepTest { @Parameters public static Collection data() { - return Lists.newArrayList(new String[] { "http" }, new String[] { "ws" }, new String[] { "zmq" }); + return List.of(new String[] { "http" }, new String[] { "ws" }, new String[] { "zmq" }); } public ReqRepTest(final String transport) { @@ -59,20 +56,14 @@ public class ReqRepTest { final int port = TestHelper.getFreeTcpPort(); final CountDownLatch replyCounter = new CountDownLatch(count); final CountDownLatch requestCounter = new CountDownLatch(count); - final RequesterSession req = ml.requester(TestHelper.getConnectUri(transport, port), new ReplyMessageHandler() { - @Override - public void handleReply(JsonRpcReplyMessage reply) { - LOG.info("Response received : {}", reply); - replyCounter.countDown(); - } + final RequesterSession req = ml.requester(TestHelper.getConnectUri(transport, port), reply -> { + LOG.info("Response received : {}", reply); + replyCounter.countDown(); }, true); - final ResponderSession rep = ml.responder(TestHelper.getBindUri(transport, port), new RequestMessageHandler() { - @Override - public void handleRequest(JsonRpcRequestMessage request, Builder replyBuilder) { - LOG.info("Request received : {}", request); - replyBuilder.metadata(request.getMetadata()).result(request.getParams()); - requestCounter.countDown(); - } + final ResponderSession rep = ml.responder(TestHelper.getBindUri(transport, port), (request, replyBuilder) -> { + LOG.info("Request received : {}", request); + replyBuilder.metadata(request.getMetadata()).result(request.getParams()); + requestCounter.countDown(); }, true); req.await(); for (int i = 0; i < count; i++) { diff --git a/bus/transport-http/src/test/java/org/opendaylight/jsonrpc/bus/http/HttpReqRepTest.java b/bus/transport-http/src/test/java/org/opendaylight/jsonrpc/bus/http/HttpReqRepTest.java index 3a52997f..fb9c81d7 100644 --- a/bus/transport-http/src/test/java/org/opendaylight/jsonrpc/bus/http/HttpReqRepTest.java +++ b/bus/transport-http/src/test/java/org/opendaylight/jsonrpc/bus/http/HttpReqRepTest.java @@ -7,7 +7,6 @@ */ package org.opendaylight.jsonrpc.bus.http; -import com.google.common.base.Strings; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; @@ -31,7 +30,7 @@ public class HttpReqRepTest extends AbstractReqRepTest { @Test public void testBigMessageSize() throws InterruptedException, ExecutionException, TimeoutException { final int port = getFreeTcpPort(); - testReqRep(getConnectUri(port), getBindUri(port), Strings.repeat("X", 3000), Strings.repeat("Y", 2000)); + testReqRep(getConnectUri(port), getBindUri(port), "X".repeat(3000), "Y".repeat(2000)); } @Test(expected = RecoverableTransportException.class) diff --git a/bus/transport-http/src/test/java/org/opendaylight/jsonrpc/bus/http/HttpsReqRepTest.java b/bus/transport-http/src/test/java/org/opendaylight/jsonrpc/bus/http/HttpsReqRepTest.java index cf26526e..646cc0b4 100644 --- a/bus/transport-http/src/test/java/org/opendaylight/jsonrpc/bus/http/HttpsReqRepTest.java +++ b/bus/transport-http/src/test/java/org/opendaylight/jsonrpc/bus/http/HttpsReqRepTest.java @@ -7,7 +7,6 @@ */ package org.opendaylight.jsonrpc.bus.http; -import com.google.common.base.Strings; import java.io.IOException; import java.util.UUID; import java.util.concurrent.ExecutionException; @@ -49,7 +48,7 @@ public class HttpsReqRepTest extends AbstractReqRepTest { .build(); testReqRep(uri, uri, "ABCD", "1234567890"); - testReqRep(uri, uri, Strings.repeat("X", 3000), Strings.repeat("Y", 2000)); + testReqRep(uri, uri, "X".repeat(3000), "Y".repeat(2000)); } @Test(expected = IllegalStateException.class) diff --git a/bus/transport-http/src/test/java/org/opendaylight/jsonrpc/bus/http/WsReqRepTest.java b/bus/transport-http/src/test/java/org/opendaylight/jsonrpc/bus/http/WsReqRepTest.java index 07208e3c..7279e107 100644 --- a/bus/transport-http/src/test/java/org/opendaylight/jsonrpc/bus/http/WsReqRepTest.java +++ b/bus/transport-http/src/test/java/org/opendaylight/jsonrpc/bus/http/WsReqRepTest.java @@ -7,7 +7,6 @@ */ package org.opendaylight.jsonrpc.bus.http; -import com.google.common.base.Strings; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeoutException; import org.junit.Test; @@ -24,7 +23,7 @@ public class WsReqRepTest extends AbstractReqRepTest { @Test public void testBigMessageSize() throws InterruptedException, ExecutionException, TimeoutException { final int port = getFreeTcpPort(); - testReqRep(getConnectUri(port), getBindUri(port), Strings.repeat("X", 3000), Strings.repeat("Y", 2000)); + testReqRep(getConnectUri(port), getBindUri(port), "X".repeat(3000), "Y".repeat(2000)); } @Override diff --git a/bus/transport-http/src/test/java/org/opendaylight/jsonrpc/bus/http/WssReqRepTest.java b/bus/transport-http/src/test/java/org/opendaylight/jsonrpc/bus/http/WssReqRepTest.java index 477fe186..940b5baf 100644 --- a/bus/transport-http/src/test/java/org/opendaylight/jsonrpc/bus/http/WssReqRepTest.java +++ b/bus/transport-http/src/test/java/org/opendaylight/jsonrpc/bus/http/WssReqRepTest.java @@ -7,7 +7,6 @@ */ package org.opendaylight.jsonrpc.bus.http; -import com.google.common.base.Strings; import java.io.IOException; import java.util.UUID; import java.util.concurrent.ExecutionException; @@ -54,7 +53,7 @@ public class WssReqRepTest extends AbstractReqRepTest { .build(); testReqRep(clientUri, serverUri, "ABCD", "1234567890"); - testReqRep(clientUri, serverUri, Strings.repeat("X", 3000), Strings.repeat("Y", 2000)); + testReqRep(clientUri, serverUri, "X".repeat(3000), "Y".repeat(2000)); } @Test(timeout = 15_000, expected = IllegalStateException.class) diff --git a/bus/transport-zmq/src/test/java/org/opendaylight/jsonrpc/bus/zmq/ReqRepTest.java b/bus/transport-zmq/src/test/java/org/opendaylight/jsonrpc/bus/zmq/ReqRepTest.java index 8f01df97..33e6b600 100644 --- a/bus/transport-zmq/src/test/java/org/opendaylight/jsonrpc/bus/zmq/ReqRepTest.java +++ b/bus/transport-zmq/src/test/java/org/opendaylight/jsonrpc/bus/zmq/ReqRepTest.java @@ -9,15 +9,12 @@ package org.opendaylight.jsonrpc.bus.zmq; import static org.junit.Assert.assertTrue; -import com.google.common.base.Strings; import java.util.concurrent.CountDownLatch; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import org.junit.Test; import org.opendaylight.jsonrpc.bus.api.BusSessionFactory; -import org.opendaylight.jsonrpc.bus.api.MessageListener; -import org.opendaylight.jsonrpc.bus.api.PeerContext; import org.opendaylight.jsonrpc.bus.api.RecoverableTransportException; import org.opendaylight.jsonrpc.bus.api.Requester; import org.opendaylight.jsonrpc.bus.api.Responder; @@ -40,13 +37,10 @@ public class ReqRepTest extends AbstractSessionTest { latch.countDown(); } }); - final Requester requester = factory.requester(getConnectUri(port), new MessageListener() { - @Override - public void onMessage(PeerContext peerContext, String message) { - LOG.info("Received response : {}", message); - if ("Hi".equals(message)) { - latch.countDown(); - } + final Requester requester = factory.requester(getConnectUri(port), (peerContext, message) -> { + LOG.info("Received response : {}", message); + if ("Hi".equals(message)) { + latch.countDown(); } }); requester.awaitConnection(); @@ -60,7 +54,7 @@ public class ReqRepTest extends AbstractSessionTest { public void testLongFrame() throws Exception { final int port = getFreeTcpPort(); final CountDownLatch latch = new CountDownLatch(2); - final String msg = Strings.repeat("X", 256); + final String msg = "X".repeat(256); final Responder responder = factory.responder(getBindUri(port), (peerContext, message) -> { if (msg.equals(message)) { // echo back @@ -68,13 +62,10 @@ public class ReqRepTest extends AbstractSessionTest { latch.countDown(); } }); - final Requester requester = factory.requester(getConnectUri(port), new MessageListener() { - @Override - public void onMessage(PeerContext peerContext, String message) { - LOG.info("Received response : {}", message); - if (msg.equals(message)) { - latch.countDown(); - } + final Requester requester = factory.requester(getConnectUri(port), (peerContext, message) -> { + LOG.info("Received response : {}", message); + if (msg.equals(message)) { + latch.countDown(); } }); requester.awaitConnection(); diff --git a/dom-codec/src/test/java/org/opendaylight/jsonrpc/dom/codec/AbstractCodecTest.java b/dom-codec/src/test/java/org/opendaylight/jsonrpc/dom/codec/AbstractCodecTest.java index 17842122..927c8385 100644 --- a/dom-codec/src/test/java/org/opendaylight/jsonrpc/dom/codec/AbstractCodecTest.java +++ b/dom-codec/src/test/java/org/opendaylight/jsonrpc/dom/codec/AbstractCodecTest.java @@ -7,7 +7,6 @@ */ package org.opendaylight.jsonrpc.dom.codec; -import com.google.common.base.Strings; import com.google.common.io.Resources; import com.google.gson.JsonElement; import com.google.gson.JsonParser; @@ -49,13 +48,13 @@ public abstract class AbstractCodecTest extends AbstractDataBrokerTest { factory = new JsonRpcCodecFactory(context); } - protected JsonElement loadJsonData(String name) throws IOException { + protected JsonElement loadJsonData(final String name) throws IOException { try (InputStream is = Resources.getResource(name).openStream()) { return JsonParser.parseReader(new InputStreamReader(is)); } } - protected NormalizedNode loadDomData(String name, YangInstanceIdentifier path) throws IOException { + protected NormalizedNode loadDomData(final String name, final YangInstanceIdentifier path) throws IOException { final SchemaInferenceStack stack = DataSchemaContextTree.from(schemaContext) .enterPath(path) .orElseThrow() @@ -74,7 +73,7 @@ public abstract class AbstractCodecTest extends AbstractDataBrokerTest { } } - protected static void dumpYangPath(YangInstanceIdentifier path) { + protected static void dumpYangPath(final YangInstanceIdentifier path) { final StringBuilder sb = new StringBuilder(); int level = 2; for (PathArgument arg : path.getPathArguments()) { @@ -83,12 +82,12 @@ public abstract class AbstractCodecTest extends AbstractDataBrokerTest { LOG.info("YangInstanceIdentifier : \n{}", sb.toString()); } - protected static void dumpYangPathArgument(int level, StringBuilder sb, PathArgument arg) { - sb.append(Strings.repeat(" ", (level - 1) * 2)); + protected static void dumpYangPathArgument(final int level, final StringBuilder sb, final PathArgument arg) { + sb.append(" ".repeat((level - 1) * 2)); sb.append(" ").append(arg.getClass().getSimpleName()).append(arg).append('\n'); if (arg instanceof NodeIdentifierWithPredicates) { ((NodeIdentifierWithPredicates) arg).entrySet().forEach(pre -> { - sb.append(Strings.repeat(" ", (level - 1) * 2)); + sb.append(" ".repeat((level - 1) * 2)); sb.append(" key") .append(':') .append(pre.getKey().getLocalName()) @@ -100,14 +99,14 @@ public abstract class AbstractCodecTest extends AbstractDataBrokerTest { } - protected static void dumpNormalizedNode(NormalizedNode node) { + protected static void dumpNormalizedNode(final NormalizedNode node) { StringWriter sw = new StringWriter(); dumpNormalizedNode(node, sw, 1); LOG.info("Normalized node content : \n{}", sw.toString()); } - protected static void dumpNormalizedNode(NormalizedNode nn, StringWriter sw, int level) { - sw.write(Strings.repeat(" ", (level - 1) * 2)); + protected static void dumpNormalizedNode(final NormalizedNode nn, final StringWriter sw, final int level) { + sw.write(" ".repeat((level - 1) * 2)); sw.write(nn.body().getClass().getSimpleName()); sw.write(" : "); sw.write(nn.name().toString()); diff --git a/provider/common/src/main/java/org/opendaylight/jsonrpc/hmap/HierarchicalEnumHashMap.java b/provider/common/src/main/java/org/opendaylight/jsonrpc/hmap/HierarchicalEnumHashMap.java index 267d9fd1..d4248c17 100644 --- a/provider/common/src/main/java/org/opendaylight/jsonrpc/hmap/HierarchicalEnumHashMap.java +++ b/provider/common/src/main/java/org/opendaylight/jsonrpc/hmap/HierarchicalEnumHashMap.java @@ -7,7 +7,6 @@ */ package org.opendaylight.jsonrpc.hmap; -import com.google.common.base.Strings; import java.util.Collection; import java.util.Collections; import java.util.EnumMap; @@ -111,7 +110,7 @@ public final class HierarchicalEnumHashMap, D, I> implement } private void append(StringBuilder sb, EnumTreeNode node, int level) { - sb.append(Strings.repeat(" ", level * 2)); + sb.append(" ".repeat(level * 2)); sb.append(node.id()).append("[").append(node.allValues()).append("]"); sb.append("\n"); for (final EnumTreeNode child : node.children()) { diff --git a/provider/common/src/main/java/org/opendaylight/jsonrpc/provider/common/GovernanceSchemaContextProvider.java b/provider/common/src/main/java/org/opendaylight/jsonrpc/provider/common/GovernanceSchemaContextProvider.java index a9a65984..1c06bc19 100644 --- a/provider/common/src/main/java/org/opendaylight/jsonrpc/provider/common/GovernanceSchemaContextProvider.java +++ b/provider/common/src/main/java/org/opendaylight/jsonrpc/provider/common/GovernanceSchemaContextProvider.java @@ -13,10 +13,10 @@ import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Queues; import com.google.common.io.CharSource; import java.io.IOException; import java.time.Duration; +import java.util.ArrayDeque; import java.util.Deque; import java.util.HashSet; import java.util.Objects; @@ -106,7 +106,7 @@ public class GovernanceSchemaContextProvider implements SchemaContextProvider { @SuppressWarnings("checkstyle:IllegalCatch") private EffectiveModelContext createInternal(Peer peer) throws ReactorException { final BuildAction reactor = RFC7950Reactors.defaultReactorBuilder(xpathParserFactory).build().newBuild(); - final Deque toResolve = Queues.newArrayDeque(); + final Deque toResolve = new ArrayDeque<>(); try { Optional.ofNullable(peer.getModules()) .orElse(Set.of()) @@ -128,7 +128,7 @@ public class GovernanceSchemaContextProvider implements SchemaContextProvider { return new ModuleInfo(parts[0], parts[1]); } return new ModuleInfo(yi.getValue(), null); - }).collect(Collectors.toList())); + }).toList()); // resolve remaining until queue is empty while (!toResolve.isEmpty()) { final ModuleInfo mi = toResolve.pop(); diff --git a/provider/common/src/test/java/org/opendaylight/jsonrpc/hmap/HierarchicalEnumHashMapTest.java b/provider/common/src/test/java/org/opendaylight/jsonrpc/hmap/HierarchicalEnumHashMapTest.java index 78552ea6..32ae52c7 100644 --- a/provider/common/src/test/java/org/opendaylight/jsonrpc/hmap/HierarchicalEnumHashMapTest.java +++ b/provider/common/src/test/java/org/opendaylight/jsonrpc/hmap/HierarchicalEnumHashMapTest.java @@ -11,7 +11,6 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; import com.google.common.collect.Iterables; -import com.google.common.collect.Lists; import com.google.gson.JsonElement; import com.google.gson.JsonParser; import java.io.ByteArrayOutputStream; @@ -19,6 +18,7 @@ import java.io.IOException; import java.io.InputStream; import java.nio.charset.StandardCharsets; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import java.util.Map; import java.util.Optional; @@ -74,7 +74,7 @@ public class HierarchicalEnumHashMapTest { @Test public void testDeserializePath() throws IOException { JsonElement json; - json = CODEC.deserialize(Lists.newArrayList(null, "level1", "level2", "level3")); + json = CODEC.deserialize(Arrays.asList(null, "level1", "level2", "level3")); LOG.info("JSON : {}", json); assertEquals("{\"level1\":{\"level2\":{\"level3\":{}}}}", json.toString()); final List rootOnlyPath = new ArrayList<>(); @@ -82,19 +82,19 @@ public class HierarchicalEnumHashMapTest { json = CODEC.deserialize(rootOnlyPath); LOG.info("JSON : {}", json); assertEquals("{}", json.toString()); - json = CODEC.deserialize(Lists.newArrayList(null, "level1", "item1=value", "level3", "item=value")); + json = CODEC.deserialize(Arrays.asList(null, "level1", "item1=value", "level3", "item=value")); LOG.info("JSON : {}", json); - json = CODEC.deserialize(Lists.newArrayList(null, "network-topology:network-topology", "topology", + json = CODEC.deserialize(Arrays.asList(null, "network-topology:network-topology", "topology", "topology-id=topology1", "node", "node-id=node1", "termination-point", "tp-id=eth0")); LOG.info("JSON : {}", json); assertEquals(parse(getData("path4")).toString(), json.toString()); } - private static JsonElement parse(String str) { + private static JsonElement parse(final String str) { return JsonParser.parseString(str); } - private String getData(String name) throws IOException { + private String getData(final String name) throws IOException { final ByteArrayOutputStream baos = new ByteArrayOutputStream(); try (InputStream is = getClass().getResourceAsStream("/" + name + ".json")) { is.transferTo(baos); diff --git a/provider/common/src/test/java/org/opendaylight/jsonrpc/provider/common/AbstractJsonRpcTest.java b/provider/common/src/test/java/org/opendaylight/jsonrpc/provider/common/AbstractJsonRpcTest.java index 9c06a542..75b3e03d 100644 --- a/provider/common/src/test/java/org/opendaylight/jsonrpc/provider/common/AbstractJsonRpcTest.java +++ b/provider/common/src/test/java/org/opendaylight/jsonrpc/provider/common/AbstractJsonRpcTest.java @@ -7,7 +7,6 @@ */ package org.opendaylight.jsonrpc.provider.common; -import com.google.common.base.Strings; import java.io.IOException; import java.net.Socket; import java.util.Set; @@ -64,12 +63,12 @@ public abstract class AbstractJsonRpcTest extends AbstractDataBrokerTest { @Override protected void setupWithSchema(final EffectiveModelContext context) { - this.testCustomizer = new ConcurrentDataBrokerTestCustomizer(true); - this.dataBroker = this.testCustomizer.createDataBroker(); - this.domBroker = this.testCustomizer.createDOMDataBroker(); - this.testCustomizer.updateSchema(runtimeContext); - this.schemaContext = context; - setupWithDataBroker(this.dataBroker); + testCustomizer = new ConcurrentDataBrokerTestCustomizer(true); + dataBroker = testCustomizer.createDataBroker(); + domBroker = testCustomizer.createDOMDataBroker(); + testCustomizer.updateSchema(runtimeContext); + schemaContext = context; + setupWithDataBroker(dataBroker); rpcRouter = new DOMRpcRouter(getSchemaService()); bnnc = new DefaultBindingDOMCodecFactory().createBindingDOMCodec(runtimeContext); codecFactory = new JsonRpcCodecFactory(context); @@ -90,7 +89,7 @@ public abstract class AbstractJsonRpcTest extends AbstractDataBrokerTest { } protected DOMSchemaService getSchemaService() { - return this.testCustomizer.getSchemaService(); + return testCustomizer.getSchemaService(); } @Override @@ -99,16 +98,16 @@ public abstract class AbstractJsonRpcTest extends AbstractDataBrokerTest { @Override public DataBroker getDataBroker() { - return this.dataBroker; + return dataBroker; } @Override public DOMDataBroker getDomBroker() { - return this.domBroker; + return domBroker; } public DOMMountPointService getDOMMountPointService() { - return this.domMountPointService; + return domMountPointService; } public DOMRpcRouter getDOMRpcRouter() { @@ -124,9 +123,9 @@ public abstract class AbstractJsonRpcTest extends AbstractDataBrokerTest { } protected void logTestName(final String stage) { - LOG.info("{}", Strings.repeat("=", 80)); + LOG.info("{}", "=".repeat(80)); LOG.info("[{}]{}", stage, nameRule.getMethodName()); - LOG.info("{}", Strings.repeat("=", 80)); + LOG.info("{}", "=".repeat(80)); } @SuppressWarnings("checkstyle:IllegalCatch") diff --git a/provider/common/src/test/java/org/opendaylight/jsonrpc/provider/common/MockGovernance.java b/provider/common/src/test/java/org/opendaylight/jsonrpc/provider/common/MockGovernance.java index 4a0f6093..34e85977 100644 --- a/provider/common/src/test/java/org/opendaylight/jsonrpc/provider/common/MockGovernance.java +++ b/provider/common/src/test/java/org/opendaylight/jsonrpc/provider/common/MockGovernance.java @@ -7,7 +7,6 @@ */ package org.opendaylight.jsonrpc.provider.common; -import com.google.common.collect.Lists; import com.google.common.io.Resources; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -50,6 +49,6 @@ public class MockGovernance implements RemoteGovernance { @Override public List depends(ModuleInfo arg) { - return Lists.newArrayList(new ModuleInfo(arg.getModule(), arg.getRevision())); + return List.of(new ModuleInfo(arg.getModule(), arg.getRevision())); } } diff --git a/provider/common/src/test/java/org/opendaylight/jsonrpc/provider/common/RemoteControlTest.java b/provider/common/src/test/java/org/opendaylight/jsonrpc/provider/common/RemoteControlTest.java index 7617f194..9154141d 100644 --- a/provider/common/src/test/java/org/opendaylight/jsonrpc/provider/common/RemoteControlTest.java +++ b/provider/common/src/test/java/org/opendaylight/jsonrpc/provider/common/RemoteControlTest.java @@ -15,13 +15,12 @@ import static org.junit.Assert.fail; import static org.opendaylight.jsonrpc.provider.common.Util.store2int; import static org.opendaylight.jsonrpc.provider.common.Util.store2str; -import com.google.common.base.Strings; import com.google.gson.JsonElement; import com.google.gson.JsonParser; import java.io.IOException; import java.net.URISyntaxException; -import java.util.Collections; import java.util.List; +import java.util.Map; import java.util.Set; import java.util.UUID; import java.util.concurrent.CountDownLatch; @@ -231,7 +230,7 @@ public class RemoteControlTest extends AbstractJsonRpcTest { public void testMerge() throws OperationFailedException, InterruptedException, ExecutionException { DOMDataTreeWriteTransaction wtx = getDomBroker().newWriteOnlyTransaction(); Config c1 = new ConfigBuilder().setWhoAmI(new Uri("urn:bla")) - .setConfiguredEndpoints(Collections.emptyMap()).build(); + .setConfiguredEndpoints(Map.of()).build(); NodeResult e1 = getCodec() .toNormalizedDataObject(InstanceIdentifier.create(Config.class), c1); @@ -380,7 +379,7 @@ public class RemoteControlTest extends AbstractJsonRpcTest { int index = 0; LOG.info("Path len : {}", path.size()); for (final PathArgument p : path) { - LOG.info("{}{} : {}", Strings.repeat("-", index++), p.getNodeType(), p); + LOG.info("{}{} : {}", "-".repeat(index++), p.getNodeType(), p); } } } diff --git a/tools/test-tool/src/main/java/org/opendaylight/jsonrpc/tool/test/Main.java b/tools/test-tool/src/main/java/org/opendaylight/jsonrpc/tool/test/Main.java index 22355e76..f92a0fe8 100644 --- a/tools/test-tool/src/main/java/org/opendaylight/jsonrpc/tool/test/Main.java +++ b/tools/test-tool/src/main/java/org/opendaylight/jsonrpc/tool/test/Main.java @@ -8,11 +8,12 @@ package org.opendaylight.jsonrpc.tool.test; import com.google.common.base.Preconditions; -import com.google.common.collect.Lists; import com.google.common.util.concurrent.Uninterruptibles; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.net.URISyntaxException; import java.nio.file.Path; +import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import java.util.concurrent.CountDownLatch; import java.util.stream.Collectors; @@ -49,7 +50,7 @@ public final class Main { if (opts.datastore != null) { Preconditions.checkArgument(opts.datastoreModules != null, "Argument 'datastore-modules' is required if --datastore option is provided"); - final List modules = Lists.newArrayList(opts.datastoreModules.split(",")); + final List modules = new ArrayList<>(Arrays.asList(opts.datastoreModules.split(","))); if (opts.rpc != null) { modules.add("test-model-rpc"); } -- 2.34.1 From bba7780854f8f851cbbc05affb889e9dec3798b8 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Wed, 12 Aug 2026 21:32:38 +0200 Subject: [PATCH 2/3] Bump upstreams Adopt: - odlparent-14.3.7 - infrautils-7.1.14 - yangtools-14.0.25 - mdsal-14.0.22 - controller-11.0.5 - netconf-9.0.3 Change-Id: I03cdd121e4f8f53ed026d22e5243a093cc88916a Signed-off-by: Robert Varga --- artifacts/pom.xml | 2 +- bus/config/pom.xml | 2 +- features/features-jsonrpc/pom.xml | 2 +- features/odl-jsonrpc-all/pom.xml | 2 +- features/odl-jsonrpc-bus/pom.xml | 2 +- features/odl-jsonrpc-cluster/pom.xml | 2 +- features/odl-jsonrpc-provider/pom.xml | 2 +- features/pom.xml | 2 +- karaf/pom.xml | 2 +- parent/pom.xml | 6 +++--- pom.xml | 2 +- provider/cluster/pom.xml | 2 +- provider/common/pom.xml | 2 +- 13 files changed, 15 insertions(+), 15 deletions(-) diff --git a/artifacts/pom.xml b/artifacts/pom.xml index 35714dba..d7a0c251 100644 --- a/artifacts/pom.xml +++ b/artifacts/pom.xml @@ -11,7 +11,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent odlparent-lite - 14.3.1 + 14.3.7 org.opendaylight.jsonrpc diff --git a/bus/config/pom.xml b/bus/config/pom.xml index 9593af82..c51d5b41 100644 --- a/bus/config/pom.xml +++ b/bus/config/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent bundle-parent - 14.3.1 + 14.3.7 diff --git a/features/features-jsonrpc/pom.xml b/features/features-jsonrpc/pom.xml index 3b232990..ec00ade9 100644 --- a/features/features-jsonrpc/pom.xml +++ b/features/features-jsonrpc/pom.xml @@ -13,7 +13,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent feature-repo-parent - 14.3.1 + 14.3.7 diff --git a/features/odl-jsonrpc-all/pom.xml b/features/odl-jsonrpc-all/pom.xml index d9bbb3e2..fe3e5b60 100644 --- a/features/odl-jsonrpc-all/pom.xml +++ b/features/odl-jsonrpc-all/pom.xml @@ -13,7 +13,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent single-feature-parent - 14.3.1 + 14.3.7 diff --git a/features/odl-jsonrpc-bus/pom.xml b/features/odl-jsonrpc-bus/pom.xml index a8d5e496..c042cb97 100644 --- a/features/odl-jsonrpc-bus/pom.xml +++ b/features/odl-jsonrpc-bus/pom.xml @@ -13,7 +13,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent single-feature-parent - 14.3.1 + 14.3.7 diff --git a/features/odl-jsonrpc-cluster/pom.xml b/features/odl-jsonrpc-cluster/pom.xml index 07f2d6bc..30bfdd88 100644 --- a/features/odl-jsonrpc-cluster/pom.xml +++ b/features/odl-jsonrpc-cluster/pom.xml @@ -13,7 +13,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent single-feature-parent - 14.3.1 + 14.3.7 diff --git a/features/odl-jsonrpc-provider/pom.xml b/features/odl-jsonrpc-provider/pom.xml index 7f9bb1a2..2bd8366d 100644 --- a/features/odl-jsonrpc-provider/pom.xml +++ b/features/odl-jsonrpc-provider/pom.xml @@ -13,7 +13,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent single-feature-parent - 14.3.1 + 14.3.7 diff --git a/features/pom.xml b/features/pom.xml index b1f0147b..4e9a56f5 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent odlparent-lite - 14.3.1 + 14.3.7 org.opendaylight.jsonrpc diff --git a/karaf/pom.xml b/karaf/pom.xml index 232aee9b..c857d2c9 100644 --- a/karaf/pom.xml +++ b/karaf/pom.xml @@ -11,7 +11,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent karaf4-parent - 14.3.1 + 14.3.7 org.opendaylight.jsonrpc diff --git a/parent/pom.xml b/parent/pom.xml index 87283af9..dc249296 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.mdsal binding-parent - 14.0.21 + 14.0.22 @@ -34,14 +34,14 @@ org.opendaylight.netconf netconf-artifacts - 9.0.2 + 9.0.3 pom import org.opendaylight.aaa aaa-artifacts - 0.21.4 + 0.21.5 pom import diff --git a/pom.xml b/pom.xml index 476ffa84..8654aa64 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent odlparent-lite - 14.3.1 + 14.3.7 org.opendaylight.jsonrpc diff --git a/provider/cluster/pom.xml b/provider/cluster/pom.xml index 4ef978b0..e2ff330b 100644 --- a/provider/cluster/pom.xml +++ b/provider/cluster/pom.xml @@ -25,7 +25,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.controller bundle-parent - 11.0.4 + 11.0.5 pom import diff --git a/provider/common/pom.xml b/provider/common/pom.xml index 5073e9a3..19bd60fa 100644 --- a/provider/common/pom.xml +++ b/provider/common/pom.xml @@ -24,7 +24,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.mdsal bnd-parent - 14.0.21 + 14.0.22 pom import -- 2.34.1 From 3c3a50a76a7b0b63977e86d223770c3850322ae3 Mon Sep 17 00:00:00 2001 From: jenkins-releng Date: Wed, 12 Aug 2026 23:11:50 +0000 Subject: [PATCH 3/3] Release Validate --- api/pom.xml | 2 +- artifacts/pom.xml | 2 +- binding-adapter/pom.xml | 2 +- bus/api/pom.xml | 2 +- bus/config/pom.xml | 2 +- bus/examples/binding-bridge/pom.xml | 2 +- bus/examples/inband-models/pom.xml | 2 +- bus/examples/pom.xml | 2 +- bus/jsonrpc/pom.xml | 2 +- bus/messagelib/pom.xml | 2 +- bus/pom.xml | 2 +- bus/spi/pom.xml | 2 +- bus/transport-http/pom.xml | 2 +- bus/transport-zmq/pom.xml | 2 +- dom-codec/pom.xml | 2 +- features/features-jsonrpc/pom.xml | 2 +- features/odl-jsonrpc-all/pom.xml | 2 +- features/odl-jsonrpc-bus/pom.xml | 2 +- features/odl-jsonrpc-cluster/pom.xml | 2 +- features/odl-jsonrpc-provider/pom.xml | 2 +- features/pom.xml | 2 +- karaf/pom.xml | 2 +- parent/pom.xml | 2 +- pom.xml | 2 +- provider/cluster/pom.xml | 2 +- provider/common/pom.xml | 2 +- provider/pom.xml | 2 +- provider/single/pom.xml | 2 +- security/aaa/pom.xml | 2 +- security/api/pom.xml | 2 +- security/noop/pom.xml | 2 +- security/pom.xml | 2 +- security/service/pom.xml | 2 +- test-model/pom.xml | 2 +- tools/parent/pom.xml | 2 +- tools/pom.xml | 2 +- tools/test-tool/pom.xml | 2 +- 37 files changed, 37 insertions(+), 37 deletions(-) diff --git a/api/pom.xml b/api/pom.xml index 2b5cccbf..ae24d983 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.jsonrpc jsonrpc-parent - 1.18.3-SNAPSHOT + 1.18.3 ../parent jsonrpc-api diff --git a/artifacts/pom.xml b/artifacts/pom.xml index d7a0c251..dae81f63 100644 --- a/artifacts/pom.xml +++ b/artifacts/pom.xml @@ -16,7 +16,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.jsonrpc jsonrpc-artifacts - 1.18.3-SNAPSHOT + 1.18.3 pom JSON-RPC :: Artifacts diff --git a/binding-adapter/pom.xml b/binding-adapter/pom.xml index 66f0f845..17020667 100644 --- a/binding-adapter/pom.xml +++ b/binding-adapter/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.jsonrpc jsonrpc-parent - 1.18.3-SNAPSHOT + 1.18.3 ../parent diff --git a/bus/api/pom.xml b/bus/api/pom.xml index 6620cd75..c573f338 100644 --- a/bus/api/pom.xml +++ b/bus/api/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.jsonrpc jsonrpc-parent - 1.18.3-SNAPSHOT + 1.18.3 ../../parent org.opendaylight.jsonrpc.bus diff --git a/bus/config/pom.xml b/bus/config/pom.xml index c51d5b41..631546fe 100644 --- a/bus/config/pom.xml +++ b/bus/config/pom.xml @@ -17,7 +17,7 @@ org.opendaylight.jsonrpc.bus bus-config - 1.18.3-SNAPSHOT + 1.18.3 JSON-RPC :: BUS :: Config Configuration files for JSONRPC bus jar diff --git a/bus/examples/binding-bridge/pom.xml b/bus/examples/binding-bridge/pom.xml index ec28a99d..3c452698 100644 --- a/bus/examples/binding-bridge/pom.xml +++ b/bus/examples/binding-bridge/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.jsonrpc jsonrpc-parent - 1.18.3-SNAPSHOT + 1.18.3 ../../../parent org.opendaylight.jsonrpc.bus diff --git a/bus/examples/inband-models/pom.xml b/bus/examples/inband-models/pom.xml index 079f26df..8214c48c 100644 --- a/bus/examples/inband-models/pom.xml +++ b/bus/examples/inband-models/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.jsonrpc jsonrpc-parent - 1.18.3-SNAPSHOT + 1.18.3 ../../../parent inband-models diff --git a/bus/examples/pom.xml b/bus/examples/pom.xml index d37876aa..08eb750e 100644 --- a/bus/examples/pom.xml +++ b/bus/examples/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.jsonrpc jsonrpc-bus - 1.18.3-SNAPSHOT + 1.18.3 org.opendaylight.jsonrpc.bus examples diff --git a/bus/jsonrpc/pom.xml b/bus/jsonrpc/pom.xml index 00ec5048..2b596092 100644 --- a/bus/jsonrpc/pom.xml +++ b/bus/jsonrpc/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.jsonrpc jsonrpc-parent - 1.18.3-SNAPSHOT + 1.18.3 ../../parent org.opendaylight.jsonrpc.bus diff --git a/bus/messagelib/pom.xml b/bus/messagelib/pom.xml index e5f89717..cd250b7b 100644 --- a/bus/messagelib/pom.xml +++ b/bus/messagelib/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.jsonrpc jsonrpc-parent - 1.18.3-SNAPSHOT + 1.18.3 ../../parent org.opendaylight.jsonrpc.bus diff --git a/bus/pom.xml b/bus/pom.xml index 9c1bbe4e..a7f313bb 100644 --- a/bus/pom.xml +++ b/bus/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.jsonrpc jsonrpc - 1.18.3-SNAPSHOT + 1.18.3 jsonrpc-bus pom diff --git a/bus/spi/pom.xml b/bus/spi/pom.xml index 78591656..464ac9ce 100644 --- a/bus/spi/pom.xml +++ b/bus/spi/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.jsonrpc jsonrpc-parent - 1.18.3-SNAPSHOT + 1.18.3 ../../parent org.opendaylight.jsonrpc.bus diff --git a/bus/transport-http/pom.xml b/bus/transport-http/pom.xml index 1cc7ecf5..6000b577 100644 --- a/bus/transport-http/pom.xml +++ b/bus/transport-http/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.jsonrpc jsonrpc-parent - 1.18.3-SNAPSHOT + 1.18.3 ../../parent org.opendaylight.jsonrpc.bus diff --git a/bus/transport-zmq/pom.xml b/bus/transport-zmq/pom.xml index a82daf7d..e634df28 100644 --- a/bus/transport-zmq/pom.xml +++ b/bus/transport-zmq/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.jsonrpc jsonrpc-parent - 1.18.3-SNAPSHOT + 1.18.3 ../../parent org.opendaylight.jsonrpc.bus diff --git a/dom-codec/pom.xml b/dom-codec/pom.xml index 6c1130eb..650c527e 100644 --- a/dom-codec/pom.xml +++ b/dom-codec/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.jsonrpc jsonrpc-parent - 1.18.3-SNAPSHOT + 1.18.3 ../parent diff --git a/features/features-jsonrpc/pom.xml b/features/features-jsonrpc/pom.xml index ec00ade9..e399beec 100644 --- a/features/features-jsonrpc/pom.xml +++ b/features/features-jsonrpc/pom.xml @@ -19,7 +19,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.jsonrpc features-jsonrpc - 1.18.3-SNAPSHOT + 1.18.3 feature JSON-RPC :: Features :: repository diff --git a/features/odl-jsonrpc-all/pom.xml b/features/odl-jsonrpc-all/pom.xml index fe3e5b60..e23174b0 100644 --- a/features/odl-jsonrpc-all/pom.xml +++ b/features/odl-jsonrpc-all/pom.xml @@ -19,7 +19,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.jsonrpc odl-jsonrpc-all - 1.18.3-SNAPSHOT + 1.18.3 feature JSON-RPC :: Feature :: all diff --git a/features/odl-jsonrpc-bus/pom.xml b/features/odl-jsonrpc-bus/pom.xml index c042cb97..25024b75 100644 --- a/features/odl-jsonrpc-bus/pom.xml +++ b/features/odl-jsonrpc-bus/pom.xml @@ -19,7 +19,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.jsonrpc odl-jsonrpc-bus - 1.18.3-SNAPSHOT + 1.18.3 feature JSON-RPC :: Feature :: bus diff --git a/features/odl-jsonrpc-cluster/pom.xml b/features/odl-jsonrpc-cluster/pom.xml index 30bfdd88..6a90b3c1 100644 --- a/features/odl-jsonrpc-cluster/pom.xml +++ b/features/odl-jsonrpc-cluster/pom.xml @@ -19,7 +19,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.jsonrpc odl-jsonrpc-cluster - 1.18.3-SNAPSHOT + 1.18.3 feature JSON-RPC :: Feature :: Cluster diff --git a/features/odl-jsonrpc-provider/pom.xml b/features/odl-jsonrpc-provider/pom.xml index 2bd8366d..e162c6d9 100644 --- a/features/odl-jsonrpc-provider/pom.xml +++ b/features/odl-jsonrpc-provider/pom.xml @@ -19,7 +19,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.jsonrpc odl-jsonrpc-provider - 1.18.3-SNAPSHOT + 1.18.3 feature JSON-RPC :: Feature :: provider diff --git a/features/pom.xml b/features/pom.xml index 4e9a56f5..336ee3db 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -16,7 +16,7 @@ org.opendaylight.jsonrpc features-aggregator - 1.18.3-SNAPSHOT + 1.18.3 pom JSON-RPC :: Features :: Aggregator diff --git a/karaf/pom.xml b/karaf/pom.xml index c857d2c9..411bff93 100644 --- a/karaf/pom.xml +++ b/karaf/pom.xml @@ -16,7 +16,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.jsonrpc jsonrpc-karaf - 1.18.3-SNAPSHOT + 1.18.3 JSON-RPC :: Karaf pom diff --git a/parent/pom.xml b/parent/pom.xml index dc249296..e1dc18ea 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -18,7 +18,7 @@ 4.0.0 org.opendaylight.jsonrpc jsonrpc-parent - 1.18.3-SNAPSHOT + 1.18.3 pom JSON-RPC :: Parent diff --git a/pom.xml b/pom.xml index 8654aa64..fcb5ffb6 100644 --- a/pom.xml +++ b/pom.xml @@ -16,7 +16,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.jsonrpc jsonrpc - 1.18.3-SNAPSHOT + 1.18.3 pom JSON-RPC :: POM diff --git a/provider/cluster/pom.xml b/provider/cluster/pom.xml index e2ff330b..c0497c50 100644 --- a/provider/cluster/pom.xml +++ b/provider/cluster/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.jsonrpc jsonrpc-provider - 1.18.3-SNAPSHOT + 1.18.3 .. diff --git a/provider/common/pom.xml b/provider/common/pom.xml index 19bd60fa..212409ca 100644 --- a/provider/common/pom.xml +++ b/provider/common/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.jsonrpc jsonrpc-provider - 1.18.3-SNAPSHOT + 1.18.3 .. diff --git a/provider/pom.xml b/provider/pom.xml index bfc44b7b..d80659a0 100644 --- a/provider/pom.xml +++ b/provider/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.jsonrpc jsonrpc-parent - 1.18.3-SNAPSHOT + 1.18.3 ../parent diff --git a/provider/single/pom.xml b/provider/single/pom.xml index 7124411d..59d3c280 100644 --- a/provider/single/pom.xml +++ b/provider/single/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.jsonrpc jsonrpc-provider - 1.18.3-SNAPSHOT + 1.18.3 .. diff --git a/security/aaa/pom.xml b/security/aaa/pom.xml index 26331363..1fdb5c79 100644 --- a/security/aaa/pom.xml +++ b/security/aaa/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.jsonrpc jsonrpc-parent - 1.18.3-SNAPSHOT + 1.18.3 ../../parent org.opendaylight.jsonrpc.security diff --git a/security/api/pom.xml b/security/api/pom.xml index 2041a201..033d18bc 100644 --- a/security/api/pom.xml +++ b/security/api/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.jsonrpc jsonrpc-parent - 1.18.3-SNAPSHOT + 1.18.3 ../../parent org.opendaylight.jsonrpc.security diff --git a/security/noop/pom.xml b/security/noop/pom.xml index e79e19f5..ae8a0ae9 100644 --- a/security/noop/pom.xml +++ b/security/noop/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.jsonrpc jsonrpc-parent - 1.18.3-SNAPSHOT + 1.18.3 ../../parent org.opendaylight.jsonrpc.security diff --git a/security/pom.xml b/security/pom.xml index 3e9efb09..3d560d4f 100644 --- a/security/pom.xml +++ b/security/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.jsonrpc jsonrpc - 1.18.3-SNAPSHOT + 1.18.3 jsonrpc-security pom diff --git a/security/service/pom.xml b/security/service/pom.xml index 277891d6..08308d5e 100644 --- a/security/service/pom.xml +++ b/security/service/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.jsonrpc jsonrpc-parent - 1.18.3-SNAPSHOT + 1.18.3 ../../parent org.opendaylight.jsonrpc.security diff --git a/test-model/pom.xml b/test-model/pom.xml index 37fde4a9..d473716a 100644 --- a/test-model/pom.xml +++ b/test-model/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.jsonrpc jsonrpc-parent - 1.18.3-SNAPSHOT + 1.18.3 ../parent jsonrpc-test-model diff --git a/tools/parent/pom.xml b/tools/parent/pom.xml index 6bb0170a..f3d52600 100644 --- a/tools/parent/pom.xml +++ b/tools/parent/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.jsonrpc jsonrpc-parent - 1.18.3-SNAPSHOT + 1.18.3 ../../parent tools-parent diff --git a/tools/pom.xml b/tools/pom.xml index c31e8c7f..fc03f716 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.jsonrpc jsonrpc - 1.18.3-SNAPSHOT + 1.18.3 jsonrpc-tools pom diff --git a/tools/test-tool/pom.xml b/tools/test-tool/pom.xml index 95d0979e..db4c1847 100644 --- a/tools/test-tool/pom.xml +++ b/tools/test-tool/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.jsonrpc tools-parent - 1.18.3-SNAPSHOT + 1.18.3 ../parent test-tool -- 2.34.1