From: Robert Varga Date: Sat, 20 Jan 2024 09:52:00 +0000 (+0100) Subject: Rename singleton service components X-Git-Tag: v13.0.0~1 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=mdsal.git;a=commitdiff_plain;h=3ea5c72d92876e02e47f01827f3f8ac8d4fd09fb Rename singleton service components We only have an API and an implementation. Make sure we use the appropriate naming. Change-Id: I471520afcb6902cf6229901a7a29bee9ba13223d Signed-off-by: Robert Varga --- diff --git a/artifacts/pom.xml b/artifacts/pom.xml index f63bffa8ea..c297607671 100644 --- a/artifacts/pom.xml +++ b/artifacts/pom.xml @@ -228,12 +228,12 @@ org.opendaylight.mdsal - mdsal-singleton-common-api + mdsal-singleton-api 13.0.0-SNAPSHOT org.opendaylight.mdsal - mdsal-singleton-dom-impl + mdsal-singleton-impl 13.0.0-SNAPSHOT diff --git a/docs/pom.xml b/docs/pom.xml index 956e95a31b..83f5469bf2 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -172,11 +172,11 @@ org.opendaylight.mdsal - mdsal-singleton-common-api + mdsal-singleton-api org.opendaylight.mdsal - mdsal-singleton-dom-impl + mdsal-singleton-impl diff --git a/features/odl-mdsal-singleton-common/pom.xml b/features/odl-mdsal-singleton-common/pom.xml index 1f440fb05f..e91b5c7578 100644 --- a/features/odl-mdsal-singleton-common/pom.xml +++ b/features/odl-mdsal-singleton-common/pom.xml @@ -29,7 +29,7 @@ org.opendaylight.mdsal - mdsal-singleton-common-api + mdsal-singleton-api diff --git a/features/odl-mdsal-singleton-dom/pom.xml b/features/odl-mdsal-singleton-dom/pom.xml index ade63a386e..93ab6df7f3 100644 --- a/features/odl-mdsal-singleton-dom/pom.xml +++ b/features/odl-mdsal-singleton-dom/pom.xml @@ -46,7 +46,7 @@ org.opendaylight.mdsal - mdsal-singleton-dom-impl + mdsal-singleton-impl diff --git a/replicate/mdsal-replicate-netty/pom.xml b/replicate/mdsal-replicate-netty/pom.xml index a58c584dd4..830bdfc490 100644 --- a/replicate/mdsal-replicate-netty/pom.xml +++ b/replicate/mdsal-replicate-netty/pom.xml @@ -31,7 +31,7 @@ org.opendaylight.mdsal - mdsal-singleton-common-api + mdsal-singleton-api org.opendaylight.yangtools @@ -75,7 +75,7 @@ org.opendaylight.mdsal - mdsal-singleton-dom-impl + mdsal-singleton-impl test diff --git a/replicate/mdsal-replicate-netty/src/main/java/org/opendaylight/mdsal/replicate/netty/NettyReplicationSink.java b/replicate/mdsal-replicate-netty/src/main/java/org/opendaylight/mdsal/replicate/netty/NettyReplicationSink.java index b75973092e..03bb91420d 100644 --- a/replicate/mdsal-replicate-netty/src/main/java/org/opendaylight/mdsal/replicate/netty/NettyReplicationSink.java +++ b/replicate/mdsal-replicate-netty/src/main/java/org/opendaylight/mdsal/replicate/netty/NettyReplicationSink.java @@ -14,7 +14,7 @@ import java.net.InetSocketAddress; import java.net.UnknownHostException; import java.time.Duration; import org.opendaylight.mdsal.dom.api.DOMDataBroker; -import org.opendaylight.mdsal.singleton.common.api.ClusterSingletonServiceProvider; +import org.opendaylight.mdsal.singleton.api.ClusterSingletonServiceProvider; import org.opendaylight.yangtools.concepts.Registration; import org.osgi.service.component.annotations.Activate; import org.osgi.service.component.annotations.Component; diff --git a/replicate/mdsal-replicate-netty/src/main/java/org/opendaylight/mdsal/replicate/netty/NettyReplicationSource.java b/replicate/mdsal-replicate-netty/src/main/java/org/opendaylight/mdsal/replicate/netty/NettyReplicationSource.java index eee9740097..ff49ff4a39 100644 --- a/replicate/mdsal-replicate-netty/src/main/java/org/opendaylight/mdsal/replicate/netty/NettyReplicationSource.java +++ b/replicate/mdsal-replicate-netty/src/main/java/org/opendaylight/mdsal/replicate/netty/NettyReplicationSource.java @@ -14,7 +14,7 @@ import com.google.common.annotations.VisibleForTesting; import java.time.Duration; import org.opendaylight.mdsal.dom.api.DOMDataBroker; import org.opendaylight.mdsal.dom.api.DOMDataBroker.DataTreeChangeExtension; -import org.opendaylight.mdsal.singleton.common.api.ClusterSingletonServiceProvider; +import org.opendaylight.mdsal.singleton.api.ClusterSingletonServiceProvider; import org.opendaylight.yangtools.concepts.Registration; import org.osgi.service.component.annotations.Activate; import org.osgi.service.component.annotations.Component; diff --git a/replicate/mdsal-replicate-netty/src/main/java/org/opendaylight/mdsal/replicate/netty/SinkSingletonService.java b/replicate/mdsal-replicate-netty/src/main/java/org/opendaylight/mdsal/replicate/netty/SinkSingletonService.java index 30f50d5a99..648cf13547 100644 --- a/replicate/mdsal-replicate-netty/src/main/java/org/opendaylight/mdsal/replicate/netty/SinkSingletonService.java +++ b/replicate/mdsal-replicate-netty/src/main/java/org/opendaylight/mdsal/replicate/netty/SinkSingletonService.java @@ -32,8 +32,8 @@ import org.checkerframework.checker.lock.qual.Holding; import org.opendaylight.mdsal.common.api.LogicalDatastoreType; import org.opendaylight.mdsal.dom.api.DOMDataBroker; import org.opendaylight.mdsal.dom.api.DOMDataTreeIdentifier; -import org.opendaylight.mdsal.singleton.common.api.ClusterSingletonService; -import org.opendaylight.mdsal.singleton.common.api.ServiceGroupIdentifier; +import org.opendaylight.mdsal.singleton.api.ClusterSingletonService; +import org.opendaylight.mdsal.singleton.api.ServiceGroupIdentifier; import org.opendaylight.yangtools.util.concurrent.FluentFutures; import org.opendaylight.yangtools.yang.common.Empty; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; diff --git a/replicate/mdsal-replicate-netty/src/main/java/org/opendaylight/mdsal/replicate/netty/SourceSingletonService.java b/replicate/mdsal-replicate-netty/src/main/java/org/opendaylight/mdsal/replicate/netty/SourceSingletonService.java index 22cc0c95f8..32f29c10fa 100644 --- a/replicate/mdsal-replicate-netty/src/main/java/org/opendaylight/mdsal/replicate/netty/SourceSingletonService.java +++ b/replicate/mdsal-replicate-netty/src/main/java/org/opendaylight/mdsal/replicate/netty/SourceSingletonService.java @@ -27,8 +27,8 @@ import java.util.List; import java.util.concurrent.TimeUnit; import org.checkerframework.checker.lock.qual.GuardedBy; import org.opendaylight.mdsal.dom.api.DOMDataBroker.DataTreeChangeExtension; -import org.opendaylight.mdsal.singleton.common.api.ClusterSingletonService; -import org.opendaylight.mdsal.singleton.common.api.ServiceGroupIdentifier; +import org.opendaylight.mdsal.singleton.api.ClusterSingletonService; +import org.opendaylight.mdsal.singleton.api.ServiceGroupIdentifier; import org.opendaylight.yangtools.yang.data.codec.binfmt.NormalizedNodeStreamVersion; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/replicate/mdsal-replicate-netty/src/test/java/org/opendaylight/mdsal/replicate/netty/IntegrationTest.java b/replicate/mdsal-replicate-netty/src/test/java/org/opendaylight/mdsal/replicate/netty/IntegrationTest.java index a2f1920e8b..216839409c 100644 --- a/replicate/mdsal-replicate-netty/src/test/java/org/opendaylight/mdsal/replicate/netty/IntegrationTest.java +++ b/replicate/mdsal-replicate-netty/src/test/java/org/opendaylight/mdsal/replicate/netty/IntegrationTest.java @@ -33,7 +33,7 @@ import org.opendaylight.mdsal.dom.api.DOMDataBroker; import org.opendaylight.mdsal.dom.api.DOMDataTreeWriteTransaction; import org.opendaylight.mdsal.dom.api.DOMTransactionChain; import org.opendaylight.mdsal.eos.dom.simple.SimpleDOMEntityOwnershipService; -import org.opendaylight.mdsal.singleton.dom.impl.EOSClusterSingletonServiceProvider; +import org.opendaylight.mdsal.singleton.impl.EOSClusterSingletonServiceProvider; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.mdsal.core.general.entity.rev150930.Entity; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.mdsal.core.general.entity.rev150930.EntityBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.mdsal.core.general.entity.rev150930.EntityKey; diff --git a/singleton-service/mdsal-singleton-common-api/pom.xml b/singleton-service/mdsal-singleton-api/pom.xml similarity index 97% rename from singleton-service/mdsal-singleton-common-api/pom.xml rename to singleton-service/mdsal-singleton-api/pom.xml index 741b2207f2..50def16e60 100644 --- a/singleton-service/mdsal-singleton-common-api/pom.xml +++ b/singleton-service/mdsal-singleton-api/pom.xml @@ -16,7 +16,7 @@ ../../bundle-parent - mdsal-singleton-common-api + mdsal-singleton-api bundle diff --git a/singleton-service/mdsal-singleton-common-api/src/main/java/module-info.java b/singleton-service/mdsal-singleton-api/src/main/java/module-info.java similarity index 80% rename from singleton-service/mdsal-singleton-common-api/src/main/java/module-info.java rename to singleton-service/mdsal-singleton-api/src/main/java/module-info.java index b704978e31..58be524d58 100644 --- a/singleton-service/mdsal-singleton-common-api/src/main/java/module-info.java +++ b/singleton-service/mdsal-singleton-api/src/main/java/module-info.java @@ -5,8 +5,8 @@ * 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; +module org.opendaylight.mdsal.singleton.api { + exports org.opendaylight.mdsal.singleton.api; requires transitive org.opendaylight.yangtools.concepts; 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-api/src/main/java/org/opendaylight/mdsal/singleton/api/ClusterSingletonService.java similarity index 96% rename from singleton-service/mdsal-singleton-common-api/src/main/java/org/opendaylight/mdsal/singleton/common/api/ClusterSingletonService.java rename to singleton-service/mdsal-singleton-api/src/main/java/org/opendaylight/mdsal/singleton/api/ClusterSingletonService.java index 58368c3618..6ad7de2e71 100644 --- a/singleton-service/mdsal-singleton-common-api/src/main/java/org/opendaylight/mdsal/singleton/common/api/ClusterSingletonService.java +++ b/singleton-service/mdsal-singleton-api/src/main/java/org/opendaylight/mdsal/singleton/api/ClusterSingletonService.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.singleton.common.api; +package org.opendaylight.mdsal.singleton.api; import com.google.common.util.concurrent.ListenableFuture; import org.opendaylight.yangtools.concepts.Identifiable; 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-api/src/main/java/org/opendaylight/mdsal/singleton/api/ClusterSingletonServiceProvider.java similarity index 92% rename from singleton-service/mdsal-singleton-common-api/src/main/java/org/opendaylight/mdsal/singleton/common/api/ClusterSingletonServiceProvider.java rename to singleton-service/mdsal-singleton-api/src/main/java/org/opendaylight/mdsal/singleton/api/ClusterSingletonServiceProvider.java index 770e534ea4..3763c84f37 100644 --- a/singleton-service/mdsal-singleton-common-api/src/main/java/org/opendaylight/mdsal/singleton/common/api/ClusterSingletonServiceProvider.java +++ b/singleton-service/mdsal-singleton-api/src/main/java/org/opendaylight/mdsal/singleton/api/ClusterSingletonServiceProvider.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.singleton.common.api; +package org.opendaylight.mdsal.singleton.api; import org.opendaylight.yangtools.concepts.Registration; @@ -23,7 +23,7 @@ import org.opendaylight.yangtools.concepts.Registration; public interface ClusterSingletonServiceProvider { /** * Method registers {@link ClusterSingletonService} to Provider. - * Method returns {@link java.lang.RuntimeException} for unexpected state, so be careful with implementation. + * Method throws {@link RuntimeException} for unexpected state, so be careful with implementation. * Note: RuntimeException is implemented as a notification about some problems with registration and client * has to implement some strategy for handling this issue. * TODO: RuntimeException is not a transparent contract for handling unexpected state and it needs to be diff --git a/singleton-service/mdsal-singleton-common-api/src/main/java/org/opendaylight/mdsal/singleton/common/api/ServiceGroupIdentifier.java b/singleton-service/mdsal-singleton-api/src/main/java/org/opendaylight/mdsal/singleton/api/ServiceGroupIdentifier.java similarity index 94% rename from singleton-service/mdsal-singleton-common-api/src/main/java/org/opendaylight/mdsal/singleton/common/api/ServiceGroupIdentifier.java rename to singleton-service/mdsal-singleton-api/src/main/java/org/opendaylight/mdsal/singleton/api/ServiceGroupIdentifier.java index 1e2aa4659d..928280a2e1 100644 --- a/singleton-service/mdsal-singleton-common-api/src/main/java/org/opendaylight/mdsal/singleton/common/api/ServiceGroupIdentifier.java +++ b/singleton-service/mdsal-singleton-api/src/main/java/org/opendaylight/mdsal/singleton/api/ServiceGroupIdentifier.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.singleton.common.api; +package org.opendaylight.mdsal.singleton.api; import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.yangtools.concepts.Identifier; diff --git a/singleton-service/mdsal-singleton-common-api/src/site/asciidoc/01_doubleCandidateSimpleSequence.plantuml b/singleton-service/mdsal-singleton-api/src/site/asciidoc/01_doubleCandidateSimpleSequence.plantuml similarity index 100% rename from singleton-service/mdsal-singleton-common-api/src/site/asciidoc/01_doubleCandidateSimpleSequence.plantuml rename to singleton-service/mdsal-singleton-api/src/site/asciidoc/01_doubleCandidateSimpleSequence.plantuml diff --git a/singleton-service/mdsal-singleton-common-api/src/site/asciidoc/02_classClusterSingletonService.plantuml b/singleton-service/mdsal-singleton-api/src/site/asciidoc/02_classClusterSingletonService.plantuml similarity index 100% rename from singleton-service/mdsal-singleton-common-api/src/site/asciidoc/02_classClusterSingletonService.plantuml rename to singleton-service/mdsal-singleton-api/src/site/asciidoc/02_classClusterSingletonService.plantuml diff --git a/singleton-service/mdsal-singleton-common-api/src/site/asciidoc/03_classClusterSingletonServiceGroup.plantuml b/singleton-service/mdsal-singleton-api/src/site/asciidoc/03_classClusterSingletonServiceGroup.plantuml similarity index 100% rename from singleton-service/mdsal-singleton-common-api/src/site/asciidoc/03_classClusterSingletonServiceGroup.plantuml rename to singleton-service/mdsal-singleton-api/src/site/asciidoc/03_classClusterSingletonServiceGroup.plantuml diff --git a/singleton-service/mdsal-singleton-common-api/src/site/asciidoc/04_classClusterSingletonServiceProvider.plantuml b/singleton-service/mdsal-singleton-api/src/site/asciidoc/04_classClusterSingletonServiceProvider.plantuml similarity index 100% rename from singleton-service/mdsal-singleton-common-api/src/site/asciidoc/04_classClusterSingletonServiceProvider.plantuml rename to singleton-service/mdsal-singleton-api/src/site/asciidoc/04_classClusterSingletonServiceProvider.plantuml diff --git a/singleton-service/mdsal-singleton-common-api/src/site/asciidoc/05_pluginOsgiLifeCycle.plantuml b/singleton-service/mdsal-singleton-api/src/site/asciidoc/05_pluginOsgiLifeCycle.plantuml similarity index 100% rename from singleton-service/mdsal-singleton-common-api/src/site/asciidoc/05_pluginOsgiLifeCycle.plantuml rename to singleton-service/mdsal-singleton-api/src/site/asciidoc/05_pluginOsgiLifeCycle.plantuml diff --git a/singleton-service/mdsal-singleton-common-api/src/site/asciidoc/06_baseAppSingleInstance.plantuml b/singleton-service/mdsal-singleton-api/src/site/asciidoc/06_baseAppSingleInstance.plantuml similarity index 100% rename from singleton-service/mdsal-singleton-common-api/src/site/asciidoc/06_baseAppSingleInstance.plantuml rename to singleton-service/mdsal-singleton-api/src/site/asciidoc/06_baseAppSingleInstance.plantuml diff --git a/singleton-service/mdsal-singleton-common-api/src/site/asciidoc/07_processAppSingleInstSimply.plantuml b/singleton-service/mdsal-singleton-api/src/site/asciidoc/07_processAppSingleInstSimply.plantuml similarity index 100% rename from singleton-service/mdsal-singleton-common-api/src/site/asciidoc/07_processAppSingleInstSimply.plantuml rename to singleton-service/mdsal-singleton-api/src/site/asciidoc/07_processAppSingleInstSimply.plantuml diff --git a/singleton-service/mdsal-singleton-common-api/src/site/asciidoc/08_processAppSingleInst.plantuml b/singleton-service/mdsal-singleton-api/src/site/asciidoc/08_processAppSingleInst.plantuml similarity index 100% rename from singleton-service/mdsal-singleton-common-api/src/site/asciidoc/08_processAppSingleInst.plantuml rename to singleton-service/mdsal-singleton-api/src/site/asciidoc/08_processAppSingleInst.plantuml diff --git a/singleton-service/mdsal-singleton-common-api/src/site/asciidoc/cluster-wide-services.adoc b/singleton-service/mdsal-singleton-api/src/site/asciidoc/cluster-wide-services.adoc similarity index 100% rename from singleton-service/mdsal-singleton-common-api/src/site/asciidoc/cluster-wide-services.adoc rename to singleton-service/mdsal-singleton-api/src/site/asciidoc/cluster-wide-services.adoc diff --git a/singleton-service/mdsal-singleton-common-api/src/site/site.xml b/singleton-service/mdsal-singleton-api/src/site/site.xml similarity index 100% rename from singleton-service/mdsal-singleton-common-api/src/site/site.xml rename to singleton-service/mdsal-singleton-api/src/site/site.xml diff --git a/singleton-service/mdsal-singleton-common-api/src/test/java/org/opendaylight/mdsal/singleton/common/api/ServiceGroupIdentifierTest.java b/singleton-service/mdsal-singleton-api/src/test/java/org/opendaylight/mdsal/singleton/api/ServiceGroupIdentifierTest.java similarity index 94% rename from singleton-service/mdsal-singleton-common-api/src/test/java/org/opendaylight/mdsal/singleton/common/api/ServiceGroupIdentifierTest.java rename to singleton-service/mdsal-singleton-api/src/test/java/org/opendaylight/mdsal/singleton/api/ServiceGroupIdentifierTest.java index 4b3217418b..9609f14f1a 100644 --- a/singleton-service/mdsal-singleton-common-api/src/test/java/org/opendaylight/mdsal/singleton/common/api/ServiceGroupIdentifierTest.java +++ b/singleton-service/mdsal-singleton-api/src/test/java/org/opendaylight/mdsal/singleton/api/ServiceGroupIdentifierTest.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.singleton.common.api; +package org.opendaylight.mdsal.singleton.api; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/singleton-service/mdsal-singleton-dom-impl/pom.xml b/singleton-service/mdsal-singleton-impl/pom.xml similarity index 96% rename from singleton-service/mdsal-singleton-dom-impl/pom.xml rename to singleton-service/mdsal-singleton-impl/pom.xml index 487a85109b..e5a1517cbc 100644 --- a/singleton-service/mdsal-singleton-dom-impl/pom.xml +++ b/singleton-service/mdsal-singleton-impl/pom.xml @@ -16,7 +16,7 @@ ../../bundle-parent - mdsal-singleton-dom-impl + mdsal-singleton-impl bundle @@ -67,7 +67,7 @@ org.opendaylight.mdsal - mdsal-singleton-common-api + mdsal-singleton-api org.osgi diff --git a/singleton-service/mdsal-singleton-dom-impl/src/main/java/module-info.java b/singleton-service/mdsal-singleton-impl/src/main/java/module-info.java similarity index 81% rename from singleton-service/mdsal-singleton-dom-impl/src/main/java/module-info.java rename to singleton-service/mdsal-singleton-impl/src/main/java/module-info.java index 920f1da08c..d715ab552e 100644 --- a/singleton-service/mdsal-singleton-dom-impl/src/main/java/module-info.java +++ b/singleton-service/mdsal-singleton-impl/src/main/java/module-info.java @@ -5,10 +5,10 @@ * 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.dom.impl { - exports org.opendaylight.mdsal.singleton.dom.impl; +module org.opendaylight.mdsal.singleton.impl { + exports org.opendaylight.mdsal.singleton.impl; - requires transitive org.opendaylight.mdsal.singleton.common.api; + requires transitive org.opendaylight.mdsal.singleton.api; requires transitive org.opendaylight.mdsal.eos.dom.api; requires org.opendaylight.mdsal.eos.common.api; requires org.opendaylight.yangtools.concepts; diff --git a/singleton-service/mdsal-singleton-dom-impl/src/main/java/org/opendaylight/mdsal/singleton/dom/impl/ActiveServiceGroup.java b/singleton-service/mdsal-singleton-impl/src/main/java/org/opendaylight/mdsal/singleton/impl/ActiveServiceGroup.java similarity index 99% rename from singleton-service/mdsal-singleton-dom-impl/src/main/java/org/opendaylight/mdsal/singleton/dom/impl/ActiveServiceGroup.java rename to singleton-service/mdsal-singleton-impl/src/main/java/org/opendaylight/mdsal/singleton/impl/ActiveServiceGroup.java index 33179922cc..b117333638 100644 --- a/singleton-service/mdsal-singleton-dom-impl/src/main/java/org/opendaylight/mdsal/singleton/dom/impl/ActiveServiceGroup.java +++ b/singleton-service/mdsal-singleton-impl/src/main/java/org/opendaylight/mdsal/singleton/impl/ActiveServiceGroup.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.singleton.dom.impl; +package org.opendaylight.mdsal.singleton.impl; import static com.google.common.base.Preconditions.checkState; import static com.google.common.base.Verify.verify; @@ -35,8 +35,8 @@ import org.opendaylight.mdsal.eos.common.api.CandidateAlreadyRegisteredException import org.opendaylight.mdsal.eos.common.api.EntityOwnershipStateChange; import org.opendaylight.mdsal.eos.dom.api.DOMEntity; import org.opendaylight.mdsal.eos.dom.api.DOMEntityOwnershipService; -import org.opendaylight.mdsal.singleton.common.api.ClusterSingletonService; -import org.opendaylight.mdsal.singleton.common.api.ServiceGroupIdentifier; +import org.opendaylight.mdsal.singleton.api.ClusterSingletonService; +import org.opendaylight.mdsal.singleton.api.ServiceGroupIdentifier; import org.opendaylight.yangtools.concepts.Registration; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/singleton-service/mdsal-singleton-dom-impl/src/main/java/org/opendaylight/mdsal/singleton/dom/impl/EOSClusterSingletonServiceProvider.java b/singleton-service/mdsal-singleton-impl/src/main/java/org/opendaylight/mdsal/singleton/impl/EOSClusterSingletonServiceProvider.java similarity index 97% rename from singleton-service/mdsal-singleton-dom-impl/src/main/java/org/opendaylight/mdsal/singleton/dom/impl/EOSClusterSingletonServiceProvider.java rename to singleton-service/mdsal-singleton-impl/src/main/java/org/opendaylight/mdsal/singleton/impl/EOSClusterSingletonServiceProvider.java index 8332a92605..bd8028d3f5 100644 --- a/singleton-service/mdsal-singleton-dom-impl/src/main/java/org/opendaylight/mdsal/singleton/dom/impl/EOSClusterSingletonServiceProvider.java +++ b/singleton-service/mdsal-singleton-impl/src/main/java/org/opendaylight/mdsal/singleton/impl/EOSClusterSingletonServiceProvider.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.singleton.dom.impl; +package org.opendaylight.mdsal.singleton.impl; import static com.google.common.base.Verify.verify; import static com.google.common.base.Verify.verifyNotNull; @@ -30,9 +30,9 @@ import org.opendaylight.mdsal.eos.common.api.EntityOwnershipStateChange; import org.opendaylight.mdsal.eos.dom.api.DOMEntity; import org.opendaylight.mdsal.eos.dom.api.DOMEntityOwnershipListener; import org.opendaylight.mdsal.eos.dom.api.DOMEntityOwnershipService; -import org.opendaylight.mdsal.singleton.common.api.ClusterSingletonService; -import org.opendaylight.mdsal.singleton.common.api.ClusterSingletonServiceProvider; -import org.opendaylight.mdsal.singleton.common.api.ServiceGroupIdentifier; +import org.opendaylight.mdsal.singleton.api.ClusterSingletonService; +import org.opendaylight.mdsal.singleton.api.ClusterSingletonServiceProvider; +import org.opendaylight.mdsal.singleton.api.ServiceGroupIdentifier; import org.opendaylight.yangtools.concepts.Registration; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifierWithPredicates; import org.osgi.service.component.annotations.Activate; diff --git a/singleton-service/mdsal-singleton-dom-impl/src/main/java/org/opendaylight/mdsal/singleton/dom/impl/PlaceholderServiceGroup.java b/singleton-service/mdsal-singleton-impl/src/main/java/org/opendaylight/mdsal/singleton/impl/PlaceholderServiceGroup.java similarity index 96% rename from singleton-service/mdsal-singleton-dom-impl/src/main/java/org/opendaylight/mdsal/singleton/dom/impl/PlaceholderServiceGroup.java rename to singleton-service/mdsal-singleton-impl/src/main/java/org/opendaylight/mdsal/singleton/impl/PlaceholderServiceGroup.java index 8a27e388c2..162e5e338c 100644 --- a/singleton-service/mdsal-singleton-dom-impl/src/main/java/org/opendaylight/mdsal/singleton/dom/impl/PlaceholderServiceGroup.java +++ b/singleton-service/mdsal-singleton-impl/src/main/java/org/opendaylight/mdsal/singleton/impl/PlaceholderServiceGroup.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.singleton.dom.impl; +package org.opendaylight.mdsal.singleton.impl; import static com.google.common.base.Verify.verify; import static com.google.common.base.Verify.verifyNotNull; @@ -18,7 +18,7 @@ import java.util.List; import org.opendaylight.mdsal.eos.common.api.CandidateAlreadyRegisteredException; import org.opendaylight.mdsal.eos.common.api.EntityOwnershipStateChange; import org.opendaylight.mdsal.eos.dom.api.DOMEntity; -import org.opendaylight.mdsal.singleton.common.api.ServiceGroupIdentifier; +import org.opendaylight.mdsal.singleton.api.ServiceGroupIdentifier; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/singleton-service/mdsal-singleton-dom-impl/src/main/java/org/opendaylight/mdsal/singleton/dom/impl/ServiceGroup.java b/singleton-service/mdsal-singleton-impl/src/main/java/org/opendaylight/mdsal/singleton/impl/ServiceGroup.java similarity index 94% rename from singleton-service/mdsal-singleton-dom-impl/src/main/java/org/opendaylight/mdsal/singleton/dom/impl/ServiceGroup.java rename to singleton-service/mdsal-singleton-impl/src/main/java/org/opendaylight/mdsal/singleton/impl/ServiceGroup.java index ce19b2f403..f98cd00d85 100644 --- a/singleton-service/mdsal-singleton-dom-impl/src/main/java/org/opendaylight/mdsal/singleton/dom/impl/ServiceGroup.java +++ b/singleton-service/mdsal-singleton-impl/src/main/java/org/opendaylight/mdsal/singleton/impl/ServiceGroup.java @@ -5,15 +5,15 @@ * 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.dom.impl; +package org.opendaylight.mdsal.singleton.impl; import com.google.common.util.concurrent.ListenableFuture; import org.eclipse.jdt.annotation.Nullable; import org.opendaylight.mdsal.eos.common.api.CandidateAlreadyRegisteredException; import org.opendaylight.mdsal.eos.common.api.EntityOwnershipStateChange; import org.opendaylight.mdsal.eos.dom.api.DOMEntity; -import org.opendaylight.mdsal.singleton.common.api.ClusterSingletonService; -import org.opendaylight.mdsal.singleton.common.api.ServiceGroupIdentifier; +import org.opendaylight.mdsal.singleton.api.ClusterSingletonService; +import org.opendaylight.mdsal.singleton.api.ServiceGroupIdentifier; import org.opendaylight.yangtools.concepts.Identifiable; /** diff --git a/singleton-service/mdsal-singleton-dom-impl/src/main/java/org/opendaylight/mdsal/singleton/dom/impl/ServiceInfo.java b/singleton-service/mdsal-singleton-impl/src/main/java/org/opendaylight/mdsal/singleton/impl/ServiceInfo.java similarity index 92% rename from singleton-service/mdsal-singleton-dom-impl/src/main/java/org/opendaylight/mdsal/singleton/dom/impl/ServiceInfo.java rename to singleton-service/mdsal-singleton-impl/src/main/java/org/opendaylight/mdsal/singleton/impl/ServiceInfo.java index f62fb6d2e5..b228753ff1 100644 --- a/singleton-service/mdsal-singleton-dom-impl/src/main/java/org/opendaylight/mdsal/singleton/dom/impl/ServiceInfo.java +++ b/singleton-service/mdsal-singleton-impl/src/main/java/org/opendaylight/mdsal/singleton/impl/ServiceInfo.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.singleton.dom.impl; +package org.opendaylight.mdsal.singleton.impl; import static com.google.common.base.Verify.verify; import static com.google.common.base.Verify.verifyNotNull; @@ -14,7 +14,7 @@ import static java.util.Objects.requireNonNull; import com.google.common.util.concurrent.ListenableFuture; import org.eclipse.jdt.annotation.NonNull; import org.eclipse.jdt.annotation.Nullable; -import org.opendaylight.mdsal.singleton.dom.impl.ActiveServiceGroup.ServiceState; +import org.opendaylight.mdsal.singleton.impl.ActiveServiceGroup.ServiceState; final class ServiceInfo { static final @NonNull ServiceInfo STARTED = new ServiceInfo(ServiceState.STARTED, null); diff --git a/singleton-service/mdsal-singleton-dom-impl/src/main/java/org/opendaylight/mdsal/singleton/dom/impl/ServiceRegistration.java b/singleton-service/mdsal-singleton-impl/src/main/java/org/opendaylight/mdsal/singleton/impl/ServiceRegistration.java similarity index 82% rename from singleton-service/mdsal-singleton-dom-impl/src/main/java/org/opendaylight/mdsal/singleton/dom/impl/ServiceRegistration.java rename to singleton-service/mdsal-singleton-impl/src/main/java/org/opendaylight/mdsal/singleton/impl/ServiceRegistration.java index 273116725d..d4070207f0 100644 --- a/singleton-service/mdsal-singleton-dom-impl/src/main/java/org/opendaylight/mdsal/singleton/dom/impl/ServiceRegistration.java +++ b/singleton-service/mdsal-singleton-impl/src/main/java/org/opendaylight/mdsal/singleton/impl/ServiceRegistration.java @@ -5,9 +5,9 @@ * 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.dom.impl; +package org.opendaylight.mdsal.singleton.impl; -import org.opendaylight.mdsal.singleton.common.api.ClusterSingletonService; +import org.opendaylight.mdsal.singleton.api.ClusterSingletonService; import org.opendaylight.yangtools.concepts.AbstractObjectRegistration; abstract class ServiceRegistration extends AbstractObjectRegistration { diff --git a/singleton-service/mdsal-singleton-dom-impl/src/test/java/org/opendaylight/mdsal/singleton/dom/impl/AbstractEOSClusterSingletonServiceProviderTest.java b/singleton-service/mdsal-singleton-impl/src/test/java/org/opendaylight/mdsal/singleton/impl/AbstractEOSClusterSingletonServiceProviderTest.java similarity index 98% rename from singleton-service/mdsal-singleton-dom-impl/src/test/java/org/opendaylight/mdsal/singleton/dom/impl/AbstractEOSClusterSingletonServiceProviderTest.java rename to singleton-service/mdsal-singleton-impl/src/test/java/org/opendaylight/mdsal/singleton/impl/AbstractEOSClusterSingletonServiceProviderTest.java index bf49570e82..3f604b2386 100644 --- a/singleton-service/mdsal-singleton-dom-impl/src/test/java/org/opendaylight/mdsal/singleton/dom/impl/AbstractEOSClusterSingletonServiceProviderTest.java +++ b/singleton-service/mdsal-singleton-impl/src/test/java/org/opendaylight/mdsal/singleton/impl/AbstractEOSClusterSingletonServiceProviderTest.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.singleton.dom.impl; +package org.opendaylight.mdsal.singleton.impl; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -21,8 +21,8 @@ import static org.opendaylight.mdsal.eos.common.api.EntityOwnershipStateChange.L import static org.opendaylight.mdsal.eos.common.api.EntityOwnershipStateChange.LOCAL_OWNERSHIP_LOST_NEW_OWNER; import static org.opendaylight.mdsal.eos.common.api.EntityOwnershipStateChange.REMOTE_OWNERSHIP_CHANGED; import static org.opendaylight.mdsal.eos.common.api.EntityOwnershipStateChange.REMOTE_OWNERSHIP_LOST_NO_OWNER; -import static org.opendaylight.mdsal.singleton.dom.impl.EOSClusterSingletonServiceProvider.CLOSE_SERVICE_ENTITY_TYPE; -import static org.opendaylight.mdsal.singleton.dom.impl.EOSClusterSingletonServiceProvider.SERVICE_ENTITY_TYPE; +import static org.opendaylight.mdsal.singleton.impl.EOSClusterSingletonServiceProvider.CLOSE_SERVICE_ENTITY_TYPE; +import static org.opendaylight.mdsal.singleton.impl.EOSClusterSingletonServiceProvider.SERVICE_ENTITY_TYPE; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; @@ -33,8 +33,8 @@ import org.mockito.Mock; import org.opendaylight.mdsal.eos.common.api.CandidateAlreadyRegisteredException; import org.opendaylight.mdsal.eos.dom.api.DOMEntity; import org.opendaylight.mdsal.eos.dom.api.DOMEntityOwnershipService; -import org.opendaylight.mdsal.singleton.common.api.ClusterSingletonService; -import org.opendaylight.mdsal.singleton.common.api.ServiceGroupIdentifier; +import org.opendaylight.mdsal.singleton.api.ClusterSingletonService; +import org.opendaylight.mdsal.singleton.api.ServiceGroupIdentifier; import org.opendaylight.yangtools.concepts.Registration; /** diff --git a/singleton-service/mdsal-singleton-dom-impl/src/test/java/org/opendaylight/mdsal/singleton/dom/impl/ActiveServiceGroupTest.java b/singleton-service/mdsal-singleton-impl/src/test/java/org/opendaylight/mdsal/singleton/impl/ActiveServiceGroupTest.java similarity index 98% rename from singleton-service/mdsal-singleton-dom-impl/src/test/java/org/opendaylight/mdsal/singleton/dom/impl/ActiveServiceGroupTest.java rename to singleton-service/mdsal-singleton-impl/src/test/java/org/opendaylight/mdsal/singleton/impl/ActiveServiceGroupTest.java index 88e3f4e366..d2301e1f00 100644 --- a/singleton-service/mdsal-singleton-dom-impl/src/test/java/org/opendaylight/mdsal/singleton/dom/impl/ActiveServiceGroupTest.java +++ b/singleton-service/mdsal-singleton-impl/src/test/java/org/opendaylight/mdsal/singleton/impl/ActiveServiceGroupTest.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.singleton.dom.impl; +package org.opendaylight.mdsal.singleton.impl; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; @@ -21,8 +21,8 @@ import static org.opendaylight.mdsal.eos.common.api.EntityOwnershipStateChange.L import static org.opendaylight.mdsal.eos.common.api.EntityOwnershipStateChange.LOCAL_OWNERSHIP_LOST_NO_OWNER; import static org.opendaylight.mdsal.eos.common.api.EntityOwnershipStateChange.REMOTE_OWNERSHIP_CHANGED; import static org.opendaylight.mdsal.eos.common.api.EntityOwnershipStateChange.REMOTE_OWNERSHIP_LOST_NO_OWNER; -import static org.opendaylight.mdsal.singleton.dom.impl.EOSClusterSingletonServiceProvider.CLOSE_SERVICE_ENTITY_TYPE; -import static org.opendaylight.mdsal.singleton.dom.impl.EOSClusterSingletonServiceProvider.SERVICE_ENTITY_TYPE; +import static org.opendaylight.mdsal.singleton.impl.EOSClusterSingletonServiceProvider.CLOSE_SERVICE_ENTITY_TYPE; +import static org.opendaylight.mdsal.singleton.impl.EOSClusterSingletonServiceProvider.SERVICE_ENTITY_TYPE; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; @@ -37,8 +37,8 @@ import org.opendaylight.mdsal.eos.common.api.CandidateAlreadyRegisteredException import org.opendaylight.mdsal.eos.dom.api.DOMEntity; import org.opendaylight.mdsal.eos.dom.api.DOMEntityOwnershipListener; import org.opendaylight.mdsal.eos.dom.api.DOMEntityOwnershipService; -import org.opendaylight.mdsal.singleton.common.api.ClusterSingletonService; -import org.opendaylight.mdsal.singleton.common.api.ServiceGroupIdentifier; +import org.opendaylight.mdsal.singleton.api.ClusterSingletonService; +import org.opendaylight.mdsal.singleton.api.ServiceGroupIdentifier; import org.opendaylight.yangtools.concepts.Registration; /** diff --git a/singleton-service/mdsal-singleton-dom-impl/src/test/java/org/opendaylight/mdsal/singleton/dom/impl/AsyncEOSClusterSingletonServiceProviderTest.java b/singleton-service/mdsal-singleton-impl/src/test/java/org/opendaylight/mdsal/singleton/impl/AsyncEOSClusterSingletonServiceProviderTest.java similarity index 98% rename from singleton-service/mdsal-singleton-dom-impl/src/test/java/org/opendaylight/mdsal/singleton/dom/impl/AsyncEOSClusterSingletonServiceProviderTest.java rename to singleton-service/mdsal-singleton-impl/src/test/java/org/opendaylight/mdsal/singleton/impl/AsyncEOSClusterSingletonServiceProviderTest.java index 96dc1f16a4..67ff41467e 100644 --- a/singleton-service/mdsal-singleton-dom-impl/src/test/java/org/opendaylight/mdsal/singleton/dom/impl/AsyncEOSClusterSingletonServiceProviderTest.java +++ b/singleton-service/mdsal-singleton-impl/src/test/java/org/opendaylight/mdsal/singleton/impl/AsyncEOSClusterSingletonServiceProviderTest.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.singleton.dom.impl; +package org.opendaylight.mdsal.singleton.impl; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -25,7 +25,7 @@ import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.junit.MockitoJUnitRunner; -import org.opendaylight.mdsal.singleton.common.api.ClusterSingletonService; +import org.opendaylight.mdsal.singleton.api.ClusterSingletonService; /* * Testing {@link DOMClusterSingletonServiceProviderImpl} implementation diff --git a/singleton-service/mdsal-singleton-dom-impl/src/test/java/org/opendaylight/mdsal/singleton/dom/impl/SyncEOSClusterSingletonServiceProviderTest.java b/singleton-service/mdsal-singleton-impl/src/test/java/org/opendaylight/mdsal/singleton/impl/SyncEOSClusterSingletonServiceProviderTest.java similarity index 99% rename from singleton-service/mdsal-singleton-dom-impl/src/test/java/org/opendaylight/mdsal/singleton/dom/impl/SyncEOSClusterSingletonServiceProviderTest.java rename to singleton-service/mdsal-singleton-impl/src/test/java/org/opendaylight/mdsal/singleton/impl/SyncEOSClusterSingletonServiceProviderTest.java index 1a5d7abc78..8b0060b500 100644 --- a/singleton-service/mdsal-singleton-dom-impl/src/test/java/org/opendaylight/mdsal/singleton/dom/impl/SyncEOSClusterSingletonServiceProviderTest.java +++ b/singleton-service/mdsal-singleton-impl/src/test/java/org/opendaylight/mdsal/singleton/impl/SyncEOSClusterSingletonServiceProviderTest.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.singleton.dom.impl; +package org.opendaylight.mdsal.singleton.impl; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -21,7 +21,7 @@ import static org.opendaylight.mdsal.eos.common.api.EntityOwnershipStateChange.R import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.junit.MockitoJUnitRunner; -import org.opendaylight.mdsal.singleton.common.api.ClusterSingletonService; +import org.opendaylight.mdsal.singleton.api.ClusterSingletonService; /** * Synchronous test suite. diff --git a/singleton-service/mdsal-singleton-dom-impl/src/test/resources/simplelogger.properties b/singleton-service/mdsal-singleton-impl/src/test/resources/simplelogger.properties similarity index 100% rename from singleton-service/mdsal-singleton-dom-impl/src/test/resources/simplelogger.properties rename to singleton-service/mdsal-singleton-impl/src/test/resources/simplelogger.properties diff --git a/singleton-service/pom.xml b/singleton-service/pom.xml index 5091ca0715..365500a07d 100644 --- a/singleton-service/pom.xml +++ b/singleton-service/pom.xml @@ -23,13 +23,13 @@ ${project.artifactId} ${project.artifactId} - - mdsal-singleton-common-api - mdsal-singleton-dom-impl - - true true + + + mdsal-singleton-api + mdsal-singleton-impl +