Convert mdsal-rfc8294-netty to an explicit module

This is a straightforward module, just convert it.

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

diff --git a/netty/mdsal-rfc8294-netty/pom.xml b/netty/mdsal-rfc8294-netty/pom.xml
index 5c7d558a34a1d4a2c6854a6ef192ac19c359b3fe..0efa2546430bf1a3347e86a78e8ac917a4391907 100644 (file)
--- a/netty/mdsal-rfc8294-netty/pom.xml
+++ b/netty/mdsal-rfc8294-netty/pom.xml
@@ -22,12 +22,12 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
-            <artifactId>yang-common-netty</artifactId>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-buffer</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.mdsal</groupId>
-            <artifactId>yang-binding</artifactId>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>yang-common</artifactId>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
@@ -40,20 +40,6 @@
         </dependency>
     </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <configuration>
-                    <instructions>
-                        <Automatic-Module-Name>org.opendaylight.mdsal.rfc8294.netty</Automatic-Module-Name>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
     <scm>
         <connection>scm:git:http://git.opendaylight.org/gerrit/mdsal.git</connection>
         <developerConnection>scm:git:ssh://git.opendaylight.org:29418/mdsal.git</developerConnection>

diff --git a/netty/mdsal-rfc8294-netty/src/main/java/module-info.java b/netty/mdsal-rfc8294-netty/src/main/java/module-info.java
new file mode 100644 (file)
index 0000000..916a7e2
--- /dev/null
+++ b/netty/mdsal-rfc8294-netty/src/main/java/module-info.java
@@ -0,0 +1,18 @@
+/*
+ * 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.rfc8294.netty {
+    exports org.opendaylight.mdsal.rfc8294.netty;
+
+    requires transitive io.netty.buffer;
+    requires transitive org.opendaylight.yangtools.yang.common;
+    requires transitive org.opendaylight.yang.gen.ietf.routing.types.rfc8294;
+
+    // Annotations
+    requires static org.eclipse.jdt.annotation;
+}
+

diff --git a/netty/mdsal-rfc8294-netty/src/main/java/org/opendaylight/mdsal/rfc8294/netty/RFC8294ByteBufUtils.java b/netty/mdsal-rfc8294-netty/src/main/java/org/opendaylight/mdsal/rfc8294/netty/RFC8294ByteBufUtils.java
index 5ecd05acb8ae784e96e60c4da632e0cb3c41282d..7974df2534f86c70ec9c32013abe65ea7c819e20 100644 (file)
--- a/netty/mdsal-rfc8294-netty/src/main/java/org/opendaylight/mdsal/rfc8294/netty/RFC8294ByteBufUtils.java
+++ b/netty/mdsal-rfc8294-netty/src/main/java/org/opendaylight/mdsal/rfc8294/netty/RFC8294ByteBufUtils.java
@@ -7,14 +7,12 @@
  */
 package org.opendaylight.mdsal.rfc8294.netty;
 
-import com.google.common.annotations.Beta;
 import io.netty.buffer.ByteBuf;
 import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jdt.annotation.Nullable;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.routing.types.rev171204.Uint24;
 import org.opendaylight.yangtools.yang.common.Uint32;
 
-@Beta
 public final class RFC8294ByteBufUtils {
     private RFC8294ByteBufUtils() {
         // Hidden on purpose