Post split cleanup

- change groupIds
- change packages
- update poms

Change-Id: I343c5a292a67de1dd50687870ca4ab5b7276e93e
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
Signed-off-by: Marek Gradzki <mgradzki@cisco.com>

10 files changed, 20 insertions, 37 deletions

diff --git a/ioam/api/pom.xml b/ioam/api/pom.xml
index ebdadea05..456c0540d 100644
--- a/ioam/api/pom.xml
+++ b/ioam/api/pom.xml
@@ -19,11 +19,11 @@
     <groupId>io.fd.honeycomb.common</groupId>
     <artifactId>api-parent</artifactId>
     <version>1.16.12-SNAPSHOT</version>
-    <relativePath>../../common/api-parent</relativePath>
+
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
-  <groupId>io.fd.honeycomb.vppioam</groupId>
+  <groupId>io.fd.hc2vpp.ioam</groupId>
   <artifactId>vppioam-api</artifactId>
   <name>${project.artifactId}</name>
   <version>1.16.12-SNAPSHOT</version>
diff --git a/ioam/impl/pom.xml b/ioam/impl/pom.xml
index dd106d003..1ffdadcae 100644
--- a/ioam/impl/pom.xml
+++ b/ioam/impl/pom.xml
@@ -14,15 +14,15 @@
  limitations under the License.
 -->
 <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">
+
   <parent>
     <groupId>io.fd.honeycomb.common</groupId>
     <artifactId>impl-parent</artifactId>
     <version>1.16.12-SNAPSHOT</version>
-    <relativePath>../../common/impl-parent</relativePath>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
-  <groupId>io.fd.honeycomb.vppioam</groupId>
+  <groupId>io.fd.hc2vpp.ioam</groupId>
   <artifactId>vppioam-impl</artifactId>
   <name>${project.artifactId}</name>
   <version>1.16.12-SNAPSHOT</version>
@@ -94,12 +94,12 @@
         <version>${ioam.version}</version>
     </dependency>
     <dependency>
-      <groupId>io.fd.honeycomb.vpp</groupId>
+      <groupId>io.fd.hc2vpp.common</groupId>
       <artifactId>vpp-translate-utils</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>io.fd.honeycomb.vpp</groupId>
+      <groupId>io.fd.hc2vpp.common</groupId>
       <artifactId>vpp-translate-test</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
diff --git a/ioam/impl/src/main/java/io/fd/honeycomb/vppioam/impl/VppIoamModule.java b/ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/VppIoamModule.java
index 34975d71d..bf5df6389 100755
--- a/ioam/impl/src/main/java/io/fd/honeycomb/vppioam/impl/VppIoamModule.java
+++ b/ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/VppIoamModule.java
@@ -13,19 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.fd.honeycomb.vppioam.impl;
+package io.fd.hc2vpp.vppioam.impl;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.inject.AbstractModule;
 import com.google.inject.Singleton;
 import com.google.inject.multibindings.Multibinder;
-import com.google.inject.name.Names;
 import com.google.inject.Provider;
-import io.fd.honeycomb.data.init.DataTreeInitializer;
-import io.fd.honeycomb.translate.read.ReaderFactory;
+import io.fd.hc2vpp.vppioam.impl.config.VppIoamWriterFactory;
 import io.fd.honeycomb.translate.write.WriterFactory;
-import io.fd.honeycomb.vppioam.impl.config.VppIoamWriterFactory;
-import io.fd.honeycomb.vppioam.impl.util.JVppIoamProvider;
+import io.fd.hc2vpp.vppioam.impl.util.JVppIoamProvider;
 import io.fd.vpp.jvpp.ioamtrace.future.FutureJVppIoamtrace;
 import io.fd.vpp.jvpp.ioamtrace.future.FutureJVppIoamtraceFacade;
 import org.slf4j.Logger;
