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 --- .../src/main/java/io/fd/hc2vpp/vppnsh/impl/VppNshModule.java | 8 ++++---- .../fd/hc2vpp/vppnsh/impl/config/NshEntryWriterCustomizer.java | 6 +++--- .../fd/hc2vpp/vppnsh/impl/config/NshMapWriterCustomizer.java | 6 +++--- .../io/fd/hc2vpp/vppnsh/impl/config/VppNshWriterFactory.java | 2 +- .../fd/hc2vpp/vppnsh/impl/oper/NshEntryReaderCustomizer.java | 8 ++++---- .../io/fd/hc2vpp/vppnsh/impl/oper/NshMapReaderCustomizer.java | 8 ++++---- .../io/fd/hc2vpp/vppnsh/impl/oper/VppNshReaderFactory.java | 2 +- .../io/fd/hc2vpp/vppnsh/impl/util/FutureJVppNshCustomizer.java | 2 +- .../java/io/fd/hc2vpp/vppnsh/impl/util/JVppNshProvider.java | 6 +++--- .../test/java/io/fd/hc2vpp/vppnsh/impl/VppNshModuleTest.java | 8 ++++---- .../vppnsh/impl/config/NshEntryWriterCustomizerTest.java | 8 ++++---- .../hc2vpp/vppnsh/impl/config/NshMapWriterCustomizerTest.java | 8 ++++---- .../hc2vpp/vppnsh/impl/oper/NshEntryReaderCustomizerTest.java | 10 +++++----- .../fd/hc2vpp/vppnsh/impl/oper/NshMapReaderCustomizerTest.java | 10 +++++----- 14 files changed, 46 insertions(+), 46 deletions(-) (limited to 'nsh/impl/src') diff --git a/nsh/impl/src/main/java/io/fd/hc2vpp/vppnsh/impl/VppNshModule.java b/nsh/impl/src/main/java/io/fd/hc2vpp/vppnsh/impl/VppNshModule.java index aaa1d6c4e..a6fb70407 100755 --- a/nsh/impl/src/main/java/io/fd/hc2vpp/vppnsh/impl/VppNshModule.java +++ b/nsh/impl/src/main/java/io/fd/hc2vpp/vppnsh/impl/VppNshModule.java @@ -22,14 +22,14 @@ import com.google.inject.Provider; import com.google.inject.Singleton; import com.google.inject.multibindings.Multibinder; import com.google.inject.name.Names; -import io.fd.honeycomb.translate.read.ReaderFactory; import io.fd.hc2vpp.common.translate.util.NamingContext; -import io.fd.honeycomb.translate.write.WriterFactory; import io.fd.hc2vpp.vppnsh.impl.config.VppNshWriterFactory; import io.fd.hc2vpp.vppnsh.impl.oper.VppNshReaderFactory; import io.fd.hc2vpp.vppnsh.impl.util.JVppNshProvider; -import io.fd.vpp.jvpp.nsh.future.FutureJVppNsh; -import io.fd.vpp.jvpp.nsh.future.FutureJVppNshFacade; +import io.fd.honeycomb.translate.read.ReaderFactory; +import io.fd.honeycomb.translate.write.WriterFactory; +import io.fd.jvpp.nsh.future.FutureJVppNsh; +import io.fd.jvpp.nsh.future.FutureJVppNshFacade; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/nsh/impl/src/main/java/io/fd/hc2vpp/vppnsh/impl/config/NshEntryWriterCustomizer.java b/nsh/impl/src/main/java/io/fd/hc2vpp/vppnsh/impl/config/NshEntryWriterCustomizer.java index 540ba48e8..deac9beab 100755 --- a/nsh/impl/src/main/java/io/fd/hc2vpp/vppnsh/impl/config/NshEntryWriterCustomizer.java +++ b/nsh/impl/src/main/java/io/fd/hc2vpp/vppnsh/impl/config/NshEntryWriterCustomizer.java @@ -26,9 +26,9 @@ import io.fd.hc2vpp.vppnsh.impl.util.FutureJVppNshCustomizer; import io.fd.honeycomb.translate.spi.write.ListWriterCustomizer; import io.fd.honeycomb.translate.write.WriteContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.nsh.dto.NshAddDelEntry; -import io.fd.vpp.jvpp.nsh.dto.NshAddDelEntryReply; -import io.fd.vpp.jvpp.nsh.future.FutureJVppNsh; +import io.fd.jvpp.nsh.dto.NshAddDelEntry; +import io.fd.jvpp.nsh.dto.NshAddDelEntryReply; +import io.fd.jvpp.nsh.future.FutureJVppNsh; import java.util.List; import java.util.concurrent.CompletionStage; import javax.annotation.Nonnull; diff --git a/nsh/impl/src/main/java/io/fd/hc2vpp/vppnsh/impl/config/NshMapWriterCustomizer.java b/nsh/impl/src/main/java/io/fd/hc2vpp/vppnsh/impl/config/NshMapWriterCustomizer.java index 91be553a6..75fe90768 100755 --- a/nsh/impl/src/main/java/io/fd/hc2vpp/vppnsh/impl/config/NshMapWriterCustomizer.java +++ b/nsh/impl/src/main/java/io/fd/hc2vpp/vppnsh/impl/config/NshMapWriterCustomizer.java @@ -27,9 +27,9 @@ import io.fd.honeycomb.translate.MappingContext; import io.fd.honeycomb.translate.spi.write.ListWriterCustomizer; import io.fd.honeycomb.translate.write.WriteContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.nsh.dto.NshAddDelMap; -import io.fd.vpp.jvpp.nsh.dto.NshAddDelMapReply; -import io.fd.vpp.jvpp.nsh.future.FutureJVppNsh; +import io.fd.jvpp.nsh.dto.NshAddDelMap; +import io.fd.jvpp.nsh.dto.NshAddDelMapReply; +import io.fd.jvpp.nsh.future.FutureJVppNsh; import java.util.concurrent.CompletionStage; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.nsh.rev170315.None; diff --git a/nsh/impl/src/main/java/io/fd/hc2vpp/vppnsh/impl/config/VppNshWriterFactory.java b/nsh/impl/src/main/java/io/fd/hc2vpp/vppnsh/impl/config/VppNshWriterFactory.java index 9ab086ca8..430eeabd1 100755 --- a/nsh/impl/src/main/java/io/fd/hc2vpp/vppnsh/impl/config/VppNshWriterFactory.java +++ b/nsh/impl/src/main/java/io/fd/hc2vpp/vppnsh/impl/config/VppNshWriterFactory.java @@ -23,7 +23,7 @@ import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.honeycomb.translate.impl.write.GenericListWriter; import io.fd.honeycomb.translate.write.WriterFactory; import io.fd.honeycomb.translate.write.registry.ModifiableWriterRegistryBuilder; -import io.fd.vpp.jvpp.nsh.future.FutureJVppNsh; +import io.fd.jvpp.nsh.future.FutureJVppNsh; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.nsh.rev170315.NshMdType1Augment; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.nsh.rev170315.NshMdType2Augment; diff --git a/nsh/impl/src/main/java/io/fd/hc2vpp/vppnsh/impl/oper/NshEntryReaderCustomizer.java b/nsh/impl/src/main/java/io/fd/hc2vpp/vppnsh/impl/oper/NshEntryReaderCustomizer.java index 011672749..d3b4838fe 100755 --- a/nsh/impl/src/main/java/io/fd/hc2vpp/vppnsh/impl/oper/NshEntryReaderCustomizer.java +++ b/nsh/impl/src/main/java/io/fd/hc2vpp/vppnsh/impl/oper/NshEntryReaderCustomizer.java @@ -26,10 +26,10 @@ import io.fd.honeycomb.translate.read.ReadContext; import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.spi.read.Initialized; import io.fd.honeycomb.translate.spi.read.InitializingListReaderCustomizer; -import io.fd.vpp.jvpp.nsh.dto.NshEntryDetails; -import io.fd.vpp.jvpp.nsh.dto.NshEntryDetailsReplyDump; -import io.fd.vpp.jvpp.nsh.dto.NshEntryDump; -import io.fd.vpp.jvpp.nsh.future.FutureJVppNsh; +import io.fd.jvpp.nsh.dto.NshEntryDetails; +import io.fd.jvpp.nsh.dto.NshEntryDetailsReplyDump; +import io.fd.jvpp.nsh.dto.NshEntryDump; +import io.fd.jvpp.nsh.future.FutureJVppNsh; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; diff --git a/nsh/impl/src/main/java/io/fd/hc2vpp/vppnsh/impl/oper/NshMapReaderCustomizer.java b/nsh/impl/src/main/java/io/fd/hc2vpp/vppnsh/impl/oper/NshMapReaderCustomizer.java index 4e8d31b3f..a23fa155b 100755 --- a/nsh/impl/src/main/java/io/fd/hc2vpp/vppnsh/impl/oper/NshMapReaderCustomizer.java +++ b/nsh/impl/src/main/java/io/fd/hc2vpp/vppnsh/impl/oper/NshMapReaderCustomizer.java @@ -27,10 +27,10 @@ import io.fd.honeycomb.translate.read.ReadContext; import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.spi.read.Initialized; import io.fd.honeycomb.translate.spi.read.InitializingListReaderCustomizer; -import io.fd.vpp.jvpp.nsh.dto.NshMapDetails; -import io.fd.vpp.jvpp.nsh.dto.NshMapDetailsReplyDump; -import io.fd.vpp.jvpp.nsh.dto.NshMapDump; -import io.fd.vpp.jvpp.nsh.future.FutureJVppNsh; +import io.fd.jvpp.nsh.dto.NshMapDetails; +import io.fd.jvpp.nsh.dto.NshMapDetailsReplyDump; +import io.fd.jvpp.nsh.dto.NshMapDump; +import io.fd.jvpp.nsh.future.FutureJVppNsh; import java.util.ArrayList; import java.util.Collections; import java.util.List; diff --git a/nsh/impl/src/main/java/io/fd/hc2vpp/vppnsh/impl/oper/VppNshReaderFactory.java b/nsh/impl/src/main/java/io/fd/hc2vpp/vppnsh/impl/oper/VppNshReaderFactory.java index 41027c24c..ba098fca4 100755 --- a/nsh/impl/src/main/java/io/fd/hc2vpp/vppnsh/impl/oper/VppNshReaderFactory.java +++ b/nsh/impl/src/main/java/io/fd/hc2vpp/vppnsh/impl/oper/VppNshReaderFactory.java @@ -22,7 +22,7 @@ import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.honeycomb.translate.impl.read.GenericInitListReader; import io.fd.honeycomb.translate.read.ReaderFactory; import io.fd.honeycomb.translate.read.registry.ModifiableReaderRegistryBuilder; -import io.fd.vpp.jvpp.nsh.future.FutureJVppNsh; +import io.fd.jvpp.nsh.future.FutureJVppNsh; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.nsh.rev170315.VppNshState; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.nsh.rev170315.VppNshStateBuilder; diff --git a/nsh/impl/src/main/java/io/fd/hc2vpp/vppnsh/impl/util/FutureJVppNshCustomizer.java b/nsh/impl/src/main/java/io/fd/hc2vpp/vppnsh/impl/util/FutureJVppNshCustomizer.java index ced6fa7ee..f5f8782a1 100755 --- a/nsh/impl/src/main/java/io/fd/hc2vpp/vppnsh/impl/util/FutureJVppNshCustomizer.java +++ b/nsh/impl/src/main/java/io/fd/hc2vpp/vppnsh/impl/util/FutureJVppNshCustomizer.java @@ -18,7 +18,7 @@ package io.fd.hc2vpp.vppnsh.impl.util; import com.google.common.annotations.Beta; import com.google.common.base.Preconditions; -import io.fd.vpp.jvpp.nsh.future.FutureJVppNsh; +import io.fd.jvpp.nsh.future.FutureJVppNsh; import javax.annotation.Nonnull; /** diff --git a/nsh/impl/src/main/java/io/fd/hc2vpp/vppnsh/impl/util/JVppNshProvider.java b/nsh/impl/src/main/java/io/fd/hc2vpp/vppnsh/impl/util/JVppNshProvider.java index 8f25a44e9..2f4977b50 100755 --- a/nsh/impl/src/main/java/io/fd/hc2vpp/vppnsh/impl/util/JVppNshProvider.java +++ b/nsh/impl/src/main/java/io/fd/hc2vpp/vppnsh/impl/util/JVppNshProvider.java @@ -19,9 +19,9 @@ package io.fd.hc2vpp.vppnsh.impl.util; import com.google.inject.Inject; import io.fd.honeycomb.binding.init.ProviderTrait; import io.fd.honeycomb.data.init.ShutdownHandler; -import io.fd.vpp.jvpp.JVppRegistry; -import io.fd.vpp.jvpp.nsh.JVppNshImpl; -import io.fd.vpp.jvpp.nsh.future.FutureJVppNshFacade; +import io.fd.jvpp.JVppRegistry; +import io.fd.jvpp.nsh.JVppNshImpl; +import io.fd.jvpp.nsh.future.FutureJVppNshFacade; import java.io.IOException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/nsh/impl/src/test/java/io/fd/hc2vpp/vppnsh/impl/VppNshModuleTest.java b/nsh/impl/src/test/java/io/fd/hc2vpp/vppnsh/impl/VppNshModuleTest.java index c4b526cfd..f2e10ad88 100644 --- a/nsh/impl/src/test/java/io/fd/hc2vpp/vppnsh/impl/VppNshModuleTest.java +++ b/nsh/impl/src/test/java/io/fd/hc2vpp/vppnsh/impl/VppNshModuleTest.java @@ -30,14 +30,14 @@ import com.google.inject.Provider; import com.google.inject.name.Named; import com.google.inject.testing.fieldbinder.Bind; import com.google.inject.testing.fieldbinder.BoundFieldModule; -import io.fd.honeycomb.translate.read.ReaderFactory; +import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.honeycomb.translate.impl.read.registry.CompositeReaderRegistryBuilder; import io.fd.honeycomb.translate.impl.write.registry.FlatWriterRegistryBuilder; -import io.fd.hc2vpp.common.translate.util.NamingContext; +import io.fd.honeycomb.translate.read.ReaderFactory; import io.fd.honeycomb.translate.util.YangDAG; import io.fd.honeycomb.translate.write.WriterFactory; -import io.fd.vpp.jvpp.JVppRegistry; -import io.fd.vpp.jvpp.nsh.future.FutureJVppNshFacade; +import io.fd.jvpp.JVppRegistry; +import io.fd.jvpp.nsh.future.FutureJVppNshFacade; import java.util.HashSet; import java.util.Set; import org.junit.Before; diff --git a/nsh/impl/src/test/java/io/fd/hc2vpp/vppnsh/impl/config/NshEntryWriterCustomizerTest.java b/nsh/impl/src/test/java/io/fd/hc2vpp/vppnsh/impl/config/NshEntryWriterCustomizerTest.java index 27a6899fb..28e9cd45d 100644 --- a/nsh/impl/src/test/java/io/fd/hc2vpp/vppnsh/impl/config/NshEntryWriterCustomizerTest.java +++ b/nsh/impl/src/test/java/io/fd/hc2vpp/vppnsh/impl/config/NshEntryWriterCustomizerTest.java @@ -25,10 +25,10 @@ import static org.mockito.Mockito.verify; import io.fd.hc2vpp.common.test.write.WriterCustomizerTest; import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.VppBaseCallException; -import io.fd.vpp.jvpp.nsh.dto.NshAddDelEntry; -import io.fd.vpp.jvpp.nsh.dto.NshAddDelEntryReply; -import io.fd.vpp.jvpp.nsh.future.FutureJVppNsh; +import io.fd.jvpp.VppBaseCallException; +import io.fd.jvpp.nsh.dto.NshAddDelEntry; +import io.fd.jvpp.nsh.dto.NshAddDelEntryReply; +import io.fd.jvpp.nsh.future.FutureJVppNsh; import org.junit.Test; import org.mockito.Mock; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.nsh.rev170315.Ethernet; diff --git a/nsh/impl/src/test/java/io/fd/hc2vpp/vppnsh/impl/config/NshMapWriterCustomizerTest.java b/nsh/impl/src/test/java/io/fd/hc2vpp/vppnsh/impl/config/NshMapWriterCustomizerTest.java index 8343c1481..963e38106 100644 --- a/nsh/impl/src/test/java/io/fd/hc2vpp/vppnsh/impl/config/NshMapWriterCustomizerTest.java +++ b/nsh/impl/src/test/java/io/fd/hc2vpp/vppnsh/impl/config/NshMapWriterCustomizerTest.java @@ -25,10 +25,10 @@ import static org.mockito.Mockito.verify; import io.fd.hc2vpp.common.test.write.WriterCustomizerTest; import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.VppBaseCallException; -import io.fd.vpp.jvpp.nsh.dto.NshAddDelMap; -import io.fd.vpp.jvpp.nsh.dto.NshAddDelMapReply; -import io.fd.vpp.jvpp.nsh.future.FutureJVppNsh; +import io.fd.jvpp.VppBaseCallException; +import io.fd.jvpp.nsh.dto.NshAddDelMap; +import io.fd.jvpp.nsh.dto.NshAddDelMapReply; +import io.fd.jvpp.nsh.future.FutureJVppNsh; import org.junit.Test; import org.mockito.Mock; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.nsh.rev170315.Swap; diff --git a/nsh/impl/src/test/java/io/fd/hc2vpp/vppnsh/impl/oper/NshEntryReaderCustomizerTest.java b/nsh/impl/src/test/java/io/fd/hc2vpp/vppnsh/impl/oper/NshEntryReaderCustomizerTest.java index 555e7bf34..ffe6802f9 100644 --- a/nsh/impl/src/test/java/io/fd/hc2vpp/vppnsh/impl/oper/NshEntryReaderCustomizerTest.java +++ b/nsh/impl/src/test/java/io/fd/hc2vpp/vppnsh/impl/oper/NshEntryReaderCustomizerTest.java @@ -26,11 +26,11 @@ import io.fd.hc2vpp.common.test.read.ListReaderCustomizerTest; import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.spi.read.ReaderCustomizer; -import io.fd.vpp.jvpp.VppBaseCallException; -import io.fd.vpp.jvpp.nsh.dto.NshEntryDetails; -import io.fd.vpp.jvpp.nsh.dto.NshEntryDetailsReplyDump; -import io.fd.vpp.jvpp.nsh.dto.NshEntryDump; -import io.fd.vpp.jvpp.nsh.future.FutureJVppNsh; +import io.fd.jvpp.VppBaseCallException; +import io.fd.jvpp.nsh.dto.NshEntryDetails; +import io.fd.jvpp.nsh.dto.NshEntryDetailsReplyDump; +import io.fd.jvpp.nsh.dto.NshEntryDump; +import io.fd.jvpp.nsh.future.FutureJVppNsh; import java.util.List; import org.junit.Test; import org.mockito.Mock; diff --git a/nsh/impl/src/test/java/io/fd/hc2vpp/vppnsh/impl/oper/NshMapReaderCustomizerTest.java b/nsh/impl/src/test/java/io/fd/hc2vpp/vppnsh/impl/oper/NshMapReaderCustomizerTest.java index 33b432825..245eeac07 100644 --- a/nsh/impl/src/test/java/io/fd/hc2vpp/vppnsh/impl/oper/NshMapReaderCustomizerTest.java +++ b/nsh/impl/src/test/java/io/fd/hc2vpp/vppnsh/impl/oper/NshMapReaderCustomizerTest.java @@ -26,11 +26,11 @@ import io.fd.hc2vpp.common.test.read.ListReaderCustomizerTest; import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.spi.read.ReaderCustomizer; -import io.fd.vpp.jvpp.VppBaseCallException; -import io.fd.vpp.jvpp.nsh.dto.NshMapDetails; -import io.fd.vpp.jvpp.nsh.dto.NshMapDetailsReplyDump; -import io.fd.vpp.jvpp.nsh.dto.NshMapDump; -import io.fd.vpp.jvpp.nsh.future.FutureJVppNsh; +import io.fd.jvpp.VppBaseCallException; +import io.fd.jvpp.nsh.dto.NshMapDetails; +import io.fd.jvpp.nsh.dto.NshMapDetailsReplyDump; +import io.fd.jvpp.nsh.dto.NshMapDump; +import io.fd.jvpp.nsh.future.FutureJVppNsh; import java.util.List; import org.junit.Test; import org.mockito.Mock; -- cgit 1.2.3-korg