From 6c5e52631b1d95365aec678d848756b8575afc5f Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Fri, 14 Nov 2025 17:51:19 +0100 Subject: [PATCH 1/5] Fix annotation positions Error Prone is pointing out misplaced annotations: fix that. Change-Id: Ic1649ca6862721dad2251de840663b648881a44e Signed-off-by: Robert Varga --- .../opendaylight/daexim/impl/DataExportImportAppProvider.java | 3 +-- .../daexim/impl/DataExportImportAppProviderTest.java | 3 ++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/impl/src/main/java/org/opendaylight/daexim/impl/DataExportImportAppProvider.java b/impl/src/main/java/org/opendaylight/daexim/impl/DataExportImportAppProvider.java index a690f91..860c998 100644 --- a/impl/src/main/java/org/opendaylight/daexim/impl/DataExportImportAppProvider.java +++ b/impl/src/main/java/org/opendaylight/daexim/impl/DataExportImportAppProvider.java @@ -384,8 +384,7 @@ public final class DataExportImportAppProvider implements DataImportBootService, .build(); } - @Nullable - private DaeximControl readDaeximControl() { + private @Nullable DaeximControl readDaeximControl() { final ListenableFuture> future; try (ReadTransaction roTrx = dataBroker.newReadOnlyTransaction()) { future = roTrx.read(LogicalDatastoreType.OPERATIONAL, IPC_II); diff --git a/impl/src/test/java/org/opendaylight/daexim/impl/DataExportImportAppProviderTest.java b/impl/src/test/java/org/opendaylight/daexim/impl/DataExportImportAppProviderTest.java index 4ba4534..15f534e 100644 --- a/impl/src/test/java/org/opendaylight/daexim/impl/DataExportImportAppProviderTest.java +++ b/impl/src/test/java/org/opendaylight/daexim/impl/DataExportImportAppProviderTest.java @@ -67,7 +67,8 @@ public class DataExportImportAppProviderTest extends AbstractDataBrokerTest { private static final Logger LOG = LoggerFactory.getLogger(DataExportImportAppProviderTest.class); - public @Rule LogRule logRule = new LogRule(); + @Rule + public LogRule logRule = new LogRule(); private Path tempDir; private DataExportImportAppProvider provider; -- 2.34.1 From 15576220993554d3ec3d910aec468f3104dd7656 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Fri, 14 Nov 2025 17:51:39 +0100 Subject: [PATCH 2/5] Enable a testImport_WithBatchingLevel4Size2() ErrorProne is pointing out a missing annotation, fix that. Change-Id: Ifd55db1692f66561d949431ab3db70a72f0e5ea4 Signed-off-by: Robert Varga --- .../test/java/org/opendaylight/daexim/impl/ImportTaskTest.java | 1 + 1 file changed, 1 insertion(+) diff --git a/impl/src/test/java/org/opendaylight/daexim/impl/ImportTaskTest.java b/impl/src/test/java/org/opendaylight/daexim/impl/ImportTaskTest.java index e0ca74c..2e7cc4d 100644 --- a/impl/src/test/java/org/opendaylight/daexim/impl/ImportTaskTest.java +++ b/impl/src/test/java/org/opendaylight/daexim/impl/ImportTaskTest.java @@ -203,6 +203,7 @@ public class ImportTaskTest extends AbstractDataBrokerTest { assertEquals(rt.getWriteCount(), 3); } + @Test public void testImport_WithBatchingLevel4Size2() throws Exception { Collection childrenBefore = readRoot(); assertEquals(0, childrenBefore.size()); -- 2.34.1 From b6a4fbd7060d37188b397f210810f3f077e46ce9 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Fri, 14 Nov 2025 17:56:56 +0100 Subject: [PATCH 3/5] Migrate DateAndTimeTest Use JUnit5 and correct assertion argument order. Change-Id: Ie524e1b0b24293eb789e8c59cc26c43e62d9e55b Signed-off-by: Robert Varga --- .../daexim/impl/DateAndTimeTest.java | 44 ++++++++++--------- 1 file changed, 24 insertions(+), 20 deletions(-) diff --git a/impl/src/test/java/org/opendaylight/daexim/impl/DateAndTimeTest.java b/impl/src/test/java/org/opendaylight/daexim/impl/DateAndTimeTest.java index ab6607c..2790e4e 100644 --- a/impl/src/test/java/org/opendaylight/daexim/impl/DateAndTimeTest.java +++ b/impl/src/test/java/org/opendaylight/daexim/impl/DateAndTimeTest.java @@ -8,41 +8,45 @@ */ package org.opendaylight.daexim.impl; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; import java.util.Calendar; -import java.util.Date; import java.util.TimeZone; -import org.junit.Test; - -public class DateAndTimeTest { +import org.junit.jupiter.api.Test; +class DateAndTimeTest { @Test - public void test() { - Date date = Util.parseDate("2016-08-07T12:23:48Z"); + void test() { + var date = Util.parseDate("2016-08-07T12:23:48Z"); Calendar calendar = Calendar.getInstance(TimeZone.getTimeZone("UTC")); calendar.setTimeInMillis(date.getTime()); - assertEquals(calendar.get(Calendar.MILLISECOND), 0); - assertEquals(calendar.get(Calendar.MONTH), 7); - assertEquals(calendar.get(Calendar.MINUTE), 23); + assertEquals(0, calendar.get(Calendar.MILLISECOND)); + assertEquals(7, calendar.get(Calendar.MONTH)); + assertEquals(23, calendar.get(Calendar.MINUTE)); date = Util.parseDate("2016-08-07T12:23:48.812Z"); calendar = Calendar.getInstance(TimeZone.getTimeZone("UTC")); calendar.setTimeInMillis(date.getTime()); - assertEquals(calendar.get(Calendar.MILLISECOND), 812); - assertEquals(calendar.get(Calendar.MONTH), 7); - assertEquals(calendar.get(Calendar.MINUTE), 23); + assertEquals(812, calendar.get(Calendar.MILLISECOND)); + assertEquals(7, calendar.get(Calendar.MONTH)); + assertEquals(23, calendar.get(Calendar.MINUTE)); } - @Test(expected = IllegalArgumentException.class) - public void testInvalid_LocalTime() { - Util.parseDate("2016-08-07T12:23:48.325-01:00"); + @Test + void testInvalid_LocalTime() { + final var ex = assertThrows(IllegalArgumentException.class, + () -> Util.parseDate("2016-08-07T12:23:48.325-01:00")); + assertEquals("Unrecognized DateAndTime value : 2016-08-07T12:23:48.325-01:00 (only UTC date is accepted)", + ex.getMessage()); } - @Test(expected = IllegalArgumentException.class) - public void testInvalid_Grabage() { - Util.parseDate("this-is-not-date-and-time"); + @Test + void testInvalid_Grabage() { + final var ex = assertThrows(IllegalArgumentException.class, + () -> Util.parseDate("this-is-not-date-and-time")); + assertEquals("Unrecognized DateAndTime value : this-is-not-date-and-time (only UTC date is accepted)", + ex.getMessage()); } - } -- 2.34.1 From 6c6aab6f8663e23c188e20380c3d75e34cf82eae Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Mon, 29 Sep 2025 17:54:29 +0200 Subject: [PATCH 4/5] Bump upstreams Adopt: - odlparent-14.1.6 - yangtools-14.0.20 - infrautils-7.1.9 - ietf-1.0.2 - mdsal-15.0.2 - controller-12.0.2 - netconf-10.0.1 Change-Id: Ib681ce65098067319dd807bdacd1d270380a0a34 Signed-off-by: Robert Varga --- artifacts/pom.xml | 2 +- features/daexim-features/pom.xml | 2 +- features/odl-daexim-all/pom.xml | 4 ++-- features/odl-daexim-all/src/main/feature/feature.xml | 2 +- features/odl-daexim/pom.xml | 10 +++++----- features/odl-daexim/src/main/feature/feature.xml | 6 +++--- features/pom.xml | 2 +- impl/pom.xml | 2 +- karaf/pom.xml | 2 +- model/pom.xml | 10 +++++----- parent/pom.xml | 6 +++--- pom.xml | 2 +- spi/pom.xml | 2 +- test-model/pom.xml | 2 +- 14 files changed, 27 insertions(+), 27 deletions(-) diff --git a/artifacts/pom.xml b/artifacts/pom.xml index 5ee1036..bc4bf44 100644 --- a/artifacts/pom.xml +++ b/artifacts/pom.xml @@ -14,7 +14,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent odlparent-lite - 14.1.3 + 14.1.6 diff --git a/features/daexim-features/pom.xml b/features/daexim-features/pom.xml index 4d9b9fa..321b41f 100644 --- a/features/daexim-features/pom.xml +++ b/features/daexim-features/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent feature-repo-parent - 14.1.3 + 14.1.6 diff --git a/features/odl-daexim-all/pom.xml b/features/odl-daexim-all/pom.xml index 25bbb30..62f0e4f 100644 --- a/features/odl-daexim-all/pom.xml +++ b/features/odl-daexim-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.1.3 + 14.1.6 org.opendaylight.daexim @@ -34,7 +34,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.netconf netconf-artifacts pom - 9.0.1 + 10.0.1 import diff --git a/features/odl-daexim-all/src/main/feature/feature.xml b/features/odl-daexim-all/src/main/feature/feature.xml index 45b5d53..a25354e 100644 --- a/features/odl-daexim-all/src/main/feature/feature.xml +++ b/features/odl-daexim-all/src/main/feature/feature.xml @@ -9,6 +9,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0"> - odl-restconf + odl-restconf diff --git a/features/odl-daexim/pom.xml b/features/odl-daexim/pom.xml index ff3c50b..7b9d312 100644 --- a/features/odl-daexim/pom.xml +++ b/features/odl-daexim/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.1.3 + 14.1.6 org.opendaylight.daexim @@ -34,14 +34,14 @@ and is available at http://www.eclipse.org/legal/epl-v10.html - org.opendaylight.infrautils - odl-infrautils-ready + org.opendaylight.ietf + odl-ietf-model-rfc6991 xml features - org.opendaylight.mdsal.model - odl-mdsal-model-rfc6991 + org.opendaylight.infrautils + odl-infrautils-ready xml features diff --git a/features/odl-daexim/src/main/feature/feature.xml b/features/odl-daexim/src/main/feature/feature.xml index 20156a8..9a11fd8 100644 --- a/features/odl-daexim/src/main/feature/feature.xml +++ b/features/odl-daexim/src/main/feature/feature.xml @@ -12,10 +12,10 @@ and is available at http://www.eclipse.org/legal/epl-v10.html mvn:org.opendaylight.daexim/daexim-impl/${project.version}/cfg - odl-mdsal-binding - odl-mdsal-model-rfc6991 - odl-mdsal-broker + odl-ietf-model-rfc6991 odl-infrautils-ready odl-infrautils-utils + odl-mdsal-binding + odl-mdsal-broker diff --git a/features/pom.xml b/features/pom.xml index 2c930ac..ca3da22 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent odlparent-lite - 14.1.3 + 14.1.6 org.opendaylight.daexim diff --git a/impl/pom.xml b/impl/pom.xml index 22bc95a..0882af8 100644 --- a/impl/pom.xml +++ b/impl/pom.xml @@ -111,7 +111,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html mdsal-dom-api - org.opendaylight.mdsal.binding.model.ietf + org.opendaylight.ietf.model rfc6991-ietf-yang-types diff --git a/karaf/pom.xml b/karaf/pom.xml index 9ffc461..65b8555 100644 --- a/karaf/pom.xml +++ b/karaf/pom.xml @@ -13,7 +13,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent karaf4-parent - 14.1.3 + 14.1.6 org.opendaylight.daexim diff --git a/model/pom.xml b/model/pom.xml index 4cb9513..2cbb663 100644 --- a/model/pom.xml +++ b/model/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.mdsal binding-parent - 14.0.18 + 15.0.2 org.opendaylight.daexim @@ -40,12 +40,12 @@ and is available at http://www.eclipse.org/legal/epl-v10.html guava - org.opendaylight.yangtools - yang-common + org.opendaylight.ietf.model + rfc6991-ietf-yang-types - org.opendaylight.mdsal.binding.model.ietf - rfc6991-ietf-yang-types + org.opendaylight.yangtools + yang-common diff --git a/parent/pom.xml b/parent/pom.xml index e831139..e88274a 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -11,7 +11,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.mdsal bundle-parent - 14.0.18 + 15.0.2 org.opendaylight.daexim @@ -25,13 +25,13 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.infrautils infrautils-artifacts pom - 7.1.7 + 7.1.9 import org.opendaylight.controller controller-artifacts - 11.0.2 + 12.0.2 pom import diff --git a/pom.xml b/pom.xml index 3faa8d5..07d1115 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent odlparent-lite - 14.1.3 + 14.1.6 diff --git a/spi/pom.xml b/spi/pom.xml index e20131d..d98cb66 100644 --- a/spi/pom.xml +++ b/spi/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent bundle-parent - 14.1.3 + 14.1.6 org.opendaylight.daexim diff --git a/test-model/pom.xml b/test-model/pom.xml index 6690e9b..484669c 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.mdsal binding-parent - 14.0.18 + 15.0.2 org.opendaylight.daexim -- 2.34.1 From 4505df6b6c7a94b330dbb0a69f2c2f9324a85948 Mon Sep 17 00:00:00 2001 From: jenkins-releng Date: Fri, 14 Nov 2025 17:00:27 +0000 Subject: [PATCH 5/5] Release Validate --- akka-infoprovider-impl/pom.xml | 2 +- artifacts/pom.xml | 2 +- features/daexim-features/pom.xml | 2 +- features/odl-daexim-all/pom.xml | 2 +- features/odl-daexim/pom.xml | 2 +- features/pom.xml | 2 +- impl/pom.xml | 2 +- karaf/pom.xml | 2 +- model/pom.xml | 2 +- parent/pom.xml | 2 +- pom.xml | 2 +- spi/pom.xml | 2 +- test-model/pom.xml | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/akka-infoprovider-impl/pom.xml b/akka-infoprovider-impl/pom.xml index 9bc5919..be98168 100644 --- a/akka-infoprovider-impl/pom.xml +++ b/akka-infoprovider-impl/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.daexim parent - 1.18.0-SNAPSHOT + 1.18.0 ../parent daexim-akka-infoprovider-impl diff --git a/artifacts/pom.xml b/artifacts/pom.xml index bc4bf44..8b22c82 100644 --- a/artifacts/pom.xml +++ b/artifacts/pom.xml @@ -20,7 +20,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.daexim daexim-artifacts - 1.18.0-SNAPSHOT + 1.18.0 pom diff --git a/features/daexim-features/pom.xml b/features/daexim-features/pom.xml index 321b41f..eeff698 100644 --- a/features/daexim-features/pom.xml +++ b/features/daexim-features/pom.xml @@ -18,7 +18,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.daexim daexim-features - 1.18.0-SNAPSHOT + 1.18.0 feature ODL :: daexim :: ${project.artifactId} diff --git a/features/odl-daexim-all/pom.xml b/features/odl-daexim-all/pom.xml index 62f0e4f..e4d483d 100644 --- a/features/odl-daexim-all/pom.xml +++ b/features/odl-daexim-all/pom.xml @@ -18,7 +18,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.daexim odl-daexim-all - 1.18.0-SNAPSHOT + 1.18.0 feature OpenDaylight :: Daexim :: All diff --git a/features/odl-daexim/pom.xml b/features/odl-daexim/pom.xml index 7b9d312..76b7d35 100644 --- a/features/odl-daexim/pom.xml +++ b/features/odl-daexim/pom.xml @@ -18,7 +18,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.daexim odl-daexim - 1.18.0-SNAPSHOT + 1.18.0 feature OpenDaylight :: daexim (Karaf feature) diff --git a/features/pom.xml b/features/pom.xml index ca3da22..b1ee706 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -16,7 +16,7 @@ org.opendaylight.daexim features-aggregator - 1.18.0-SNAPSHOT + 1.18.0 pom diff --git a/impl/pom.xml b/impl/pom.xml index 0882af8..65234fb 100644 --- a/impl/pom.xml +++ b/impl/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.daexim parent - 1.18.0-SNAPSHOT + 1.18.0 ../parent daexim-impl diff --git a/karaf/pom.xml b/karaf/pom.xml index 65b8555..51682e1 100644 --- a/karaf/pom.xml +++ b/karaf/pom.xml @@ -18,7 +18,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.daexim daexim-karaf - 1.18.0-SNAPSHOT + 1.18.0 pom ${project.artifactId} diff --git a/model/pom.xml b/model/pom.xml index 2cbb663..d5d6ddb 100644 --- a/model/pom.xml +++ b/model/pom.xml @@ -18,7 +18,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.daexim daexim-model bundle - 1.18.0-SNAPSHOT + 1.18.0 diff --git a/parent/pom.xml b/parent/pom.xml index e88274a..81325c6 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -16,7 +16,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.daexim parent - 1.18.0-SNAPSHOT + 1.18.0 pom diff --git a/pom.xml b/pom.xml index 07d1115..cf14b89 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html pom org.opendaylight.daexim daexim - 1.18.0-SNAPSHOT + 1.18.0 test-model model diff --git a/spi/pom.xml b/spi/pom.xml index d98cb66..60f97dc 100644 --- a/spi/pom.xml +++ b/spi/pom.xml @@ -18,5 +18,5 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.daexim daexim-spi bundle - 1.18.0-SNAPSHOT + 1.18.0 diff --git a/test-model/pom.xml b/test-model/pom.xml index 484669c..082ce69 100644 --- a/test-model/pom.xml +++ b/test-model/pom.xml @@ -18,5 +18,5 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.daexim daexim-test-model bundle - 1.18.0-SNAPSHOT + 1.18.0 -- 2.34.1