From f2aa0c3d35d7ec7b61fafe614128042c1a0251d8 Mon Sep 17 00:00:00 2001 From: Jakub Morvay Date: Thu, 3 Dec 2015 10:47:47 +0100 Subject: [PATCH 1/1] Rename packages Rename package org.opendaylight.controller.cluster.schema.repository -> org.opendaylight.controller.cluster.schema.provider and also package org.opendaylight.controller.cluster.schema.repository.impl -> org.opendaylight.controller.cluster.schema.provider.impl. Also rename RemoteYangTextSourceImpl -> RemoteYangTextSourceProviderImpl. Change-Id: Ibb3eb34a7669f7568996fcd4109ae672816a2235 Signed-off-by: Jakub Morvay --- .../RemoteYangTextSourceProvider.java | 4 ++-- .../impl/RemoteSchemaProvider.java | 4 ++-- .../impl/RemoteYangTextSourceProviderImpl.java} | 14 +++++++------- .../YangTextSchemaSourceSerializationProxy.java | 2 +- .../impl/RemoteSchemaProviderTest.java | 4 ++-- .../impl/RemoteYangTextSourceProviderImplTest.java | 6 +++--- .../impl/YangTextSourceSerializationProxyTest.java | 2 +- 7 files changed, 18 insertions(+), 18 deletions(-) rename opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/schema/{repository => provider}/RemoteYangTextSourceProvider.java (83%) rename opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/schema/{repository => provider}/impl/RemoteSchemaProvider.java (95%) rename opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/schema/{repository/impl/RemoteYangTextSourceImpl.java => provider/impl/RemoteYangTextSourceProviderImpl.java} (83%) rename opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/schema/{repository => provider}/impl/YangTextSchemaSourceSerializationProxy.java (95%) rename opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/schema/{repository => provider}/impl/RemoteSchemaProviderTest.java (94%) rename opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/schema/{repository => provider}/impl/RemoteYangTextSourceProviderImplTest.java (93%) rename opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/schema/{repository => provider}/impl/YangTextSourceSerializationProxyTest.java (97%) diff --git a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/schema/repository/RemoteYangTextSourceProvider.java b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/schema/provider/RemoteYangTextSourceProvider.java similarity index 83% rename from opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/schema/repository/RemoteYangTextSourceProvider.java rename to opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/schema/provider/RemoteYangTextSourceProvider.java index 2b5f9699de..3401fdfd9a 100644 --- a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/schema/repository/RemoteYangTextSourceProvider.java +++ b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/schema/provider/RemoteYangTextSourceProvider.java @@ -6,12 +6,12 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.controller.cluster.schema.repository; +package org.opendaylight.controller.cluster.schema.provider; import com.google.common.annotations.Beta; import java.util.Set; import javax.annotation.Nonnull; -import org.opendaylight.controller.cluster.schema.repository.impl.YangTextSchemaSourceSerializationProxy; +import org.opendaylight.controller.cluster.schema.provider.impl.YangTextSchemaSourceSerializationProxy; import org.opendaylight.yangtools.yang.model.repo.api.SourceIdentifier; import scala.concurrent.Future; diff --git a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/schema/repository/impl/RemoteSchemaProvider.java b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/schema/provider/impl/RemoteSchemaProvider.java similarity index 95% rename from opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/schema/repository/impl/RemoteSchemaProvider.java rename to opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/schema/provider/impl/RemoteSchemaProvider.java index 6d6fed75ff..e2a42b2f5e 100644 --- a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/schema/repository/impl/RemoteSchemaProvider.java +++ b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/schema/provider/impl/RemoteSchemaProvider.java @@ -6,14 +6,14 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.controller.cluster.schema.repository.impl; +package org.opendaylight.controller.cluster.schema.provider.impl; import akka.dispatch.OnComplete; import com.google.common.annotations.Beta; import com.google.common.util.concurrent.CheckedFuture; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.SettableFuture; -import org.opendaylight.controller.cluster.schema.repository.RemoteYangTextSourceProvider; +import org.opendaylight.controller.cluster.schema.provider.RemoteYangTextSourceProvider; import org.opendaylight.yangtools.util.concurrent.ExceptionMapper; import org.opendaylight.yangtools.yang.model.repo.api.SchemaSourceException; import org.opendaylight.yangtools.yang.model.repo.api.SourceIdentifier; diff --git a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/schema/repository/impl/RemoteYangTextSourceImpl.java b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/schema/provider/impl/RemoteYangTextSourceProviderImpl.java similarity index 83% rename from opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/schema/repository/impl/RemoteYangTextSourceImpl.java rename to opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/schema/provider/impl/RemoteYangTextSourceProviderImpl.java index 273aa3895b..07d1714680 100644 --- a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/schema/repository/impl/RemoteYangTextSourceImpl.java +++ b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/schema/provider/impl/RemoteYangTextSourceProviderImpl.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.controller.cluster.schema.repository.impl; +package org.opendaylight.controller.cluster.schema.provider.impl; import com.google.common.annotations.Beta; import com.google.common.util.concurrent.CheckedFuture; @@ -14,7 +14,7 @@ import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; import java.io.IOException; import java.util.Set; -import org.opendaylight.controller.cluster.schema.repository.RemoteYangTextSourceProvider; +import org.opendaylight.controller.cluster.schema.provider.RemoteYangTextSourceProvider; import org.opendaylight.yangtools.yang.model.repo.api.SchemaRepository; import org.opendaylight.yangtools.yang.model.repo.api.SourceIdentifier; import org.opendaylight.yangtools.yang.model.repo.api.YangTextSchemaSource; @@ -24,16 +24,16 @@ import scala.concurrent.Future; import scala.concurrent.Promise; /** - * Remote schema repository implementation backed by local schema repository. + * Remote schema provider implementation backed by local schema provider. */ @Beta -public class RemoteYangTextSourceImpl implements RemoteYangTextSourceProvider { - private static final Logger LOG = LoggerFactory.getLogger(RemoteYangTextSourceImpl.class); +public class RemoteYangTextSourceProviderImpl implements RemoteYangTextSourceProvider { + private static final Logger LOG = LoggerFactory.getLogger(RemoteYangTextSourceProviderImpl.class); private final SchemaRepository repository; private final Set providedSources; - public RemoteYangTextSourceImpl(SchemaRepository repository, Set providedSources) { + public RemoteYangTextSourceProviderImpl(SchemaRepository repository, Set providedSources) { this.repository = repository; this.providedSources = providedSources; } @@ -63,7 +63,7 @@ public class RemoteYangTextSourceImpl implements RemoteYangTextSourceProvider { @Override public void onFailure(Throwable t) { - LOG.warn("Unable to retrieve schema source from repository", t); + LOG.warn("Unable to retrieve schema source from provider", t); promise.failure(t); } }); diff --git a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/schema/repository/impl/YangTextSchemaSourceSerializationProxy.java b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/schema/provider/impl/YangTextSchemaSourceSerializationProxy.java similarity index 95% rename from opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/schema/repository/impl/YangTextSchemaSourceSerializationProxy.java rename to opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/schema/provider/impl/YangTextSchemaSourceSerializationProxy.java index 8a428377e9..8c1f8d0c13 100644 --- a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/schema/repository/impl/YangTextSchemaSourceSerializationProxy.java +++ b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/schema/provider/impl/YangTextSchemaSourceSerializationProxy.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.controller.cluster.schema.repository.impl; +package org.opendaylight.controller.cluster.schema.provider.impl; import com.google.common.annotations.Beta; import com.google.common.io.ByteSource; diff --git a/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/schema/repository/impl/RemoteSchemaProviderTest.java b/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/schema/provider/impl/RemoteSchemaProviderTest.java similarity index 94% rename from opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/schema/repository/impl/RemoteSchemaProviderTest.java rename to opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/schema/provider/impl/RemoteSchemaProviderTest.java index b74f9d7695..2c48b2c6c6 100644 --- a/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/schema/repository/impl/RemoteSchemaProviderTest.java +++ b/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/schema/provider/impl/RemoteSchemaProviderTest.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.controller.cluster.schema.repository.impl; +package org.opendaylight.controller.cluster.schema.provider.impl; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; @@ -21,7 +21,7 @@ import java.io.IOException; import org.junit.Before; import org.junit.Test; import org.mockito.Mockito; -import org.opendaylight.controller.cluster.schema.repository.RemoteYangTextSourceProvider; +import org.opendaylight.controller.cluster.schema.provider.RemoteYangTextSourceProvider; import org.opendaylight.yangtools.yang.model.repo.api.SchemaSourceException; import org.opendaylight.yangtools.yang.model.repo.api.SourceIdentifier; import org.opendaylight.yangtools.yang.model.repo.api.YangTextSchemaSource; diff --git a/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/schema/repository/impl/RemoteYangTextSourceProviderImplTest.java b/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/schema/provider/impl/RemoteYangTextSourceProviderImplTest.java similarity index 93% rename from opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/schema/repository/impl/RemoteYangTextSourceProviderImplTest.java rename to opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/schema/provider/impl/RemoteYangTextSourceProviderImplTest.java index 8f70cbbf7e..360d210bf0 100644 --- a/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/schema/repository/impl/RemoteYangTextSourceProviderImplTest.java +++ b/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/schema/provider/impl/RemoteYangTextSourceProviderImplTest.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.controller.cluster.schema.repository.impl; +package org.opendaylight.controller.cluster.schema.provider.impl; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; @@ -31,7 +31,7 @@ public class RemoteYangTextSourceProviderImplTest { private static final SourceIdentifier ID = new SourceIdentifier("Test", "2015-10-30"); - private RemoteYangTextSourceImpl remoteRepository; + private RemoteYangTextSourceProviderImpl remoteRepository; private SchemaRepository mockedLocalRepository; private Set providedSources = Collections.singleton(ID); @@ -39,7 +39,7 @@ public class RemoteYangTextSourceProviderImplTest { public void setUp() { mockedLocalRepository = Mockito.mock(SchemaRepository.class); - remoteRepository = new RemoteYangTextSourceImpl(mockedLocalRepository, providedSources); + remoteRepository = new RemoteYangTextSourceProviderImpl(mockedLocalRepository, providedSources); } @Test diff --git a/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/schema/repository/impl/YangTextSourceSerializationProxyTest.java b/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/schema/provider/impl/YangTextSourceSerializationProxyTest.java similarity index 97% rename from opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/schema/repository/impl/YangTextSourceSerializationProxyTest.java rename to opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/schema/provider/impl/YangTextSourceSerializationProxyTest.java index 82b48a0bcd..18bc34c6c2 100644 --- a/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/schema/repository/impl/YangTextSourceSerializationProxyTest.java +++ b/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/schema/provider/impl/YangTextSourceSerializationProxyTest.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.controller.cluster.schema.repository.impl; +package org.opendaylight.controller.cluster.schema.provider.impl; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; -- 2.36.6