From 0daebe388a00641f31de6eb491f13906bf7b8ba9 Mon Sep 17 00:00:00 2001 From: Marek Gradzki Date: Wed, 28 Sep 2016 10:57:24 +0200 Subject: VPP-378: update jvpp package names Depends on - vpp: https://gerrit.fd.io/r/#/c/3178 - NSH: https://gerrit.fd.io/r/#/c/3181 Change-Id: I1929947ccccc453aa32552fc42942a8b24ade157 Signed-off-by: Marek Gradzki --- .../main/java/io/fd/honeycomb/vpp/distro/JVppCoreProvider.java | 8 ++++---- .../java/io/fd/honeycomb/vpp/distro/JVppRegistryProvider.java | 4 ++-- .../src/main/java/io/fd/honeycomb/vpp/distro/VppCommonModule.java | 4 ++-- .../java/io/fd/honeycomb/vpp/test/read/JvppDumpExecutorTest.java | 4 ++-- .../java/io/fd/honeycomb/vpp/test/read/ReaderCustomizerTest.java | 2 +- .../main/java/io/fd/honeycomb/vpp/test/util/FutureProducer.java | 4 ++-- .../java/io/fd/honeycomb/vpp/test/util/InterfaceDumpHelper.java | 6 +++--- .../java/io/fd/honeycomb/vpp/test/write/WriterCustomizerTest.java | 2 +- .../translate/vpp/util/AbstractInterfaceTypeCustomizer.java | 2 +- .../io/fd/honeycomb/translate/vpp/util/FutureJVppCustomizer.java | 2 +- .../io/fd/honeycomb/translate/vpp/util/JvppReplyConsumer.java | 4 ++-- .../io/fd/honeycomb/translate/vpp/util/JvppReplyConsumerTest.java | 2 +- .../honeycomb/translate/vpp/util/cache/DumpCacheManagerTest.java | 4 ++-- 13 files changed, 24 insertions(+), 24 deletions(-) (limited to 'vpp-common') diff --git a/vpp-common/minimal-distribution/src/main/java/io/fd/honeycomb/vpp/distro/JVppCoreProvider.java b/vpp-common/minimal-distribution/src/main/java/io/fd/honeycomb/vpp/distro/JVppCoreProvider.java index 41f7b1335..b8334df55 100644 --- a/vpp-common/minimal-distribution/src/main/java/io/fd/honeycomb/vpp/distro/JVppCoreProvider.java +++ b/vpp-common/minimal-distribution/src/main/java/io/fd/honeycomb/vpp/distro/JVppCoreProvider.java @@ -19,10 +19,10 @@ package io.fd.honeycomb.vpp.distro; import com.google.inject.Inject; import io.fd.honeycomb.infra.distro.ProviderTrait; import java.io.IOException; -import org.openvpp.jvpp.JVppRegistry; -import org.openvpp.jvpp.core.JVppCoreImpl; -import org.openvpp.jvpp.core.future.FutureJVppCore; -import org.openvpp.jvpp.core.future.FutureJVppCoreFacade; +import io.fd.vpp.jvpp.JVppRegistry; +import io.fd.vpp.jvpp.core.JVppCoreImpl; +import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.vpp.jvpp.core.future.FutureJVppCoreFacade; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/vpp-common/minimal-distribution/src/main/java/io/fd/honeycomb/vpp/distro/JVppRegistryProvider.java b/vpp-common/minimal-distribution/src/main/java/io/fd/honeycomb/vpp/distro/JVppRegistryProvider.java index 983f019ff..9ecdd69ee 100644 --- a/vpp-common/minimal-distribution/src/main/java/io/fd/honeycomb/vpp/distro/JVppRegistryProvider.java +++ b/vpp-common/minimal-distribution/src/main/java/io/fd/honeycomb/vpp/distro/JVppRegistryProvider.java @@ -20,8 +20,8 @@ import com.google.inject.Inject; import io.fd.honeycomb.infra.distro.ProviderTrait; import io.fd.honeycomb.translate.vpp.util.VppStatusListener; import java.io.IOException; -import org.openvpp.jvpp.JVppRegistry; -import org.openvpp.jvpp.JVppRegistryImpl; +import io.fd.vpp.jvpp.JVppRegistry; +import io.fd.vpp.jvpp.JVppRegistryImpl; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/vpp-common/minimal-distribution/src/main/java/io/fd/honeycomb/vpp/distro/VppCommonModule.java b/vpp-common/minimal-distribution/src/main/java/io/fd/honeycomb/vpp/distro/VppCommonModule.java index 3e7ccfa3d..957819f28 100644 --- a/vpp-common/minimal-distribution/src/main/java/io/fd/honeycomb/vpp/distro/VppCommonModule.java +++ b/vpp-common/minimal-distribution/src/main/java/io/fd/honeycomb/vpp/distro/VppCommonModule.java @@ -22,8 +22,8 @@ import com.google.inject.multibindings.Multibinder; import io.fd.honeycomb.translate.read.ReaderFactory; import io.fd.honeycomb.translate.vpp.util.VppStatusListener; import net.jmob.guice.conf.core.ConfigurationModule; -import org.openvpp.jvpp.JVppRegistry; -import org.openvpp.jvpp.core.future.FutureJVppCore; +import io.fd.vpp.jvpp.JVppRegistry; +import io.fd.vpp.jvpp.core.future.FutureJVppCore; public final class VppCommonModule extends AbstractModule { protected void configure() { diff --git a/vpp-common/vpp-translate-test/src/main/java/io/fd/honeycomb/vpp/test/read/JvppDumpExecutorTest.java b/vpp-common/vpp-translate-test/src/main/java/io/fd/honeycomb/vpp/test/read/JvppDumpExecutorTest.java index a3ab1fc3e..da1600f2f 100644 --- a/vpp-common/vpp-translate-test/src/main/java/io/fd/honeycomb/vpp/test/read/JvppDumpExecutorTest.java +++ b/vpp-common/vpp-translate-test/src/main/java/io/fd/honeycomb/vpp/test/read/JvppDumpExecutorTest.java @@ -31,8 +31,8 @@ import java.util.concurrent.TimeoutException; import org.junit.Before; import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import org.openvpp.jvpp.VppInvocationException; -import org.openvpp.jvpp.core.future.FutureJVppCore; +import io.fd.vpp.jvpp.VppInvocationException; +import io.fd.vpp.jvpp.core.future.FutureJVppCore; /** * Generic test for implementation of {@link EntityDumpExecutor} diff --git a/vpp-common/vpp-translate-test/src/main/java/io/fd/honeycomb/vpp/test/read/ReaderCustomizerTest.java b/vpp-common/vpp-translate-test/src/main/java/io/fd/honeycomb/vpp/test/read/ReaderCustomizerTest.java index 22dc2b6fd..d4cb385c6 100644 --- a/vpp-common/vpp-translate-test/src/main/java/io/fd/honeycomb/vpp/test/read/ReaderCustomizerTest.java +++ b/vpp-common/vpp-translate-test/src/main/java/io/fd/honeycomb/vpp/test/read/ReaderCustomizerTest.java @@ -37,7 +37,7 @@ import org.mockito.MockitoAnnotations; import org.opendaylight.yangtools.concepts.Builder; import org.opendaylight.yangtools.yang.binding.DataObject; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; -import org.openvpp.jvpp.core.future.FutureJVppCore; +import io.fd.vpp.jvpp.core.future.FutureJVppCore; /** * Generic test for classes implementing {@link ReaderCustomizer} interface. diff --git a/vpp-common/vpp-translate-test/src/main/java/io/fd/honeycomb/vpp/test/util/FutureProducer.java b/vpp-common/vpp-translate-test/src/main/java/io/fd/honeycomb/vpp/test/util/FutureProducer.java index 6a81549f2..a75b3c0ab 100644 --- a/vpp-common/vpp-translate-test/src/main/java/io/fd/honeycomb/vpp/test/util/FutureProducer.java +++ b/vpp-common/vpp-translate-test/src/main/java/io/fd/honeycomb/vpp/test/util/FutureProducer.java @@ -18,8 +18,8 @@ package io.fd.honeycomb.vpp.test.util; import java.util.concurrent.CompletableFuture; import javax.annotation.Nonnull; -import org.openvpp.jvpp.VppCallbackException; -import org.openvpp.jvpp.core.future.FutureJVppCore; +import io.fd.vpp.jvpp.VppCallbackException; +import io.fd.vpp.jvpp.core.future.FutureJVppCore; /** *

