Rename EntityOwnershipChangeState

This is a bit of a misnomer, coming from the fact we communicate this
delta from EntityOwnershipChange.

A better name EntityOwnershipStateChange, as it pertains to a change in
EntityOwnershipState.

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

diff --git a/entityownership/mdsal-eos-binding-adapter/src/test/java/org/opendaylight/mdsal/eos/binding/dom/adapter/DefaultEntityOwnershipServiceTest.java b/entityownership/mdsal-eos-binding-adapter/src/test/java/org/opendaylight/mdsal/eos/binding/dom/adapter/DefaultEntityOwnershipServiceTest.java
index e2f623c23c05dc1a2dd3abbfbb81c6cc5781b2ef..115901c854ec2bceb6f45af4e0c22ef32d3b8c3d 100644 (file)
--- a/entityownership/mdsal-eos-binding-adapter/src/test/java/org/opendaylight/mdsal/eos/binding/dom/adapter/DefaultEntityOwnershipServiceTest.java
+++ b/entityownership/mdsal-eos-binding-adapter/src/test/java/org/opendaylight/mdsal/eos/binding/dom/adapter/DefaultEntityOwnershipServiceTest.java
@@ -30,8 +30,8 @@ import org.opendaylight.mdsal.eos.binding.api.Entity;
 import org.opendaylight.mdsal.eos.binding.api.EntityOwnershipListener;
 import org.opendaylight.mdsal.eos.common.api.CandidateAlreadyRegisteredException;
 import org.opendaylight.mdsal.eos.common.api.EntityOwnershipChange;
-import org.opendaylight.mdsal.eos.common.api.EntityOwnershipChangeState;
 import org.opendaylight.mdsal.eos.common.api.EntityOwnershipState;
+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;
@@ -89,7 +89,7 @@ public class DefaultEntityOwnershipServiceTest {
             verify(mockDOMService).registerListener(eq(DOM_ENTITY.getType()),  domListenerCaptor.capture());
 
             final var domOwnershipChange = new EntityOwnershipChange<>(DOM_ENTITY,
-                EntityOwnershipChangeState.LOCAL_OWNERSHIP_GRANTED, true);
+                EntityOwnershipStateChange.LOCAL_OWNERSHIP_GRANTED, true);
             domListenerCaptor.getValue().ownershipChanged(domOwnershipChange);
 
             final var ownershipChangeCaptor = ArgumentCaptor.forClass(EntityOwnershipChange.class);
@@ -97,7 +97,7 @@ public class DefaultEntityOwnershipServiceTest {
 
             final var change = ownershipChangeCaptor.getValue();
             assertEquals("getEntity", BINDING_ENTITY, change.getEntity());
-            assertEquals("getState", EntityOwnershipChangeState.LOCAL_OWNERSHIP_GRANTED, change.getState());
+            assertEquals("getState", EntityOwnershipStateChange.LOCAL_OWNERSHIP_GRANTED, change.getState());
         }
         verify(mockDOMReg).close();
     }
@@ -125,7 +125,7 @@ public class DefaultEntityOwnershipServiceTest {
         final var domEntityOwnershipListenerAdapter = new DOMEntityOwnershipListenerAdapter(listener,
                 new ConstantAdapterContext(mockCodecRegistry));
         final var domOwnershipChange = new EntityOwnershipChange<>(DOM_ENTITY,
-            EntityOwnershipChangeState.LOCAL_OWNERSHIP_GRANTED);
+            EntityOwnershipStateChange.LOCAL_OWNERSHIP_GRANTED);
 
         domEntityOwnershipListenerAdapter.ownershipChanged(domOwnershipChange);
     }