diff --git a/ioam/impl/src/main/java/io/fd/honeycomb/vppioam/impl/config/IoamTraceWriterCustomizer.java b/ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/config/IoamTraceWriterCustomizer.java
index 8a45e87df..bab92fc5d 100755
--- a/ioam/impl/src/main/java/io/fd/honeycomb/vppioam/impl/config/IoamTraceWriterCustomizer.java
+++ b/ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/config/IoamTraceWriterCustomizer.java
@@ -13,19 +13,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.fd.honeycomb.vppioam.impl.config;
+package io.fd.hc2vpp.vppioam.impl.config;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 import static com.google.common.base.Preconditions.checkState;
 
-import io.fd.honeycomb.translate.MappingContext;
+import io.fd.hc2vpp.vppioam.impl.util.FutureJVppIoamCustomizer;
 import io.fd.honeycomb.translate.spi.write.ListWriterCustomizer;
-import io.fd.honeycomb.translate.vpp.util.ByteDataTranslator;
-import io.fd.honeycomb.translate.vpp.util.JvppReplyConsumer;
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
+import io.fd.hc2vpp.common.translate.util.ByteDataTranslator;
+import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer;
 import io.fd.honeycomb.translate.write.WriteContext;
 import io.fd.honeycomb.translate.write.WriteFailedException;
-import io.fd.honeycomb.vppioam.impl.util.FutureJVppIoamCustomizer;
 
 import io.fd.vpp.jvpp.ioamtrace.dto.TraceProfileAdd;
 import io.fd.vpp.jvpp.ioamtrace.dto.TraceProfileAddReply;
@@ -33,7 +31,6 @@ import io.fd.vpp.jvpp.ioamtrace.dto.TraceProfileDel;
 import io.fd.vpp.jvpp.ioamtrace.dto.TraceProfileDelReply;
 import io.fd.vpp.jvpp.ioamtrace.future.FutureJVppIoamtrace;
 
-import java.util.concurrent.CompletionStage;
 import javax.annotation.Nonnull;
 import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.ioam.sb.trace.rev160512.IoamTraceConfig;
 import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.ioam.sb.trace.rev160512.ioam.trace.config.TraceConfig;
diff --git a/ioam/impl/src/main/java/io/fd/honeycomb/vppioam/impl/config/VppIoamWriterFactory.java b/ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/config/VppIoamWriterFactory.java
index 40311cd8c..a5773956c 100755
--- a/ioam/impl/src/main/java/io/fd/honeycomb/vppioam/impl/config/VppIoamWriterFactory.java
+++ b/ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/config/VppIoamWriterFactory.java
@@ -14,13 +14,10 @@
  * limitations under the License.
  */
 
-package io.fd.honeycomb.vppioam.impl.config;
+package io.fd.hc2vpp.vppioam.impl.config;
 
-import com.google.common.collect.Sets;
 import com.google.inject.Inject;
-import com.google.inject.name.Named;
 import io.fd.honeycomb.translate.impl.write.GenericListWriter;
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
 import io.fd.honeycomb.translate.write.WriterFactory;
 import io.fd.honeycomb.translate.write.registry.ModifiableWriterRegistryBuilder;
 import javax.annotation.Nonnull;
diff --git a/ioam/impl/src/main/java/io/fd/honeycomb/vppioam/impl/util/FutureJVppIoamCustomizer.java b/ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/util/FutureJVppIoamCustomizer.java
index b60581a1b..a93ea379c 100755
--- a/ioam/impl/src/main/java/io/fd/honeycomb/vppioam/impl/util/FutureJVppIoamCustomizer.java
+++ b/ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/util/FutureJVppIoamCustomizer.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.fd.honeycomb.vppioam.impl.util;
+package io.fd.hc2vpp.vppioam.impl.util;
 
 import com.google.common.annotations.Beta;
 import com.google.common.base.Preconditions;
diff --git a/ioam/impl/src/main/java/io/fd/honeycomb/vppioam/impl/util/JVppIoamProvider.java b/ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/util/JVppIoamProvider.java
index d95266457..a34715ca6 100755
--- a/ioam/impl/src/main/java/io/fd/honeycomb/vppioam/impl/util/JVppIoamProvider.java
+++ b/ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/util/JVppIoamProvider.java
@@ -14,14 +14,12 @@
  * limitations under the License.
  */
 
