From a8616c3bc96f216d214d8352ea221e21ccb7d914 Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Sun, 8 Nov 2020 12:02:29 +0100
Subject: [PATCH] Convert mdsal-singleton-common-api to a JPMS module

This is a very simple API component, convert it to a JPMS module,
also adjusting its dependencies.

JIRA: MDSAL-639
Change-Id: I68364c2b3e008cb4954d6693152c2a6bffc14373
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---
 .../mdsal-singleton-common-api/pom.xml           |  9 +--------
 .../src/main/java/module-info.java               | 16 ++++++++++++++++
 .../common/api/ClusterSingletonService.java      |  2 --
 .../api/ClusterSingletonServiceProvider.java     |  3 ---
 4 files changed, 17 insertions(+), 13 deletions(-)
 create mode 100644 singleton-service/mdsal-singleton-common-api/src/main/java/module-info.java

diff --git a/singleton-service/mdsal-singleton-common-api/pom.xml b/singleton-service/mdsal-singleton-common-api/pom.xml
index 6c0d3b8902..ac2ff97b5c 100644
--- a/singleton-service/mdsal-singleton-common-api/pom.xml
+++ b/singleton-service/mdsal-singleton-common-api/pom.xml
@@ -20,10 +20,6 @@
     <packaging>bundle</packaging>
 
     <dependencies>
-        <dependency>
-            <groupId>org.opendaylight.mdsal</groupId>
-            <artifactId>mdsal-eos-common-api</artifactId>
-        </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
@@ -36,10 +32,7 @@
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>util</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
-            <artifactId>yang-common</artifactId>
-        </dependency>
+
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>mockito-configuration</artifactId>
diff --git a/singleton-service/mdsal-singleton-common-api/src/main/java/module-info.java b/singleton-service/mdsal-singleton-common-api/src/main/java/module-info.java
new file mode 100644
index 0000000000..b2d5fbd07e
--- /dev/null
+++ b/singleton-service/mdsal-singleton-common-api/src/main/java/module-info.java
@@ -0,0 +1,16 @@
+/*
+ * Copyright (c) 2020 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.singleton.common.api {
+    exports org.opendaylight.mdsal.singleton.common.api;
+
+    requires transitive org.opendaylight.yangtools.concepts;
+    requires org.opendaylight.yangtools.util;
+
+    // Annotations
+    requires static transitive org.eclipse.jdt.annotation;
+}
diff --git a/singleton-service/mdsal-singleton-common-api/src/main/java/org/opendaylight/mdsal/singleton/common/api/ClusterSingletonService.java b/singleton-service/mdsal-singleton-common-api/src/main/java/org/opendaylight/mdsal/singleton/common/api/ClusterSingletonService.java
index cd4cdca149..58368c3618 100644
--- a/singleton-service/mdsal-singleton-common-api/src/main/java/org/opendaylight/mdsal/singleton/common/api/ClusterSingletonService.java
+++ b/singleton-service/mdsal-singleton-common-api/src/main/java/org/opendaylight/mdsal/singleton/common/api/ClusterSingletonService.java
@@ -5,7 +5,6 @@
  * 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.singleton.common.api;
 
 import com.google.common.util.concurrent.ListenableFuture;
@@ -33,5 +32,4 @@ public interface ClusterSingletonService extends Identifiable<ServiceGroupIdenti
      * @return a ListenableFuture that is completed when the underlying instance close operation is complete.
      */
     ListenableFuture<? extends Object> closeServiceInstance();
-
 }
diff --git a/singleton-service/mdsal-singleton-common-api/src/main/java/org/opendaylight/mdsal/singleton/common/api/ClusterSingletonServiceProvider.java b/singleton-service/mdsal-singleton-common-api/src/main/java/org/opendaylight/mdsal/singleton/common/api/ClusterSingletonServiceProvider.java
index 531483d043..6778a845b7 100644
--- a/singleton-service/mdsal-singleton-common-api/src/main/java/org/opendaylight/mdsal/singleton/common/api/ClusterSingletonServiceProvider.java
+++ b/singleton-service/mdsal-singleton-common-api/src/main/java/org/opendaylight/mdsal/singleton/common/api/ClusterSingletonServiceProvider.java
@@ -5,7 +5,6 @@
  * 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.singleton.common.api;
 
 /**
@@ -20,7 +19,6 @@ package org.opendaylight.mdsal.singleton.common.api;
  * a service group candidate must hold ownership of both these entities.
  */
 public interface ClusterSingletonServiceProvider extends AutoCloseable {
-
     /**
      * Method registers {@link ClusterSingletonService} to Provider.
      * Method returns {@link java.lang.RuntimeException} for unexpected state, so be careful with implementation.
@@ -35,5 +33,4 @@ public interface ClusterSingletonServiceProvider extends AutoCloseable {
      * @return {@link AutoCloseable} registration
      */
     ClusterSingletonServiceRegistration registerClusterSingletonService(ClusterSingletonService service);
-
 }
-- 
2.36.6