diff --git a/entityownership/mdsal-eos-common-api/src/main/java/org/opendaylight/mdsal/eos/common/api/EntityOwnershipChange.java b/entityownership/mdsal-eos-common-api/src/main/java/org/opendaylight/mdsal/eos/common/api/EntityOwnershipChange.java
index 7b40b58272e7529667c12d9a776951b3a4168e21..004650e45a2a7eeaac6f0a3e22900261a8ac6449 100644 (file)
--- a/entityownership/mdsal-eos-common-api/src/main/java/org/opendaylight/mdsal/eos/common/api/EntityOwnershipChange.java
+++ b/entityownership/mdsal-eos-common-api/src/main/java/org/opendaylight/mdsal/eos/common/api/EntityOwnershipChange.java
@@ -20,14 +20,14 @@ import org.eclipse.jdt.annotation.NonNull;
  */
 public final class EntityOwnershipChange<E extends GenericEntity<?>> {
     private final @NonNull E entity;
-    private final @NonNull EntityOwnershipChangeState state;
+    private final @NonNull EntityOwnershipStateChange state;
     private final boolean inJeopardy;
 
-    public EntityOwnershipChange(final @NonNull E entity, final @NonNull EntityOwnershipChangeState state) {
+    public EntityOwnershipChange(final @NonNull E entity, final @NonNull EntityOwnershipStateChange state) {
         this(entity, state, false);
     }
 
-    public EntityOwnershipChange(final @NonNull E entity, final @NonNull EntityOwnershipChangeState state,
+    public EntityOwnershipChange(final @NonNull E entity, final @NonNull EntityOwnershipStateChange state,
             final boolean inJeopardy) {
         this.entity = requireNonNull(entity, "entity can't be null");
         this.state = requireNonNull(state, "state can't be null");
@@ -44,9 +44,9 @@ public final class EntityOwnershipChange<E extends GenericEntity<?>> {
 
     /**
      * Returns the ownership change state.
-     * @return an EntityOwnershipChangeState enum
+     * @return an EntityOwnershipStateChange enum
      */
-    public @NonNull EntityOwnershipChangeState getState() {
+    public @NonNull EntityOwnershipStateChange getState() {
         return state;
     }
 

diff --git a/entityownership/mdsal-eos-common-api/src/main/java/org/opendaylight/mdsal/eos/common/api/EntityOwnershipChangeState.java b/entityownership/mdsal-eos-common-api/src/main/java/org/opendaylight/mdsal/eos/common/api/EntityOwnershipStateChange.java
similarity index 91%
rename from entityownership/mdsal-eos-common-api/src/main/java/org/opendaylight/mdsal/eos/common/api/EntityOwnershipChangeState.java
rename to entityownership/mdsal-eos-common-api/src/main/java/org/opendaylight/mdsal/eos/common/api/EntityOwnershipStateChange.java
index b3028e292b0e0b8609d07837539ee507330b862c..8d6549b167643e42b142e125a48f13038e4b948f 100644 (file)
--- a/entityownership/mdsal-eos-common-api/src/main/java/org/opendaylight/mdsal/eos/common/api/EntityOwnershipChangeState.java
+++ b/entityownership/mdsal-eos-common-api/src/main/java/org/opendaylight/mdsal/eos/common/api/EntityOwnershipStateChange.java
@@ -15,7 +15,7 @@ import org.eclipse.jdt.annotation.NonNull;
  *
  * @author Thomas Pantelis
  */
-public enum EntityOwnershipChangeState {
+public enum EntityOwnershipStateChange {
     /**
      * The local process instance has been granted ownership.
      */
@@ -48,10 +48,10 @@ public enum EntityOwnershipChangeState {
      */
     REMOTE_OWNERSHIP_LOST_NO_OWNER(false, false, false);
 
-    private static final ImmutableMap<Key, EntityOwnershipChangeState> BY_KEY;
+    private static final ImmutableMap<Key, EntityOwnershipStateChange> BY_KEY;
 
     static {
-        final var builder = ImmutableMap.<Key, EntityOwnershipChangeState>builder();
+        final var builder = ImmutableMap.<Key, EntityOwnershipStateChange>builder();
         for (var e : values()) {
             builder.put(new Key(e.wasOwner, e.isOwner, e.hasOwner), e);
         }
@@ -62,7 +62,7 @@ public enum EntityOwnershipChangeState {
     private final boolean isOwner;
     private final boolean hasOwner;
 
-    EntityOwnershipChangeState(final boolean wasOwner, final boolean isOwner, final boolean hasOwner) {
+    EntityOwnershipStateChange(final boolean wasOwner, final boolean isOwner, final boolean hasOwner) {
         this.wasOwner = wasOwner;
         this.isOwner = isOwner;
         this.hasOwner = hasOwner;
@@ -98,7 +98,7 @@ public enum EntityOwnershipChangeState {
         return name() + " [wasOwner=" + wasOwner + ", isOwner=" + isOwner + ", hasOwner=" + hasOwner + "]";
     }
 
-    public static @NonNull EntityOwnershipChangeState from(final boolean wasOwner, final boolean isOwner,
+    public static @NonNull EntityOwnershipStateChange from(final boolean wasOwner, final boolean isOwner,
             final boolean hasOwner) {
         final var state = BY_KEY.get(new Key(wasOwner, isOwner, hasOwner));
         if (state != null) {

diff --git a/entityownership/mdsal-eos-common-api/src/test/java/org/opendaylight/mdsal/eos/common/api/EntityOwnershipChangeStateTest.java b/entityownership/mdsal-eos-common-api/src/test/java/org/opendaylight/mdsal/eos/common/api/EntityOwnershipStateChangeTest.java
similarity index 56%
rename from entityownership/mdsal-eos-common-api/src/test/java/org/opendaylight/mdsal/eos/common/api/EntityOwnershipChangeStateTest.java
rename to entityownership/mdsal-eos-common-api/src/test/java/org/opendaylight/mdsal/eos/common/api/EntityOwnershipStateChangeTest.java
index 07dd717fb434f64e13022c2e14c232b683828b2a..e5b51f07839e4edfc491065a28de48280bea8aa5 100644 (file)
--- a/entityownership/mdsal-eos-common-api/src/test/java/org/opendaylight/mdsal/eos/common/api/EntityOwnershipChangeStateTest.java
+++ b/entityownership/mdsal-eos-common-api/src/test/java/org/opendaylight/mdsal/eos/common/api/EntityOwnershipStateChangeTest.java
@@ -15,40 +15,40 @@ import static org.junit.Assert.assertTrue;
 import org.junit.Test;
 
 /**
- * Unit tests for EntityOwnershipChangeState.
+ * Unit tests for EntityOwnershipStateChange.
  *
  * @author Thomas Pantelis
  */
-public class EntityOwnershipChangeStateTest {
+public class EntityOwnershipStateChangeTest {
     @Test
     public void testFromWithValid() {
-        assertEquals("from(false, true, true)", EntityOwnershipChangeState.LOCAL_OWNERSHIP_GRANTED,
-                EntityOwnershipChangeState.from(false, true, true));
-        assertEquals("from(true, false, true)", EntityOwnershipChangeState.LOCAL_OWNERSHIP_LOST_NEW_OWNER,
-                EntityOwnershipChangeState.from(true, false, true));
-        assertEquals("from(true, false, false)", EntityOwnershipChangeState.LOCAL_OWNERSHIP_LOST_NO_OWNER,
-                EntityOwnershipChangeState.from(true, false, false));
-        assertEquals("from(false, false, true)", EntityOwnershipChangeState.REMOTE_OWNERSHIP_CHANGED,
-                EntityOwnershipChangeState.from(false, false, true));
-        assertEquals("from(false, false, false)", EntityOwnershipChangeState.REMOTE_OWNERSHIP_LOST_NO_OWNER,
-                EntityOwnershipChangeState.from(false, false, false));
-        assertEquals("from(true, true, true)", EntityOwnershipChangeState.LOCAL_OWNERSHIP_RETAINED_WITH_NO_CHANGE,
-                EntityOwnershipChangeState.from(true, true, true));
+        assertEquals("from(false, true, true)", EntityOwnershipStateChange.LOCAL_OWNERSHIP_GRANTED,
+                EntityOwnershipStateChange.from(false, true, true));
+        assertEquals("from(true, false, true)", EntityOwnershipStateChange.LOCAL_OWNERSHIP_LOST_NEW_OWNER,
+                EntityOwnershipStateChange.from(true, false, true));
+        assertEquals("from(true, false, false)", EntityOwnershipStateChange.LOCAL_OWNERSHIP_LOST_NO_OWNER,
+                EntityOwnershipStateChange.from(true, false, false));
+        assertEquals("from(false, false, true)", EntityOwnershipStateChange.REMOTE_OWNERSHIP_CHANGED,
+                EntityOwnershipStateChange.from(false, false, true));
+        assertEquals("from(false, false, false)", EntityOwnershipStateChange.REMOTE_OWNERSHIP_LOST_NO_OWNER,
+                EntityOwnershipStateChange.from(false, false, false));
+        assertEquals("from(true, true, true)", EntityOwnershipStateChange.LOCAL_OWNERSHIP_RETAINED_WITH_NO_CHANGE,
+                EntityOwnershipStateChange.from(true, true, true));
     }
 
     @Test
     public void testFromWithInvalidFalseTrueFalse() {
-        assertThrows(IllegalArgumentException.class, () -> EntityOwnershipChangeState.from(false, true, false));
+        assertThrows(IllegalArgumentException.class, () -> EntityOwnershipStateChange.from(false, true, false));
     }
 
     @Test
     public void testFromWithInvalidTrueTrueFalse() {
-        assertThrows(IllegalArgumentException.class, () -> EntityOwnershipChangeState.from(true, true, false));
+        assertThrows(IllegalArgumentException.class, () -> EntityOwnershipStateChange.from(true, true, false));
     }
 
     @Test
     public void basicTest() {
-        final var entityOwnershipChangeState = EntityOwnershipChangeState.from(false, true, true);
+        final var entityOwnershipChangeState = EntityOwnershipStateChange.from(false, true, true);
         assertTrue(entityOwnershipChangeState.hasOwner());
         assertTrue(entityOwnershipChangeState.isOwner());
         assertFalse(entityOwnershipChangeState.wasOwner());

diff --git a/entityownership/mdsal-eos-common-api/src/test/java/org/opendaylight/mdsal/eos/common/api/GenericEntityOwnershipChangeTest.java b/entityownership/mdsal-eos-common-api/src/test/java/org/opendaylight/mdsal/eos/common/api/GenericEntityOwnershipChangeTest.java
index cf43057e69d1103b2c1c997fce5669b00ee329f5..ec1cb0327517238d26e504dca359ce090200ead9 100644 (file)
--- a/entityownership/mdsal-eos-common-api/src/test/java/org/opendaylight/mdsal/eos/common/api/GenericEntityOwnershipChangeTest.java
+++ b/entityownership/mdsal-eos-common-api/src/test/java/org/opendaylight/mdsal/eos/common/api/GenericEntityOwnershipChangeTest.java
@@ -26,10 +26,10 @@ class GenericEntityOwnershipChangeTest {
     void basicTest() {
         doReturn("testEntity").when(genericEntity).toString();
         final var genericEntityOwnershipChange = new EntityOwnershipChange<>(genericEntity,
-            EntityOwnershipChangeState.LOCAL_OWNERSHIP_GRANTED);
+            EntityOwnershipStateChange.LOCAL_OWNERSHIP_GRANTED);
 
         assertEquals(genericEntity, genericEntityOwnershipChange.getEntity());
-        assertEquals(EntityOwnershipChangeState.LOCAL_OWNERSHIP_GRANTED, genericEntityOwnershipChange.getState());
+        assertEquals(EntityOwnershipStateChange.LOCAL_OWNERSHIP_GRANTED, genericEntityOwnershipChange.getState());
         assertFalse(genericEntityOwnershipChange.inJeopardy());
         assertTrue(genericEntityOwnershipChange.toString().contains("testEntity"));
     }

diff --git a/entityownership/mdsal-eos-dom-api/src/test/java/org/opendaylight/mdsal/eos/dom/api/DOMEntityOwnershipChangeTest.java b/entityownership/mdsal-eos-dom-api/src/test/java/org/opendaylight/mdsal/eos/dom/api/DOMEntityOwnershipChangeTest.java
index 0b12cb98d5bb71c1f7aaebece4b50a1c14658bbf..23e8bd79123d7fc1a5dcdc44d7d06bf7347dcbba 100644 (file)
--- a/entityownership/mdsal-eos-dom-api/src/test/java/org/opendaylight/mdsal/eos/dom/api/DOMEntityOwnershipChangeTest.java
+++ b/entityownership/mdsal-eos-dom-api/src/test/java/org/opendaylight/mdsal/eos/dom/api/DOMEntityOwnershipChangeTest.java
@@ -11,7 +11,7 @@ import static org.junit.Assert.assertNotNull;
 
 import org.junit.Test;
 import org.opendaylight.mdsal.eos.common.api.EntityOwnershipChange;
-import org.opendaylight.mdsal.eos.common.api.EntityOwnershipChangeState;
+import org.opendaylight.mdsal.eos.common.api.EntityOwnershipStateChange;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 
@@ -22,7 +22,7 @@ public class DOMEntityOwnershipChangeTest {
 
     @Test
     public void createTest() {
-        assertNotNull(new EntityOwnershipChange<>(ENTITY, EntityOwnershipChangeState.LOCAL_OWNERSHIP_GRANTED));
-        assertNotNull(new EntityOwnershipChange<>(ENTITY, EntityOwnershipChangeState.LOCAL_OWNERSHIP_GRANTED, false));
+        assertNotNull(new EntityOwnershipChange<>(ENTITY, EntityOwnershipStateChange.LOCAL_OWNERSHIP_GRANTED));
+        assertNotNull(new EntityOwnershipChange<>(ENTITY, EntityOwnershipStateChange.LOCAL_OWNERSHIP_GRANTED, false));
     }
 }
\ No newline at end of file

diff --git a/entityownership/mdsal-eos-dom-simple/src/main/java/org/opendaylight/mdsal/eos/dom/simple/SimpleDOMEntityOwnershipService.java b/entityownership/mdsal-eos-dom-simple/src/main/java/org/opendaylight/mdsal/eos/dom/simple/SimpleDOMEntityOwnershipService.java
index ab413a471b64c3171c59c469529ab26ed8d9e6aa..f21b17112b3658105fd76bfe3ba943bcdc91541f 100644 (file)
--- a/entityownership/mdsal-eos-dom-simple/src/main/java/org/opendaylight/mdsal/eos/dom/simple/SimpleDOMEntityOwnershipService.java
+++ b/entityownership/mdsal-eos-dom-simple/src/main/java/org/opendaylight/mdsal/eos/dom/simple/SimpleDOMEntityOwnershipService.java
@@ -8,8 +8,8 @@
 package org.opendaylight.mdsal.eos.dom.simple;
 
 import static java.util.Objects.requireNonNull;
-import static org.opendaylight.mdsal.eos.common.api.EntityOwnershipChangeState.LOCAL_OWNERSHIP_GRANTED;
-import static org.opendaylight.mdsal.eos.common.api.EntityOwnershipChangeState.LOCAL_OWNERSHIP_LOST_NO_OWNER;
+import static org.opendaylight.mdsal.eos.common.api.EntityOwnershipStateChange.LOCAL_OWNERSHIP_GRANTED;
+import static org.opendaylight.mdsal.eos.common.api.EntityOwnershipStateChange.LOCAL_OWNERSHIP_LOST_NO_OWNER;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.MoreObjects;
@@ -25,8 +25,8 @@ import org.checkerframework.checker.lock.qual.GuardedBy;
 import org.kohsuke.MetaInfServices;
 import org.opendaylight.mdsal.eos.common.api.CandidateAlreadyRegisteredException;
 import org.opendaylight.mdsal.eos.common.api.EntityOwnershipChange;
-import org.opendaylight.mdsal.eos.common.api.EntityOwnershipChangeState;
 import org.opendaylight.mdsal.eos.common.api.EntityOwnershipState;
+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;
@@ -143,7 +143,7 @@ public sealed class SimpleDOMEntityOwnershipService implements DOMEntityOwnershi
         }
     }
 
-    private void notifyListeners(final DOMEntity entity, final EntityOwnershipChangeState state) {
+    private void notifyListeners(final DOMEntity entity, final EntityOwnershipStateChange state) {
 
         final Collection<DOMEntityOwnershipListener> snap;
 

diff --git a/entityownership/mdsal-eos-dom-simple/src/test/java/org/opendaylight/mdsal/eos/dom/simple/SimpleDOMEntityOwnershipServiceTest.java b/entityownership/mdsal-eos-dom-simple/src/test/java/org/opendaylight/mdsal/eos/dom/simple/SimpleDOMEntityOwnershipServiceTest.java
index aa57a644ccf9211c92019f7f2ed40d0cec50729d..a9169be3c1e812453b8ee788f19d5b783596dcae 100644 (file)
--- a/entityownership/mdsal-eos-dom-simple/src/test/java/org/opendaylight/mdsal/eos/dom/simple/SimpleDOMEntityOwnershipServiceTest.java
+++ b/entityownership/mdsal-eos-dom-simple/src/test/java/org/opendaylight/mdsal/eos/dom/simple/SimpleDOMEntityOwnershipServiceTest.java
@@ -26,8 +26,8 @@ import org.mockito.ArgumentCaptor;
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.opendaylight.mdsal.eos.common.api.CandidateAlreadyRegisteredException;
 import org.opendaylight.mdsal.eos.common.api.EntityOwnershipChange;
-import org.opendaylight.mdsal.eos.common.api.EntityOwnershipChangeState;
 import org.opendaylight.mdsal.eos.common.api.EntityOwnershipState;
+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;
@@ -85,7 +85,7 @@ class SimpleDOMEntityOwnershipServiceTest {
 
                 var fooChange = fooCaptor.getValue();
                 assertEquals(FOO_FOO_ENTITY, fooChange.getEntity());
-                assertEquals(EntityOwnershipChangeState.LOCAL_OWNERSHIP_GRANTED, fooChange.getState());
+                assertEquals(EntityOwnershipStateChange.LOCAL_OWNERSHIP_GRANTED, fooChange.getState());
 
                 reset(fooListener);
                 doNothing().when(fooListener).ownershipChanged(any(EntityOwnershipChange.class));
@@ -93,7 +93,7 @@ class SimpleDOMEntityOwnershipServiceTest {
                 verify(fooListener).ownershipChanged(fooCaptor.capture());
                 fooChange = fooCaptor.getValue();
                 assertEquals(FOO_FOO_ENTITY, fooChange.getEntity());
-                assertEquals(EntityOwnershipChangeState.LOCAL_OWNERSHIP_LOST_NO_OWNER, fooChange.getState());
+                assertEquals(EntityOwnershipStateChange.LOCAL_OWNERSHIP_LOST_NO_OWNER, fooChange.getState());
             }
         }
     }

diff --git a/singleton-service/mdsal-singleton-dom-impl/src/main/java/org/opendaylight/mdsal/singleton/dom/impl/ClusterSingletonServiceGroupImpl.java b/singleton-service/mdsal-singleton-dom-impl/src/main/java/org/opendaylight/mdsal/singleton/dom/impl/ClusterSingletonServiceGroupImpl.java
index c2ee4f03e20afafd72c8ccc71c30f30ddf857c84..9a91d727399969f9f449237a1a479a9467d91a12 100644 (file)
--- a/singleton-service/mdsal-singleton-dom-impl/src/main/java/org/opendaylight/mdsal/singleton/dom/impl/ClusterSingletonServiceGroupImpl.java
+++ b/singleton-service/mdsal-singleton-dom-impl/src/main/java/org/opendaylight/mdsal/singleton/dom/impl/ClusterSingletonServiceGroupImpl.java
@@ -36,7 +36,7 @@ import org.checkerframework.checker.lock.qual.Holding;
 import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.mdsal.eos.common.api.CandidateAlreadyRegisteredException;
 import org.opendaylight.mdsal.eos.common.api.EntityOwnershipChange;
-import org.opendaylight.mdsal.eos.common.api.EntityOwnershipChangeState;
+import org.opendaylight.mdsal.eos.common.api.EntityOwnershipStateChange;
 import org.opendaylight.mdsal.eos.common.api.GenericEntity;
 import org.opendaylight.mdsal.eos.common.api.GenericEntityOwnershipListener;
 import org.opendaylight.mdsal.eos.common.api.GenericEntityOwnershipService;
@@ -362,7 +362,7 @@ final class ClusterSingletonServiceGroupImpl<P extends HierarchicalIdentifier<P>
     }
 
     @Holding("this")
-    private void cleanupCandidateOwnershipChanged(final EntityOwnershipChangeState state, final boolean jeopardy) {
+    private void cleanupCandidateOwnershipChanged(final EntityOwnershipStateChange state, final boolean jeopardy) {
         if (jeopardy) {
             cleanupEntityState = switch (state) {
                 case LOCAL_OWNERSHIP_GRANTED, LOCAL_OWNERSHIP_RETAINED_WITH_NO_CHANGE -> {
@@ -391,7 +391,7 @@ final class ClusterSingletonServiceGroupImpl<P extends HierarchicalIdentifier<P>
     }
 
     @Holding("this")
-    private void serviceOwnershipChanged(final EntityOwnershipChangeState state, final boolean jeopardy) {
+    private void serviceOwnershipChanged(final EntityOwnershipStateChange state, final boolean jeopardy) {
         if (jeopardy) {
             LOG.info("Service group {} service entity ownership uncertain", identifier);
             serviceEntityState = switch (state) {

diff --git a/singleton-service/mdsal-singleton-dom-impl/src/test/java/org/opendaylight/mdsal/singleton/dom/impl/AbstractDOMClusterServiceProviderTest.java b/singleton-service/mdsal-singleton-dom-impl/src/test/java/org/opendaylight/mdsal/singleton/dom/impl/AbstractDOMClusterServiceProviderTest.java
index f2678ccabb9d8318f3de4b2623ec833847c6a46f..0edb4d2afa1bf73c79f469e28788e6df6c018230 100644 (file)
--- a/singleton-service/mdsal-singleton-dom-impl/src/test/java/org/opendaylight/mdsal/singleton/dom/impl/AbstractDOMClusterServiceProviderTest.java
+++ b/singleton-service/mdsal-singleton-dom-impl/src/test/java/org/opendaylight/mdsal/singleton/dom/impl/AbstractDOMClusterServiceProviderTest.java
@@ -28,7 +28,7 @@ import org.junit.Test;
 import org.mockito.Mock;
 import org.opendaylight.mdsal.eos.common.api.CandidateAlreadyRegisteredException;
 import org.opendaylight.mdsal.eos.common.api.EntityOwnershipChange;
-import org.opendaylight.mdsal.eos.common.api.EntityOwnershipChangeState;
+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;
@@ -132,50 +132,50 @@ public abstract class AbstractDOMClusterServiceProviderTest {
     }
 
     static final EntityOwnershipChange<DOMEntity> getEntityToMaster() {
-        return new EntityOwnershipChange(ENTITY, EntityOwnershipChangeState.LOCAL_OWNERSHIP_GRANTED);
+        return new EntityOwnershipChange(ENTITY, EntityOwnershipStateChange.LOCAL_OWNERSHIP_GRANTED);
     }
 
     static final EntityOwnershipChange<DOMEntity> getEntityToSlave() {
-        return new EntityOwnershipChange(ENTITY, EntityOwnershipChangeState.LOCAL_OWNERSHIP_LOST_NEW_OWNER);
+        return new EntityOwnershipChange(ENTITY, EntityOwnershipStateChange.LOCAL_OWNERSHIP_LOST_NEW_OWNER);
     }
 
     static final EntityOwnershipChange<DOMEntity> getInitEntityToSlave() {
-        return new EntityOwnershipChange(ENTITY, EntityOwnershipChangeState.REMOTE_OWNERSHIP_CHANGED);
+        return new EntityOwnershipChange(ENTITY, EntityOwnershipStateChange.REMOTE_OWNERSHIP_CHANGED);
     }
 
     static final EntityOwnershipChange<DOMEntity> getInitEntityToSlaveNoMaster() {
-        return new EntityOwnershipChange<>(ENTITY, EntityOwnershipChangeState.REMOTE_OWNERSHIP_LOST_NO_OWNER);
+        return new EntityOwnershipChange<>(ENTITY, EntityOwnershipStateChange.REMOTE_OWNERSHIP_LOST_NO_OWNER);
     }
 
     static final EntityOwnershipChange<DOMEntity> getEntityToJeopardy() {
-        return new EntityOwnershipChange<>(ENTITY, EntityOwnershipChangeState.REMOTE_OWNERSHIP_LOST_NO_OWNER, true);
+        return new EntityOwnershipChange<>(ENTITY, EntityOwnershipStateChange.REMOTE_OWNERSHIP_LOST_NO_OWNER, true);
     }
 
     static final EntityOwnershipChange<DOMEntity> getEntityMasterJeopardy() {
-        return new EntityOwnershipChange<>(ENTITY, EntityOwnershipChangeState.LOCAL_OWNERSHIP_RETAINED_WITH_NO_CHANGE,
+        return new EntityOwnershipChange<>(ENTITY, EntityOwnershipStateChange.LOCAL_OWNERSHIP_RETAINED_WITH_NO_CHANGE,
             true);
     }
 
     static final EntityOwnershipChange<DOMEntity> getDoubleEntityToMaster() {
-        return new EntityOwnershipChange<>(DOUBLE_ENTITY, EntityOwnershipChangeState.LOCAL_OWNERSHIP_GRANTED);
+        return new EntityOwnershipChange<>(DOUBLE_ENTITY, EntityOwnershipStateChange.LOCAL_OWNERSHIP_GRANTED);
     }
 
     static final EntityOwnershipChange<DOMEntity> getInitDoubleEntityToSlave() {
-        return new EntityOwnershipChange<>(DOUBLE_ENTITY, EntityOwnershipChangeState.REMOTE_OWNERSHIP_CHANGED);
+        return new EntityOwnershipChange<>(DOUBLE_ENTITY, EntityOwnershipStateChange.REMOTE_OWNERSHIP_CHANGED);
     }
 
     static final EntityOwnershipChange<DOMEntity> getDoubleEntityToSlave() {
-        return new EntityOwnershipChange<>(DOUBLE_ENTITY, EntityOwnershipChangeState.LOCAL_OWNERSHIP_LOST_NEW_OWNER);
+        return new EntityOwnershipChange<>(DOUBLE_ENTITY, EntityOwnershipStateChange.LOCAL_OWNERSHIP_LOST_NEW_OWNER);
     }
 
     static final EntityOwnershipChange<DOMEntity> getDoubleEntityToJeopardy() {
-        return new EntityOwnershipChange<>(DOUBLE_ENTITY, EntityOwnershipChangeState.REMOTE_OWNERSHIP_LOST_NO_OWNER,
+        return new EntityOwnershipChange<>(DOUBLE_ENTITY, EntityOwnershipStateChange.REMOTE_OWNERSHIP_LOST_NO_OWNER,
             true);
     }
 
     static final EntityOwnershipChange<DOMEntity> getDoubleEntityMasterJeopardy() {
         return new EntityOwnershipChange<>(DOUBLE_ENTITY,
-            EntityOwnershipChangeState.LOCAL_OWNERSHIP_RETAINED_WITH_NO_CHANGE, true);
+            EntityOwnershipStateChange.LOCAL_OWNERSHIP_RETAINED_WITH_NO_CHANGE, true);
     }
 
     /**

diff --git a/singleton-service/mdsal-singleton-dom-impl/src/test/java/org/opendaylight/mdsal/singleton/dom/impl/ClusterSingletonServiceGroupImplTest.java b/singleton-service/mdsal-singleton-dom-impl/src/test/java/org/opendaylight/mdsal/singleton/dom/impl/ClusterSingletonServiceGroupImplTest.java
index 26c69fe20aeac2eb43a2cd08a17719b9c9151730..d1967c21d92fd690c03051dadfe73b4c49f598c6 100644 (file)
--- a/singleton-service/mdsal-singleton-dom-impl/src/test/java/org/opendaylight/mdsal/singleton/dom/impl/ClusterSingletonServiceGroupImplTest.java
+++ b/singleton-service/mdsal-singleton-dom-impl/src/test/java/org/opendaylight/mdsal/singleton/dom/impl/ClusterSingletonServiceGroupImplTest.java
@@ -28,7 +28,7 @@ import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
 import org.opendaylight.mdsal.eos.common.api.CandidateAlreadyRegisteredException;
 import org.opendaylight.mdsal.eos.common.api.EntityOwnershipChange;
-import org.opendaylight.mdsal.eos.common.api.EntityOwnershipChangeState;
+import org.opendaylight.mdsal.eos.common.api.EntityOwnershipStateChange;
 import org.opendaylight.mdsal.eos.common.api.GenericEntityOwnershipListener;
 import org.opendaylight.mdsal.eos.common.api.GenericEntityOwnershipService;
 import org.opendaylight.mdsal.singleton.common.api.ClusterSingletonService;
@@ -510,40 +510,40 @@ public class ClusterSingletonServiceGroupImplTest {
     }
 
     private static EntityOwnershipChange<TestEntity> getEntityToMaster() {
-        return new EntityOwnershipChange<>(MAIN_ENTITY, EntityOwnershipChangeState.LOCAL_OWNERSHIP_GRANTED);
+        return new EntityOwnershipChange<>(MAIN_ENTITY, EntityOwnershipStateChange.LOCAL_OWNERSHIP_GRANTED);
     }
 
     private static EntityOwnershipChange<TestEntity> getEntityToSlave() {
-        return new EntityOwnershipChange<>(MAIN_ENTITY, EntityOwnershipChangeState.LOCAL_OWNERSHIP_LOST_NEW_OWNER);
+        return new EntityOwnershipChange<>(MAIN_ENTITY, EntityOwnershipStateChange.LOCAL_OWNERSHIP_LOST_NEW_OWNER);
     }
 
     private static EntityOwnershipChange<TestEntity> getEntityToSlaveNoMaster() {
-        return new EntityOwnershipChange<>(MAIN_ENTITY, EntityOwnershipChangeState.LOCAL_OWNERSHIP_LOST_NO_OWNER);
+        return new EntityOwnershipChange<>(MAIN_ENTITY, EntityOwnershipStateChange.LOCAL_OWNERSHIP_LOST_NO_OWNER);
     }
 
     private static EntityOwnershipChange<TestEntity> getEntityToMasterJeopardy() {
-        return new EntityOwnershipChange<>(MAIN_ENTITY, EntityOwnershipChangeState.LOCAL_OWNERSHIP_GRANTED, true);
+        return new EntityOwnershipChange<>(MAIN_ENTITY, EntityOwnershipStateChange.LOCAL_OWNERSHIP_GRANTED, true);
     }
 
     private static EntityOwnershipChange<TestEntity> getEntityToJeopardy() {
-        return new EntityOwnershipChange<>(MAIN_ENTITY, EntityOwnershipChangeState.REMOTE_OWNERSHIP_LOST_NO_OWNER,
+        return new EntityOwnershipChange<>(MAIN_ENTITY, EntityOwnershipStateChange.REMOTE_OWNERSHIP_LOST_NO_OWNER,
             true);
     }
 
     private static EntityOwnershipChange<TestEntity> getDoubleEntityToMaster() {
-        return new EntityOwnershipChange<>(CLOSE_ENTITY, EntityOwnershipChangeState.LOCAL_OWNERSHIP_GRANTED);
+        return new EntityOwnershipChange<>(CLOSE_ENTITY, EntityOwnershipStateChange.LOCAL_OWNERSHIP_GRANTED);
     }
 
     private static EntityOwnershipChange<TestEntity> getDoubleEntityToSlave() {
-        return new EntityOwnershipChange<>(CLOSE_ENTITY, EntityOwnershipChangeState.LOCAL_OWNERSHIP_LOST_NEW_OWNER);
+        return new EntityOwnershipChange<>(CLOSE_ENTITY, EntityOwnershipStateChange.LOCAL_OWNERSHIP_LOST_NEW_OWNER);
     }
 
     private static EntityOwnershipChange<TestEntity> getInitDoubleEntityToSlave() {
-        return new EntityOwnershipChange<>(CLOSE_ENTITY, EntityOwnershipChangeState.REMOTE_OWNERSHIP_CHANGED);
+        return new EntityOwnershipChange<>(CLOSE_ENTITY, EntityOwnershipStateChange.REMOTE_OWNERSHIP_CHANGED);
     }
 
     private static EntityOwnershipChange<TestEntity> getDoubleEntityToJeopardy() {
-        return new EntityOwnershipChange<>(CLOSE_ENTITY, EntityOwnershipChangeState.REMOTE_OWNERSHIP_LOST_NO_OWNER,
+        return new EntityOwnershipChange<>(CLOSE_ENTITY, EntityOwnershipStateChange.REMOTE_OWNERSHIP_LOST_NO_OWNER,
             true);
     }
 }