Fix: Split codec package into api module to fix maven build failure
Change-Id: I5f57163f329ab21bb362dcf2bef54a3a6664ce10
diff --git a/drivers/lisp/BUCK b/drivers/lisp/BUCK
index c43fb2e..cd5eb9e 100644
--- a/drivers/lisp/BUCK
+++ b/drivers/lisp/BUCK
@@ -3,18 +3,17 @@
'//protocols/lisp/api:onos-protocols-lisp-api',
'//protocols/lisp/msg:onos-protocols-lisp-msg',
'//apps/mappingmanagement/api:onos-apps-mappingmanagement-api',
- '//apps/mappingmanagement/web:onos-apps-mappingmanagement-web',
'//core/store/serializers:onos-core-serializers'
]
TEST_DEPS = [
'//lib:TEST_ADAPTERS',
+ '//apps/mappingmanagement/api:onos-apps-mappingmanagement-api-tests',
'//core/api:onos-api-tests',
'//lib:jersey-test-framework-core',
'//lib:jersey-test-framework-jetty',
'//utils/osgi:onlab-osgi-tests',
'//web/api:onos-rest-tests',
- '//apps/mappingmanagement/web:onos-apps-mappingmanagement-web-tests',
]
BUNDLES = [
diff --git a/drivers/lisp/pom.xml b/drivers/lisp/pom.xml
index 419ea16..ed3fec3 100644
--- a/drivers/lisp/pom.xml
+++ b/drivers/lisp/pom.xml
@@ -54,12 +54,7 @@
</dependency>
<dependency>
<groupId>org.onosproject</groupId>
- <artifactId>onos-app-mapping-web</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.onosproject</groupId>
- <artifactId>onos-app-mapping-web</artifactId>
+ <artifactId>onos-mapping-api</artifactId>
<version>${project.version}</version>
<classifier>tests</classifier>
<scope>test</scope>
diff --git a/drivers/lisp/src/main/java/org/onosproject/drivers/lisp/extensions/LispMappingExtensionCodecRegistrator.java b/drivers/lisp/src/main/java/org/onosproject/drivers/lisp/extensions/LispMappingExtensionCodecRegistrator.java
index d9e5e68..ebb51d2 100644
--- a/drivers/lisp/src/main/java/org/onosproject/drivers/lisp/extensions/LispMappingExtensionCodecRegistrator.java
+++ b/drivers/lisp/src/main/java/org/onosproject/drivers/lisp/extensions/LispMappingExtensionCodecRegistrator.java
@@ -32,7 +32,7 @@
import org.onosproject.drivers.lisp.extensions.codec.LispSrcDstAddressCodec;
import org.onosproject.drivers.lisp.extensions.codec.LispTeAddressCodec;
import org.onosproject.drivers.lisp.extensions.codec.LispTeRecordCodec;
-import org.onosproject.mapping.web.MappingCodecRegistrator;
+import org.onosproject.mapping.MappingCodecRegistrator;
import org.slf4j.Logger;
import static org.slf4j.LoggerFactory.getLogger;
diff --git a/drivers/lisp/src/test/java/org/onosproject/drivers/lisp/extensions/codec/LispAppDataAddressCodecTest.java b/drivers/lisp/src/test/java/org/onosproject/drivers/lisp/extensions/codec/LispAppDataAddressCodecTest.java
index d1fa5bd..6b52c0b 100644
--- a/drivers/lisp/src/test/java/org/onosproject/drivers/lisp/extensions/codec/LispAppDataAddressCodecTest.java
+++ b/drivers/lisp/src/test/java/org/onosproject/drivers/lisp/extensions/codec/LispAppDataAddressCodecTest.java
@@ -29,7 +29,7 @@
import org.onosproject.drivers.lisp.extensions.LispAppDataAddress;
import org.onosproject.drivers.lisp.extensions.LispMappingExtensionCodecRegistrator;
import org.onosproject.mapping.addresses.MappingAddresses;
-import org.onosproject.mapping.web.codec.MappingAddressJsonMatcher;
+import org.onosproject.mapping.codec.MappingAddressJsonMatcher;
import java.io.IOException;
import java.io.InputStream;
diff --git a/drivers/lisp/src/test/java/org/onosproject/drivers/lisp/extensions/codec/LispAsAddressCodecTest.java b/drivers/lisp/src/test/java/org/onosproject/drivers/lisp/extensions/codec/LispAsAddressCodecTest.java
index 1b1f17b..3b0bea1 100644
--- a/drivers/lisp/src/test/java/org/onosproject/drivers/lisp/extensions/codec/LispAsAddressCodecTest.java
+++ b/drivers/lisp/src/test/java/org/onosproject/drivers/lisp/extensions/codec/LispAsAddressCodecTest.java
@@ -29,7 +29,7 @@
import org.onosproject.drivers.lisp.extensions.LispAsAddress;
import org.onosproject.drivers.lisp.extensions.LispMappingExtensionCodecRegistrator;
import org.onosproject.mapping.addresses.MappingAddresses;
-import org.onosproject.mapping.web.codec.MappingAddressJsonMatcher;
+import org.onosproject.mapping.codec.MappingAddressJsonMatcher;
import java.io.IOException;
import java.io.InputStream;
diff --git a/drivers/lisp/src/test/java/org/onosproject/drivers/lisp/extensions/codec/LispGcAddressCodecTest.java b/drivers/lisp/src/test/java/org/onosproject/drivers/lisp/extensions/codec/LispGcAddressCodecTest.java
index 356254b..2dc4bd1 100644
--- a/drivers/lisp/src/test/java/org/onosproject/drivers/lisp/extensions/codec/LispGcAddressCodecTest.java
+++ b/drivers/lisp/src/test/java/org/onosproject/drivers/lisp/extensions/codec/LispGcAddressCodecTest.java
@@ -29,7 +29,7 @@
import org.onosproject.drivers.lisp.extensions.LispGcAddress;
import org.onosproject.drivers.lisp.extensions.LispMappingExtensionCodecRegistrator;
import org.onosproject.mapping.addresses.MappingAddresses;
-import org.onosproject.mapping.web.codec.MappingAddressJsonMatcher;
+import org.onosproject.mapping.codec.MappingAddressJsonMatcher;
import java.io.IOException;
import java.io.InputStream;
diff --git a/drivers/lisp/src/test/java/org/onosproject/drivers/lisp/extensions/codec/LispListAddressCodecTest.java b/drivers/lisp/src/test/java/org/onosproject/drivers/lisp/extensions/codec/LispListAddressCodecTest.java
index 0a3f0a1..8608ebd 100644
--- a/drivers/lisp/src/test/java/org/onosproject/drivers/lisp/extensions/codec/LispListAddressCodecTest.java
+++ b/drivers/lisp/src/test/java/org/onosproject/drivers/lisp/extensions/codec/LispListAddressCodecTest.java
@@ -29,7 +29,7 @@
import org.onosproject.drivers.lisp.extensions.LispListAddress;
import org.onosproject.drivers.lisp.extensions.LispMappingExtensionCodecRegistrator;
import org.onosproject.mapping.addresses.MappingAddresses;
-import org.onosproject.mapping.web.codec.MappingAddressJsonMatcher;
+import org.onosproject.mapping.codec.MappingAddressJsonMatcher;
import java.io.IOException;
import java.io.InputStream;
diff --git a/drivers/lisp/src/test/java/org/onosproject/drivers/lisp/extensions/codec/LispMulticastAddressCodecTest.java b/drivers/lisp/src/test/java/org/onosproject/drivers/lisp/extensions/codec/LispMulticastAddressCodecTest.java
index 488494c..a4553cd 100644
--- a/drivers/lisp/src/test/java/org/onosproject/drivers/lisp/extensions/codec/LispMulticastAddressCodecTest.java
+++ b/drivers/lisp/src/test/java/org/onosproject/drivers/lisp/extensions/codec/LispMulticastAddressCodecTest.java
@@ -29,7 +29,7 @@
import org.onosproject.drivers.lisp.extensions.LispMappingExtensionCodecRegistrator;
import org.onosproject.drivers.lisp.extensions.LispMulticastAddress;
import org.onosproject.mapping.addresses.MappingAddresses;
-import org.onosproject.mapping.web.codec.MappingAddressJsonMatcher;
+import org.onosproject.mapping.codec.MappingAddressJsonMatcher;
import java.io.IOException;
import java.io.InputStream;
diff --git a/drivers/lisp/src/test/java/org/onosproject/drivers/lisp/extensions/codec/LispNatAddressCodecTest.java b/drivers/lisp/src/test/java/org/onosproject/drivers/lisp/extensions/codec/LispNatAddressCodecTest.java
index 551ee44..6f70d6d 100644
--- a/drivers/lisp/src/test/java/org/onosproject/drivers/lisp/extensions/codec/LispNatAddressCodecTest.java
+++ b/drivers/lisp/src/test/java/org/onosproject/drivers/lisp/extensions/codec/LispNatAddressCodecTest.java
@@ -31,7 +31,7 @@
import org.onosproject.drivers.lisp.extensions.LispNatAddress;
import org.onosproject.mapping.addresses.MappingAddress;
import org.onosproject.mapping.addresses.MappingAddresses;
-import org.onosproject.mapping.web.codec.MappingAddressJsonMatcher;
+import org.onosproject.mapping.codec.MappingAddressJsonMatcher;
import java.io.IOException;
import java.io.InputStream;
diff --git a/drivers/lisp/src/test/java/org/onosproject/drivers/lisp/extensions/codec/LispNonceAddressCodecTest.java b/drivers/lisp/src/test/java/org/onosproject/drivers/lisp/extensions/codec/LispNonceAddressCodecTest.java
index 881a906..b8290b4 100644
--- a/drivers/lisp/src/test/java/org/onosproject/drivers/lisp/extensions/codec/LispNonceAddressCodecTest.java
+++ b/drivers/lisp/src/test/java/org/onosproject/drivers/lisp/extensions/codec/LispNonceAddressCodecTest.java
@@ -29,7 +29,7 @@
import org.onosproject.drivers.lisp.extensions.LispMappingExtensionCodecRegistrator;
import org.onosproject.drivers.lisp.extensions.LispNonceAddress;
import org.onosproject.mapping.addresses.MappingAddresses;
-import org.onosproject.mapping.web.codec.MappingAddressJsonMatcher;
+import org.onosproject.mapping.codec.MappingAddressJsonMatcher;
import java.io.IOException;
import java.io.InputStream;
diff --git a/drivers/lisp/src/test/java/org/onosproject/drivers/lisp/extensions/codec/LispSegmentAddressCodecTest.java b/drivers/lisp/src/test/java/org/onosproject/drivers/lisp/extensions/codec/LispSegmentAddressCodecTest.java
index 0721f52..0cc932b 100644
--- a/drivers/lisp/src/test/java/org/onosproject/drivers/lisp/extensions/codec/LispSegmentAddressCodecTest.java
+++ b/drivers/lisp/src/test/java/org/onosproject/drivers/lisp/extensions/codec/LispSegmentAddressCodecTest.java
@@ -29,7 +29,7 @@
import org.onosproject.drivers.lisp.extensions.LispMappingExtensionCodecRegistrator;
import org.onosproject.drivers.lisp.extensions.LispSegmentAddress;
import org.onosproject.mapping.addresses.MappingAddresses;
-import org.onosproject.mapping.web.codec.MappingAddressJsonMatcher;
+import org.onosproject.mapping.codec.MappingAddressJsonMatcher;
import java.io.IOException;
import java.io.InputStream;
diff --git a/drivers/lisp/src/test/java/org/onosproject/drivers/lisp/extensions/codec/LispSrcDstAddressCodecTest.java b/drivers/lisp/src/test/java/org/onosproject/drivers/lisp/extensions/codec/LispSrcDstAddressCodecTest.java
index e48bd99..8f1677f 100644
--- a/drivers/lisp/src/test/java/org/onosproject/drivers/lisp/extensions/codec/LispSrcDstAddressCodecTest.java
+++ b/drivers/lisp/src/test/java/org/onosproject/drivers/lisp/extensions/codec/LispSrcDstAddressCodecTest.java
@@ -29,7 +29,7 @@
import org.onosproject.drivers.lisp.extensions.LispMappingExtensionCodecRegistrator;
import org.onosproject.drivers.lisp.extensions.LispSrcDstAddress;
import org.onosproject.mapping.addresses.MappingAddresses;
-import org.onosproject.mapping.web.codec.MappingAddressJsonMatcher;
+import org.onosproject.mapping.codec.MappingAddressJsonMatcher;
import java.io.IOException;
import java.io.InputStream;
diff --git a/drivers/lisp/src/test/java/org/onosproject/drivers/lisp/extensions/codec/LispTeRecordJsonMatcher.java b/drivers/lisp/src/test/java/org/onosproject/drivers/lisp/extensions/codec/LispTeRecordJsonMatcher.java
index e964538..d8bd9bc 100644
--- a/drivers/lisp/src/test/java/org/onosproject/drivers/lisp/extensions/codec/LispTeRecordJsonMatcher.java
+++ b/drivers/lisp/src/test/java/org/onosproject/drivers/lisp/extensions/codec/LispTeRecordJsonMatcher.java
@@ -19,7 +19,7 @@
import org.hamcrest.Description;
import org.hamcrest.TypeSafeDiagnosingMatcher;
import org.onosproject.drivers.lisp.extensions.LispTeAddress;
-import org.onosproject.mapping.web.codec.MappingAddressJsonMatcher;
+import org.onosproject.mapping.codec.MappingAddressJsonMatcher;
/**
* Hamcrest matcher for TeRecord.