From 6e41848c1e96692d744c6d791b238aa6419b3742 Mon Sep 17 00:00:00 2001 From: Vaclav Demcak Date: Fri, 8 Jul 2016 14:28:55 +0200 Subject: [PATCH] Rename package in EosCommonApi * rename package from org.opendaylight.mdsal.common.api.clustering to org.opendaylight.mdsal.eos.common.api Change-Id: Ic97ceb1c81881dc23e29cca4c32b7c69d095b363 Signed-off-by: Vaclav Demcak --- .../clustering/BindingDOMEntityOwnershipServiceAdapter.java | 4 ++-- .../BindingDOMEntityOwnershipServiceAdapterTest.java | 6 +++--- .../opendaylight/mdsal/binding/api/clustering/Entity.java | 2 +- .../clustering/EntityOwnershipCandidateRegistration.java | 2 +- .../mdsal/binding/api/clustering/EntityOwnershipChange.java | 4 ++-- .../binding/api/clustering/EntityOwnershipListener.java | 2 +- .../api/clustering/EntityOwnershipListenerRegistration.java | 2 +- .../binding/api/clustering/EntityOwnershipService.java | 6 +++--- .../common/api}/CandidateAlreadyRegisteredException.java | 2 +- .../common/api}/EntityOwnershipChangeState.java | 2 +- .../clustering => eos/common/api}/EntityOwnershipState.java | 2 +- .../api/clustering => eos/common/api}/GenericEntity.java | 2 +- .../api}/GenericEntityOwnershipCandidateRegistration.java | 2 +- .../common/api}/GenericEntityOwnershipChange.java | 2 +- .../common/api}/GenericEntityOwnershipListener.java | 2 +- .../api}/GenericEntityOwnershipListenerRegistration.java | 2 +- .../common/api}/GenericEntityOwnershipService.java | 2 +- .../common/api}/EntityOwnershipChangeStateTest.java | 3 ++- .../common/api}/EntityOwnershipStateTest.java | 3 ++- .../common/api}/GenericEntityOwnershipChangeTest.java | 5 ++++- .../clustering => eos/common/api}/GenericEntityTest.java | 3 ++- ...AbstractGenericEntityOwnershipCandidateRegistration.java | 2 ++ .../AbstractGenericEntityOwnershipListenerRegistration.java | 4 ++++ ...ractGenericEntityOwnershipCandidateRegistrationTest.java | 1 + ...tractGenericEntityOwnershipListenerRegistrationTest.java | 1 + .../opendaylight/mdsal/dom/api/clustering/DOMEntity.java | 2 +- .../clustering/DOMEntityOwnershipCandidateRegistration.java | 2 +- .../mdsal/dom/api/clustering/DOMEntityOwnershipChange.java | 4 ++-- .../dom/api/clustering/DOMEntityOwnershipListener.java | 2 +- .../clustering/DOMEntityOwnershipListenerRegistration.java | 2 +- .../mdsal/dom/api/clustering/DOMEntityOwnershipService.java | 6 +++--- .../dom/api/clustering/DOMEntityOwnershipChangeTest.java | 2 +- 32 files changed, 51 insertions(+), 37 deletions(-) rename entityownership/mdsal-eos-common-api/src/main/java/org/opendaylight/mdsal/{common/api/clustering => eos/common/api}/CandidateAlreadyRegisteredException.java (96%) rename entityownership/mdsal-eos-common-api/src/main/java/org/opendaylight/mdsal/{common/api/clustering => eos/common/api}/EntityOwnershipChangeState.java (98%) rename entityownership/mdsal-eos-common-api/src/main/java/org/opendaylight/mdsal/{common/api/clustering => eos/common/api}/EntityOwnershipState.java (94%) rename entityownership/mdsal-eos-common-api/src/main/java/org/opendaylight/mdsal/{common/api/clustering => eos/common/api}/GenericEntity.java (98%) rename entityownership/mdsal-eos-common-api/src/main/java/org/opendaylight/mdsal/{common/api/clustering => eos/common/api}/GenericEntityOwnershipCandidateRegistration.java (94%) rename entityownership/mdsal-eos-common-api/src/main/java/org/opendaylight/mdsal/{common/api/clustering => eos/common/api}/GenericEntityOwnershipChange.java (97%) rename entityownership/mdsal-eos-common-api/src/main/java/org/opendaylight/mdsal/{common/api/clustering => eos/common/api}/GenericEntityOwnershipListener.java (94%) rename entityownership/mdsal-eos-common-api/src/main/java/org/opendaylight/mdsal/{common/api/clustering => eos/common/api}/GenericEntityOwnershipListenerRegistration.java (95%) rename entityownership/mdsal-eos-common-api/src/main/java/org/opendaylight/mdsal/{common/api/clustering => eos/common/api}/GenericEntityOwnershipService.java (98%) rename entityownership/mdsal-eos-common-api/src/test/java/org/opendaylight/mdsal/{common/api/clustering => eos/common/api}/EntityOwnershipChangeStateTest.java (95%) rename entityownership/mdsal-eos-common-api/src/test/java/org/opendaylight/mdsal/{common/api/clustering => eos/common/api}/EntityOwnershipStateTest.java (86%) rename entityownership/mdsal-eos-common-api/src/test/java/org/opendaylight/mdsal/{common/api/clustering => eos/common/api}/GenericEntityOwnershipChangeTest.java (83%) rename entityownership/mdsal-eos-common-api/src/test/java/org/opendaylight/mdsal/{common/api/clustering => eos/common/api}/GenericEntityTest.java (94%) diff --git a/entityownership/mdsal-eos-binding-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/clustering/BindingDOMEntityOwnershipServiceAdapter.java b/entityownership/mdsal-eos-binding-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/clustering/BindingDOMEntityOwnershipServiceAdapter.java index fd9ee85fa0..ebfa1d8efc 100644 --- a/entityownership/mdsal-eos-binding-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/clustering/BindingDOMEntityOwnershipServiceAdapter.java +++ b/entityownership/mdsal-eos-binding-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/clustering/BindingDOMEntityOwnershipServiceAdapter.java @@ -17,10 +17,10 @@ import org.opendaylight.mdsal.binding.api.clustering.EntityOwnershipListener; import org.opendaylight.mdsal.binding.api.clustering.EntityOwnershipListenerRegistration; import org.opendaylight.mdsal.binding.api.clustering.EntityOwnershipService; import org.opendaylight.mdsal.binding.dom.adapter.BindingToNormalizedNodeCodec; -import org.opendaylight.mdsal.common.api.clustering.CandidateAlreadyRegisteredException; -import org.opendaylight.mdsal.common.api.clustering.EntityOwnershipState; import org.opendaylight.mdsal.dom.api.clustering.DOMEntity; import org.opendaylight.mdsal.dom.api.clustering.DOMEntityOwnershipService; +import org.opendaylight.mdsal.eos.common.api.CandidateAlreadyRegisteredException; +import org.opendaylight.mdsal.eos.common.api.EntityOwnershipState; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/entityownership/mdsal-eos-binding-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/clustering/BindingDOMEntityOwnershipServiceAdapterTest.java b/entityownership/mdsal-eos-binding-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/clustering/BindingDOMEntityOwnershipServiceAdapterTest.java index 9c56fb9883..a2f4db9f57 100644 --- a/entityownership/mdsal-eos-binding-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/clustering/BindingDOMEntityOwnershipServiceAdapterTest.java +++ b/entityownership/mdsal-eos-binding-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/clustering/BindingDOMEntityOwnershipServiceAdapterTest.java @@ -27,15 +27,15 @@ import org.opendaylight.mdsal.binding.api.clustering.EntityOwnershipChange; import org.opendaylight.mdsal.binding.api.clustering.EntityOwnershipListener; import org.opendaylight.mdsal.binding.api.clustering.EntityOwnershipListenerRegistration; import org.opendaylight.mdsal.binding.dom.adapter.BindingToNormalizedNodeCodec; -import org.opendaylight.mdsal.common.api.clustering.CandidateAlreadyRegisteredException; -import org.opendaylight.mdsal.common.api.clustering.EntityOwnershipChangeState; -import org.opendaylight.mdsal.common.api.clustering.EntityOwnershipState; import org.opendaylight.mdsal.dom.api.clustering.DOMEntity; import org.opendaylight.mdsal.dom.api.clustering.DOMEntityOwnershipCandidateRegistration; import org.opendaylight.mdsal.dom.api.clustering.DOMEntityOwnershipChange; import org.opendaylight.mdsal.dom.api.clustering.DOMEntityOwnershipListener; import org.opendaylight.mdsal.dom.api.clustering.DOMEntityOwnershipListenerRegistration; import org.opendaylight.mdsal.dom.api.clustering.DOMEntityOwnershipService; +import org.opendaylight.mdsal.eos.common.api.CandidateAlreadyRegisteredException; +import org.opendaylight.mdsal.eos.common.api.EntityOwnershipChangeState; +import org.opendaylight.mdsal.eos.common.api.EntityOwnershipState; import org.opendaylight.yangtools.binding.data.codec.impl.BindingNormalizedNodeCodecRegistry; import org.opendaylight.yangtools.sal.binding.generator.impl.GeneratedClassLoadingStrategy; diff --git a/entityownership/mdsal-eos-binding-api/src/main/java/org/opendaylight/mdsal/binding/api/clustering/Entity.java b/entityownership/mdsal-eos-binding-api/src/main/java/org/opendaylight/mdsal/binding/api/clustering/Entity.java index aaa2a7cd1d..1a7df90163 100644 --- a/entityownership/mdsal-eos-binding-api/src/main/java/org/opendaylight/mdsal/binding/api/clustering/Entity.java +++ b/entityownership/mdsal-eos-binding-api/src/main/java/org/opendaylight/mdsal/binding/api/clustering/Entity.java @@ -10,7 +10,7 @@ package org.opendaylight.mdsal.binding.api.clustering; import com.google.common.annotations.Beta; import com.google.common.base.Preconditions; import javax.annotation.Nonnull; -import org.opendaylight.mdsal.common.api.clustering.GenericEntity; +import org.opendaylight.mdsal.eos.common.api.GenericEntity; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.mdsal.core.general.entity.rev150930.EntityKey; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; diff --git a/entityownership/mdsal-eos-binding-api/src/main/java/org/opendaylight/mdsal/binding/api/clustering/EntityOwnershipCandidateRegistration.java b/entityownership/mdsal-eos-binding-api/src/main/java/org/opendaylight/mdsal/binding/api/clustering/EntityOwnershipCandidateRegistration.java index dedd6cf172..c9b3fef61a 100644 --- a/entityownership/mdsal-eos-binding-api/src/main/java/org/opendaylight/mdsal/binding/api/clustering/EntityOwnershipCandidateRegistration.java +++ b/entityownership/mdsal-eos-binding-api/src/main/java/org/opendaylight/mdsal/binding/api/clustering/EntityOwnershipCandidateRegistration.java @@ -8,7 +8,7 @@ package org.opendaylight.mdsal.binding.api.clustering; import com.google.common.annotations.Beta; -import org.opendaylight.mdsal.common.api.clustering.GenericEntityOwnershipCandidateRegistration; +import org.opendaylight.mdsal.eos.common.api.GenericEntityOwnershipCandidateRegistration; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; /** diff --git a/entityownership/mdsal-eos-binding-api/src/main/java/org/opendaylight/mdsal/binding/api/clustering/EntityOwnershipChange.java b/entityownership/mdsal-eos-binding-api/src/main/java/org/opendaylight/mdsal/binding/api/clustering/EntityOwnershipChange.java index e15b4fe79b..4b9261a30d 100644 --- a/entityownership/mdsal-eos-binding-api/src/main/java/org/opendaylight/mdsal/binding/api/clustering/EntityOwnershipChange.java +++ b/entityownership/mdsal-eos-binding-api/src/main/java/org/opendaylight/mdsal/binding/api/clustering/EntityOwnershipChange.java @@ -9,8 +9,8 @@ package org.opendaylight.mdsal.binding.api.clustering; import com.google.common.annotations.Beta; import javax.annotation.Nonnull; -import org.opendaylight.mdsal.common.api.clustering.EntityOwnershipChangeState; -import org.opendaylight.mdsal.common.api.clustering.GenericEntityOwnershipChange; +import org.opendaylight.mdsal.eos.common.api.EntityOwnershipChangeState; +import org.opendaylight.mdsal.eos.common.api.GenericEntityOwnershipChange; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; /** diff --git a/entityownership/mdsal-eos-binding-api/src/main/java/org/opendaylight/mdsal/binding/api/clustering/EntityOwnershipListener.java b/entityownership/mdsal-eos-binding-api/src/main/java/org/opendaylight/mdsal/binding/api/clustering/EntityOwnershipListener.java index 47b3b9a572..acf2524b8a 100644 --- a/entityownership/mdsal-eos-binding-api/src/main/java/org/opendaylight/mdsal/binding/api/clustering/EntityOwnershipListener.java +++ b/entityownership/mdsal-eos-binding-api/src/main/java/org/opendaylight/mdsal/binding/api/clustering/EntityOwnershipListener.java @@ -8,7 +8,7 @@ package org.opendaylight.mdsal.binding.api.clustering; import com.google.common.annotations.Beta; -import org.opendaylight.mdsal.common.api.clustering.GenericEntityOwnershipListener; +import org.opendaylight.mdsal.eos.common.api.GenericEntityOwnershipListener; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; /** diff --git a/entityownership/mdsal-eos-binding-api/src/main/java/org/opendaylight/mdsal/binding/api/clustering/EntityOwnershipListenerRegistration.java b/entityownership/mdsal-eos-binding-api/src/main/java/org/opendaylight/mdsal/binding/api/clustering/EntityOwnershipListenerRegistration.java index ca681b27f0..aeee8c52a1 100644 --- a/entityownership/mdsal-eos-binding-api/src/main/java/org/opendaylight/mdsal/binding/api/clustering/EntityOwnershipListenerRegistration.java +++ b/entityownership/mdsal-eos-binding-api/src/main/java/org/opendaylight/mdsal/binding/api/clustering/EntityOwnershipListenerRegistration.java @@ -8,7 +8,7 @@ package org.opendaylight.mdsal.binding.api.clustering; import com.google.common.annotations.Beta; -import org.opendaylight.mdsal.common.api.clustering.GenericEntityOwnershipListenerRegistration; +import org.opendaylight.mdsal.eos.common.api.GenericEntityOwnershipListenerRegistration; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; /** diff --git a/entityownership/mdsal-eos-binding-api/src/main/java/org/opendaylight/mdsal/binding/api/clustering/EntityOwnershipService.java b/entityownership/mdsal-eos-binding-api/src/main/java/org/opendaylight/mdsal/binding/api/clustering/EntityOwnershipService.java index 384996b8e3..cff1f3aa9d 100644 --- a/entityownership/mdsal-eos-binding-api/src/main/java/org/opendaylight/mdsal/binding/api/clustering/EntityOwnershipService.java +++ b/entityownership/mdsal-eos-binding-api/src/main/java/org/opendaylight/mdsal/binding/api/clustering/EntityOwnershipService.java @@ -10,9 +10,9 @@ package org.opendaylight.mdsal.binding.api.clustering; import com.google.common.annotations.Beta; import com.google.common.base.Optional; import javax.annotation.Nonnull; -import org.opendaylight.mdsal.common.api.clustering.CandidateAlreadyRegisteredException; -import org.opendaylight.mdsal.common.api.clustering.EntityOwnershipState; -import org.opendaylight.mdsal.common.api.clustering.GenericEntityOwnershipService; +import org.opendaylight.mdsal.eos.common.api.CandidateAlreadyRegisteredException; +import org.opendaylight.mdsal.eos.common.api.EntityOwnershipState; +import org.opendaylight.mdsal.eos.common.api.GenericEntityOwnershipService; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; /** diff --git a/entityownership/mdsal-eos-common-api/src/main/java/org/opendaylight/mdsal/common/api/clustering/CandidateAlreadyRegisteredException.java b/entityownership/mdsal-eos-common-api/src/main/java/org/opendaylight/mdsal/eos/common/api/CandidateAlreadyRegisteredException.java similarity index 96% rename from entityownership/mdsal-eos-common-api/src/main/java/org/opendaylight/mdsal/common/api/clustering/CandidateAlreadyRegisteredException.java rename to entityownership/mdsal-eos-common-api/src/main/java/org/opendaylight/mdsal/eos/common/api/CandidateAlreadyRegisteredException.java index 7dfb407542..c94b49a038 100644 --- a/entityownership/mdsal-eos-common-api/src/main/java/org/opendaylight/mdsal/common/api/clustering/CandidateAlreadyRegisteredException.java +++ b/entityownership/mdsal-eos-common-api/src/main/java/org/opendaylight/mdsal/eos/common/api/CandidateAlreadyRegisteredException.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.mdsal.common.api.clustering; +package org.opendaylight.mdsal.eos.common.api; import com.google.common.base.Preconditions; import javax.annotation.Nonnull; diff --git a/entityownership/mdsal-eos-common-api/src/main/java/org/opendaylight/mdsal/common/api/clustering/EntityOwnershipChangeState.java b/entityownership/mdsal-eos-common-api/src/main/java/org/opendaylight/mdsal/eos/common/api/EntityOwnershipChangeState.java similarity index 98% rename from entityownership/mdsal-eos-common-api/src/main/java/org/opendaylight/mdsal/common/api/clustering/EntityOwnershipChangeState.java rename to entityownership/mdsal-eos-common-api/src/main/java/org/opendaylight/mdsal/eos/common/api/EntityOwnershipChangeState.java index 4dbb629ef9..1c222fc1b8 100644 --- a/entityownership/mdsal-eos-common-api/src/main/java/org/opendaylight/mdsal/common/api/clustering/EntityOwnershipChangeState.java +++ b/entityownership/mdsal-eos-common-api/src/main/java/org/opendaylight/mdsal/eos/common/api/EntityOwnershipChangeState.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.common.api.clustering; +package org.opendaylight.mdsal.eos.common.api; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableMap; diff --git a/entityownership/mdsal-eos-common-api/src/main/java/org/opendaylight/mdsal/common/api/clustering/EntityOwnershipState.java b/entityownership/mdsal-eos-common-api/src/main/java/org/opendaylight/mdsal/eos/common/api/EntityOwnershipState.java similarity index 94% rename from entityownership/mdsal-eos-common-api/src/main/java/org/opendaylight/mdsal/common/api/clustering/EntityOwnershipState.java rename to entityownership/mdsal-eos-common-api/src/main/java/org/opendaylight/mdsal/eos/common/api/EntityOwnershipState.java index fcd7d84941..f91383a7e0 100644 --- a/entityownership/mdsal-eos-common-api/src/main/java/org/opendaylight/mdsal/common/api/clustering/EntityOwnershipState.java +++ b/entityownership/mdsal-eos-common-api/src/main/java/org/opendaylight/mdsal/eos/common/api/EntityOwnershipState.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.common.api.clustering; +package org.opendaylight.mdsal.eos.common.api; /** * Enumerates the current ownership state for an entity. diff --git a/entityownership/mdsal-eos-common-api/src/main/java/org/opendaylight/mdsal/common/api/clustering/GenericEntity.java b/entityownership/mdsal-eos-common-api/src/main/java/org/opendaylight/mdsal/eos/common/api/GenericEntity.java similarity index 98% rename from entityownership/mdsal-eos-common-api/src/main/java/org/opendaylight/mdsal/common/api/clustering/GenericEntity.java rename to entityownership/mdsal-eos-common-api/src/main/java/org/opendaylight/mdsal/eos/common/api/GenericEntity.java index 9cd856d99a..969ee0a6da 100644 --- a/entityownership/mdsal-eos-common-api/src/main/java/org/opendaylight/mdsal/common/api/clustering/GenericEntity.java +++ b/entityownership/mdsal-eos-common-api/src/main/java/org/opendaylight/mdsal/eos/common/api/GenericEntity.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.common.api.clustering; +package org.opendaylight.mdsal.eos.common.api; import com.google.common.base.Preconditions; import java.io.Serializable; diff --git a/entityownership/mdsal-eos-common-api/src/main/java/org/opendaylight/mdsal/common/api/clustering/GenericEntityOwnershipCandidateRegistration.java b/entityownership/mdsal-eos-common-api/src/main/java/org/opendaylight/mdsal/eos/common/api/GenericEntityOwnershipCandidateRegistration.java similarity index 94% rename from entityownership/mdsal-eos-common-api/src/main/java/org/opendaylight/mdsal/common/api/clustering/GenericEntityOwnershipCandidateRegistration.java rename to entityownership/mdsal-eos-common-api/src/main/java/org/opendaylight/mdsal/eos/common/api/GenericEntityOwnershipCandidateRegistration.java index 669d1f9af6..7056f1f824 100644 --- a/entityownership/mdsal-eos-common-api/src/main/java/org/opendaylight/mdsal/common/api/clustering/GenericEntityOwnershipCandidateRegistration.java +++ b/entityownership/mdsal-eos-common-api/src/main/java/org/opendaylight/mdsal/eos/common/api/GenericEntityOwnershipCandidateRegistration.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.common.api.clustering; +package org.opendaylight.mdsal.eos.common.api; import org.opendaylight.yangtools.concepts.ObjectRegistration; import org.opendaylight.yangtools.concepts.Path; diff --git a/entityownership/mdsal-eos-common-api/src/main/java/org/opendaylight/mdsal/common/api/clustering/GenericEntityOwnershipChange.java b/entityownership/mdsal-eos-common-api/src/main/java/org/opendaylight/mdsal/eos/common/api/GenericEntityOwnershipChange.java similarity index 97% rename from entityownership/mdsal-eos-common-api/src/main/java/org/opendaylight/mdsal/common/api/clustering/GenericEntityOwnershipChange.java rename to entityownership/mdsal-eos-common-api/src/main/java/org/opendaylight/mdsal/eos/common/api/GenericEntityOwnershipChange.java index 338ecdd05e..860f36de4f 100644 --- a/entityownership/mdsal-eos-common-api/src/main/java/org/opendaylight/mdsal/common/api/clustering/GenericEntityOwnershipChange.java +++ b/entityownership/mdsal-eos-common-api/src/main/java/org/opendaylight/mdsal/eos/common/api/GenericEntityOwnershipChange.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.common.api.clustering; +package org.opendaylight.mdsal.eos.common.api; import com.google.common.base.Preconditions; import javax.annotation.Nonnull; diff --git a/entityownership/mdsal-eos-common-api/src/main/java/org/opendaylight/mdsal/common/api/clustering/GenericEntityOwnershipListener.java b/entityownership/mdsal-eos-common-api/src/main/java/org/opendaylight/mdsal/eos/common/api/GenericEntityOwnershipListener.java similarity index 94% rename from entityownership/mdsal-eos-common-api/src/main/java/org/opendaylight/mdsal/common/api/clustering/GenericEntityOwnershipListener.java rename to entityownership/mdsal-eos-common-api/src/main/java/org/opendaylight/mdsal/eos/common/api/GenericEntityOwnershipListener.java index e1b10d1235..6e64b8ed71 100644 --- a/entityownership/mdsal-eos-common-api/src/main/java/org/opendaylight/mdsal/common/api/clustering/GenericEntityOwnershipListener.java +++ b/entityownership/mdsal-eos-common-api/src/main/java/org/opendaylight/mdsal/eos/common/api/GenericEntityOwnershipListener.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.mdsal.common.api.clustering; +package org.opendaylight.mdsal.eos.common.api; import org.opendaylight.yangtools.concepts.Path; diff --git a/entityownership/mdsal-eos-common-api/src/main/java/org/opendaylight/mdsal/common/api/clustering/GenericEntityOwnershipListenerRegistration.java b/entityownership/mdsal-eos-common-api/src/main/java/org/opendaylight/mdsal/eos/common/api/GenericEntityOwnershipListenerRegistration.java similarity index 95% rename from entityownership/mdsal-eos-common-api/src/main/java/org/opendaylight/mdsal/common/api/clustering/GenericEntityOwnershipListenerRegistration.java rename to entityownership/mdsal-eos-common-api/src/main/java/org/opendaylight/mdsal/eos/common/api/GenericEntityOwnershipListenerRegistration.java index b7671b733d..05c074c121 100644 --- a/entityownership/mdsal-eos-common-api/src/main/java/org/opendaylight/mdsal/common/api/clustering/GenericEntityOwnershipListenerRegistration.java +++ b/entityownership/mdsal-eos-common-api/src/main/java/org/opendaylight/mdsal/eos/common/api/GenericEntityOwnershipListenerRegistration.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.common.api.clustering; +package org.opendaylight.mdsal.eos.common.api; import javax.annotation.Nonnull; import org.opendaylight.yangtools.concepts.ObjectRegistration; diff --git a/entityownership/mdsal-eos-common-api/src/main/java/org/opendaylight/mdsal/common/api/clustering/GenericEntityOwnershipService.java b/entityownership/mdsal-eos-common-api/src/main/java/org/opendaylight/mdsal/eos/common/api/GenericEntityOwnershipService.java similarity index 98% rename from entityownership/mdsal-eos-common-api/src/main/java/org/opendaylight/mdsal/common/api/clustering/GenericEntityOwnershipService.java rename to entityownership/mdsal-eos-common-api/src/main/java/org/opendaylight/mdsal/eos/common/api/GenericEntityOwnershipService.java index 5c2713c632..ae56cd1e4e 100644 --- a/entityownership/mdsal-eos-common-api/src/main/java/org/opendaylight/mdsal/common/api/clustering/GenericEntityOwnershipService.java +++ b/entityownership/mdsal-eos-common-api/src/main/java/org/opendaylight/mdsal/eos/common/api/GenericEntityOwnershipService.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.common.api.clustering; +package org.opendaylight.mdsal.eos.common.api; import com.google.common.base.Optional; import javax.annotation.Nonnull; diff --git a/entityownership/mdsal-eos-common-api/src/test/java/org/opendaylight/mdsal/common/api/clustering/EntityOwnershipChangeStateTest.java b/entityownership/mdsal-eos-common-api/src/test/java/org/opendaylight/mdsal/eos/common/api/EntityOwnershipChangeStateTest.java similarity index 95% rename from entityownership/mdsal-eos-common-api/src/test/java/org/opendaylight/mdsal/common/api/clustering/EntityOwnershipChangeStateTest.java rename to entityownership/mdsal-eos-common-api/src/test/java/org/opendaylight/mdsal/eos/common/api/EntityOwnershipChangeStateTest.java index fd71d79bf0..7957523a04 100644 --- a/entityownership/mdsal-eos-common-api/src/test/java/org/opendaylight/mdsal/common/api/clustering/EntityOwnershipChangeStateTest.java +++ b/entityownership/mdsal-eos-common-api/src/test/java/org/opendaylight/mdsal/eos/common/api/EntityOwnershipChangeStateTest.java @@ -5,13 +5,14 @@ * 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.common.api.clustering; +package org.opendaylight.mdsal.eos.common.api; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import org.junit.Test; +import org.opendaylight.mdsal.eos.common.api.EntityOwnershipChangeState; /** * Unit tests for EntityOwnershipChangeState. diff --git a/entityownership/mdsal-eos-common-api/src/test/java/org/opendaylight/mdsal/common/api/clustering/EntityOwnershipStateTest.java b/entityownership/mdsal-eos-common-api/src/test/java/org/opendaylight/mdsal/eos/common/api/EntityOwnershipStateTest.java similarity index 86% rename from entityownership/mdsal-eos-common-api/src/test/java/org/opendaylight/mdsal/common/api/clustering/EntityOwnershipStateTest.java rename to entityownership/mdsal-eos-common-api/src/test/java/org/opendaylight/mdsal/eos/common/api/EntityOwnershipStateTest.java index 417f7f58ce..4bfc56fce7 100644 --- a/entityownership/mdsal-eos-common-api/src/test/java/org/opendaylight/mdsal/common/api/clustering/EntityOwnershipStateTest.java +++ b/entityownership/mdsal-eos-common-api/src/test/java/org/opendaylight/mdsal/eos/common/api/EntityOwnershipStateTest.java @@ -5,11 +5,12 @@ * 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.common.api.clustering; +package org.opendaylight.mdsal.eos.common.api; import static org.junit.Assert.assertEquals; import org.junit.Test; +import org.opendaylight.mdsal.eos.common.api.EntityOwnershipState; public class EntityOwnershipStateTest { diff --git a/entityownership/mdsal-eos-common-api/src/test/java/org/opendaylight/mdsal/common/api/clustering/GenericEntityOwnershipChangeTest.java b/entityownership/mdsal-eos-common-api/src/test/java/org/opendaylight/mdsal/eos/common/api/GenericEntityOwnershipChangeTest.java similarity index 83% rename from entityownership/mdsal-eos-common-api/src/test/java/org/opendaylight/mdsal/common/api/clustering/GenericEntityOwnershipChangeTest.java rename to entityownership/mdsal-eos-common-api/src/test/java/org/opendaylight/mdsal/eos/common/api/GenericEntityOwnershipChangeTest.java index 4c08191798..6fc87f062b 100644 --- a/entityownership/mdsal-eos-common-api/src/test/java/org/opendaylight/mdsal/common/api/clustering/GenericEntityOwnershipChangeTest.java +++ b/entityownership/mdsal-eos-common-api/src/test/java/org/opendaylight/mdsal/eos/common/api/GenericEntityOwnershipChangeTest.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.common.api.clustering; +package org.opendaylight.mdsal.eos.common.api; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -14,6 +14,9 @@ import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import org.junit.Test; +import org.opendaylight.mdsal.eos.common.api.EntityOwnershipChangeState; +import org.opendaylight.mdsal.eos.common.api.GenericEntity; +import org.opendaylight.mdsal.eos.common.api.GenericEntityOwnershipChange; public class GenericEntityOwnershipChangeTest { diff --git a/entityownership/mdsal-eos-common-api/src/test/java/org/opendaylight/mdsal/common/api/clustering/GenericEntityTest.java b/entityownership/mdsal-eos-common-api/src/test/java/org/opendaylight/mdsal/eos/common/api/GenericEntityTest.java similarity index 94% rename from entityownership/mdsal-eos-common-api/src/test/java/org/opendaylight/mdsal/common/api/clustering/GenericEntityTest.java rename to entityownership/mdsal-eos-common-api/src/test/java/org/opendaylight/mdsal/eos/common/api/GenericEntityTest.java index 1baa613a5f..9d8953ab4e 100644 --- a/entityownership/mdsal-eos-common-api/src/test/java/org/opendaylight/mdsal/common/api/clustering/GenericEntityTest.java +++ b/entityownership/mdsal-eos-common-api/src/test/java/org/opendaylight/mdsal/eos/common/api/GenericEntityTest.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.common.api.clustering; +package org.opendaylight.mdsal.eos.common.api; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -14,6 +14,7 @@ import static org.junit.Assert.assertTrue; import javax.annotation.Nonnull; import org.junit.Test; +import org.opendaylight.mdsal.eos.common.api.GenericEntity; import org.opendaylight.yangtools.concepts.Path; public class GenericEntityTest { diff --git a/entityownership/mdsal-eos-common-spi/src/main/java/org/opendaylight/mdsal/common/api/clustering/AbstractGenericEntityOwnershipCandidateRegistration.java b/entityownership/mdsal-eos-common-spi/src/main/java/org/opendaylight/mdsal/common/api/clustering/AbstractGenericEntityOwnershipCandidateRegistration.java index 8f044a5254..6785af99a8 100644 --- a/entityownership/mdsal-eos-common-spi/src/main/java/org/opendaylight/mdsal/common/api/clustering/AbstractGenericEntityOwnershipCandidateRegistration.java +++ b/entityownership/mdsal-eos-common-spi/src/main/java/org/opendaylight/mdsal/common/api/clustering/AbstractGenericEntityOwnershipCandidateRegistration.java @@ -10,6 +10,8 @@ package org.opendaylight.mdsal.common.api.clustering; import com.google.common.base.Preconditions; import javax.annotation.Nonnull; +import org.opendaylight.mdsal.eos.common.api.GenericEntity; +import org.opendaylight.mdsal.eos.common.api.GenericEntityOwnershipCandidateRegistration; import org.opendaylight.yangtools.concepts.AbstractObjectRegistration; import org.opendaylight.yangtools.concepts.Path; diff --git a/entityownership/mdsal-eos-common-spi/src/main/java/org/opendaylight/mdsal/common/api/clustering/AbstractGenericEntityOwnershipListenerRegistration.java b/entityownership/mdsal-eos-common-spi/src/main/java/org/opendaylight/mdsal/common/api/clustering/AbstractGenericEntityOwnershipListenerRegistration.java index ec802e394c..64ff3ee6da 100644 --- a/entityownership/mdsal-eos-common-spi/src/main/java/org/opendaylight/mdsal/common/api/clustering/AbstractGenericEntityOwnershipListenerRegistration.java +++ b/entityownership/mdsal-eos-common-spi/src/main/java/org/opendaylight/mdsal/common/api/clustering/AbstractGenericEntityOwnershipListenerRegistration.java @@ -10,6 +10,10 @@ package org.opendaylight.mdsal.common.api.clustering; import com.google.common.base.Preconditions; import javax.annotation.Nonnull; +import org.opendaylight.mdsal.eos.common.api.GenericEntity; +import org.opendaylight.mdsal.eos.common.api.GenericEntityOwnershipChange; +import org.opendaylight.mdsal.eos.common.api.GenericEntityOwnershipListener; +import org.opendaylight.mdsal.eos.common.api.GenericEntityOwnershipListenerRegistration; import org.opendaylight.yangtools.concepts.AbstractObjectRegistration; import org.opendaylight.yangtools.concepts.Path; diff --git a/entityownership/mdsal-eos-common-spi/src/test/java/org/opendaylight/mdsal/common/api/clustering/AbstractGenericEntityOwnershipCandidateRegistrationTest.java b/entityownership/mdsal-eos-common-spi/src/test/java/org/opendaylight/mdsal/common/api/clustering/AbstractGenericEntityOwnershipCandidateRegistrationTest.java index ea74020f33..7314e25684 100644 --- a/entityownership/mdsal-eos-common-spi/src/test/java/org/opendaylight/mdsal/common/api/clustering/AbstractGenericEntityOwnershipCandidateRegistrationTest.java +++ b/entityownership/mdsal-eos-common-spi/src/test/java/org/opendaylight/mdsal/common/api/clustering/AbstractGenericEntityOwnershipCandidateRegistrationTest.java @@ -11,6 +11,7 @@ import static org.junit.Assert.assertNotNull; import static org.mockito.Mockito.mock; import org.junit.Test; +import org.opendaylight.mdsal.eos.common.api.GenericEntity; public class AbstractGenericEntityOwnershipCandidateRegistrationTest extends AbstractGenericEntityOwnershipCandidateRegistration { diff --git a/entityownership/mdsal-eos-common-spi/src/test/java/org/opendaylight/mdsal/common/api/clustering/AbstractGenericEntityOwnershipListenerRegistrationTest.java b/entityownership/mdsal-eos-common-spi/src/test/java/org/opendaylight/mdsal/common/api/clustering/AbstractGenericEntityOwnershipListenerRegistrationTest.java index 4bcef286f4..2e1f1e65bd 100644 --- a/entityownership/mdsal-eos-common-spi/src/test/java/org/opendaylight/mdsal/common/api/clustering/AbstractGenericEntityOwnershipListenerRegistrationTest.java +++ b/entityownership/mdsal-eos-common-spi/src/test/java/org/opendaylight/mdsal/common/api/clustering/AbstractGenericEntityOwnershipListenerRegistrationTest.java @@ -11,6 +11,7 @@ import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.mock; import org.junit.Test; +import org.opendaylight.mdsal.eos.common.api.GenericEntityOwnershipListener; public class AbstractGenericEntityOwnershipListenerRegistrationTest extends AbstractGenericEntityOwnershipListenerRegistration { diff --git a/entityownership/mdsal-eos-dom-api/src/main/java/org/opendaylight/mdsal/dom/api/clustering/DOMEntity.java b/entityownership/mdsal-eos-dom-api/src/main/java/org/opendaylight/mdsal/dom/api/clustering/DOMEntity.java index 4b567a55ee..c0c3e25b82 100644 --- a/entityownership/mdsal-eos-dom-api/src/main/java/org/opendaylight/mdsal/dom/api/clustering/DOMEntity.java +++ b/entityownership/mdsal-eos-dom-api/src/main/java/org/opendaylight/mdsal/dom/api/clustering/DOMEntity.java @@ -10,7 +10,7 @@ package org.opendaylight.mdsal.dom.api.clustering; import com.google.common.annotations.Beta; import com.google.common.base.Preconditions; import javax.annotation.Nonnull; -import org.opendaylight.mdsal.common.api.clustering.GenericEntity; +import org.opendaylight.mdsal.eos.common.api.GenericEntity; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; diff --git a/entityownership/mdsal-eos-dom-api/src/main/java/org/opendaylight/mdsal/dom/api/clustering/DOMEntityOwnershipCandidateRegistration.java b/entityownership/mdsal-eos-dom-api/src/main/java/org/opendaylight/mdsal/dom/api/clustering/DOMEntityOwnershipCandidateRegistration.java index 6bcce77dcd..3afa7acc67 100644 --- a/entityownership/mdsal-eos-dom-api/src/main/java/org/opendaylight/mdsal/dom/api/clustering/DOMEntityOwnershipCandidateRegistration.java +++ b/entityownership/mdsal-eos-dom-api/src/main/java/org/opendaylight/mdsal/dom/api/clustering/DOMEntityOwnershipCandidateRegistration.java @@ -8,7 +8,7 @@ package org.opendaylight.mdsal.dom.api.clustering; import com.google.common.annotations.Beta; -import org.opendaylight.mdsal.common.api.clustering.GenericEntityOwnershipCandidateRegistration; +import org.opendaylight.mdsal.eos.common.api.GenericEntityOwnershipCandidateRegistration; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; /** diff --git a/entityownership/mdsal-eos-dom-api/src/main/java/org/opendaylight/mdsal/dom/api/clustering/DOMEntityOwnershipChange.java b/entityownership/mdsal-eos-dom-api/src/main/java/org/opendaylight/mdsal/dom/api/clustering/DOMEntityOwnershipChange.java index 579a84595e..3271972a98 100644 --- a/entityownership/mdsal-eos-dom-api/src/main/java/org/opendaylight/mdsal/dom/api/clustering/DOMEntityOwnershipChange.java +++ b/entityownership/mdsal-eos-dom-api/src/main/java/org/opendaylight/mdsal/dom/api/clustering/DOMEntityOwnershipChange.java @@ -9,8 +9,8 @@ package org.opendaylight.mdsal.dom.api.clustering; import com.google.common.annotations.Beta; import javax.annotation.Nonnull; -import org.opendaylight.mdsal.common.api.clustering.EntityOwnershipChangeState; -import org.opendaylight.mdsal.common.api.clustering.GenericEntityOwnershipChange; +import org.opendaylight.mdsal.eos.common.api.EntityOwnershipChangeState; +import org.opendaylight.mdsal.eos.common.api.GenericEntityOwnershipChange; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; /** diff --git a/entityownership/mdsal-eos-dom-api/src/main/java/org/opendaylight/mdsal/dom/api/clustering/DOMEntityOwnershipListener.java b/entityownership/mdsal-eos-dom-api/src/main/java/org/opendaylight/mdsal/dom/api/clustering/DOMEntityOwnershipListener.java index 17a3044d00..36c80a6921 100644 --- a/entityownership/mdsal-eos-dom-api/src/main/java/org/opendaylight/mdsal/dom/api/clustering/DOMEntityOwnershipListener.java +++ b/entityownership/mdsal-eos-dom-api/src/main/java/org/opendaylight/mdsal/dom/api/clustering/DOMEntityOwnershipListener.java @@ -8,7 +8,7 @@ package org.opendaylight.mdsal.dom.api.clustering; import com.google.common.annotations.Beta; -import org.opendaylight.mdsal.common.api.clustering.GenericEntityOwnershipListener; +import org.opendaylight.mdsal.eos.common.api.GenericEntityOwnershipListener; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; /** diff --git a/entityownership/mdsal-eos-dom-api/src/main/java/org/opendaylight/mdsal/dom/api/clustering/DOMEntityOwnershipListenerRegistration.java b/entityownership/mdsal-eos-dom-api/src/main/java/org/opendaylight/mdsal/dom/api/clustering/DOMEntityOwnershipListenerRegistration.java index 312a136cdd..f16d9d945c 100644 --- a/entityownership/mdsal-eos-dom-api/src/main/java/org/opendaylight/mdsal/dom/api/clustering/DOMEntityOwnershipListenerRegistration.java +++ b/entityownership/mdsal-eos-dom-api/src/main/java/org/opendaylight/mdsal/dom/api/clustering/DOMEntityOwnershipListenerRegistration.java @@ -8,7 +8,7 @@ package org.opendaylight.mdsal.dom.api.clustering; import com.google.common.annotations.Beta; -import org.opendaylight.mdsal.common.api.clustering.GenericEntityOwnershipListenerRegistration; +import org.opendaylight.mdsal.eos.common.api.GenericEntityOwnershipListenerRegistration; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; /** diff --git a/entityownership/mdsal-eos-dom-api/src/main/java/org/opendaylight/mdsal/dom/api/clustering/DOMEntityOwnershipService.java b/entityownership/mdsal-eos-dom-api/src/main/java/org/opendaylight/mdsal/dom/api/clustering/DOMEntityOwnershipService.java index 7aa8502fc5..3fdf9cb1ca 100644 --- a/entityownership/mdsal-eos-dom-api/src/main/java/org/opendaylight/mdsal/dom/api/clustering/DOMEntityOwnershipService.java +++ b/entityownership/mdsal-eos-dom-api/src/main/java/org/opendaylight/mdsal/dom/api/clustering/DOMEntityOwnershipService.java @@ -10,9 +10,9 @@ package org.opendaylight.mdsal.dom.api.clustering; import com.google.common.annotations.Beta; import com.google.common.base.Optional; import javax.annotation.Nonnull; -import org.opendaylight.mdsal.common.api.clustering.CandidateAlreadyRegisteredException; -import org.opendaylight.mdsal.common.api.clustering.EntityOwnershipState; -import org.opendaylight.mdsal.common.api.clustering.GenericEntityOwnershipService; +import org.opendaylight.mdsal.eos.common.api.CandidateAlreadyRegisteredException; +import org.opendaylight.mdsal.eos.common.api.EntityOwnershipState; +import org.opendaylight.mdsal.eos.common.api.GenericEntityOwnershipService; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; /** diff --git a/entityownership/mdsal-eos-dom-api/src/test/java/org/opendaylight/mdsal/dom/api/clustering/DOMEntityOwnershipChangeTest.java b/entityownership/mdsal-eos-dom-api/src/test/java/org/opendaylight/mdsal/dom/api/clustering/DOMEntityOwnershipChangeTest.java index 8f1169b503..b01a8c8689 100644 --- a/entityownership/mdsal-eos-dom-api/src/test/java/org/opendaylight/mdsal/dom/api/clustering/DOMEntityOwnershipChangeTest.java +++ b/entityownership/mdsal-eos-dom-api/src/test/java/org/opendaylight/mdsal/dom/api/clustering/DOMEntityOwnershipChangeTest.java @@ -10,7 +10,7 @@ package org.opendaylight.mdsal.dom.api.clustering; import static org.junit.Assert.assertNotNull; import org.junit.Test; -import org.opendaylight.mdsal.common.api.clustering.EntityOwnershipChangeState; +import org.opendaylight.mdsal.eos.common.api.EntityOwnershipChangeState; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; -- 2.36.6