Remove ClusterSingletonBinding 71/42171/2
authorVaclav Demcak <vdemcak@cisco.com>
Wed, 20 Jul 2016 20:00:48 +0000 (22:00 +0200)
committerRobert Varga <nite@hq.sk>
Thu, 21 Jul 2016 12:32:14 +0000 (12:32 +0000)
We would like to use DOMClusterSingletonServiceProvider only,
so we have to remove Binding CSS instances.

* remove mdsal-singleton-binding-api project
* remove mdsal-singleton-binding-impl project
* clean features.xml + features/pom.xml
* clean artefacts pom.xml
* clean singleton-service/pom.xml

Change-Id: If4cdd968210d950dc66f4835e2ae14c25cfab7cc
Signed-off-by: Vaclav Demcak <vdemcak@cisco.com>
common/artifacts/pom.xml
common/features/pom.xml
common/features/src/main/features/features.xml
singleton-service/mdsal-singleton-binding-api/pom.xml [deleted file]
singleton-service/mdsal-singleton-binding-api/src/main/java/org/opendaylight/mdsal/singleton/binding/api/ClusterSingletonServiceProvider.java [deleted file]
singleton-service/mdsal-singleton-binding-impl/pom.xml [deleted file]
singleton-service/mdsal-singleton-binding-impl/src/main/java/org/opendaylight/mdsal/singleton/binding/impl/ClusterSingletonServiceProviderImpl.java [deleted file]
singleton-service/mdsal-singleton-binding-impl/src/test/java/org/opendaylight/mdsal/singleton/binding/impl/ClusterSingletonServiceProviderImplTest.java [deleted file]
singleton-service/pom.xml