VPP translation test helper, that produces instances of {@link CompletableFuture} with desired results.

diff --git a/vpp-common/vpp-translate-test/src/main/java/io/fd/honeycomb/vpp/test/util/InterfaceDumpHelper.java b/vpp-common/vpp-translate-test/src/main/java/io/fd/honeycomb/vpp/test/util/InterfaceDumpHelper.java index e7ebd0d88..c88ad3f44 100644 --- a/vpp-common/vpp-translate-test/src/main/java/io/fd/honeycomb/vpp/test/util/InterfaceDumpHelper.java +++ b/vpp-common/vpp-translate-test/src/main/java/io/fd/honeycomb/vpp/test/util/InterfaceDumpHelper.java @@ -21,9 +21,9 @@ import static org.mockito.Mockito.when; import java.util.Collections; import javax.annotation.Nonnull; -import org.openvpp.jvpp.core.dto.SwInterfaceDetails; -import org.openvpp.jvpp.core.dto.SwInterfaceDetailsReplyDump; -import org.openvpp.jvpp.core.future.FutureJVppCore; +import io.fd.vpp.jvpp.core.dto.SwInterfaceDetails; +import io.fd.vpp.jvpp.core.dto.SwInterfaceDetailsReplyDump; +import io.fd.vpp.jvpp.core.future.FutureJVppCore; /** * VPP translation test helper, that helps stubbing {@link FutureJVppCore#swInterfaceDump}. diff --git a/vpp-common/vpp-translate-test/src/main/java/io/fd/honeycomb/vpp/test/write/WriterCustomizerTest.java b/vpp-common/vpp-translate-test/src/main/java/io/fd/honeycomb/vpp/test/write/WriterCustomizerTest.java index 98bff86c4..900418c4c 100644 --- a/vpp-common/vpp-translate-test/src/main/java/io/fd/honeycomb/vpp/test/write/WriterCustomizerTest.java +++ b/vpp-common/vpp-translate-test/src/main/java/io/fd/honeycomb/vpp/test/write/WriterCustomizerTest.java @@ -26,7 +26,7 @@ import org.junit.Before; import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.MockitoAnnotations; -import org.openvpp.jvpp.core.future.FutureJVppCore; +import io.fd.vpp.jvpp.core.future.FutureJVppCore; /** * Generic test for classes implementing {@link WriterCustomizer} interface. diff --git a/vpp-common/vpp-translate-utils/src/main/java/io/fd/honeycomb/translate/vpp/util/AbstractInterfaceTypeCustomizer.java b/vpp-common/vpp-translate-utils/src/main/java/io/fd/honeycomb/translate/vpp/util/AbstractInterfaceTypeCustomizer.java index b466fa605..faf9be5d8 100644 --- a/vpp-common/vpp-translate-utils/src/main/java/io/fd/honeycomb/translate/vpp/util/AbstractInterfaceTypeCustomizer.java +++ b/vpp-common/vpp-translate-utils/src/main/java/io/fd/honeycomb/translate/vpp/util/AbstractInterfaceTypeCustomizer.java @@ -28,7 +28,7 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces. import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.Interface; import org.opendaylight.yangtools.yang.binding.DataObject; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; -import org.openvpp.jvpp.core.future.FutureJVppCore; +import io.fd.vpp.jvpp.core.future.FutureJVppCore; /** * Validation WriteCustomizers for Interface subnodes. diff --git a/vpp-common/vpp-translate-utils/src/main/java/io/fd/honeycomb/translate/vpp/util/FutureJVppCustomizer.java b/vpp-common/vpp-translate-utils/src/main/java/io/fd/honeycomb/translate/vpp/util/FutureJVppCustomizer.java index 5885e72a8..2a43ab503 100644 --- a/vpp-common/vpp-translate-utils/src/main/java/io/fd/honeycomb/translate/vpp/util/FutureJVppCustomizer.java +++ b/vpp-common/vpp-translate-utils/src/main/java/io/fd/honeycomb/translate/vpp/util/FutureJVppCustomizer.java @@ -19,7 +19,7 @@ package io.fd.honeycomb.translate.vpp.util; import com.google.common.annotations.Beta; import com.google.common.base.Preconditions; import javax.annotation.Nonnull; -import org.openvpp.jvpp.core.future.FutureJVppCore; +import io.fd.vpp.jvpp.core.future.FutureJVppCore; /** * Abstract utility to hold the vppApi reference. diff --git a/vpp-common/vpp-translate-utils/src/main/java/io/fd/honeycomb/translate/vpp/util/JvppReplyConsumer.java b/vpp-common/vpp-translate-utils/src/main/java/io/fd/honeycomb/translate/vpp/util/JvppReplyConsumer.java index 47ee5d14f..9fb04c618 100644 --- a/vpp-common/vpp-translate-utils/src/main/java/io/fd/honeycomb/translate/vpp/util/JvppReplyConsumer.java +++ b/vpp-common/vpp-translate-utils/src/main/java/io/fd/honeycomb/translate/vpp/util/JvppReplyConsumer.java @@ -25,8 +25,8 @@ import java.util.concurrent.TimeoutException; import javax.annotation.Nonnegative; import javax.annotation.Nonnull; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; -import org.openvpp.jvpp.VppBaseCallException; -import org.openvpp.jvpp.dto.JVppReply; +import io.fd.vpp.jvpp.VppBaseCallException; +import io.fd.vpp.jvpp.dto.JVppReply; /** * Trait providing logic for consuming reply's to jvpp api calls diff --git a/vpp-common/vpp-translate-utils/src/test/java/io/fd/honeycomb/translate/vpp/util/JvppReplyConsumerTest.java b/vpp-common/vpp-translate-utils/src/test/java/io/fd/honeycomb/translate/vpp/util/JvppReplyConsumerTest.java index af05ffd8f..75c14f1bc 100644 --- a/vpp-common/vpp-translate-utils/src/test/java/io/fd/honeycomb/translate/vpp/util/JvppReplyConsumerTest.java +++ b/vpp-common/vpp-translate-utils/src/test/java/io/fd/honeycomb/translate/vpp/util/JvppReplyConsumerTest.java @@ -15,7 +15,7 @@ import org.junit.Test; import org.opendaylight.yangtools.yang.binding.DataContainer; import org.opendaylight.yangtools.yang.binding.DataObject; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; -import org.openvpp.jvpp.dto.JVppReply; +import io.fd.vpp.jvpp.dto.JVppReply; public class JvppReplyConsumerTest implements JvppReplyConsumer { diff --git a/vpp-common/vpp-translate-utils/src/test/java/io/fd/honeycomb/translate/vpp/util/cache/DumpCacheManagerTest.java b/vpp-common/vpp-translate-utils/src/test/java/io/fd/honeycomb/translate/vpp/util/cache/DumpCacheManagerTest.java index abb9866ec..0d7702bc0 100644 --- a/vpp-common/vpp-translate-utils/src/test/java/io/fd/honeycomb/translate/vpp/util/cache/DumpCacheManagerTest.java +++ b/vpp-common/vpp-translate-utils/src/test/java/io/fd/honeycomb/translate/vpp/util/cache/DumpCacheManagerTest.java @@ -30,8 +30,8 @@ import org.junit.Before; import org.junit.Test; import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import org.openvpp.jvpp.core.dto.IpDetails; -import org.openvpp.jvpp.core.dto.IpDetailsReplyDump; +import io.fd.vpp.jvpp.core.dto.IpDetails; +import io.fd.vpp.jvpp.core.dto.IpDetailsReplyDump; public class DumpCacheManagerTest { -- cgit 1.2.3-korg