From 53f7c0c6184692a75cf2838a60ead925073587d5 Mon Sep 17 00:00:00 2001 From: Michal Cmarada Date: Thu, 28 Feb 2019 10:32:46 +0100 Subject: HC2VPP-404: Update package names for JVPP Fix package names for JVPP so it no longer contains vpp since it has been migrated outside of VPP project. Change-Id: I1e7a3fe4713beaaf7a1a0b41e7180d03bb7b74e5 Signed-off-by: Michal Cmarada --- .../java/io/fd/hc2vpp/management/rpc/CliInbandService.java | 4 ++-- .../io/fd/hc2vpp/management/state/StateReaderFactory.java | 2 +- .../io/fd/hc2vpp/management/state/VersionCustomizer.java | 12 ++++++------ .../io/fd/hc2vpp/management/VppManagementModuleTest.java | 2 +- .../io/fd/hc2vpp/management/rpc/CliInbandServiceTest.java | 4 ++-- .../java/io/fd/hc2vpp/management/state/VppStateTest.java | 10 +++++----- 6 files changed, 17 insertions(+), 17 deletions(-) (limited to 'vpp-management/impl') diff --git a/vpp-management/impl/src/main/java/io/fd/hc2vpp/management/rpc/CliInbandService.java b/vpp-management/impl/src/main/java/io/fd/hc2vpp/management/rpc/CliInbandService.java index 0450771fc..ebb0ffc13 100644 --- a/vpp-management/impl/src/main/java/io/fd/hc2vpp/management/rpc/CliInbandService.java +++ b/vpp-management/impl/src/main/java/io/fd/hc2vpp/management/rpc/CliInbandService.java @@ -19,8 +19,8 @@ package io.fd.hc2vpp.management.rpc; import com.google.inject.Inject; import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer; import io.fd.honeycomb.rpc.RpcService; -import io.fd.vpp.jvpp.core.dto.CliInband; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.CliInband; +import io.fd.jvpp.core.future.FutureJVppCore; import java.util.concurrent.CompletionStage; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.management.rev170315.CliInbandInput; diff --git a/vpp-management/impl/src/main/java/io/fd/hc2vpp/management/state/StateReaderFactory.java b/vpp-management/impl/src/main/java/io/fd/hc2vpp/management/state/StateReaderFactory.java index c8eb916e4..d15745723 100644 --- a/vpp-management/impl/src/main/java/io/fd/hc2vpp/management/state/StateReaderFactory.java +++ b/vpp-management/impl/src/main/java/io/fd/hc2vpp/management/state/StateReaderFactory.java @@ -24,7 +24,7 @@ import io.fd.honeycomb.translate.impl.read.GenericReader; import io.fd.honeycomb.translate.read.ReaderFactory; import io.fd.honeycomb.translate.read.registry.ModifiableReaderRegistryBuilder; import io.fd.honeycomb.translate.util.read.KeepaliveReaderWrapper; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.future.FutureJVppCore; import java.util.concurrent.ScheduledExecutorService; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.management.rev170315.VppState; diff --git a/vpp-management/impl/src/main/java/io/fd/hc2vpp/management/state/VersionCustomizer.java b/vpp-management/impl/src/main/java/io/fd/hc2vpp/management/state/VersionCustomizer.java index 5c0687865..1fbab489f 100644 --- a/vpp-management/impl/src/main/java/io/fd/hc2vpp/management/state/VersionCustomizer.java +++ b/vpp-management/impl/src/main/java/io/fd/hc2vpp/management/state/VersionCustomizer.java @@ -23,12 +23,12 @@ import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer; import io.fd.honeycomb.translate.read.ReadContext; import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.spi.read.ReaderCustomizer; -import io.fd.vpp.jvpp.core.dto.ShowVersion; -import io.fd.vpp.jvpp.core.dto.ShowVersionReply; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; -import io.fd.vpp.jvpp.dto.ControlPing; -import io.fd.vpp.jvpp.dto.ControlPingReply; -import io.fd.vpp.jvpp.dto.JVppReply; +import io.fd.jvpp.core.dto.ShowVersion; +import io.fd.jvpp.core.dto.ShowVersionReply; +import io.fd.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.dto.ControlPing; +import io.fd.jvpp.dto.ControlPingReply; +import io.fd.jvpp.dto.JVppReply; import java.util.concurrent.CompletionStage; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.management.rev170315.VppStateBuilder; diff --git a/vpp-management/impl/src/test/java/io/fd/hc2vpp/management/VppManagementModuleTest.java b/vpp-management/impl/src/test/java/io/fd/hc2vpp/management/VppManagementModuleTest.java index 8e06e0bc3..938596ba3 100644 --- a/vpp-management/impl/src/test/java/io/fd/hc2vpp/management/VppManagementModuleTest.java +++ b/vpp-management/impl/src/test/java/io/fd/hc2vpp/management/VppManagementModuleTest.java @@ -28,7 +28,7 @@ import com.google.inject.testing.fieldbinder.BoundFieldModule; import io.fd.honeycomb.translate.impl.read.registry.CompositeReaderRegistryBuilder; import io.fd.honeycomb.translate.read.ReaderFactory; import io.fd.honeycomb.translate.util.YangDAG; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.future.FutureJVppCore; import java.util.HashSet; import java.util.Set; import org.junit.Before; diff --git a/vpp-management/impl/src/test/java/io/fd/hc2vpp/management/rpc/CliInbandServiceTest.java b/vpp-management/impl/src/test/java/io/fd/hc2vpp/management/rpc/CliInbandServiceTest.java index 91f353bbc..0caae42f2 100644 --- a/vpp-management/impl/src/test/java/io/fd/hc2vpp/management/rpc/CliInbandServiceTest.java +++ b/vpp-management/impl/src/test/java/io/fd/hc2vpp/management/rpc/CliInbandServiceTest.java @@ -22,8 +22,8 @@ import static org.mockito.Mockito.when; import static org.mockito.MockitoAnnotations.initMocks; import io.fd.hc2vpp.common.test.util.FutureProducer; -import io.fd.vpp.jvpp.core.dto.CliInbandReply; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.CliInbandReply; +import io.fd.jvpp.core.future.FutureJVppCore; import org.junit.Test; import org.mockito.Mock; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.management.rev170315.CliInbandInput; diff --git a/vpp-management/impl/src/test/java/io/fd/hc2vpp/management/state/VppStateTest.java b/vpp-management/impl/src/test/java/io/fd/hc2vpp/management/state/VppStateTest.java index 0caae2c2e..087efee1b 100644 --- a/vpp-management/impl/src/test/java/io/fd/hc2vpp/management/state/VppStateTest.java +++ b/vpp-management/impl/src/test/java/io/fd/hc2vpp/management/state/VppStateTest.java @@ -33,11 +33,11 @@ import io.fd.honeycomb.translate.impl.read.registry.CompositeReaderRegistryBuild import io.fd.honeycomb.translate.read.ReadContext; import io.fd.honeycomb.translate.read.registry.ReaderRegistry; import io.fd.honeycomb.translate.util.YangDAG; -import io.fd.vpp.jvpp.core.dto.ShowVersion; -import io.fd.vpp.jvpp.core.dto.ShowVersionReply; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; -import io.fd.vpp.jvpp.dto.ControlPing; -import io.fd.vpp.jvpp.dto.ControlPingReply; +import io.fd.jvpp.core.dto.ShowVersion; +import io.fd.jvpp.core.dto.ShowVersionReply; +import io.fd.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.dto.ControlPing; +import io.fd.jvpp.dto.ControlPingReply; import javax.annotation.Nonnull; import org.junit.Before; import org.junit.Test; -- cgit 1.2.3-korg