Convert ietf-type-util to a JPMS module

Correct the package and turn the artifact into an explicit module. Also
fix up dependencies on mdsal-binding-spec-util.

JIRA: MDSAL-826
Change-Id: Ib2ad5d82ae9350794d11e0fdf2853e55e8f755db
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/model/ietf/ietf-type-util/pom.xml b/model/ietf/ietf-type-util/pom.xml
index 1c441aff79fa24a532c63d05a819a5c21c9c8499..47b750d02e424486168428c32348c33d1043e16f 100644 (file)
--- a/model/ietf/ietf-type-util/pom.xml
+++ b/model/ietf/ietf-type-util/pom.xml
@@ -25,29 +25,13 @@
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.mdsal</groupId>
-            <artifactId>mdsal-binding-spec-util</artifactId>
-        </dependency>
+
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>mockito-configuration</artifactId>
         </dependency>
     </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <configuration>
-                    <instructions>
-                        <Automatic-Module-Name>org.opendaylight.mdsal.model.ietf.type.util</Automatic-Module-Name>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
     <scm>
         <connection>scm:git:http://git.opendaylight.org/gerrit/controller.git</connection>
         <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>

diff --git a/model/ietf/ietf-type-util/src/main/java/module-info.java b/model/ietf/ietf-type-util/src/main/java/module-info.java
new file mode 100644 (file)
index 0000000..20ae0d4
--- /dev/null
+++ b/model/ietf/ietf-type-util/src/main/java/module-info.java
@@ -0,0 +1,15 @@
+/*
+ * Copyright (c) 2023 PANTHEON.tech, s.r.o. and others.  All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ */
+module org.opendaylight.mdsal.model.ietf.type.util {
+    exports org.opendaylight.mdsal.model.ietf.type.util;
+
+    requires com.google.common;
+
+    // Annotations
+    requires static org.eclipse.jdt.annotation;
+}

diff --git a/model/ietf/ietf-type-util/src/main/java/org/opendaylight/mdsal/model/ietf/util/Ipv4Utils.java b/model/ietf/ietf-type-util/src/main/java/org/opendaylight/mdsal/model/ietf/type/util/Ipv4Utils.java
similarity index 98%
rename from model/ietf/ietf-type-util/src/main/java/org/opendaylight/mdsal/model/ietf/util/Ipv4Utils.java
rename to model/ietf/ietf-type-util/src/main/java/org/opendaylight/mdsal/model/ietf/type/util/Ipv4Utils.java
index 891e740570b8f0f9004709e53845c625e286a8fe..49a26ae0f8f4f6a81a549edf5c292269c96dfae6 100644 (file)
--- a/model/ietf/ietf-type-util/src/main/java/org/opendaylight/mdsal/model/ietf/util/Ipv4Utils.java
+++ b/model/ietf/ietf-type-util/src/main/java/org/opendaylight/mdsal/model/ietf/type/util/Ipv4Utils.java
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.mdsal.model.ietf.util;
+package org.opendaylight.mdsal.model.ietf.type.util;
 
 import static com.google.common.base.Preconditions.checkArgument;
 

diff --git a/model/ietf/ietf-type-util/src/main/java/org/opendaylight/mdsal/model/ietf/util/Ipv6Utils.java b/model/ietf/ietf-type-util/src/main/java/org/opendaylight/mdsal/model/ietf/type/util/Ipv6Utils.java
similarity index 99%
rename from model/ietf/ietf-type-util/src/main/java/org/opendaylight/mdsal/model/ietf/util/Ipv6Utils.java
rename to model/ietf/ietf-type-util/src/main/java/org/opendaylight/mdsal/model/ietf/type/util/Ipv6Utils.java
index 8ffd0066cc99feaffa15a5af1122c36eed4995b8..af758592c6fd653f03d87c67ff83f562e5a7ebc4 100644 (file)
--- a/model/ietf/ietf-type-util/src/main/java/org/opendaylight/mdsal/model/ietf/util/Ipv6Utils.java
+++ b/model/ietf/ietf-type-util/src/main/java/org/opendaylight/mdsal/model/ietf/type/util/Ipv6Utils.java
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.mdsal.model.ietf.util;
+package org.opendaylight.mdsal.model.ietf.type.util;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Verify.verify;