index ca993a3e2ff968bb04a5db7ea7225e376e1d24a7..0d40234d8ed798976f0f5202bf2622f54769f8e9 100644 (file)
                 <artifactId>mdsal-singleton-dom-impl</artifactId>
                 <version>${project.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.opendaylight.mdsal</groupId>
-                <artifactId>mdsal-singleton-binding-api</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.mdsal</groupId>
-                <artifactId>mdsal-singleton-binding-impl</artifactId>
-                <version>${project.version}</version>
-            </dependency>
         </dependencies>
     </dependencyManagement>
 
index 5121b1bcdd7aeda288b97d7a9ea547a47abd2c32..4c6972a4534f23c282db73decf817a8ce8719abd 100644 (file)
             <groupId>${project.groupId}</groupId>
             <artifactId>mdsal-singleton-dom-impl</artifactId>
         </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>mdsal-singleton-binding-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>mdsal-singleton-binding-impl</artifactId>
-        </dependency>
 
         <!-- Binding MD-SAL & Java Binding -->
         <dependency>
index df61d09f9e170266b22707d08793d3a89507a82a..dfd71d3e75b64818eab15926a114f7f2f444fc6f 100644 (file)
         <bundle>mvn:org.opendaylight.mdsal/mdsal-singleton-dom-impl/{{VERSION}}</bundle>
     </feature>
 
-    <feature name='odl-mdsal-singleton-binding' version='${project.version}' description='OpenDaylight :: MD-SAL :: Singleton :: Binding'>
-        <feature version='${project.version}'>odl-mdsal-singleton-common</feature>
-        <feature version='${project.version}'>odl-mdsal-eos-binding</feature>
-        <bundle>mvn:org.opendaylight.mdsal/mdsal-singleton-binding-api/{{VERSION}}</bundle>
-        <bundle>mvn:org.opendaylight.mdsal/mdsal-singleton-binding-impl/{{VERSION}}</bundle>
-    </feature>
-
 </features>
diff --git a/singleton-service/mdsal-singleton-binding-api/pom.xml b/singleton-service/mdsal-singleton-binding-api/pom.xml
deleted file mode 100644 (file)
index 6a690b5..0000000
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.opendaylight.mdsal</groupId>
-    <artifactId>singleton-service</artifactId>
-    <version>2.1.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>mdsal-singleton-binding-api</artifactId>
-  <packaging>bundle</packaging>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.opendaylight.mdsal</groupId>
-      <artifactId>mdsal-eos-binding-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.mdsal</groupId>
-      <artifactId>mdsal-singleton-common-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.yangtools</groupId>
-      <artifactId>concepts</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.yangtools</groupId>
-      <artifactId>util</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.yangtools</groupId>
-      <artifactId>yang-common</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.yangtools</groupId>
-      <artifactId>mockito-configuration</artifactId>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-
-  <scm>
-    <connection>scm:git:http://git.opendaylight.org/gerrit/mdsal.git</connection>
-    <developerConnection>scm:git:ssh://git.opendaylight.org:29418/mdsal.git</developerConnection>
-    <tag>HEAD</tag>
-    <url>https://wiki.opendaylight.org/view/MD-SAL:Main</url>
-  </scm>
-
-  <!--
-      Maven Site Configuration
-
-      The following configuration is necessary for maven-site-plugin to
-      correctly identify the correct deployment path for OpenDaylight Maven
-      sites.
-  -->
-  <url>${odl.site.url}/${project.groupId}/${stream}/${project.artifactId}/</url>
-
-  <distributionManagement>
-    <site>
-      <id>opendaylight-site</id>
-      <url>${nexus.site.url}/${project.artifactId}/</url>
-    </site>
-  </distributionManagement>
-
-</project>
diff --git a/singleton-service/mdsal-singleton-binding-api/src/main/java/org/opendaylight/mdsal/singleton/binding/api/ClusterSingletonServiceProvider.java b/singleton-service/mdsal-singleton-binding-api/src/main/java/org/opendaylight/mdsal/singleton/binding/api/ClusterSingletonServiceProvider.java
deleted file mode 100644 (file)
index 75121c5..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco Systems, Inc. and others.  All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-
-package org.opendaylight.mdsal.singleton.binding.api;
-
-import org.opendaylight.mdsal.eos.binding.api.EntityOwnershipListener;
-import org.opendaylight.mdsal.singleton.common.api.CommonClusterSingletonServiceProvider;
-
-/**
- * Binding version of {@link ClusterSingletonServiceProvider}
- */
-public interface ClusterSingletonServiceProvider
-        extends CommonClusterSingletonServiceProvider, EntityOwnershipListener {
-
-    // Marker interface for blueprint
-}
diff --git a/singleton-service/mdsal-singleton-binding-impl/pom.xml b/singleton-service/mdsal-singleton-binding-impl/pom.xml
deleted file mode 100644 (file)
index 7c26229..0000000
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.opendaylight.mdsal</groupId>
-    <artifactId>singleton-service</artifactId>
-    <version>2.1.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>mdsal-singleton-binding-impl</artifactId>
-  <packaging>bundle</packaging>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.opendaylight.mdsal</groupId>
-      <artifactId>mdsal-eos-binding-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.mdsal</groupId>
-      <artifactId>mdsal-singleton-common-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.mdsal</groupId>
-      <artifactId>mdsal-singleton-common-spi</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.mdsal</groupId>
-      <artifactId>mdsal-singleton-binding-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.yangtools</groupId>
-      <artifactId>concepts</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.yangtools</groupId>
-      <artifactId>util</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.yangtools</groupId>
-      <artifactId>yang-common</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.yangtools</groupId>
-      <artifactId>mockito-configuration</artifactId>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-  <scm>
-    <connection>scm:git:http://git.opendaylight.org/gerrit/controller.git</connection>
-    <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
-    <tag>HEAD</tag>
-    <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:MD-SAL</url>
-  </scm>
-
-  <!--
-      Maven Site Configuration
-
-      The following configuration is necessary for maven-site-plugin to
-      correctly identify the correct deployment path for OpenDaylight Maven
-      sites.
-  -->
-  <url>${odl.site.url}/${project.groupId}/${stream}/${project.artifactId}/</url>
-
-  <distributionManagement>
-    <site>
-      <id>opendaylight-site</id>
-      <url>${nexus.site.url}/${project.artifactId}/</url>
-    </site>
-  </distributionManagement>
-
-</project>
diff --git a/singleton-service/mdsal-singleton-binding-impl/src/main/java/org/opendaylight/mdsal/singleton/binding/impl/ClusterSingletonServiceProviderImpl.java b/singleton-service/mdsal-singleton-binding-impl/src/main/java/org/opendaylight/mdsal/singleton/binding/impl/ClusterSingletonServiceProviderImpl.java
deleted file mode 100644 (file)
index f9fe93a..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco Systems, Inc. and others.  All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-
-package org.opendaylight.mdsal.singleton.binding.impl;
-
-import org.opendaylight.mdsal.eos.binding.api.Entity;
-import org.opendaylight.mdsal.eos.binding.api.EntityOwnershipChange;
-import org.opendaylight.mdsal.eos.binding.api.EntityOwnershipListener;
-import org.opendaylight.mdsal.eos.binding.api.EntityOwnershipListenerRegistration;
-import org.opendaylight.mdsal.eos.binding.api.EntityOwnershipService;
-import org.opendaylight.mdsal.eos.common.api.GenericEntityOwnershipService;
-import org.opendaylight.mdsal.singleton.binding.api.ClusterSingletonServiceProvider;
-import org.opendaylight.mdsal.singleton.common.spi.AbstractClusterSingletonServiceProviderImpl;
-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;
-
-/**
- * Binding version of {@link AbstractClusterSingletonServiceProviderImpl}
- */
-public final class ClusterSingletonServiceProviderImpl extends
-        AbstractClusterSingletonServiceProviderImpl<InstanceIdentifier<?>, Entity,
-                                                    EntityOwnershipChange,
-                                                    EntityOwnershipListener,
-                                                    EntityOwnershipService,
-                                                    EntityOwnershipListenerRegistration>
-        implements ClusterSingletonServiceProvider {
-
-    /**
-     * Initialization all needed class internal property for {@link ClusterSingletonServiceProviderImpl}
-     *
-     * @param entityOwnershipService - we need only {@link GenericEntityOwnershipService}
-     */
-    public ClusterSingletonServiceProviderImpl(final EntityOwnershipService entityOwnershipService) {
-        super(entityOwnershipService);
-    }
-
-    @Override
-    protected final Entity createEntity(final String type, final String ident) {
-        return new Entity(type, ident);
-    }
-
-    @Override
-    protected final EntityOwnershipListenerRegistration registerListener(final String type,
-            final EntityOwnershipService eos) {
-        return eos.registerListener(type, this);
-    }
-
-    @Override
-    protected final String getServiceIdentifierFromEntity(final Entity entity) {
-        final InstanceIdentifier<?> ii = entity.getIdentifier();
-        final EntityKey entityKey = ii.firstKeyOf(
-                org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.mdsal.core.general.entity.rev150930.Entity.class);
-        return entityKey.getName();
-    }
-}
diff --git a/singleton-service/mdsal-singleton-binding-impl/src/test/java/org/opendaylight/mdsal/singleton/binding/impl/ClusterSingletonServiceProviderImplTest.java b/singleton-service/mdsal-singleton-binding-impl/src/test/java/org/opendaylight/mdsal/singleton/binding/impl/ClusterSingletonServiceProviderImplTest.java
deleted file mode 100644 (file)
index 4208dd8..0000000
+++ /dev/null
@@ -1,695 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco Systems, Inc. and others.  All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-
-package org.opendaylight.mdsal.singleton.binding.impl;
-
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.doNothing;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.doThrow;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.verify;
-import com.google.common.util.concurrent.Futures;
-import com.google.common.util.concurrent.ListenableFuture;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.opendaylight.mdsal.eos.binding.api.Entity;
-import org.opendaylight.mdsal.eos.binding.api.EntityOwnershipCandidateRegistration;
-import org.opendaylight.mdsal.eos.binding.api.EntityOwnershipChange;
-import org.opendaylight.mdsal.eos.binding.api.EntityOwnershipListenerRegistration;
-import org.opendaylight.mdsal.eos.binding.api.EntityOwnershipService;
-import org.opendaylight.mdsal.eos.common.api.CandidateAlreadyRegisteredException;
-import org.opendaylight.mdsal.eos.common.api.EntityOwnershipChangeState;
-import org.opendaylight.mdsal.singleton.common.api.ClusterSingletonService;
-import org.opendaylight.mdsal.singleton.common.api.ClusterSingletonServiceRegistration;
-import org.opendaylight.mdsal.singleton.common.api.ServiceGroupIdentifier;
-
-/**
- * Testing {@link ClusterSingletonServiceProviderImpl}
- */
-public class ClusterSingletonServiceProviderImplTest {
-
-    private static final String SERVICE_ENTITY_TYPE = "org.opendaylight.mdsal.ServiceEntityType";
-    private static final String CLOSE_SERVICE_ENTITY_TYPE = "org.opendaylight.mdsal.AsyncServiceCloseEntityType";
-    private static final String SERVICE_NAME = "testServiceName";
-
-    @Mock
-    private EntityOwnershipService mockEos;
-    @Mock
-    private EntityOwnershipCandidateRegistration mockEntityCandReg;
-    @Mock
-    private EntityOwnershipCandidateRegistration mockDoubleEntityCandReg;
-    @Mock
-    private EntityOwnershipListenerRegistration mockEosEntityListReg;
-    @Mock
-    private EntityOwnershipListenerRegistration mockEosDoubleEntityListReg;
-
-    private ClusterSingletonServiceProviderImpl clusterSingletonServiceProvider;
-    private TestClusterSingletonServiceInstance clusterSingletonService;
-    private TestClusterSingletonServiceInstance clusterSingletonService2;
-
-    private final Entity entity = new Entity(SERVICE_ENTITY_TYPE, SERVICE_NAME);
-    private final Entity doubleEntity = new Entity(CLOSE_SERVICE_ENTITY_TYPE, SERVICE_NAME);
-
-    /**
-     * Initialization functionality for every Tests in this suite
-     *
-     * @throws Exception
-     */
-    @Before
-    public void setup() throws Exception {
-        MockitoAnnotations.initMocks(this);
-
-        doNothing().when(mockEosEntityListReg).close();
-        doNothing().when(mockEosDoubleEntityListReg).close();
-        doNothing().when(mockEntityCandReg).close();
-        doNothing().when(mockDoubleEntityCandReg).close();
-        doReturn(mockEosEntityListReg).when(mockEos).registerListener(eq(SERVICE_ENTITY_TYPE),
-                any(ClusterSingletonServiceProviderImpl.class));
-        doReturn(mockEosDoubleEntityListReg).when(mockEos).registerListener(eq(CLOSE_SERVICE_ENTITY_TYPE),
-                any(ClusterSingletonServiceProviderImpl.class));
-        doReturn(mockEntityCandReg).when(mockEos).registerCandidate(entity);
-        doReturn(mockDoubleEntityCandReg).when(mockEos).registerCandidate(doubleEntity);
-
-        clusterSingletonServiceProvider = new ClusterSingletonServiceProviderImpl(mockEos);
-        clusterSingletonServiceProvider.initializeProvider();
-        verify(mockEos).registerListener(SERVICE_ENTITY_TYPE, clusterSingletonServiceProvider);
-        verify(mockEos).registerListener(CLOSE_SERVICE_ENTITY_TYPE, clusterSingletonServiceProvider);
-
-        clusterSingletonService = new TestClusterSingletonServiceInstance();
-        clusterSingletonService2 = new TestClusterSingletonServiceInstance();
-
-        Assert.assertEquals(TestClusterSingletonServiceState.INITIALIZED, clusterSingletonService.getServiceState());
-        Assert.assertEquals(TestClusterSingletonServiceState.INITIALIZED, clusterSingletonService2.getServiceState());
-    }
-
-    /**
-     * Test checks NullPointer for null {@link EntityOwnershipService} input value
-     *
-     * @throws Exception
-     */
-    @Test(expected = NullPointerException.class)
-    public void initializationClusterSingletonServiceProviderNullInputTest() throws Exception {
-        clusterSingletonServiceProvider = new ClusterSingletonServiceProviderImpl(null);
-    }
-
-    /**
-     * Test GoldPath for close {@link ClusterSingletonServiceProviderImpl}
-     *
-     * @throws Exception
-     */
-    @Test
-    public void closeClusterSingletonServiceProviderTest() throws Exception {
-        verify(mockEos).registerListener(SERVICE_ENTITY_TYPE, clusterSingletonServiceProvider);
-        verify(mockEos).registerListener(CLOSE_SERVICE_ENTITY_TYPE, clusterSingletonServiceProvider);
-        clusterSingletonServiceProvider.close();
-        verify(mockEosEntityListReg).close();
-        verify(mockEosDoubleEntityListReg).close();
-    }
-
-    /**
-     * Test parser ServiceIdentifier from Entity
-     *
-     * @throws Exception
-     */
-    @Test
-    public void makeEntityClusterSingletonServiceProviderTest() throws Exception {
-        final Entity testEntity = clusterSingletonServiceProvider.createEntity(SERVICE_ENTITY_TYPE, SERVICE_NAME);
-        Assert.assertEquals(entity, testEntity);
-        final Entity testDbEn = clusterSingletonServiceProvider.createEntity(CLOSE_SERVICE_ENTITY_TYPE, SERVICE_NAME);
-        Assert.assertEquals(doubleEntity, testDbEn);
-    }
-
-    /**
-     * Test parser ServiceIdentifier from Entity
-     *
-     * @throws Exception
-     */
-    @Test
-    public void getIdentifierClusterSingletonServiceProviderTest() throws Exception {
-        final String entityIdentifier = clusterSingletonServiceProvider.getServiceIdentifierFromEntity(entity);
-        Assert.assertEquals(SERVICE_NAME, entityIdentifier);
-        final String doubleEntityId = clusterSingletonServiceProvider.getServiceIdentifierFromEntity(doubleEntity);
-        Assert.assertEquals(SERVICE_NAME, doubleEntityId);
-    }
-
-    /**
-     * Test GoldPath for initialization {@link ClusterSingletonService}
-     *
-     * @throws Exception
-     */
-    @Test
-    public void initializationClusterSingletonServiceTest() throws Exception {
-        final ClusterSingletonServiceRegistration reg = clusterSingletonServiceProvider
-                .registerClusterSingletonService(clusterSingletonService);
-        Assert.assertNotNull(reg);
-        verify(mockEos).registerCandidate(entity);
-        Assert.assertEquals(TestClusterSingletonServiceState.INITIALIZED, clusterSingletonService.getServiceState());
-    }
-
-    /**
-     * Test GoldPath for initialization with init ownership result SLAVE {@link ClusterSingletonService}
-     *
-     * @throws Exception
-     */
-    @Test
-    public void slaveInitClusterSingletonServiceTest() throws Exception {
-        final ClusterSingletonServiceRegistration reg = clusterSingletonServiceProvider
-                .registerClusterSingletonService(clusterSingletonService);
-        Assert.assertNotNull(reg);
-        verify(mockEos).registerCandidate(entity);
-        clusterSingletonServiceProvider.ownershipChanged(getInitEntityToSlave());
-        verify(mockEos, never()).registerCandidate(doubleEntity);
-        Assert.assertEquals(TestClusterSingletonServiceState.INITIALIZED, clusterSingletonService.getServiceState());
-    }
-
-    /**
-     * Test GoldPath for initialization with init ownership result SLAVE, but NO-MASTER {@link ClusterSingletonService}
-     *
-     * @throws Exception
-     */
-    @Test
-    public void slaveInitNoMasterClusterSingletonServiceTest() throws Exception {
-        final ClusterSingletonServiceRegistration reg = clusterSingletonServiceProvider
-                .registerClusterSingletonService(clusterSingletonService);
-        Assert.assertNotNull(reg);
-        verify(mockEos).registerCandidate(entity);
-        clusterSingletonServiceProvider.ownershipChanged(getInitEntityToSlaveNoMaster());
-        verify(mockEos, never()).registerCandidate(doubleEntity);
-        Assert.assertEquals(TestClusterSingletonServiceState.INITIALIZED, clusterSingletonService.getServiceState());
-    }
-
-    /**
-     * Test GoldPath for initialization with init ownership result MASTER {@link ClusterSingletonService}
-     *
-     * @throws Exception
-     */
-    @Test
-    public void masterInitClusterSingletonServiceTest() throws Exception {
-        final ClusterSingletonServiceRegistration reg = clusterSingletonServiceProvider
-                .registerClusterSingletonService(clusterSingletonService);
-        Assert.assertNotNull(reg);
-        verify(mockEos).registerCandidate(entity);
-        clusterSingletonServiceProvider.ownershipChanged(getEntityToMaster());
-        verify(mockEos).registerCandidate(doubleEntity);
-        Assert.assertEquals(TestClusterSingletonServiceState.INITIALIZED, clusterSingletonService.getServiceState());
-    }
-
-    /**
-     * Test GoldPath for initialization with init ownership result MASTER {@link ClusterSingletonService}
-     *
-     * @throws Exception
-     */
-    @Test
-    public void masterInitSlaveDoubleCandidateClusterSingletonServiceTest() throws Exception {
-        final ClusterSingletonServiceRegistration reg = clusterSingletonServiceProvider
-                .registerClusterSingletonService(clusterSingletonService);
-        Assert.assertNotNull(reg);
-        verify(mockEos).registerCandidate(entity);
-        clusterSingletonServiceProvider.ownershipChanged(getEntityToMaster());
-        verify(mockEos).registerCandidate(doubleEntity);
-        clusterSingletonServiceProvider.ownershipChanged(getInitDoubleEntityToSlave());
-        Assert.assertEquals(TestClusterSingletonServiceState.INITIALIZED, clusterSingletonService.getServiceState());
-    }
-
-    /**
-     * Test GoldPath for takeLeadership with ownership result MASTER {@link ClusterSingletonService}
-     *
-     * @throws Exception
-     */
-    @Test
-    public void takeLeadershipClusterSingletonServiceTest() throws Exception {
-        final ClusterSingletonServiceRegistration reg = clusterSingletonServiceProvider
-                .registerClusterSingletonService(clusterSingletonService);
-        Assert.assertNotNull(reg);
-        verify(mockEos).registerCandidate(entity);
-        clusterSingletonServiceProvider.ownershipChanged(getEntityToMaster());
-        verify(mockEos).registerCandidate(doubleEntity);
-        Assert.assertEquals(TestClusterSingletonServiceState.INITIALIZED, clusterSingletonService.getServiceState());
-        clusterSingletonServiceProvider.ownershipChanged(getDoubleEntityToMaster());
-        Assert.assertEquals(TestClusterSingletonServiceState.STARTED, clusterSingletonService.getServiceState());
-    }
-
-    /**
-     * Test GoldPath for initialization with init ownership result MASTER {@link ClusterSingletonService}
-     *
-     * @throws Exception
-     */
-    @Test
-    public void masterInitClusterSingletonServiceTwoServicesTest() throws Exception {
-        final ClusterSingletonServiceRegistration reg = clusterSingletonServiceProvider
-                .registerClusterSingletonService(clusterSingletonService);
-        Assert.assertNotNull(reg);
-        verify(mockEos).registerCandidate(entity);
-        clusterSingletonServiceProvider.ownershipChanged(getEntityToMaster());
-        verify(mockEos).registerCandidate(doubleEntity);
-        Assert.assertEquals(TestClusterSingletonServiceState.INITIALIZED, clusterSingletonService.getServiceState());
-        final ClusterSingletonServiceRegistration reg2 = clusterSingletonServiceProvider
-                .registerClusterSingletonService(clusterSingletonService2);
-        Assert.assertNotNull(reg2);
-        Assert.assertEquals(TestClusterSingletonServiceState.INITIALIZED, clusterSingletonService2.getServiceState());
-    }
-
-    /**
-     * Test GoldPath for takeLeadership with ownership result MASTER {@link ClusterSingletonService}
-     *
-     * @throws Exception
-     */
-    @Test
-    public void takeLeadershipClusterSingletonServiceTwoAddDuringWaitPhaseServicesTest() throws Exception {
-        final ClusterSingletonServiceRegistration reg = clusterSingletonServiceProvider
-                .registerClusterSingletonService(clusterSingletonService);
-        Assert.assertNotNull(reg);
-        verify(mockEos).registerCandidate(entity);
-        clusterSingletonServiceProvider.ownershipChanged(getEntityToMaster());
-        verify(mockEos).registerCandidate(doubleEntity);
-        final ClusterSingletonServiceRegistration reg2 = clusterSingletonServiceProvider
-                .registerClusterSingletonService(clusterSingletonService2);
-        Assert.assertNotNull(reg2);
-        Assert.assertEquals(TestClusterSingletonServiceState.INITIALIZED, clusterSingletonService.getServiceState());
-        Assert.assertEquals(TestClusterSingletonServiceState.INITIALIZED, clusterSingletonService2.getServiceState());
-        clusterSingletonServiceProvider.ownershipChanged(getDoubleEntityToMaster());
-        Assert.assertEquals(TestClusterSingletonServiceState.STARTED, clusterSingletonService.getServiceState());
-        Assert.assertEquals(TestClusterSingletonServiceState.STARTED, clusterSingletonService2.getServiceState());
-    }
-
-    /**
-     * Test GoldPath for takeLeadership with ownership result MASTER {@link ClusterSingletonService}
-     *
-     * @throws Exception
-     */
-    @Test
-    public void takeLeadershipClusterSingletonServiceTowServicesTest() throws Exception {
-        final ClusterSingletonServiceRegistration reg = clusterSingletonServiceProvider
-                .registerClusterSingletonService(clusterSingletonService);
-        Assert.assertNotNull(reg);
-        verify(mockEos).registerCandidate(entity);
-        clusterSingletonServiceProvider.ownershipChanged(getEntityToMaster());
-        verify(mockEos).registerCandidate(doubleEntity);
-        Assert.assertEquals(TestClusterSingletonServiceState.INITIALIZED, clusterSingletonService.getServiceState());
-        clusterSingletonServiceProvider.ownershipChanged(getDoubleEntityToMaster());
-        Assert.assertEquals(TestClusterSingletonServiceState.STARTED, clusterSingletonService.getServiceState());
-        final ClusterSingletonServiceRegistration reg2 = clusterSingletonServiceProvider
-                .registerClusterSingletonService(clusterSingletonService2);
-        Assert.assertNotNull(reg2);
-        Assert.assertEquals(TestClusterSingletonServiceState.STARTED, clusterSingletonService2.getServiceState());
-    }
-
-    /**
-     * Test checks CandidateAlreadyRegisteredException processing in initialization phase
-     *
-     * @throws Exception
-     */
-    @Test
-    public void initializationClusterSingletonServiceCandidateAlreadyRegistredTest() throws Exception {
-        doThrow(CandidateAlreadyRegisteredException.class).when(mockEos).registerCandidate(entity);
-        final ClusterSingletonServiceRegistration reg = clusterSingletonServiceProvider
-                .registerClusterSingletonService(clusterSingletonService);
-        Assert.assertNull(reg);
-    }
-
-    /**
-     * Test GoldPath for lostLeadership during tryToTakeLeadership with ownership result MASTER
-     * {@link ClusterSingletonService}
-     *
-     * @throws Exception
-     */
-    @Test
-    public void lostLeadershipDuringTryToTakeLeadershipClusterSingletonServiceTest() throws Exception {
-        final ClusterSingletonServiceRegistration reg = clusterSingletonServiceProvider
-                .registerClusterSingletonService(clusterSingletonService);
-        Assert.assertNotNull(reg);
-        verify(mockEos).registerCandidate(entity);
-        clusterSingletonServiceProvider.ownershipChanged(getEntityToMaster());
-        verify(mockEos).registerCandidate(doubleEntity);
-        Assert.assertEquals(TestClusterSingletonServiceState.INITIALIZED, clusterSingletonService.getServiceState());
-        clusterSingletonServiceProvider.ownershipChanged(getEntityToSlave());
-        Assert.assertEquals(TestClusterSingletonServiceState.INITIALIZED, clusterSingletonService.getServiceState());
-        clusterSingletonServiceProvider.ownershipChanged(getDoubleEntityToMaster());
-        Assert.assertEquals(TestClusterSingletonServiceState.INITIALIZED, clusterSingletonService.getServiceState());
-    }
-
-    /**
-     * Test GoldPath for lostLeadership with ownership result MASTER-TO-SLAVE {@link ClusterSingletonService}
-     *
-     * @throws Exception
-     */
-    @Test
-    public void lostLeadershipClusterSingletonServiceTest() throws Exception {
-        final ClusterSingletonServiceRegistration reg = clusterSingletonServiceProvider
-                .registerClusterSingletonService(clusterSingletonService);
-        Assert.assertNotNull(reg);
-        verify(mockEos).registerCandidate(entity);
-        clusterSingletonServiceProvider.ownershipChanged(getEntityToMaster());
-        verify(mockEos).registerCandidate(doubleEntity);
-        Assert.assertEquals(TestClusterSingletonServiceState.INITIALIZED, clusterSingletonService.getServiceState());
-        clusterSingletonServiceProvider.ownershipChanged(getInitDoubleEntityToSlave());
-        Assert.assertEquals(TestClusterSingletonServiceState.INITIALIZED, clusterSingletonService.getServiceState());
-        clusterSingletonServiceProvider.ownershipChanged(getDoubleEntityToMaster());
-        Assert.assertEquals(TestClusterSingletonServiceState.STARTED, clusterSingletonService.getServiceState());
-        clusterSingletonServiceProvider.ownershipChanged(getEntityToSlave());
-        Assert.assertEquals(TestClusterSingletonServiceState.DESTROYED, clusterSingletonService.getServiceState());
-    }
-
-    /**
-     * Test checks umexpected change for MASTER-TO-SLAVE double Candidate role change
-     *
-     * @throws Exception
-     */
-    @Test
-    public void unexpectedLostLeadershipDoubleCandidateTest() throws Exception {
-        final ClusterSingletonServiceRegistration reg = clusterSingletonServiceProvider
-                .registerClusterSingletonService(clusterSingletonService);
-        Assert.assertNotNull(reg);
-        verify(mockEos).registerCandidate(entity);
-        clusterSingletonServiceProvider.ownershipChanged(getEntityToMaster());
-        verify(mockEos).registerCandidate(doubleEntity);
-        Assert.assertEquals(TestClusterSingletonServiceState.INITIALIZED, clusterSingletonService.getServiceState());
-        clusterSingletonServiceProvider.ownershipChanged(getInitDoubleEntityToSlave());
-        Assert.assertEquals(TestClusterSingletonServiceState.INITIALIZED, clusterSingletonService.getServiceState());
-        clusterSingletonServiceProvider.ownershipChanged(getDoubleEntityToMaster());
-        Assert.assertEquals(TestClusterSingletonServiceState.STARTED, clusterSingletonService.getServiceState());
-        clusterSingletonServiceProvider.ownershipChanged(getDoubleEntityToSlave());
-        Assert.assertEquals(TestClusterSingletonServiceState.DESTROYED, clusterSingletonService.getServiceState());
-        verify(mockEosDoubleEntityListReg, never()).close();
-        verify(mockEntityCandReg, never()).close();
-        verify(mockDoubleEntityCandReg).close();
-    }
-
-    /**
-     * Test checks inJeopardy Cluster Node state for Master Instance
-     *
-     * @throws Exception
-     */
-    @Test
-    public void inJeopardyMasterTest() throws Exception {
-        final ClusterSingletonServiceRegistration reg = clusterSingletonServiceProvider
-                .registerClusterSingletonService(clusterSingletonService);
-        Assert.assertNotNull(reg);
-        verify(mockEos).registerCandidate(entity);
-        clusterSingletonServiceProvider.ownershipChanged(getEntityToMaster());
-        verify(mockEos).registerCandidate(doubleEntity);
-        Assert.assertEquals(TestClusterSingletonServiceState.INITIALIZED, clusterSingletonService.getServiceState());
-        clusterSingletonServiceProvider.ownershipChanged(getInitDoubleEntityToSlave());
-        Assert.assertEquals(TestClusterSingletonServiceState.INITIALIZED, clusterSingletonService.getServiceState());
-        clusterSingletonServiceProvider.ownershipChanged(getDoubleEntityToMaster());
-        Assert.assertEquals(TestClusterSingletonServiceState.STARTED, clusterSingletonService.getServiceState());
-        clusterSingletonServiceProvider.ownershipChanged(getEntityToJeopardy());
-        Assert.assertEquals(TestClusterSingletonServiceState.DESTROYED, clusterSingletonService.getServiceState());
-        verify(mockEosEntityListReg, never()).close();
-        verify(mockEosDoubleEntityListReg, never()).close();
-        verify(mockEntityCandReg, never()).close();
-        verify(mockDoubleEntityCandReg).close();
-    }
-
-    /**
-     * Test checks inJeopardy Cluster Node state for Slave Instance
-     *
-     * @throws Exception
-     */
-    @Test
-    public void inJeopardySlaveTest() throws Exception {
-        final ClusterSingletonServiceRegistration reg = clusterSingletonServiceProvider
-                .registerClusterSingletonService(clusterSingletonService);
-        Assert.assertNotNull(reg);
-        verify(mockEos).registerCandidate(entity);
-        clusterSingletonServiceProvider.ownershipChanged(getInitEntityToSlave());
-        verify(mockEos, never()).registerCandidate(doubleEntity);
-        Assert.assertEquals(TestClusterSingletonServiceState.INITIALIZED, clusterSingletonService.getServiceState());
-        clusterSingletonServiceProvider.ownershipChanged(getEntityToJeopardy());
-        Assert.assertEquals(TestClusterSingletonServiceState.INITIALIZED, clusterSingletonService.getServiceState());
-        verify(mockEosEntityListReg, never()).close();
-        verify(mockEosDoubleEntityListReg, never()).close();
-        verify(mockEntityCandReg, never()).close();
-        verify(mockDoubleEntityCandReg, never()).close();
-    }
-
-    /**
-     * Test checks close procesing for {@link ClusterSingletonServiceRegistration}
-     *
-     * @throws Exception
-     */
-    @Test
-    public void closeClusterSingletonServiceRegistrationNoRoleTest() throws Exception {
-        final ClusterSingletonServiceRegistration reg = clusterSingletonServiceProvider
-                .registerClusterSingletonService(clusterSingletonService);
-        Assert.assertNotNull(reg);
-        verify(mockEos).registerCandidate(entity);
-        Assert.assertEquals(TestClusterSingletonServiceState.INITIALIZED, clusterSingletonService.getServiceState());
-        reg.close();
-        verify(mockEosEntityListReg, never()).close();
-        verify(mockEosDoubleEntityListReg, never()).close();
-        verify(mockEntityCandReg).close();
-        verify(mockDoubleEntityCandReg, never()).close();
-        Assert.assertEquals(TestClusterSingletonServiceState.INITIALIZED, clusterSingletonService.getServiceState());
-    }
-
-    /**
-     * Test checks close procesing for {@link ClusterSingletonServiceRegistration}
-     *
-     * @throws Exception
-     */
-    @Test
-    public void closeClusterSingletonServiceRegistrationNoRoleTwoServicesTest() throws Exception {
-        final ClusterSingletonServiceRegistration reg = clusterSingletonServiceProvider
-                .registerClusterSingletonService(clusterSingletonService);
-        Assert.assertNotNull(reg);
-        verify(mockEos).registerCandidate(entity);
-        final ClusterSingletonServiceRegistration reg2 = clusterSingletonServiceProvider
-                .registerClusterSingletonService(clusterSingletonService2);
-        Assert.assertNotNull(reg2);
-        Assert.assertEquals(TestClusterSingletonServiceState.INITIALIZED, clusterSingletonService.getServiceState());
-        Assert.assertEquals(TestClusterSingletonServiceState.INITIALIZED, clusterSingletonService2.getServiceState());
-        reg.close();
-        verify(mockEosEntityListReg, never()).close();
-        verify(mockEosDoubleEntityListReg, never()).close();
-        verify(mockEntityCandReg, never()).close();
-        verify(mockDoubleEntityCandReg, never()).close();
-        Assert.assertEquals(TestClusterSingletonServiceState.INITIALIZED, clusterSingletonService.getServiceState());
-        Assert.assertEquals(TestClusterSingletonServiceState.INITIALIZED, clusterSingletonService2.getServiceState());
-    }
-
-    /**
-     * Test checks close procesing for {@link ClusterSingletonServiceRegistration}
-     *
-     * @throws Exception
-     */
-    @Test
-    public void closeClusterSingletonServiceRegistrationSlaveTest() throws Exception {
-        final ClusterSingletonServiceRegistration reg = clusterSingletonServiceProvider
-                .registerClusterSingletonService(clusterSingletonService);
-        Assert.assertNotNull(reg);
-        Assert.assertEquals(TestClusterSingletonServiceState.INITIALIZED, clusterSingletonService.getServiceState());
-        verify(mockEos).registerCandidate(entity);
-        clusterSingletonServiceProvider.ownershipChanged(getInitEntityToSlave());
-        reg.close();
-        verify(mockEosEntityListReg, never()).close();
-        verify(mockEosDoubleEntityListReg, never()).close();
-        verify(mockEntityCandReg).close();
-        verify(mockDoubleEntityCandReg, never()).close();
-        Assert.assertEquals(TestClusterSingletonServiceState.INITIALIZED, clusterSingletonService.getServiceState());
-    }
-
-    /**
-     * Test checks close procesing for {@link ClusterSingletonServiceRegistration}
-     *
-     * @throws Exception
-     */
-    @Test
-    public void closeClusterSingletonServiceRegistrationSlaveTwoServicesTest() throws Exception {
-        final ClusterSingletonServiceRegistration reg = clusterSingletonServiceProvider
-                .registerClusterSingletonService(clusterSingletonService);
-        Assert.assertNotNull(reg);
-        verify(mockEos).registerCandidate(entity);
-        final ClusterSingletonServiceRegistration reg2 = clusterSingletonServiceProvider
-                .registerClusterSingletonService(clusterSingletonService2);
-        Assert.assertNotNull(reg2);
-        clusterSingletonServiceProvider.ownershipChanged(getInitEntityToSlave());
-        Assert.assertEquals(TestClusterSingletonServiceState.INITIALIZED, clusterSingletonService.getServiceState());
-        Assert.assertEquals(TestClusterSingletonServiceState.INITIALIZED, clusterSingletonService2.getServiceState());
-        reg.close();
-        verify(mockEosEntityListReg, never()).close();
-        verify(mockEosDoubleEntityListReg, never()).close();
-        verify(mockEntityCandReg, never()).close();
-        verify(mockDoubleEntityCandReg, never()).close();
-        Assert.assertEquals(TestClusterSingletonServiceState.INITIALIZED, clusterSingletonService.getServiceState());
-        Assert.assertEquals(TestClusterSingletonServiceState.INITIALIZED, clusterSingletonService2.getServiceState());
-    }
-
-    /**
-     * Test checks close procesing for {@link ClusterSingletonServiceRegistration}
-     *
-     * @throws Exception
-     */
-    @Test
-    public void closeClusterSingletonServiceRegistrationMasterTest() throws Exception {
-        final ClusterSingletonServiceRegistration reg = clusterSingletonServiceProvider
-                .registerClusterSingletonService(clusterSingletonService);
-        Assert.assertNotNull(reg);
-        Assert.assertEquals(TestClusterSingletonServiceState.INITIALIZED, clusterSingletonService.getServiceState());
-        verify(mockEos).registerCandidate(entity);
-        clusterSingletonServiceProvider.ownershipChanged(getEntityToMaster());
-        verify(mockEos).registerCandidate(doubleEntity);
-        clusterSingletonServiceProvider.ownershipChanged(getDoubleEntityToMaster());
-        Assert.assertEquals(TestClusterSingletonServiceState.STARTED, clusterSingletonService.getServiceState());
-        reg.close();
-        verify(mockEosEntityListReg, never()).close();
-        verify(mockEosDoubleEntityListReg, never()).close();
-        verify(mockEntityCandReg).close();
-        verify(mockDoubleEntityCandReg).close();
-        Assert.assertEquals(TestClusterSingletonServiceState.DESTROYED, clusterSingletonService.getServiceState());
-    }
-
-    /**
-     * Test checks close procesing for {@link ClusterSingletonServiceRegistration}
-     *
-     * @throws Exception
-     */
-    @Test
-    public void closeClusterSingletonServiceRegistrationMasterTwoServicesTest() throws Exception {
-        final ClusterSingletonServiceRegistration reg = clusterSingletonServiceProvider
-                .registerClusterSingletonService(clusterSingletonService);
-        Assert.assertNotNull(reg);
-        final ClusterSingletonServiceRegistration reg2 = clusterSingletonServiceProvider
-                .registerClusterSingletonService(clusterSingletonService2);
-        Assert.assertNotNull(reg2);
-        Assert.assertEquals(TestClusterSingletonServiceState.INITIALIZED, clusterSingletonService.getServiceState());
-        Assert.assertEquals(TestClusterSingletonServiceState.INITIALIZED, clusterSingletonService2.getServiceState());
-        verify(mockEos).registerCandidate(entity);
-        clusterSingletonServiceProvider.ownershipChanged(getEntityToMaster());
-        verify(mockEos).registerCandidate(doubleEntity);
-        clusterSingletonServiceProvider.ownershipChanged(getDoubleEntityToMaster());
-        Assert.assertEquals(TestClusterSingletonServiceState.STARTED, clusterSingletonService.getServiceState());
-        Assert.assertEquals(TestClusterSingletonServiceState.STARTED, clusterSingletonService2.getServiceState());
-        reg.close();
-        verify(mockEosEntityListReg, never()).close();
-        verify(mockEosDoubleEntityListReg, never()).close();
-        verify(mockEntityCandReg, never()).close();
-        verify(mockDoubleEntityCandReg, never()).close();
-        Assert.assertEquals(TestClusterSingletonServiceState.DESTROYED, clusterSingletonService.getServiceState());
-        Assert.assertEquals(TestClusterSingletonServiceState.STARTED, clusterSingletonService2.getServiceState());
-    }
-
-    /**
-     * Test checks validation Error processing for SLAVE-TO-MASTER entity Candidate role change
-     *
-     * @throws Exception
-     */
-    @Test
-    public void tryToTakeLeaderForClosedServiceRegistrationTest() throws Exception {
-        final ClusterSingletonServiceRegistration reg = clusterSingletonServiceProvider
-                .registerClusterSingletonService(clusterSingletonService);
-        Assert.assertNotNull(reg);
-        final ClusterSingletonServiceRegistration reg2 = clusterSingletonServiceProvider
-                .registerClusterSingletonService(clusterSingletonService2);
-        Assert.assertNotNull(reg2);
-        Assert.assertEquals(TestClusterSingletonServiceState.INITIALIZED, clusterSingletonService.getServiceState());
-        Assert.assertEquals(TestClusterSingletonServiceState.INITIALIZED, clusterSingletonService2.getServiceState());
-        verify(mockEos).registerCandidate(entity);
-        reg.close();
-        clusterSingletonServiceProvider.ownershipChanged(getEntityToMaster());
-        verify(mockEos).registerCandidate(doubleEntity);
-        clusterSingletonServiceProvider.ownershipChanged(getDoubleEntityToMaster());
-        Assert.assertEquals(TestClusterSingletonServiceState.INITIALIZED, clusterSingletonService.getServiceState());
-        Assert.assertEquals(TestClusterSingletonServiceState.STARTED, clusterSingletonService2.getServiceState());
-        verify(mockEosEntityListReg, never()).close();
-        verify(mockEosDoubleEntityListReg, never()).close();
-        verify(mockEntityCandReg, never()).close();
-        verify(mockDoubleEntityCandReg, never()).close();
-        Assert.assertEquals(TestClusterSingletonServiceState.INITIALIZED, clusterSingletonService.getServiceState());
-        Assert.assertEquals(TestClusterSingletonServiceState.STARTED, clusterSingletonService2.getServiceState());
-    }
-
-    private EntityOwnershipChange getEntityToMaster() {
-        return new EntityOwnershipChange(entity, EntityOwnershipChangeState.from(false, true, true));
-    }
-
-    private EntityOwnershipChange getEntityToSlave() {
-        return new EntityOwnershipChange(entity, EntityOwnershipChangeState.from(true, false, true));
-    }
-
-    private EntityOwnershipChange getInitEntityToSlave() {
-        return new EntityOwnershipChange(entity, EntityOwnershipChangeState.from(false, false, true));
-    }
-
-    private EntityOwnershipChange getInitEntityToSlaveNoMaster() {
-        return new EntityOwnershipChange(entity, EntityOwnershipChangeState.from(false, false, false));
-    }
-
-    private EntityOwnershipChange getDoubleEntityToMaster() {
-        return new EntityOwnershipChange(doubleEntity, EntityOwnershipChangeState.from(false, true, true));
-    }
-
-    private EntityOwnershipChange getInitDoubleEntityToSlave() {
-        return new EntityOwnershipChange(doubleEntity, EntityOwnershipChangeState.from(false, false, true));
-    }
-
-    private EntityOwnershipChange getDoubleEntityToSlave() {
-        return new EntityOwnershipChange(doubleEntity, EntityOwnershipChangeState.from(true, false, true));
-    }
-
-    private EntityOwnershipChange getEntityToJeopardy() {
-        return new EntityOwnershipChange(entity, EntityOwnershipChangeState.from(false, false, false), true);
-    }
-
-    /**
-     * Base states for AbstractClusterProjectProvider
-     */
-    static enum TestClusterSingletonServiceState {
-        /**
-         * State represents a correct Instantiated process
-         */
-        STARTED,
-        /**
-         * State represents a correct call abstract method instantiatingProject
-         */
-        INITIALIZED,
-        /**
-         * State represents a correct call abstract method destryingProject
-         */
-        DESTROYED;
-    }
-
-    /**
-     * Test implementation of {@link ClusterSingletonService}
-     */
-    class TestClusterSingletonServiceInstance implements ClusterSingletonService {
-
-        private final ServiceGroupIdentifier SERVICE_IDENT = ServiceGroupIdentifier.create(SERVICE_NAME);
-        private TestClusterSingletonServiceState serviceState;
-
-        public TestClusterSingletonServiceInstance() {
-            this.serviceState = TestClusterSingletonServiceState.INITIALIZED;
-        }
-
-        @Override
-        public void instantiateServiceInstance() {
-            this.serviceState = TestClusterSingletonServiceState.STARTED;
-        }
-
-        @Override
-        public ListenableFuture<Void> closeServiceInstance() {
-            this.serviceState = TestClusterSingletonServiceState.DESTROYED;
-            return Futures.immediateFuture(null);
-        }
-
-        public TestClusterSingletonServiceState getServiceState() {
-            return serviceState;
-        }
-
-        @Override
-        public ServiceGroupIdentifier getIdentifier() {
-            return SERVICE_IDENT;
-        }
-    }
-
-}
index 41bffc1cd015198f9dabb391390fe43eb8508efb..2d752238bb5e3f7b1d0990a906260ec989a01242 100644 (file)
@@ -28,8 +28,6 @@
       <module>mdsal-singleton-common-spi</module>
       <module>mdsal-singleton-dom-api</module>
       <module>mdsal-singleton-dom-impl</module>
-      <module>mdsal-singleton-binding-api</module>
-      <module>mdsal-singleton-binding-impl</module>
     </modules>