-package io.fd.honeycomb.vppioam.impl.util;
+package io.fd.hc2vpp.vppioam.impl.util;
 
 import com.google.inject.Inject;
-import com.google.inject.Provider;
 import io.fd.honeycomb.infra.distro.ProviderTrait;
 import java.io.IOException;
 import io.fd.vpp.jvpp.JVppRegistry;
-import io.fd.vpp.jvpp.ioamtrace.future.FutureJVppIoamtrace;
 import io.fd.vpp.jvpp.ioamtrace.future.FutureJVppIoamtraceFacade;
 import io.fd.vpp.jvpp.ioamtrace.JVppIoamtraceImpl;
 import org.slf4j.Logger;
diff --git a/ioam/impl/src/test/java/io/fd/honeycomb/vppioam/impl/VppIoamModuleTest.java b/ioam/impl/src/test/java/io/fd/hc2vpp/vppioam/impl/VppIoamModuleTest.java
index d9176d39d..b1af9d5b2 100644
--- a/ioam/impl/src/test/java/io/fd/honeycomb/vppioam/impl/VppIoamModuleTest.java
+++ b/ioam/impl/src/test/java/io/fd/hc2vpp/vppioam/impl/VppIoamModuleTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.fd.honeycomb.vppioam.impl;
+package io.fd.hc2vpp.vppioam.impl;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.not;
diff --git a/ioam/impl/src/test/java/io/fd/honeycomb/vppioam/impl/config/IoamTraceWriterCustomizerTest.java b/ioam/impl/src/test/java/io/fd/hc2vpp/vppioam/impl/config/IoamTraceWriterCustomizerTest.java
index 8c182dd01..9f5290c6f 100644
--- a/ioam/impl/src/test/java/io/fd/honeycomb/vppioam/impl/config/IoamTraceWriterCustomizerTest.java
+++ b/ioam/impl/src/test/java/io/fd/hc2vpp/vppioam/impl/config/IoamTraceWriterCustomizerTest.java
@@ -14,19 +14,16 @@
  * limitations under the License.
  */
 
-package io.fd.honeycomb.vppioam.impl.config;
+package io.fd.hc2vpp.vppioam.impl.config;
 
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
 
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
 import io.fd.honeycomb.translate.write.WriteFailedException;
-import io.fd.honeycomb.vpp.test.write.WriterCustomizerTest;
+import io.fd.hc2vpp.common.test.write.WriterCustomizerTest;
 import org.junit.Test;
 import org.mockito.Mock;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
@@ -36,8 +33,6 @@ import io.fd.vpp.jvpp.ioamtrace.dto.TraceProfileAddReply;
 import io.fd.vpp.jvpp.ioamtrace.dto.TraceProfileDel;
 import io.fd.vpp.jvpp.ioamtrace.dto.TraceProfileDelReply;
 import io.fd.vpp.jvpp.ioamtrace.future.FutureJVppIoamtrace;
-import io.fd.vpp.jvpp.VppBaseCallException;
-import io.fd.vpp.jvpp.VppCallbackException;
 
 import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.ioam.sb.trace.rev160512.IoamTraceConfig;
 import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.ioam.sb.trace.rev160512.ioam.trace.config.TraceConfig;
diff --git a/ioam/pom.xml b/ioam/pom.xml
index 2708114ce..3153dc29d 100644
--- a/ioam/pom.xml
+++ b/ioam/pom.xml
@@ -19,10 +19,9 @@
     <groupId>io.fd.honeycomb.common</groupId>
     <artifactId>honeycomb-parent</artifactId>
     <version>1.16.12-SNAPSHOT</version>
-    <relativePath>../common/honeycomb-parent</relativePath>
   </parent>
 
-  <groupId>io.fd.honeycomb.ioam</groupId>
+  <groupId>io.fd.hc2vpp.ioam</groupId>
   <artifactId>vppioam-aggregator</artifactId>
   <version>1.16.12-SNAPSHOT</version>
   <name>${project.artifactId}</name>