diff --git a/model/ietf/ietf-type-util/src/test/java/org/opendaylight/mdsal/model/ietf/util/Ipv6UtilsTest.java b/model/ietf/ietf-type-util/src/test/java/org/opendaylight/mdsal/model/ietf/type/util/Ipv6UtilsTest.java
similarity index 96%
rename from model/ietf/ietf-type-util/src/test/java/org/opendaylight/mdsal/model/ietf/util/Ipv6UtilsTest.java
rename to model/ietf/ietf-type-util/src/test/java/org/opendaylight/mdsal/model/ietf/type/util/Ipv6UtilsTest.java
index 75f1ab63594ebad03d47abdf33560e19b1af1f67..f82cd43ab03265aaf5c3d7a101cdda32658582ab 100644 (file)
--- a/model/ietf/ietf-type-util/src/test/java/org/opendaylight/mdsal/model/ietf/util/Ipv6UtilsTest.java
+++ b/model/ietf/ietf-type-util/src/test/java/org/opendaylight/mdsal/model/ietf/type/util/Ipv6UtilsTest.java
@@ -6,11 +6,11 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.mdsal.model.ietf.util;
+package org.opendaylight.mdsal.model.ietf.type.util;
 
 import static com.google.common.net.InetAddresses.forString;
 import static org.junit.Assert.assertArrayEquals;
-import static org.opendaylight.mdsal.model.ietf.util.Ipv6Utils.fillIpv6Bytes;
+import static org.opendaylight.mdsal.model.ietf.type.util.Ipv6Utils.fillIpv6Bytes;
 
 import org.junit.Test;
 

diff --git a/model/ietf/rfc6991-ietf-inet-types/pom.xml b/model/ietf/rfc6991-ietf-inet-types/pom.xml
index 1e53ac2bdeee303c002a0dc491daa85d1f4b907a..34193c6b698992be391c43b50e178df4bd58376b 100644 (file)
--- a/model/ietf/rfc6991-ietf-inet-types/pom.xml
+++ b/model/ietf/rfc6991-ietf-inet-types/pom.xml
@@ -31,6 +31,10 @@
             <groupId>org.opendaylight.mdsal.model</groupId>
             <artifactId>ietf-type-util</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.mdsal</groupId>
+            <artifactId>mdsal-binding-spec-util</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

diff --git a/model/ietf/rfc6991-ietf-inet-types/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/inet/types/rev130715/IetfInetUtil.java b/model/ietf/rfc6991-ietf-inet-types/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/inet/types/rev130715/IetfInetUtil.java
index 5060ed73223dd5de3821210f2ff69ac17b300263..0c968718adc15127b6fd15f86b92404349a0c521 100644 (file)
--- a/model/ietf/rfc6991-ietf-inet-types/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/inet/types/rev130715/IetfInetUtil.java
+++ b/model/ietf/rfc6991-ietf-inet-types/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/inet/types/rev130715/IetfInetUtil.java
@@ -25,8 +25,8 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.mdsal.binding.spec.reflect.StringValueObjectFactory;
-import org.opendaylight.mdsal.model.ietf.util.Ipv4Utils;
-import org.opendaylight.mdsal.model.ietf.util.Ipv6Utils;
+import org.opendaylight.mdsal.model.ietf.type.util.Ipv4Utils;
+import org.opendaylight.mdsal.model.ietf.type.util.Ipv6Utils;
 
 /**
  * A set of utility methods to efficiently instantiate various {@code ietf-inet-types} DTOs.

diff --git a/model/ietf/rfc6991-ietf-yang-types/pom.xml b/model/ietf/rfc6991-ietf-yang-types/pom.xml
index 233f8d4d8719a2d6b4174c901763c9f3880835e5..6f50df48c390c65e903d2b0f7cc2e5f6b620dbf8 100644 (file)
--- a/model/ietf/rfc6991-ietf-yang-types/pom.xml
+++ b/model/ietf/rfc6991-ietf-yang-types/pom.xml
@@ -30,6 +30,10 @@
             <groupId>org.opendaylight.mdsal.model</groupId>
             <artifactId>ietf-type-util</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.mdsal</groupId>
+            <artifactId>mdsal-binding-spec-util</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

diff --git a/model/ietf/rfc6991-ietf-yang-types/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/yang/types/rev130715/IetfYangUtil.java b/model/ietf/rfc6991-ietf-yang-types/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/yang/types/rev130715/IetfYangUtil.java
index e9d1b722befdc8ffd0c5656548b5860328dc7c49..178064d2014bcd8f75146084735ffbf759e993ea 100644 (file)
--- a/model/ietf/rfc6991-ietf-yang-types/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/yang/types/rev130715/IetfYangUtil.java
+++ b/model/ietf/rfc6991-ietf-yang-types/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/yang/types/rev130715/IetfYangUtil.java
@@ -13,7 +13,7 @@ import java.util.HexFormat;
 import java.util.UUID;
 import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.mdsal.binding.spec.reflect.StringValueObjectFactory;
-import org.opendaylight.mdsal.model.ietf.util.Ipv4Utils;
+import org.opendaylight.mdsal.model.ietf.type.util.Ipv4Utils;
 
 /**
  * Utility methods for working with types defined in {@code ietf-yang-types}.