Refactor LISP package to separate ctrl interface and impl classes
Change-Id: I4e94ff54299e886cd0e8b3ce38591b0900290f54
diff --git a/protocols/lisp/api/src/main/java/org/onosproject/lisp/LispController.java b/protocols/lisp/api/src/main/java/org/onosproject/lisp/ctl/LispController.java
similarity index 95%
rename from protocols/lisp/api/src/main/java/org/onosproject/lisp/LispController.java
rename to protocols/lisp/api/src/main/java/org/onosproject/lisp/ctl/LispController.java
index d36eae8..be9141d 100644
--- a/protocols/lisp/api/src/main/java/org/onosproject/lisp/LispController.java
+++ b/protocols/lisp/api/src/main/java/org/onosproject/lisp/ctl/LispController.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onosproject.lisp;
+package org.onosproject.lisp.ctl;
/**
* Abstraction of a LISP controller. Serves as a one stop shop for obtaining
diff --git a/protocols/lisp/api/src/main/java/org/onosproject/lisp/package-info.java b/protocols/lisp/api/src/main/java/org/onosproject/lisp/ctl/package-info.java
similarity index 94%
rename from protocols/lisp/api/src/main/java/org/onosproject/lisp/package-info.java
rename to protocols/lisp/api/src/main/java/org/onosproject/lisp/ctl/package-info.java
index 9af7cb3..860de08 100644
--- a/protocols/lisp/api/src/main/java/org/onosproject/lisp/package-info.java
+++ b/protocols/lisp/api/src/main/java/org/onosproject/lisp/ctl/package-info.java
@@ -17,4 +17,4 @@
/**
* LISP controller API.
*/
-package org.onosproject.lisp;
+package org.onosproject.lisp.ctl;
diff --git a/protocols/lisp/ctl/src/main/java/org/onosproject/lisp/ctl/LispChannelHandler.java b/protocols/lisp/ctl/src/main/java/org/onosproject/lisp/ctl/impl/LispChannelHandler.java
similarity index 98%
rename from protocols/lisp/ctl/src/main/java/org/onosproject/lisp/ctl/LispChannelHandler.java
rename to protocols/lisp/ctl/src/main/java/org/onosproject/lisp/ctl/impl/LispChannelHandler.java
index 16e8662..a36031e 100644
--- a/protocols/lisp/ctl/src/main/java/org/onosproject/lisp/ctl/LispChannelHandler.java
+++ b/protocols/lisp/ctl/src/main/java/org/onosproject/lisp/ctl/impl/LispChannelHandler.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onosproject.lisp.ctl;
+package org.onosproject.lisp.ctl.impl;
import io.netty.channel.ChannelHandlerContext;
import io.netty.channel.ChannelInboundHandlerAdapter;
@@ -21,10 +21,10 @@
import io.netty.handler.timeout.IdleStateEvent;
import io.netty.util.ReferenceCountUtil;
import org.onosproject.lisp.msg.protocols.LispEncapsulatedControl;
-import org.onosproject.lisp.msg.protocols.LispInfoReply;
-import org.onosproject.lisp.msg.protocols.LispInfoRequest;
import org.onosproject.lisp.msg.protocols.LispMapNotify;
import org.onosproject.lisp.msg.protocols.LispMapRegister;
+import org.onosproject.lisp.msg.protocols.LispInfoReply;
+import org.onosproject.lisp.msg.protocols.LispInfoRequest;
import org.onosproject.lisp.msg.protocols.LispMapRequest;
import org.onosproject.lisp.msg.protocols.LispMessage;
import org.slf4j.Logger;
diff --git a/protocols/lisp/ctl/src/main/java/org/onosproject/lisp/ctl/LispChannelInitializer.java b/protocols/lisp/ctl/src/main/java/org/onosproject/lisp/ctl/impl/LispChannelInitializer.java
similarity index 97%
rename from protocols/lisp/ctl/src/main/java/org/onosproject/lisp/ctl/LispChannelInitializer.java
rename to protocols/lisp/ctl/src/main/java/org/onosproject/lisp/ctl/impl/LispChannelInitializer.java
index c5c8867..d153546 100644
--- a/protocols/lisp/ctl/src/main/java/org/onosproject/lisp/ctl/LispChannelInitializer.java
+++ b/protocols/lisp/ctl/src/main/java/org/onosproject/lisp/ctl/impl/LispChannelInitializer.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onosproject.lisp.ctl;
+package org.onosproject.lisp.ctl.impl;
import io.netty.channel.ChannelInitializer;
import io.netty.channel.ChannelPipeline;
diff --git a/protocols/lisp/ctl/src/main/java/org/onosproject/lisp/ctl/LispControllerBootstrap.java b/protocols/lisp/ctl/src/main/java/org/onosproject/lisp/ctl/impl/LispControllerBootstrap.java
similarity index 98%
rename from protocols/lisp/ctl/src/main/java/org/onosproject/lisp/ctl/LispControllerBootstrap.java
rename to protocols/lisp/ctl/src/main/java/org/onosproject/lisp/ctl/impl/LispControllerBootstrap.java
index 922320e..29af596 100644
--- a/protocols/lisp/ctl/src/main/java/org/onosproject/lisp/ctl/LispControllerBootstrap.java
+++ b/protocols/lisp/ctl/src/main/java/org/onosproject/lisp/ctl/impl/LispControllerBootstrap.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onosproject.lisp.ctl;
+package org.onosproject.lisp.ctl.impl;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Lists;
diff --git a/protocols/lisp/ctl/src/main/java/org/onosproject/lisp/ctl/LispControllerImpl.java b/protocols/lisp/ctl/src/main/java/org/onosproject/lisp/ctl/impl/LispControllerImpl.java
similarity index 98%
rename from protocols/lisp/ctl/src/main/java/org/onosproject/lisp/ctl/LispControllerImpl.java
rename to protocols/lisp/ctl/src/main/java/org/onosproject/lisp/ctl/impl/LispControllerImpl.java
index a483957..e8dae2c 100644
--- a/protocols/lisp/ctl/src/main/java/org/onosproject/lisp/ctl/LispControllerImpl.java
+++ b/protocols/lisp/ctl/src/main/java/org/onosproject/lisp/ctl/impl/LispControllerImpl.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onosproject.lisp.ctl;
+package org.onosproject.lisp.ctl.impl;
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
@@ -26,7 +26,7 @@
import org.onlab.util.Tools;
import org.onosproject.cfg.ComponentConfigService;
import org.onosproject.core.CoreService;
-import org.onosproject.lisp.LispController;
+import org.onosproject.lisp.ctl.LispController;
import org.onosproject.lisp.msg.authentication.LispAuthenticationConfig;
import org.onosproject.net.device.DeviceService;
import org.osgi.service.component.ComponentContext;
diff --git a/protocols/lisp/ctl/src/main/java/org/onosproject/lisp/ctl/LispMapResolver.java b/protocols/lisp/ctl/src/main/java/org/onosproject/lisp/ctl/impl/LispMapResolver.java
similarity index 95%
rename from protocols/lisp/ctl/src/main/java/org/onosproject/lisp/ctl/LispMapResolver.java
rename to protocols/lisp/ctl/src/main/java/org/onosproject/lisp/ctl/impl/LispMapResolver.java
index 3e4a21d..5784a07 100644
--- a/protocols/lisp/ctl/src/main/java/org/onosproject/lisp/ctl/LispMapResolver.java
+++ b/protocols/lisp/ctl/src/main/java/org/onosproject/lisp/ctl/impl/LispMapResolver.java
@@ -13,16 +13,17 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onosproject.lisp.ctl;
+package org.onosproject.lisp.ctl.impl;
+import org.onosproject.lisp.msg.protocols.DefaultLispMapReply.DefaultReplyBuilder;
import org.onosproject.lisp.msg.protocols.LispEncapsulatedControl;
import org.onosproject.lisp.msg.protocols.LispMapRecord;
import org.onosproject.lisp.msg.protocols.LispMapReply;
-import org.onosproject.lisp.msg.protocols.LispMapRequest;
-import org.onosproject.lisp.msg.protocols.DefaultLispMapReply.DefaultReplyBuilder;
-
+import org.onosproject.lisp.msg.protocols.LispMapReply.ReplyBuilder;
import org.onosproject.lisp.msg.protocols.LispMessage;
import org.onosproject.lisp.msg.types.LispIpAddress;
+import org.onosproject.lisp.msg.protocols.LispMapRequest;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -59,7 +60,7 @@
LispMapRequest request = (LispMapRequest) ecm.getControlMessage();
// build map-reply message
- LispMapReply.ReplyBuilder replyBuilder = new DefaultReplyBuilder();
+ ReplyBuilder replyBuilder = new DefaultReplyBuilder();
replyBuilder.withNonce(request.getNonce());
replyBuilder.withIsEtr(false);
replyBuilder.withIsSecurity(false);
diff --git a/protocols/lisp/ctl/src/main/java/org/onosproject/lisp/ctl/LispMapServer.java b/protocols/lisp/ctl/src/main/java/org/onosproject/lisp/ctl/impl/LispMapServer.java
similarity index 95%
rename from protocols/lisp/ctl/src/main/java/org/onosproject/lisp/ctl/LispMapServer.java
rename to protocols/lisp/ctl/src/main/java/org/onosproject/lisp/ctl/impl/LispMapServer.java
index e69cd41..58792a2 100644
--- a/protocols/lisp/ctl/src/main/java/org/onosproject/lisp/ctl/LispMapServer.java
+++ b/protocols/lisp/ctl/src/main/java/org/onosproject/lisp/ctl/impl/LispMapServer.java
@@ -13,11 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onosproject.lisp.ctl;
+package org.onosproject.lisp.ctl.impl;
import org.onlab.packet.IpAddress;
import org.onosproject.lisp.msg.authentication.LispAuthenticationConfig;
-import org.onosproject.lisp.msg.protocols.DefaultLispInfoReply;
+import org.onosproject.lisp.msg.protocols.DefaultLispInfoReply.DefaultInfoReplyBuilder;
+import org.onosproject.lisp.msg.protocols.DefaultLispInfoRequest.DefaultInfoRequestBuilder;
import org.onosproject.lisp.msg.protocols.DefaultLispMapNotify.DefaultNotifyBuilder;
import org.onosproject.lisp.msg.protocols.DefaultLispMapRegister.DefaultRegisterBuilder;
import org.onosproject.lisp.msg.protocols.LispEidRecord;
@@ -33,6 +34,7 @@
import org.onosproject.lisp.msg.types.LispAfiAddress;
import org.onosproject.lisp.msg.types.LispIpv4Address;
import org.onosproject.lisp.msg.types.LispIpv6Address;
+import org.onosproject.lisp.msg.types.LispNatLcafAddress.NatAddressBuilder;
import org.onosproject.lisp.msg.types.LispNoAddress;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -43,8 +45,6 @@
import java.util.Arrays;
import static org.onosproject.lisp.msg.authentication.LispAuthenticationKeyEnum.valueOf;
-import static org.onosproject.lisp.msg.protocols.DefaultLispInfoRequest.DefaultInfoRequestBuilder;
-import static org.onosproject.lisp.msg.types.LispNatLcafAddress.NatAddressBuilder;
/**
* LISP map server class.
@@ -152,7 +152,7 @@
log.warn("Fails during formulate NAT address", e);
}
- InfoReplyBuilder replyBuilder = new DefaultLispInfoReply.DefaultInfoReplyBuilder();
+ InfoReplyBuilder replyBuilder = new DefaultInfoReplyBuilder();
replyBuilder.withKeyId(request.getKeyId());
replyBuilder.withAuthDataLength(valueOf(authConfig.lispAuthKeyId()).getHashLength());
replyBuilder.withAuthKey(authConfig.lispAuthKey());
diff --git a/protocols/lisp/ctl/src/main/java/org/onosproject/lisp/ctl/LispMappingDatabase.java b/protocols/lisp/ctl/src/main/java/org/onosproject/lisp/ctl/impl/LispMappingDatabase.java
similarity index 97%
rename from protocols/lisp/ctl/src/main/java/org/onosproject/lisp/ctl/LispMappingDatabase.java
rename to protocols/lisp/ctl/src/main/java/org/onosproject/lisp/ctl/impl/LispMappingDatabase.java
index d95ddaa..f4f421b 100644
--- a/protocols/lisp/ctl/src/main/java/org/onosproject/lisp/ctl/LispMappingDatabase.java
+++ b/protocols/lisp/ctl/src/main/java/org/onosproject/lisp/ctl/impl/LispMappingDatabase.java
@@ -13,13 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onosproject.lisp.ctl;
+package org.onosproject.lisp.ctl.impl;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Lists;
import org.onlab.packet.IpPrefix;
-import org.onosproject.lisp.ctl.map.ExpireHashMap;
-import org.onosproject.lisp.ctl.map.ExpireMap;
+import org.onosproject.lisp.ctl.impl.map.ExpireMap;
+import org.onosproject.lisp.ctl.impl.map.ExpireHashMap;
import org.onosproject.lisp.msg.protocols.LispEidRecord;
import org.onosproject.lisp.msg.protocols.LispMapRecord;
import org.onosproject.lisp.msg.types.LispAfiAddress;
diff --git a/protocols/lisp/ctl/src/main/java/org/onosproject/lisp/ctl/LispMessageDecoder.java b/protocols/lisp/ctl/src/main/java/org/onosproject/lisp/ctl/impl/LispMessageDecoder.java
similarity index 97%
rename from protocols/lisp/ctl/src/main/java/org/onosproject/lisp/ctl/LispMessageDecoder.java
rename to protocols/lisp/ctl/src/main/java/org/onosproject/lisp/ctl/impl/LispMessageDecoder.java
index 75a6ab8..1c5e994 100644
--- a/protocols/lisp/ctl/src/main/java/org/onosproject/lisp/ctl/LispMessageDecoder.java
+++ b/protocols/lisp/ctl/src/main/java/org/onosproject/lisp/ctl/impl/LispMessageDecoder.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onosproject.lisp.ctl;
+package org.onosproject.lisp.ctl.impl;
import io.netty.buffer.ByteBuf;
import io.netty.channel.ChannelHandlerContext;
diff --git a/protocols/lisp/ctl/src/main/java/org/onosproject/lisp/ctl/LispMessageEncoder.java b/protocols/lisp/ctl/src/main/java/org/onosproject/lisp/ctl/impl/LispMessageEncoder.java
similarity index 97%
rename from protocols/lisp/ctl/src/main/java/org/onosproject/lisp/ctl/LispMessageEncoder.java
rename to protocols/lisp/ctl/src/main/java/org/onosproject/lisp/ctl/impl/LispMessageEncoder.java
index 562ccf9..3e37fd6 100644
--- a/protocols/lisp/ctl/src/main/java/org/onosproject/lisp/ctl/LispMessageEncoder.java
+++ b/protocols/lisp/ctl/src/main/java/org/onosproject/lisp/ctl/impl/LispMessageEncoder.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onosproject.lisp.ctl;
+package org.onosproject.lisp.ctl.impl;
import io.netty.buffer.ByteBuf;
diff --git a/protocols/lisp/ctl/src/main/java/org/onosproject/lisp/ctl/map/ExpireHashMap.java b/protocols/lisp/ctl/src/main/java/org/onosproject/lisp/ctl/impl/map/ExpireHashMap.java
similarity index 98%
rename from protocols/lisp/ctl/src/main/java/org/onosproject/lisp/ctl/map/ExpireHashMap.java
rename to protocols/lisp/ctl/src/main/java/org/onosproject/lisp/ctl/impl/map/ExpireHashMap.java
index d0aca9a..08f7c88 100644
--- a/protocols/lisp/ctl/src/main/java/org/onosproject/lisp/ctl/map/ExpireHashMap.java
+++ b/protocols/lisp/ctl/src/main/java/org/onosproject/lisp/ctl/impl/map/ExpireHashMap.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onosproject.lisp.ctl.map;
+package org.onosproject.lisp.ctl.impl.map;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/protocols/lisp/ctl/src/main/java/org/onosproject/lisp/ctl/map/ExpireMap.java b/protocols/lisp/ctl/src/main/java/org/onosproject/lisp/ctl/impl/map/ExpireMap.java
similarity index 99%
rename from protocols/lisp/ctl/src/main/java/org/onosproject/lisp/ctl/map/ExpireMap.java
rename to protocols/lisp/ctl/src/main/java/org/onosproject/lisp/ctl/impl/map/ExpireMap.java
index 0d75104..7bb8fcd 100644
--- a/protocols/lisp/ctl/src/main/java/org/onosproject/lisp/ctl/map/ExpireMap.java
+++ b/protocols/lisp/ctl/src/main/java/org/onosproject/lisp/ctl/impl/map/ExpireMap.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onosproject.lisp.ctl.map;
+package org.onosproject.lisp.ctl.impl.map;
import java.util.Set;
diff --git a/protocols/lisp/ctl/src/main/java/org/onosproject/lisp/ctl/map/package-info.java b/protocols/lisp/ctl/src/main/java/org/onosproject/lisp/ctl/impl/map/package-info.java
similarity index 94%
rename from protocols/lisp/ctl/src/main/java/org/onosproject/lisp/ctl/map/package-info.java
rename to protocols/lisp/ctl/src/main/java/org/onosproject/lisp/ctl/impl/map/package-info.java
index e5a33bf..f37bfe1 100644
--- a/protocols/lisp/ctl/src/main/java/org/onosproject/lisp/ctl/map/package-info.java
+++ b/protocols/lisp/ctl/src/main/java/org/onosproject/lisp/ctl/impl/map/package-info.java
@@ -17,4 +17,4 @@
/**
* A package that contains ExpireMap interface and implementation classes.
*/
-package org.onosproject.lisp.ctl.map;
\ No newline at end of file
+package org.onosproject.lisp.ctl.impl.map;
\ No newline at end of file
diff --git a/protocols/lisp/ctl/src/main/java/org/onosproject/lisp/ctl/package-info.java b/protocols/lisp/ctl/src/main/java/org/onosproject/lisp/ctl/impl/package-info.java
similarity index 94%
rename from protocols/lisp/ctl/src/main/java/org/onosproject/lisp/ctl/package-info.java
rename to protocols/lisp/ctl/src/main/java/org/onosproject/lisp/ctl/impl/package-info.java
index cef3030..1ecccac 100644
--- a/protocols/lisp/ctl/src/main/java/org/onosproject/lisp/ctl/package-info.java
+++ b/protocols/lisp/ctl/src/main/java/org/onosproject/lisp/ctl/impl/package-info.java
@@ -17,4 +17,4 @@
/**
* LISP controller implementations.
*/
-package org.onosproject.lisp.ctl;
+package org.onosproject.lisp.ctl.impl;
diff --git a/protocols/lisp/ctl/src/test/java/org/onosproject/lisp/ctl/ChannelAdapter.java b/protocols/lisp/ctl/src/test/java/org/onosproject/lisp/ctl/impl/ChannelAdapter.java
similarity index 98%
rename from protocols/lisp/ctl/src/test/java/org/onosproject/lisp/ctl/ChannelAdapter.java
rename to protocols/lisp/ctl/src/test/java/org/onosproject/lisp/ctl/impl/ChannelAdapter.java
index 1900d24..ebed442 100644
--- a/protocols/lisp/ctl/src/test/java/org/onosproject/lisp/ctl/ChannelAdapter.java
+++ b/protocols/lisp/ctl/src/test/java/org/onosproject/lisp/ctl/impl/ChannelAdapter.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onosproject.lisp.ctl;
+package org.onosproject.lisp.ctl.impl;
import io.netty.buffer.ByteBufAllocator;
import io.netty.channel.Channel;
diff --git a/protocols/lisp/ctl/src/test/java/org/onosproject/lisp/ctl/ChannelHandlerContextAdapter.java b/protocols/lisp/ctl/src/test/java/org/onosproject/lisp/ctl/impl/ChannelHandlerContextAdapter.java
similarity index 98%
rename from protocols/lisp/ctl/src/test/java/org/onosproject/lisp/ctl/ChannelHandlerContextAdapter.java
rename to protocols/lisp/ctl/src/test/java/org/onosproject/lisp/ctl/impl/ChannelHandlerContextAdapter.java
index 8d50ea3..b76c7e6 100644
--- a/protocols/lisp/ctl/src/test/java/org/onosproject/lisp/ctl/ChannelHandlerContextAdapter.java
+++ b/protocols/lisp/ctl/src/test/java/org/onosproject/lisp/ctl/impl/ChannelHandlerContextAdapter.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onosproject.lisp.ctl;
+package org.onosproject.lisp.ctl.impl;
import io.netty.buffer.ByteBufAllocator;
diff --git a/protocols/lisp/ctl/src/test/java/org/onosproject/lisp/ctl/LispMappingDatabaseTest.java b/protocols/lisp/ctl/src/test/java/org/onosproject/lisp/ctl/impl/LispMappingDatabaseTest.java
similarity index 99%
rename from protocols/lisp/ctl/src/test/java/org/onosproject/lisp/ctl/LispMappingDatabaseTest.java
rename to protocols/lisp/ctl/src/test/java/org/onosproject/lisp/ctl/impl/LispMappingDatabaseTest.java
index 8b60e2e..2c2142a 100644
--- a/protocols/lisp/ctl/src/test/java/org/onosproject/lisp/ctl/LispMappingDatabaseTest.java
+++ b/protocols/lisp/ctl/src/test/java/org/onosproject/lisp/ctl/impl/LispMappingDatabaseTest.java
@@ -13,17 +13,17 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onosproject.lisp.ctl;
+package org.onosproject.lisp.ctl.impl;
import com.google.common.collect.ImmutableList;
import org.junit.Before;
import org.junit.Test;
import org.onlab.packet.IpAddress;
-import org.onosproject.lisp.msg.protocols.DefaultLispLocatorRecord.DefaultLocatorRecordBuilder;
import org.onosproject.lisp.msg.protocols.DefaultLispMapRecord.DefaultMapRecordBuilder;
import org.onosproject.lisp.msg.protocols.LispEidRecord;
import org.onosproject.lisp.msg.protocols.LispLocatorRecord;
import org.onosproject.lisp.msg.protocols.LispMapRecord;
+import org.onosproject.lisp.msg.protocols.DefaultLispLocatorRecord.DefaultLocatorRecordBuilder;
import org.onosproject.lisp.msg.protocols.LispMapRecord.MapRecordBuilder;
import org.onosproject.lisp.msg.types.LispIpv4Address;
diff --git a/protocols/lisp/ctl/src/test/java/org/onosproject/lisp/ctl/LispMessageAdapter.java b/protocols/lisp/ctl/src/test/java/org/onosproject/lisp/ctl/impl/LispMessageAdapter.java
similarity index 97%
rename from protocols/lisp/ctl/src/test/java/org/onosproject/lisp/ctl/LispMessageAdapter.java
rename to protocols/lisp/ctl/src/test/java/org/onosproject/lisp/ctl/impl/LispMessageAdapter.java
index f878fe6..24a4602 100644
--- a/protocols/lisp/ctl/src/test/java/org/onosproject/lisp/ctl/LispMessageAdapter.java
+++ b/protocols/lisp/ctl/src/test/java/org/onosproject/lisp/ctl/impl/LispMessageAdapter.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onosproject.lisp.ctl;
+package org.onosproject.lisp.ctl.impl;
import io.netty.buffer.ByteBuf;
import org.onosproject.lisp.msg.protocols.LispMessage;
diff --git a/protocols/lisp/ctl/src/test/java/org/onosproject/lisp/ctl/LispMessageDecoderTest.java b/protocols/lisp/ctl/src/test/java/org/onosproject/lisp/ctl/impl/LispMessageDecoderTest.java
similarity index 99%
rename from protocols/lisp/ctl/src/test/java/org/onosproject/lisp/ctl/LispMessageDecoderTest.java
rename to protocols/lisp/ctl/src/test/java/org/onosproject/lisp/ctl/impl/LispMessageDecoderTest.java
index b808ef1..d3e74b3 100644
--- a/protocols/lisp/ctl/src/test/java/org/onosproject/lisp/ctl/LispMessageDecoderTest.java
+++ b/protocols/lisp/ctl/src/test/java/org/onosproject/lisp/ctl/impl/LispMessageDecoderTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onosproject.lisp.ctl;
+package org.onosproject.lisp.ctl.impl;
import com.google.common.collect.Lists;
import io.netty.buffer.ByteBuf;
diff --git a/protocols/lisp/ctl/src/test/java/org/onosproject/lisp/ctl/LispMessageEncoderTest.java b/protocols/lisp/ctl/src/test/java/org/onosproject/lisp/ctl/impl/LispMessageEncoderTest.java
similarity index 94%
rename from protocols/lisp/ctl/src/test/java/org/onosproject/lisp/ctl/LispMessageEncoderTest.java
rename to protocols/lisp/ctl/src/test/java/org/onosproject/lisp/ctl/impl/LispMessageEncoderTest.java
index 856a324..a7fd2de 100644
--- a/protocols/lisp/ctl/src/test/java/org/onosproject/lisp/ctl/LispMessageEncoderTest.java
+++ b/protocols/lisp/ctl/src/test/java/org/onosproject/lisp/ctl/impl/LispMessageEncoderTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onosproject.lisp.ctl;
+package org.onosproject.lisp.ctl.impl;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Lists;
@@ -87,7 +87,8 @@
expBuilder.append("LISP message [LISP_MAP_NOTIFY] ");
String expected = expBuilder.toString();
- String returned = new String(buff.array(), StandardCharsets.UTF_8).substring(0, expected.length());
+ String returned = new String(buff.array(),
+ StandardCharsets.UTF_8).substring(0, expected.length());
assertThat(returned, is(expected));
}
}
diff --git a/protocols/lisp/msg/src/main/java/org/onosproject/lisp/msg/authentication/LispMacAuthentication.java b/protocols/lisp/msg/src/main/java/org/onosproject/lisp/msg/authentication/LispMacAuthentication.java
index 166a88e..ced2d2d 100644
--- a/protocols/lisp/msg/src/main/java/org/onosproject/lisp/msg/authentication/LispMacAuthentication.java
+++ b/protocols/lisp/msg/src/main/java/org/onosproject/lisp/msg/authentication/LispMacAuthentication.java
@@ -23,9 +23,6 @@
import java.security.InvalidKeyException;
import java.security.NoSuchAlgorithmException;
-import static org.onosproject.lisp.msg.authentication.LispAuthenticationKeyEnum.SHA1;
-import static org.onosproject.lisp.msg.authentication.LispAuthenticationKeyEnum.SHA256;
-
/**
* LISP MAC authentication utility class.
*/
@@ -46,7 +43,7 @@
*/
LispMacAuthentication(LispAuthenticationKeyEnum authType) {
- if (authType == SHA1 || authType == SHA256) {
+ if (authType == LispAuthenticationKeyEnum.SHA1 || authType == LispAuthenticationKeyEnum.SHA256) {
algorithm = authType.getName();
} else {
log.warn(NOT_SUPPORT_ALGORITHM_MSG, authType.getName());
diff --git a/protocols/lisp/msg/src/main/java/org/onosproject/lisp/msg/protocols/DefaultLispInfoReply.java b/protocols/lisp/msg/src/main/java/org/onosproject/lisp/msg/protocols/DefaultLispInfoReply.java
index 650d765..25827a0 100644
--- a/protocols/lisp/msg/src/main/java/org/onosproject/lisp/msg/protocols/DefaultLispInfoReply.java
+++ b/protocols/lisp/msg/src/main/java/org/onosproject/lisp/msg/protocols/DefaultLispInfoReply.java
@@ -18,12 +18,12 @@
import com.google.common.base.Objects;
import io.netty.buffer.ByteBuf;
import io.netty.buffer.Unpooled;
+import org.onosproject.lisp.msg.types.LispAfiAddress;
import org.onosproject.lisp.msg.authentication.LispAuthenticationFactory;
import org.onosproject.lisp.msg.authentication.LispAuthenticationKeyEnum;
import org.onosproject.lisp.msg.exceptions.LispParseError;
import org.onosproject.lisp.msg.exceptions.LispReaderException;
import org.onosproject.lisp.msg.exceptions.LispWriterException;
-import org.onosproject.lisp.msg.types.LispAfiAddress;
import org.onosproject.lisp.msg.types.LispLcafAddress.LcafAddressReader;
import org.onosproject.lisp.msg.types.LispLcafAddress.LcafAddressWriter;
import org.onosproject.lisp.msg.types.LispNatLcafAddress;
@@ -244,7 +244,7 @@
@Override
public LispInfoReply readFrom(ByteBuf byteBuf) throws LispParseError, LispReaderException {
- LispInfo lispInfo = DefaultLispInfo.deserialize(byteBuf);
+ LispInfo lispInfo = deserialize(byteBuf);
LispNatLcafAddress natLcafAddress = (LispNatLcafAddress)
new LcafAddressReader().readFrom(byteBuf);
@@ -266,7 +266,7 @@
@Override
public void writeTo(ByteBuf byteBuf, LispInfoReply message) throws LispWriterException {
- DefaultLispInfo.serialize(byteBuf, message);
+ serialize(byteBuf, message);
new LcafAddressWriter().writeTo(byteBuf, message.getNatLcafAddress());
}
diff --git a/protocols/lisp/msg/src/main/java/org/onosproject/lisp/msg/protocols/DefaultLispInfoRequest.java b/protocols/lisp/msg/src/main/java/org/onosproject/lisp/msg/protocols/DefaultLispInfoRequest.java
index f0dbba4..13e36a0 100644
--- a/protocols/lisp/msg/src/main/java/org/onosproject/lisp/msg/protocols/DefaultLispInfoRequest.java
+++ b/protocols/lisp/msg/src/main/java/org/onosproject/lisp/msg/protocols/DefaultLispInfoRequest.java
@@ -19,12 +19,12 @@
import io.netty.buffer.ByteBuf;
import io.netty.buffer.Unpooled;
import org.onosproject.lisp.msg.authentication.LispAuthenticationFactory;
-import org.onosproject.lisp.msg.authentication.LispAuthenticationKeyEnum;
import org.onosproject.lisp.msg.exceptions.LispParseError;
import org.onosproject.lisp.msg.exceptions.LispReaderException;
import org.onosproject.lisp.msg.exceptions.LispWriterException;
import org.onosproject.lisp.msg.types.LispAfiAddress;
import org.onosproject.lisp.msg.types.LispNoAddress;
+import org.onosproject.lisp.msg.authentication.LispAuthenticationKeyEnum;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -237,7 +237,7 @@
public LispInfoRequest readFrom(ByteBuf byteBuf)
throws LispParseError, LispReaderException {
- LispInfo lispInfo = DefaultLispInfo.deserialize(byteBuf);
+ LispInfo lispInfo = deserialize(byteBuf);
return new DefaultInfoRequestBuilder()
.withIsInfoReply(lispInfo.isInfoReply())
@@ -261,7 +261,7 @@
public void writeTo(ByteBuf byteBuf, LispInfoRequest message)
throws LispWriterException {
- DefaultLispInfo.serialize(byteBuf, message);
+ serialize(byteBuf, message);
//Fill AFI=0, no address
new LispAfiAddress.AfiAddressWriter()
diff --git a/protocols/lisp/msg/src/main/java/org/onosproject/lisp/msg/protocols/DefaultLispLocatorRecord.java b/protocols/lisp/msg/src/main/java/org/onosproject/lisp/msg/protocols/DefaultLispLocatorRecord.java
index e242a5d..e7e63fb 100644
--- a/protocols/lisp/msg/src/main/java/org/onosproject/lisp/msg/protocols/DefaultLispLocatorRecord.java
+++ b/protocols/lisp/msg/src/main/java/org/onosproject/lisp/msg/protocols/DefaultLispLocatorRecord.java
@@ -22,10 +22,11 @@
import org.onosproject.lisp.msg.exceptions.LispReaderException;
import org.onosproject.lisp.msg.exceptions.LispWriterException;
import org.onosproject.lisp.msg.types.LispAfiAddress;
+import org.onosproject.lisp.msg.types.LispAfiAddress.AfiAddressReader;
+import org.onosproject.lisp.msg.types.LispAfiAddress.AfiAddressWriter;
import static com.google.common.base.MoreObjects.toStringHelper;
import static com.google.common.base.Preconditions.checkNotNull;
-import static org.onosproject.lisp.msg.types.LispAfiAddress.AfiAddressWriter;
/**
* Default implementation of LispLocatorRecord.
@@ -262,7 +263,7 @@
// routed flag -> 1 bit
boolean routed = ByteOperator.getBit(flags, ROUTED_INDEX);
- LispAfiAddress address = new LispAfiAddress.AfiAddressReader().readFrom(byteBuf);
+ LispAfiAddress address = new AfiAddressReader().readFrom(byteBuf);
return new DefaultLocatorRecordBuilder()
.withPriority(priority)
diff --git a/protocols/lisp/msg/src/main/java/org/onosproject/lisp/msg/protocols/DefaultLispMapNotify.java b/protocols/lisp/msg/src/main/java/org/onosproject/lisp/msg/protocols/DefaultLispMapNotify.java
index d6a27fb..5cb5877 100644
--- a/protocols/lisp/msg/src/main/java/org/onosproject/lisp/msg/protocols/DefaultLispMapNotify.java
+++ b/protocols/lisp/msg/src/main/java/org/onosproject/lisp/msg/protocols/DefaultLispMapNotify.java
@@ -21,11 +21,13 @@
import io.netty.buffer.ByteBuf;
import io.netty.buffer.Unpooled;
import org.onlab.util.ImmutableByteSequence;
-import org.onosproject.lisp.msg.authentication.LispAuthenticationFactory;
-import org.onosproject.lisp.msg.authentication.LispAuthenticationKeyEnum;
import org.onosproject.lisp.msg.exceptions.LispParseError;
import org.onosproject.lisp.msg.exceptions.LispReaderException;
+import org.onosproject.lisp.msg.authentication.LispAuthenticationFactory;
+import org.onosproject.lisp.msg.authentication.LispAuthenticationKeyEnum;
import org.onosproject.lisp.msg.exceptions.LispWriterException;
+import org.onosproject.lisp.msg.protocols.DefaultLispMapRecord.MapRecordReader;
+import org.onosproject.lisp.msg.protocols.DefaultLispMapRecord.MapRecordWriter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -34,7 +36,6 @@
import static com.google.common.base.MoreObjects.toStringHelper;
import static org.onosproject.lisp.msg.authentication.LispAuthenticationKeyEnum.valueOf;
-import static org.onosproject.lisp.msg.protocols.DefaultLispMapRecord.MapRecordWriter;
/**
* Default LISP map notify message class.
@@ -279,7 +280,7 @@
List<LispMapRecord> mapRecords = Lists.newArrayList();
for (int i = 0; i < recordCount; i++) {
- mapRecords.add(new DefaultLispMapRecord.MapRecordReader().readFrom(byteBuf));
+ mapRecords.add(new MapRecordReader().readFrom(byteBuf));
}
return new DefaultNotifyBuilder()
diff --git a/protocols/lisp/msg/src/main/java/org/onosproject/lisp/msg/protocols/DefaultLispMapRecord.java b/protocols/lisp/msg/src/main/java/org/onosproject/lisp/msg/protocols/DefaultLispMapRecord.java
index d18e238..ced7306 100644
--- a/protocols/lisp/msg/src/main/java/org/onosproject/lisp/msg/protocols/DefaultLispMapRecord.java
+++ b/protocols/lisp/msg/src/main/java/org/onosproject/lisp/msg/protocols/DefaultLispMapRecord.java
@@ -21,15 +21,16 @@
import io.netty.buffer.ByteBuf;
import org.onlab.util.ByteOperator;
import org.onosproject.lisp.msg.exceptions.LispParseError;
+import org.onosproject.lisp.msg.protocols.DefaultLispLocatorRecord.LocatorRecordReader;
+import org.onosproject.lisp.msg.types.LispAfiAddress;
import org.onosproject.lisp.msg.exceptions.LispReaderException;
import org.onosproject.lisp.msg.exceptions.LispWriterException;
-import org.onosproject.lisp.msg.types.LispAfiAddress;
+import org.onosproject.lisp.msg.types.LispAfiAddress.AfiAddressWriter;
import java.util.List;
import static com.google.common.base.MoreObjects.toStringHelper;
import static com.google.common.base.Preconditions.checkNotNull;
-import static org.onosproject.lisp.msg.types.LispAfiAddress.AfiAddressWriter;
import static org.onosproject.lisp.msg.protocols.DefaultLispLocatorRecord.LocatorRecordWriter;
/**
@@ -263,7 +264,7 @@
List<LispLocatorRecord> locators = Lists.newArrayList();
for (int i = 0; i < locatorCount; i++) {
- locators.add(new DefaultLispLocatorRecord.LocatorRecordReader().readFrom(byteBuf));
+ locators.add(new LocatorRecordReader().readFrom(byteBuf));
}
return new DefaultMapRecordBuilder()
diff --git a/protocols/lisp/msg/src/main/java/org/onosproject/lisp/msg/protocols/DefaultLispMapRegister.java b/protocols/lisp/msg/src/main/java/org/onosproject/lisp/msg/protocols/DefaultLispMapRegister.java
index 3171d2e..a75d72d 100644
--- a/protocols/lisp/msg/src/main/java/org/onosproject/lisp/msg/protocols/DefaultLispMapRegister.java
+++ b/protocols/lisp/msg/src/main/java/org/onosproject/lisp/msg/protocols/DefaultLispMapRegister.java
@@ -23,10 +23,11 @@
import org.onlab.util.ByteOperator;
import org.onlab.util.ImmutableByteSequence;
import org.onosproject.lisp.msg.authentication.LispAuthenticationFactory;
-import org.onosproject.lisp.msg.authentication.LispAuthenticationKeyEnum;
import org.onosproject.lisp.msg.exceptions.LispParseError;
import org.onosproject.lisp.msg.exceptions.LispReaderException;
import org.onosproject.lisp.msg.exceptions.LispWriterException;
+import org.onosproject.lisp.msg.protocols.DefaultLispMapRecord.MapRecordReader;
+import org.onosproject.lisp.msg.protocols.DefaultLispMapRecord.MapRecordWriter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -35,9 +36,6 @@
import static com.google.common.base.MoreObjects.toStringHelper;
import static org.onosproject.lisp.msg.authentication.LispAuthenticationKeyEnum.valueOf;
-import static org.onosproject.lisp.msg.protocols.DefaultLispMapRecord.MapRecordReader;
-import static org.onosproject.lisp.msg.protocols.DefaultLispMapRecord.MapRecordWriter;
-
/**
* Default LISP map register message class.
@@ -255,7 +253,7 @@
if (authData == null) {
LispAuthenticationFactory factory = LispAuthenticationFactory.getInstance();
- authDataLength = LispAuthenticationKeyEnum.valueOf(keyId).getHashLength();
+ authDataLength = valueOf(keyId).getHashLength();
byte[] tmpAuthData = new byte[authDataLength];
Arrays.fill(tmpAuthData, (byte) 0);
authData = tmpAuthData;
diff --git a/protocols/lisp/msg/src/main/java/org/onosproject/lisp/msg/protocols/DefaultLispMapReply.java b/protocols/lisp/msg/src/main/java/org/onosproject/lisp/msg/protocols/DefaultLispMapReply.java
index fea7f52..d82c4be 100644
--- a/protocols/lisp/msg/src/main/java/org/onosproject/lisp/msg/protocols/DefaultLispMapReply.java
+++ b/protocols/lisp/msg/src/main/java/org/onosproject/lisp/msg/protocols/DefaultLispMapReply.java
@@ -23,11 +23,12 @@
import org.onosproject.lisp.msg.exceptions.LispParseError;
import org.onosproject.lisp.msg.exceptions.LispReaderException;
import org.onosproject.lisp.msg.exceptions.LispWriterException;
+import org.onosproject.lisp.msg.protocols.DefaultLispMapRecord.MapRecordReader;
+import org.onosproject.lisp.msg.protocols.DefaultLispMapRecord.MapRecordWriter;
import java.util.List;
import static com.google.common.base.MoreObjects.toStringHelper;
-import static org.onosproject.lisp.msg.protocols.DefaultLispMapRecord.MapRecordWriter;
/**
* Default LISP map reply message class.
@@ -230,7 +231,7 @@
List<LispMapRecord> mapRecords = Lists.newArrayList();
for (int i = 0; i < recordCount; i++) {
- mapRecords.add(new DefaultLispMapRecord.MapRecordReader().readFrom(byteBuf));
+ mapRecords.add(new MapRecordReader().readFrom(byteBuf));
}
return new DefaultReplyBuilder()
diff --git a/protocols/lisp/msg/src/main/java/org/onosproject/lisp/msg/protocols/DefaultLispMapRequest.java b/protocols/lisp/msg/src/main/java/org/onosproject/lisp/msg/protocols/DefaultLispMapRequest.java
index 21b0c38..9055e409 100644
--- a/protocols/lisp/msg/src/main/java/org/onosproject/lisp/msg/protocols/DefaultLispMapRequest.java
+++ b/protocols/lisp/msg/src/main/java/org/onosproject/lisp/msg/protocols/DefaultLispMapRequest.java
@@ -20,17 +20,19 @@
import com.google.common.collect.Lists;
import io.netty.buffer.ByteBuf;
import org.onlab.util.ByteOperator;
+import org.onosproject.lisp.msg.protocols.LispEidRecord.EidRecordReader;
+import org.onosproject.lisp.msg.types.LispAfiAddress;
import org.onosproject.lisp.msg.exceptions.LispParseError;
import org.onosproject.lisp.msg.exceptions.LispReaderException;
import org.onosproject.lisp.msg.exceptions.LispWriterException;
-import org.onosproject.lisp.msg.types.LispAfiAddress;
+import org.onosproject.lisp.msg.types.LispAfiAddress.AfiAddressReader;
+import org.onosproject.lisp.msg.types.LispAfiAddress.AfiAddressWriter;
import java.util.List;
import static com.google.common.base.MoreObjects.toStringHelper;
import static com.google.common.base.Preconditions.checkArgument;
import static org.onosproject.lisp.msg.protocols.LispEidRecord.EidRecordWriter;
-import static org.onosproject.lisp.msg.types.LispAfiAddress.AfiAddressWriter;
/**
* Default LISP map request message class.
@@ -339,18 +341,18 @@
// nonce -> 64 bits
long nonce = byteBuf.readLong();
- LispAfiAddress sourceEid = new LispAfiAddress.AfiAddressReader().readFrom(byteBuf);
+ LispAfiAddress sourceEid = new AfiAddressReader().readFrom(byteBuf);
// deserialize a collection of RLOC addresses
List<LispAfiAddress> itrRlocs = Lists.newArrayList();
for (int i = 0; i < irc + 1; i++) {
- itrRlocs.add(new LispAfiAddress.AfiAddressReader().readFrom(byteBuf));
+ itrRlocs.add(new AfiAddressReader().readFrom(byteBuf));
}
// deserialize a collection of EID records
List<LispEidRecord> eidRecords = Lists.newArrayList();
for (int i = 0; i < recordCount; i++) {
- eidRecords.add(new LispEidRecord.EidRecordReader().readFrom(byteBuf));
+ eidRecords.add(new EidRecordReader().readFrom(byteBuf));
}
return new DefaultRequestBuilder()
diff --git a/protocols/lisp/msg/src/main/java/org/onosproject/lisp/msg/protocols/LispEidRecord.java b/protocols/lisp/msg/src/main/java/org/onosproject/lisp/msg/protocols/LispEidRecord.java
index d933783..41d7583 100644
--- a/protocols/lisp/msg/src/main/java/org/onosproject/lisp/msg/protocols/LispEidRecord.java
+++ b/protocols/lisp/msg/src/main/java/org/onosproject/lisp/msg/protocols/LispEidRecord.java
@@ -21,10 +21,11 @@
import org.onosproject.lisp.msg.exceptions.LispReaderException;
import org.onosproject.lisp.msg.exceptions.LispWriterException;
import org.onosproject.lisp.msg.types.LispAfiAddress;
+import org.onosproject.lisp.msg.types.LispAfiAddress.AfiAddressReader;
+import org.onosproject.lisp.msg.types.LispAfiAddress.AfiAddressWriter;
import static com.google.common.base.MoreObjects.toStringHelper;
import static com.google.common.base.Preconditions.checkNotNull;
-import static org.onosproject.lisp.msg.types.LispAfiAddress.AfiAddressWriter;
/**
* LISP EID record section which is part of LISP map request message.
@@ -108,7 +109,7 @@
// mask length -> 8 bits
short maskLength = byteBuf.readUnsignedByte();
- LispAfiAddress prefix = new LispAfiAddress.AfiAddressReader().readFrom(byteBuf);
+ LispAfiAddress prefix = new AfiAddressReader().readFrom(byteBuf);
return new LispEidRecord((byte) maskLength, prefix);
}
diff --git a/protocols/lisp/msg/src/main/java/org/onosproject/lisp/msg/protocols/LispLocatorRecord.java b/protocols/lisp/msg/src/main/java/org/onosproject/lisp/msg/protocols/LispLocatorRecord.java
index e96a2af..a38527b 100644
--- a/protocols/lisp/msg/src/main/java/org/onosproject/lisp/msg/protocols/LispLocatorRecord.java
+++ b/protocols/lisp/msg/src/main/java/org/onosproject/lisp/msg/protocols/LispLocatorRecord.java
@@ -16,8 +16,8 @@
package org.onosproject.lisp.msg.protocols;
import io.netty.buffer.ByteBuf;
-import org.onosproject.lisp.msg.exceptions.LispWriterException;
import org.onosproject.lisp.msg.types.LispAfiAddress;
+import org.onosproject.lisp.msg.exceptions.LispWriterException;
/**
* LISP locator record section which is part of LISP map record.
diff --git a/protocols/lisp/msg/src/main/java/org/onosproject/lisp/msg/protocols/LispMessageReaderFactory.java b/protocols/lisp/msg/src/main/java/org/onosproject/lisp/msg/protocols/LispMessageReaderFactory.java
index 6a33720..814760b 100644
--- a/protocols/lisp/msg/src/main/java/org/onosproject/lisp/msg/protocols/LispMessageReaderFactory.java
+++ b/protocols/lisp/msg/src/main/java/org/onosproject/lisp/msg/protocols/LispMessageReaderFactory.java
@@ -17,14 +17,13 @@
import io.netty.buffer.ByteBuf;
import org.onlab.util.ByteOperator;
-
-import static org.onosproject.lisp.msg.protocols.DefaultLispMapReply.ReplyReader;
-import static org.onosproject.lisp.msg.protocols.DefaultLispMapNotify.NotifyReader;
-import static org.onosproject.lisp.msg.protocols.DefaultLispMapRegister.RegisterReader;
-import static org.onosproject.lisp.msg.protocols.DefaultLispMapRequest.RequestReader;
-import static org.onosproject.lisp.msg.protocols.DefaultLispEncapsulatedControl.EcmReader;
-import static org.onosproject.lisp.msg.protocols.DefaultLispInfoRequest.InfoRequestReader;
-import static org.onosproject.lisp.msg.protocols.DefaultLispInfoReply.InfoReplyReader;
+import org.onosproject.lisp.msg.protocols.DefaultLispEncapsulatedControl.EcmReader;
+import org.onosproject.lisp.msg.protocols.DefaultLispInfoReply.InfoReplyReader;
+import org.onosproject.lisp.msg.protocols.DefaultLispInfoRequest.InfoRequestReader;
+import org.onosproject.lisp.msg.protocols.DefaultLispMapNotify.NotifyReader;
+import org.onosproject.lisp.msg.protocols.DefaultLispMapRegister.RegisterReader;
+import org.onosproject.lisp.msg.protocols.DefaultLispMapReply.ReplyReader;
+import org.onosproject.lisp.msg.protocols.DefaultLispMapRequest.RequestReader;
/**
* A factory class which helps to instantiate LISP reader class.
diff --git a/protocols/lisp/msg/src/main/java/org/onosproject/lisp/msg/types/LispAfiAddress.java b/protocols/lisp/msg/src/main/java/org/onosproject/lisp/msg/types/LispAfiAddress.java
index 0942431..c333236 100644
--- a/protocols/lisp/msg/src/main/java/org/onosproject/lisp/msg/types/LispAfiAddress.java
+++ b/protocols/lisp/msg/src/main/java/org/onosproject/lisp/msg/types/LispAfiAddress.java
@@ -22,7 +22,13 @@
import java.util.Objects;
-import static org.onosproject.lisp.msg.types.AddressFamilyIdentifierEnum.*;
+import static org.onosproject.lisp.msg.types.AddressFamilyIdentifierEnum.IP4;
+import static org.onosproject.lisp.msg.types.AddressFamilyIdentifierEnum.IP6;
+import static org.onosproject.lisp.msg.types.AddressFamilyIdentifierEnum.NO_ADDRESS;
+import static org.onosproject.lisp.msg.types.AddressFamilyIdentifierEnum.DISTINGUISHED_NAME;
+import static org.onosproject.lisp.msg.types.AddressFamilyIdentifierEnum.MAC;
+import static org.onosproject.lisp.msg.types.AddressFamilyIdentifierEnum.LCAF;
+import static org.onosproject.lisp.msg.types.AddressFamilyIdentifierEnum.AS;
/**
* LISP Locator address typed by Address Family Identifier (AFI).
diff --git a/protocols/lisp/msg/src/main/java/org/onosproject/lisp/msg/types/LispListLcafAddress.java b/protocols/lisp/msg/src/main/java/org/onosproject/lisp/msg/types/LispListLcafAddress.java
index eb86b65..08326a5 100644
--- a/protocols/lisp/msg/src/main/java/org/onosproject/lisp/msg/types/LispListLcafAddress.java
+++ b/protocols/lisp/msg/src/main/java/org/onosproject/lisp/msg/types/LispListLcafAddress.java
@@ -20,6 +20,8 @@
import org.onosproject.lisp.msg.exceptions.LispParseError;
import org.onosproject.lisp.msg.exceptions.LispReaderException;
import org.onosproject.lisp.msg.exceptions.LispWriterException;
+import org.onosproject.lisp.msg.types.LispIpv4Address.Ipv4AddressWriter;
+import org.onosproject.lisp.msg.types.LispIpv6Address.Ipv6AddressWriter;
import java.util.List;
import java.util.Objects;
@@ -189,8 +191,8 @@
int lcafIndex = byteBuf.writerIndex();
LispLcafAddress.serializeCommon(byteBuf, address);
- LispIpv4Address.Ipv4AddressWriter v4Writer = new LispIpv4Address.Ipv4AddressWriter();
- LispIpv6Address.Ipv6AddressWriter v6Writer = new LispIpv6Address.Ipv6AddressWriter();
+ Ipv4AddressWriter v4Writer = new Ipv4AddressWriter();
+ Ipv6AddressWriter v6Writer = new Ipv6AddressWriter();
LispAfiAddress ipv4 = address.getAddresses().get(IPV4_ADDRESS_INDEX);
LispAfiAddress ipv6 = address.getAddresses().get(IPV6_ADDRESS_INDEX);
diff --git a/protocols/lisp/msg/src/main/java/org/onosproject/lisp/msg/types/LispNatLcafAddress.java b/protocols/lisp/msg/src/main/java/org/onosproject/lisp/msg/types/LispNatLcafAddress.java
index 7ce4e7a..bc2a6b4 100644
--- a/protocols/lisp/msg/src/main/java/org/onosproject/lisp/msg/types/LispNatLcafAddress.java
+++ b/protocols/lisp/msg/src/main/java/org/onosproject/lisp/msg/types/LispNatLcafAddress.java
@@ -277,7 +277,7 @@
public LispNatLcafAddress readFrom(ByteBuf byteBuf)
throws LispParseError, LispReaderException {
- LispLcafAddress lcafAddress = LispLcafAddress.deserializeCommon(byteBuf);
+ LispLcafAddress lcafAddress = deserializeCommon(byteBuf);
short msUdpPortNumber = (short) byteBuf.readUnsignedShort();
short etrUdpPortNumber = (short) byteBuf.readUnsignedShort();
@@ -288,7 +288,7 @@
List<LispAfiAddress> rtrRlocAddresses = Lists.newArrayList();
- while (byteBuf.readerIndex() - LispLcafAddress.COMMON_HEADER_SIZE < lcafAddress.getLength()) {
+ while (byteBuf.readerIndex() - COMMON_HEADER_SIZE < lcafAddress.getLength()) {
rtrRlocAddresses.add(new AfiAddressReader().readFrom(byteBuf));
}
@@ -317,7 +317,7 @@
throws LispWriterException {
int lcafIndex = byteBuf.writerIndex();
- LispLcafAddress.serializeCommon(byteBuf, address);
+ serializeCommon(byteBuf, address);
byteBuf.writeShort(address.getMsUdpPortNumber());
byteBuf.writeShort(address.getEtrUdpPortNumber());
@@ -333,7 +333,7 @@
writer.writeTo(byteBuf, rtrRlocAddresses.get(i));
}
- LispLcafAddress.updateLength(lcafIndex, byteBuf);
+ updateLength(lcafIndex, byteBuf);
}
}
}
diff --git a/protocols/lisp/msg/src/main/java/org/onosproject/lisp/msg/types/LispSegmentLcafAddress.java b/protocols/lisp/msg/src/main/java/org/onosproject/lisp/msg/types/LispSegmentLcafAddress.java
index f6a715a..b38319f 100644
--- a/protocols/lisp/msg/src/main/java/org/onosproject/lisp/msg/types/LispSegmentLcafAddress.java
+++ b/protocols/lisp/msg/src/main/java/org/onosproject/lisp/msg/types/LispSegmentLcafAddress.java
@@ -19,6 +19,7 @@
import org.onosproject.lisp.msg.exceptions.LispParseError;
import org.onosproject.lisp.msg.exceptions.LispReaderException;
import org.onosproject.lisp.msg.exceptions.LispWriterException;
+import org.onosproject.lisp.msg.types.LispAfiAddress.AfiAddressReader;
import java.util.Objects;
@@ -205,7 +206,7 @@
byte idMaskLength = lcafAddress.getReserved2();
int instanceId = (int) byteBuf.readUnsignedInt();
- LispAfiAddress address = new LispAfiAddress.AfiAddressReader().readFrom(byteBuf);
+ LispAfiAddress address = new AfiAddressReader().readFrom(byteBuf);
return new SegmentAddressBuilder()
.withReserved1(lcafAddress.getReserved1())
diff --git a/protocols/lisp/msg/src/main/java/org/onosproject/lisp/msg/types/LispSourceDestLcafAddress.java b/protocols/lisp/msg/src/main/java/org/onosproject/lisp/msg/types/LispSourceDestLcafAddress.java
index dd21127..d36b591 100644
--- a/protocols/lisp/msg/src/main/java/org/onosproject/lisp/msg/types/LispSourceDestLcafAddress.java
+++ b/protocols/lisp/msg/src/main/java/org/onosproject/lisp/msg/types/LispSourceDestLcafAddress.java
@@ -19,6 +19,8 @@
import org.onosproject.lisp.msg.exceptions.LispParseError;
import org.onosproject.lisp.msg.exceptions.LispReaderException;
import org.onosproject.lisp.msg.exceptions.LispWriterException;
+import org.onosproject.lisp.msg.types.LispAfiAddress.AfiAddressReader;
+import org.onosproject.lisp.msg.types.LispAfiAddress.AfiAddressWriter;
import java.util.Objects;
@@ -267,14 +269,14 @@
@Override
public LispSourceDestLcafAddress readFrom(ByteBuf byteBuf) throws LispParseError, LispReaderException {
- LispLcafAddress lcafAddress = LispLcafAddress.deserializeCommon(byteBuf);
+ LispLcafAddress lcafAddress = deserializeCommon(byteBuf);
short reserved = byteBuf.readShort();
byte srcMaskLength = (byte) byteBuf.readUnsignedByte();
byte dstMaskLength = (byte) byteBuf.readUnsignedByte();
- LispAfiAddress srcPrefix = new LispAfiAddress.AfiAddressReader().readFrom(byteBuf);
- LispAfiAddress dstPrefix = new LispAfiAddress.AfiAddressReader().readFrom(byteBuf);
+ LispAfiAddress srcPrefix = new AfiAddressReader().readFrom(byteBuf);
+ LispAfiAddress dstPrefix = new AfiAddressReader().readFrom(byteBuf);
return new SourceDestAddressBuilder()
.withReserved1(lcafAddress.getReserved1())
@@ -301,16 +303,16 @@
throws LispWriterException {
int lcafIndex = byteBuf.writerIndex();
- LispLcafAddress.serializeCommon(byteBuf, address);
+ serializeCommon(byteBuf, address);
byteBuf.writeShort(address.getReserved());
byteBuf.writeByte(address.getSrcMaskLength());
byteBuf.writeByte(address.getDstMaskLength());
- AfiAddressWriter writer = new LispAfiAddress.AfiAddressWriter();
+ AfiAddressWriter writer = new AfiAddressWriter();
writer.writeTo(byteBuf, address.getSrcPrefix());
writer.writeTo(byteBuf, address.getDstPrefix());
- LispLcafAddress.updateLength(lcafIndex, byteBuf);
+ updateLength(lcafIndex, byteBuf);
}
}
}
diff --git a/protocols/lisp/msg/src/main/java/org/onosproject/lisp/msg/types/LispTeLcafAddress.java b/protocols/lisp/msg/src/main/java/org/onosproject/lisp/msg/types/LispTeLcafAddress.java
index 6a64c64..b944652 100644
--- a/protocols/lisp/msg/src/main/java/org/onosproject/lisp/msg/types/LispTeLcafAddress.java
+++ b/protocols/lisp/msg/src/main/java/org/onosproject/lisp/msg/types/LispTeLcafAddress.java
@@ -27,6 +27,7 @@
import java.util.Objects;
import static com.google.common.base.MoreObjects.toStringHelper;
+import static org.onosproject.lisp.msg.types.LispLcafAddress.COMMON_HEADER_SIZE;
/**
* Traffic Engineering (TE) type LCAF address class.
@@ -134,7 +135,7 @@
LispLcafAddress lcafAddress = LispLcafAddress.deserializeCommon(byteBuf);
List<LispTeRecord> teRecords = Lists.newArrayList();
- while (byteBuf.readerIndex() - LispLcafAddress.COMMON_HEADER_SIZE < lcafAddress.getLength()) {
+ while (byteBuf.readerIndex() - COMMON_HEADER_SIZE < lcafAddress.getLength()) {
teRecords.add(new LispTeRecord.TeRecordReader().readFrom(byteBuf));
}
diff --git a/protocols/lisp/msg/src/main/java/org/onosproject/lisp/msg/types/LispTeRecord.java b/protocols/lisp/msg/src/main/java/org/onosproject/lisp/msg/types/LispTeRecord.java
index 63eb838..3a496d6 100644
--- a/protocols/lisp/msg/src/main/java/org/onosproject/lisp/msg/types/LispTeRecord.java
+++ b/protocols/lisp/msg/src/main/java/org/onosproject/lisp/msg/types/LispTeRecord.java
@@ -21,6 +21,7 @@
import org.onosproject.lisp.msg.exceptions.LispReaderException;
import org.onosproject.lisp.msg.exceptions.LispWriterException;
import org.onosproject.lisp.msg.types.LispAfiAddress.AfiAddressReader;
+import org.onosproject.lisp.msg.types.LispAfiAddress.AfiAddressWriter;
import java.util.Objects;
@@ -256,7 +257,7 @@
byteBuf.writeByte((byte) (lookup + rlocProbe + strict));
// RTR RLOC address
- LispAfiAddress.AfiAddressWriter writer = new LispAfiAddress.AfiAddressWriter();
+ AfiAddressWriter writer = new AfiAddressWriter();
writer.writeTo(byteBuf, record.rtrRlocAddress);
}
}
diff --git a/protocols/lisp/msg/src/test/java/org/onosproject/lisp/msg/authentication/LispAuthenticationTest.java b/protocols/lisp/msg/src/test/java/org/onosproject/lisp/msg/authentication/LispAuthenticationTest.java
index 414670d..f19e4a6 100644
--- a/protocols/lisp/msg/src/test/java/org/onosproject/lisp/msg/authentication/LispAuthenticationTest.java
+++ b/protocols/lisp/msg/src/test/java/org/onosproject/lisp/msg/authentication/LispAuthenticationTest.java
@@ -20,7 +20,10 @@
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.is;
-import static org.onosproject.lisp.msg.authentication.LispAuthenticationKeyEnum.*;
+import static org.onosproject.lisp.msg.authentication.LispAuthenticationKeyEnum.NONE;
+import static org.onosproject.lisp.msg.authentication.LispAuthenticationKeyEnum.SHA1;
+import static org.onosproject.lisp.msg.authentication.LispAuthenticationKeyEnum.SHA256;
+import static org.onosproject.lisp.msg.authentication.LispAuthenticationKeyEnum.UNKNOWN;
/**
* Test case for LISP authentication.
diff --git a/protocols/lisp/msg/src/test/java/org/onosproject/lisp/msg/protocols/DefaultLispEncapsulatedControlTest.java b/protocols/lisp/msg/src/test/java/org/onosproject/lisp/msg/protocols/DefaultLispEncapsulatedControlTest.java
index 06cf2a1..2a1b278 100644
--- a/protocols/lisp/msg/src/test/java/org/onosproject/lisp/msg/protocols/DefaultLispEncapsulatedControlTest.java
+++ b/protocols/lisp/msg/src/test/java/org/onosproject/lisp/msg/protocols/DefaultLispEncapsulatedControlTest.java
@@ -30,13 +30,22 @@
import org.onosproject.lisp.msg.exceptions.LispParseError;
import org.onosproject.lisp.msg.exceptions.LispReaderException;
import org.onosproject.lisp.msg.exceptions.LispWriterException;
+import org.onosproject.lisp.msg.protocols.DefaultLispEncapsulatedControl.DefaultEcmBuilder;
+import org.onosproject.lisp.msg.protocols.DefaultLispEncapsulatedControl.EcmReader;
+import org.onosproject.lisp.msg.protocols.DefaultLispEncapsulatedControl.EcmWriter;
+import org.onosproject.lisp.msg.protocols.DefaultLispMapRegister.DefaultRegisterBuilder;
+import org.onosproject.lisp.msg.protocols.LispEncapsulatedControl.EcmBuilder;
+import org.onosproject.lisp.msg.protocols.LispMapRegister.RegisterBuilder;
import org.onosproject.lisp.msg.types.LispIpv4Address;
+import org.onosproject.lisp.msg.protocols.LispMapRecord.MapRecordBuilder;
+import org.onosproject.lisp.msg.protocols.DefaultLispMapRecord.DefaultMapRecordBuilder;
import java.util.List;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.is;
+
/**
* Unit tests for DefaultLispEncapsulatedControl class.
*/
@@ -58,8 +67,7 @@
public void setup() {
//Creates ecm1
- LispEncapsulatedControl.EcmBuilder builder1 =
- new DefaultLispEncapsulatedControl.DefaultEcmBuilder();
+ EcmBuilder builder1 = new DefaultEcmBuilder();
IP innerIp1 = new IPv4().setSourceAddress(ECM1_SRC_IP)
.setDestinationAddress(ECM1_DST_IP)
@@ -67,8 +75,7 @@
UDP innerUdp1 = new UDP().setSourcePort(1)
.setDestinationPort(2);
- LispMapRegister.RegisterBuilder msgBuilder = new
- DefaultLispMapRegister.DefaultRegisterBuilder();
+ RegisterBuilder msgBuilder = new DefaultRegisterBuilder();
List<LispMapRecord> records1 = ImmutableList.of(getMapRecord(),
getMapRecord());
@@ -88,8 +95,7 @@
.build();
//Creates sameAsEcm1
- LispEncapsulatedControl.EcmBuilder builder2 =
- new DefaultLispEncapsulatedControl.DefaultEcmBuilder();
+ EcmBuilder builder2 = new DefaultEcmBuilder();
IP innerIp2 = new IPv4().setSourceAddress(ECM1_SRC_IP)
.setDestinationAddress(ECM1_DST_IP)
@@ -97,8 +103,7 @@
UDP innerUdp2 = new UDP().setSourcePort(1)
.setDestinationPort(2);
- LispMapRegister.RegisterBuilder msgBuilder2 =
- new DefaultLispMapRegister.DefaultRegisterBuilder();
+ RegisterBuilder msgBuilder2 = new DefaultRegisterBuilder();
List<LispMapRecord> records2 = ImmutableList.of(getMapRecord(),
getMapRecord());
@@ -118,8 +123,7 @@
.build();
//Creates ecm2
- LispEncapsulatedControl.EcmBuilder builder3 =
- new DefaultLispEncapsulatedControl.DefaultEcmBuilder();
+ EcmBuilder builder3 = new DefaultEcmBuilder();
IP innerIp3 = new IPv4().setSourceAddress(ECM2_SRC_IP)
.setDestinationAddress(ECM2_DST_IP)
@@ -127,8 +131,7 @@
UDP innerUdp3 = new UDP().setSourcePort(10)
.setDestinationPort(20);
- LispMapRegister.RegisterBuilder msgBuilder3 =
- new DefaultLispMapRegister.DefaultRegisterBuilder();
+ RegisterBuilder msgBuilder3 = new DefaultRegisterBuilder();
List<LispMapRecord> records3 = ImmutableList.of(getMapRecord(),
getMapRecord());
@@ -157,8 +160,7 @@
@Test
public void testConstruction() {
- DefaultLispEncapsulatedControl ecm =
- (DefaultLispEncapsulatedControl) ecm1;
+ DefaultLispEncapsulatedControl ecm = (DefaultLispEncapsulatedControl) ecm1;
assertThat("Inner Ip versions are not match",
ecm.innerIpHeader().getVersion(), is((byte) 4));
@@ -185,22 +187,18 @@
LispWriterException, LispParseError, DeserializationException {
ByteBuf byteBuf = Unpooled.buffer();
- DefaultLispEncapsulatedControl.EcmWriter writer =
- new DefaultLispEncapsulatedControl.EcmWriter();
+ EcmWriter writer = new EcmWriter();
writer.writeTo(byteBuf, ecm1);
- DefaultLispEncapsulatedControl.EcmReader reader =
- new DefaultLispEncapsulatedControl.EcmReader();
+ EcmReader reader = new EcmReader();
LispEncapsulatedControl deserialized = reader.readFrom(byteBuf);
- new EqualsTester()
- .addEqualityGroup(ecm1, deserialized).testEquals();
+ new EqualsTester().addEqualityGroup(ecm1, deserialized).testEquals();
}
private LispMapRecord getMapRecord() {
- LispMapRecord.MapRecordBuilder builder1 =
- new DefaultLispMapRecord.DefaultMapRecordBuilder();
+ MapRecordBuilder builder1 = new DefaultMapRecordBuilder();
LispIpv4Address ipv4Locator1 =
new LispIpv4Address(IpAddress.valueOf(RECORD_EID));
diff --git a/protocols/lisp/msg/src/test/java/org/onosproject/lisp/msg/protocols/DefaultLispInfoReplyTest.java b/protocols/lisp/msg/src/test/java/org/onosproject/lisp/msg/protocols/DefaultLispInfoReplyTest.java
index 6ff19a7..d72ba55 100644
--- a/protocols/lisp/msg/src/test/java/org/onosproject/lisp/msg/protocols/DefaultLispInfoReplyTest.java
+++ b/protocols/lisp/msg/src/test/java/org/onosproject/lisp/msg/protocols/DefaultLispInfoReplyTest.java
@@ -27,9 +27,9 @@
import org.onosproject.lisp.msg.protocols.DefaultLispInfoReply.DefaultInfoReplyBuilder;
import org.onosproject.lisp.msg.protocols.DefaultLispInfoReply.InfoReplyReader;
import org.onosproject.lisp.msg.protocols.DefaultLispInfoReply.InfoReplyWriter;
-import org.onosproject.lisp.msg.protocols.LispInfoReply.InfoReplyBuilder;
import org.onosproject.lisp.msg.types.LispIpv4Address;
import org.onosproject.lisp.msg.types.LispNatLcafAddress;
+import org.onosproject.lisp.msg.protocols.LispInfoReply.InfoReplyBuilder;
import org.onosproject.lisp.msg.types.LispNatLcafAddress.NatAddressBuilder;
import static org.hamcrest.MatcherAssert.assertThat;
diff --git a/protocols/lisp/msg/src/test/java/org/onosproject/lisp/msg/protocols/DefaultLispInfoRequestTest.java b/protocols/lisp/msg/src/test/java/org/onosproject/lisp/msg/protocols/DefaultLispInfoRequestTest.java
index fe433b0..9dbac92 100644
--- a/protocols/lisp/msg/src/test/java/org/onosproject/lisp/msg/protocols/DefaultLispInfoRequestTest.java
+++ b/protocols/lisp/msg/src/test/java/org/onosproject/lisp/msg/protocols/DefaultLispInfoRequestTest.java
@@ -113,7 +113,6 @@
InfoRequestReader reader = new InfoRequestReader();
LispInfoRequest deserialized = reader.readFrom(byteBuf);
- new EqualsTester()
- .addEqualityGroup(request1, deserialized).testEquals();
+ new EqualsTester().addEqualityGroup(request1, deserialized).testEquals();
}
}
diff --git a/protocols/lisp/msg/src/test/java/org/onosproject/lisp/msg/protocols/DefaultLispLocatorRecordTest.java b/protocols/lisp/msg/src/test/java/org/onosproject/lisp/msg/protocols/DefaultLispLocatorRecordTest.java
index ec45980..0410178 100644
--- a/protocols/lisp/msg/src/test/java/org/onosproject/lisp/msg/protocols/DefaultLispLocatorRecordTest.java
+++ b/protocols/lisp/msg/src/test/java/org/onosproject/lisp/msg/protocols/DefaultLispLocatorRecordTest.java
@@ -24,11 +24,14 @@
import org.onosproject.lisp.msg.exceptions.LispParseError;
import org.onosproject.lisp.msg.exceptions.LispReaderException;
import org.onosproject.lisp.msg.exceptions.LispWriterException;
+import org.onosproject.lisp.msg.protocols.DefaultLispLocatorRecord.DefaultLocatorRecordBuilder;
+import org.onosproject.lisp.msg.protocols.LispLocatorRecord.LocatorRecordBuilder;
+import org.onosproject.lisp.msg.protocols.DefaultLispLocatorRecord.LocatorRecordWriter;
+import org.onosproject.lisp.msg.protocols.DefaultLispLocatorRecord.LocatorRecordReader;
import org.onosproject.lisp.msg.types.LispIpv4Address;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.is;
-import static org.onosproject.lisp.msg.protocols.DefaultLispLocatorRecord.*;
/**
* Unit tests for DefaultLispLocatorRecord class.
diff --git a/protocols/lisp/msg/src/test/java/org/onosproject/lisp/msg/protocols/DefaultLispMapNotifyTest.java b/protocols/lisp/msg/src/test/java/org/onosproject/lisp/msg/protocols/DefaultLispMapNotifyTest.java
index f9dd47f..4b7fe12 100644
--- a/protocols/lisp/msg/src/test/java/org/onosproject/lisp/msg/protocols/DefaultLispMapNotifyTest.java
+++ b/protocols/lisp/msg/src/test/java/org/onosproject/lisp/msg/protocols/DefaultLispMapNotifyTest.java
@@ -25,6 +25,11 @@
import org.onosproject.lisp.msg.exceptions.LispParseError;
import org.onosproject.lisp.msg.exceptions.LispReaderException;
import org.onosproject.lisp.msg.exceptions.LispWriterException;
+import org.onosproject.lisp.msg.protocols.DefaultLispMapNotify.DefaultNotifyBuilder;
+import org.onosproject.lisp.msg.protocols.DefaultLispMapNotify.NotifyReader;
+import org.onosproject.lisp.msg.protocols.DefaultLispMapNotify.NotifyWriter;
+import org.onosproject.lisp.msg.protocols.DefaultLispMapRecord.DefaultMapRecordBuilder;
+import org.onosproject.lisp.msg.protocols.LispMapNotify.NotifyBuilder;
import org.onosproject.lisp.msg.protocols.LispMapRecord.MapRecordBuilder;
import org.onosproject.lisp.msg.types.LispIpv4Address;
@@ -32,8 +37,6 @@
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.is;
-import static org.onosproject.lisp.msg.protocols.DefaultLispMapNotify.*;
-import static org.onosproject.lisp.msg.protocols.DefaultLispMapRecord.DefaultMapRecordBuilder;
/**
* Unit tests for DefaultLispMapNotify class.
@@ -120,7 +123,6 @@
NotifyReader reader = new NotifyReader();
LispMapNotify deserialized = reader.readFrom(byteBuf);
- new EqualsTester()
- .addEqualityGroup(notify1, deserialized).testEquals();
+ new EqualsTester().addEqualityGroup(notify1, deserialized).testEquals();
}
}
diff --git a/protocols/lisp/msg/src/test/java/org/onosproject/lisp/msg/protocols/DefaultLispMapRecordTest.java b/protocols/lisp/msg/src/test/java/org/onosproject/lisp/msg/protocols/DefaultLispMapRecordTest.java
index aa1c7df..4c266e5 100644
--- a/protocols/lisp/msg/src/test/java/org/onosproject/lisp/msg/protocols/DefaultLispMapRecordTest.java
+++ b/protocols/lisp/msg/src/test/java/org/onosproject/lisp/msg/protocols/DefaultLispMapRecordTest.java
@@ -24,6 +24,8 @@
import org.onosproject.lisp.msg.exceptions.LispParseError;
import org.onosproject.lisp.msg.exceptions.LispReaderException;
import org.onosproject.lisp.msg.exceptions.LispWriterException;
+import org.onosproject.lisp.msg.protocols.DefaultLispMapRecord.DefaultMapRecordBuilder;
+import org.onosproject.lisp.msg.protocols.LispMapRecord.MapRecordBuilder;
import org.onosproject.lisp.msg.types.LispIpv4Address;
import static org.hamcrest.MatcherAssert.assertThat;
diff --git a/protocols/lisp/msg/src/test/java/org/onosproject/lisp/msg/protocols/DefaultLispMapRegisterTest.java b/protocols/lisp/msg/src/test/java/org/onosproject/lisp/msg/protocols/DefaultLispMapRegisterTest.java
index 4dd081a..4e9529d 100644
--- a/protocols/lisp/msg/src/test/java/org/onosproject/lisp/msg/protocols/DefaultLispMapRegisterTest.java
+++ b/protocols/lisp/msg/src/test/java/org/onosproject/lisp/msg/protocols/DefaultLispMapRegisterTest.java
@@ -25,6 +25,8 @@
import org.onosproject.lisp.msg.exceptions.LispParseError;
import org.onosproject.lisp.msg.exceptions.LispReaderException;
import org.onosproject.lisp.msg.exceptions.LispWriterException;
+import org.onosproject.lisp.msg.protocols.DefaultLispMapRecord.DefaultMapRecordBuilder;
+import org.onosproject.lisp.msg.protocols.DefaultLispMapRegister.DefaultRegisterBuilder;
import org.onosproject.lisp.msg.protocols.DefaultLispMapRegister.RegisterReader;
import org.onosproject.lisp.msg.protocols.DefaultLispMapRegister.RegisterWriter;
import org.onosproject.lisp.msg.protocols.LispMapRecord.MapRecordBuilder;
@@ -35,8 +37,6 @@
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.is;
-import static org.onosproject.lisp.msg.protocols.DefaultLispMapRecord.DefaultMapRecordBuilder;
-import static org.onosproject.lisp.msg.protocols.DefaultLispMapRegister.DefaultRegisterBuilder;
/**
* Unit tests for DefaultLispMapRegister class.
@@ -131,7 +131,6 @@
RegisterReader reader = new RegisterReader();
LispMapRegister deserialized = reader.readFrom(byteBuf);
- new EqualsTester()
- .addEqualityGroup(register1, deserialized).testEquals();
+ new EqualsTester().addEqualityGroup(register1, deserialized).testEquals();
}
}
diff --git a/protocols/lisp/msg/src/test/java/org/onosproject/lisp/msg/protocols/DefaultLispMapReplyTest.java b/protocols/lisp/msg/src/test/java/org/onosproject/lisp/msg/protocols/DefaultLispMapReplyTest.java
index e72b6ca..dea2492 100644
--- a/protocols/lisp/msg/src/test/java/org/onosproject/lisp/msg/protocols/DefaultLispMapReplyTest.java
+++ b/protocols/lisp/msg/src/test/java/org/onosproject/lisp/msg/protocols/DefaultLispMapReplyTest.java
@@ -126,7 +126,6 @@
ReplyReader reader = new ReplyReader();
LispMapReply deserialized = reader.readFrom(byteBuf);
- new EqualsTester()
- .addEqualityGroup(reply1, deserialized).testEquals();
+ new EqualsTester().addEqualityGroup(reply1, deserialized).testEquals();
}
}
diff --git a/protocols/lisp/msg/src/test/java/org/onosproject/lisp/msg/protocols/DefaultLispMapRequestTest.java b/protocols/lisp/msg/src/test/java/org/onosproject/lisp/msg/protocols/DefaultLispMapRequestTest.java
index 6a4fd54..79e4a5c 100644
--- a/protocols/lisp/msg/src/test/java/org/onosproject/lisp/msg/protocols/DefaultLispMapRequestTest.java
+++ b/protocols/lisp/msg/src/test/java/org/onosproject/lisp/msg/protocols/DefaultLispMapRequestTest.java
@@ -24,15 +24,18 @@
import org.onlab.packet.IpAddress;
import org.onosproject.lisp.msg.exceptions.LispParseError;
import org.onosproject.lisp.msg.exceptions.LispReaderException;
-import org.onosproject.lisp.msg.exceptions.LispWriterException;
+import org.onosproject.lisp.msg.protocols.DefaultLispMapRequest.DefaultRequestBuilder;
+import org.onosproject.lisp.msg.protocols.DefaultLispMapRequest.RequestReader;
+import org.onosproject.lisp.msg.protocols.DefaultLispMapRequest.RequestWriter;
+import org.onosproject.lisp.msg.protocols.LispMapRequest.RequestBuilder;
import org.onosproject.lisp.msg.types.LispAfiAddress;
+import org.onosproject.lisp.msg.exceptions.LispWriterException;
import org.onosproject.lisp.msg.types.LispIpv4Address;
import java.util.List;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.is;
-import static org.onosproject.lisp.msg.protocols.DefaultLispMapRequest.*;
/**
* Unit tests for DefaultLispMapRequest class.
@@ -142,7 +145,6 @@
RequestReader reader = new RequestReader();
LispMapRequest deserialized = reader.readFrom(byteBuf);
- new EqualsTester()
- .addEqualityGroup(request1, deserialized).testEquals();
+ new EqualsTester().addEqualityGroup(request1, deserialized).testEquals();
}
}
diff --git a/protocols/lisp/msg/src/test/java/org/onosproject/lisp/msg/types/LispAppDataLcafAddressTest.java b/protocols/lisp/msg/src/test/java/org/onosproject/lisp/msg/types/LispAppDataLcafAddressTest.java
index 2af2048..338dfb6 100644
--- a/protocols/lisp/msg/src/test/java/org/onosproject/lisp/msg/types/LispAppDataLcafAddressTest.java
+++ b/protocols/lisp/msg/src/test/java/org/onosproject/lisp/msg/types/LispAppDataLcafAddressTest.java
@@ -24,12 +24,12 @@
import org.onosproject.lisp.msg.exceptions.LispParseError;
import org.onosproject.lisp.msg.exceptions.LispReaderException;
import org.onosproject.lisp.msg.exceptions.LispWriterException;
+import org.onosproject.lisp.msg.types.LispAppDataLcafAddress.AppDataAddressBuilder;
import org.onosproject.lisp.msg.types.LispAppDataLcafAddress.AppDataLcafAddressWriter;
+import org.onosproject.lisp.msg.types.LispAppDataLcafAddress.AppDataLcafAddressReader;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.is;
-import static org.onosproject.lisp.msg.types.LispAppDataLcafAddress.AppDataAddressBuilder;
-import static org.onosproject.lisp.msg.types.LispAppDataLcafAddress.AppDataLcafAddressReader;
/**
* Unit tests for LispAppDataLcafAddress class.
@@ -116,7 +116,6 @@
AppDataLcafAddressReader reader = new AppDataLcafAddressReader();
LispAppDataLcafAddress deserialized = reader.readFrom(byteBuf);
- new EqualsTester()
- .addEqualityGroup(address1, deserialized).testEquals();
+ new EqualsTester().addEqualityGroup(address1, deserialized).testEquals();
}
}
diff --git a/protocols/lisp/msg/src/test/java/org/onosproject/lisp/msg/types/LispDistinguishedNameAddressTest.java b/protocols/lisp/msg/src/test/java/org/onosproject/lisp/msg/types/LispDistinguishedNameAddressTest.java
index fc2a160..8b2310a 100644
--- a/protocols/lisp/msg/src/test/java/org/onosproject/lisp/msg/types/LispDistinguishedNameAddressTest.java
+++ b/protocols/lisp/msg/src/test/java/org/onosproject/lisp/msg/types/LispDistinguishedNameAddressTest.java
@@ -23,11 +23,12 @@
import org.onosproject.lisp.msg.exceptions.LispParseError;
import org.onosproject.lisp.msg.exceptions.LispWriterException;
+import org.onosproject.lisp.msg.types.LispDistinguishedNameAddress.DistinguishedNameAddressReader;
+import org.onosproject.lisp.msg.types.LispDistinguishedNameAddress.DistinguishedNameAddressWriter;
+
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.is;
-import static org.onosproject.lisp.msg.types.LispDistinguishedNameAddress.*;
-
/**
* Unit tests for LispDistinguishedNameAddress class.
*/
@@ -69,7 +70,6 @@
DistinguishedNameAddressReader reader = new DistinguishedNameAddressReader();
LispDistinguishedNameAddress deserialized = reader.readFrom(byteBuf);
- new EqualsTester()
- .addEqualityGroup(address1, deserialized).testEquals();
+ new EqualsTester().addEqualityGroup(address1, deserialized).testEquals();
}
}
diff --git a/protocols/lisp/msg/src/test/java/org/onosproject/lisp/msg/types/LispIpv4AddressTest.java b/protocols/lisp/msg/src/test/java/org/onosproject/lisp/msg/types/LispIpv4AddressTest.java
index f247a32..b774c48 100644
--- a/protocols/lisp/msg/src/test/java/org/onosproject/lisp/msg/types/LispIpv4AddressTest.java
+++ b/protocols/lisp/msg/src/test/java/org/onosproject/lisp/msg/types/LispIpv4AddressTest.java
@@ -23,11 +23,11 @@
import org.onlab.packet.IpAddress;
import org.onosproject.lisp.msg.exceptions.LispParseError;
import org.onosproject.lisp.msg.exceptions.LispWriterException;
+import org.onosproject.lisp.msg.types.LispIpv4Address.Ipv4AddressReader;
+import org.onosproject.lisp.msg.types.LispIpv4Address.Ipv4AddressWriter;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.is;
-import static org.onosproject.lisp.msg.types.LispIpv4Address.Ipv4AddressReader;
-import static org.onosproject.lisp.msg.types.LispIpv4Address.Ipv4AddressWriter;
/**
* Unit tests for LispIpv4Address class.
@@ -69,7 +69,6 @@
Ipv4AddressReader reader = new Ipv4AddressReader();
LispIpv4Address deserialized = reader.readFrom(byteBuf);
- new EqualsTester()
- .addEqualityGroup(address1, deserialized).testEquals();
+ new EqualsTester().addEqualityGroup(address1, deserialized).testEquals();
}
}
diff --git a/protocols/lisp/msg/src/test/java/org/onosproject/lisp/msg/types/LispIpv6AddressTest.java b/protocols/lisp/msg/src/test/java/org/onosproject/lisp/msg/types/LispIpv6AddressTest.java
index 37ed606..c22f22b 100644
--- a/protocols/lisp/msg/src/test/java/org/onosproject/lisp/msg/types/LispIpv6AddressTest.java
+++ b/protocols/lisp/msg/src/test/java/org/onosproject/lisp/msg/types/LispIpv6AddressTest.java
@@ -23,11 +23,11 @@
import org.onlab.packet.IpAddress;
import org.onosproject.lisp.msg.exceptions.LispParseError;
import org.onosproject.lisp.msg.exceptions.LispWriterException;
+import org.onosproject.lisp.msg.types.LispIpv6Address.Ipv6AddressReader;
+import org.onosproject.lisp.msg.types.LispIpv6Address.Ipv6AddressWriter;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.is;
-import static org.onosproject.lisp.msg.types.LispIpv6Address.Ipv6AddressReader;
-import static org.onosproject.lisp.msg.types.LispIpv6Address.Ipv6AddressWriter;
/**
@@ -70,7 +70,6 @@
Ipv6AddressReader reader = new Ipv6AddressReader();
LispIpv6Address deserialized = reader.readFrom(byteBuf);
- new EqualsTester()
- .addEqualityGroup(address1, deserialized).testEquals();
+ new EqualsTester().addEqualityGroup(address1, deserialized).testEquals();
}
}
diff --git a/protocols/lisp/msg/src/test/java/org/onosproject/lisp/msg/types/LispListLcafAddressTest.java b/protocols/lisp/msg/src/test/java/org/onosproject/lisp/msg/types/LispListLcafAddressTest.java
index 771a2a7..4ffd1f1 100644
--- a/protocols/lisp/msg/src/test/java/org/onosproject/lisp/msg/types/LispListLcafAddressTest.java
+++ b/protocols/lisp/msg/src/test/java/org/onosproject/lisp/msg/types/LispListLcafAddressTest.java
@@ -26,12 +26,13 @@
import org.onosproject.lisp.msg.exceptions.LispReaderException;
import org.onosproject.lisp.msg.exceptions.LispWriterException;
+import org.onosproject.lisp.msg.types.LispListLcafAddress.ListLcafAddressWriter;
+import org.onosproject.lisp.msg.types.LispListLcafAddress.ListLcafAddressReader;
+
import java.util.List;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.is;
-import static org.onosproject.lisp.msg.types.LispListLcafAddress.ListLcafAddressReader;
-import static org.onosproject.lisp.msg.types.LispListLcafAddress.ListLcafAddressWriter;
/**
* Unit tests for LispListLcafAddress class.
@@ -97,7 +98,6 @@
ListLcafAddressReader reader = new ListLcafAddressReader();
LispListLcafAddress deserialized = reader.readFrom(byteBuf);
- new EqualsTester()
- .addEqualityGroup(address1, deserialized).testEquals();
+ new EqualsTester().addEqualityGroup(address1, deserialized).testEquals();
}
}
diff --git a/protocols/lisp/msg/src/test/java/org/onosproject/lisp/msg/types/LispMacAddressTest.java b/protocols/lisp/msg/src/test/java/org/onosproject/lisp/msg/types/LispMacAddressTest.java
index f28c7f6..36a37b4 100644
--- a/protocols/lisp/msg/src/test/java/org/onosproject/lisp/msg/types/LispMacAddressTest.java
+++ b/protocols/lisp/msg/src/test/java/org/onosproject/lisp/msg/types/LispMacAddressTest.java
@@ -24,10 +24,11 @@
import org.onosproject.lisp.msg.exceptions.LispParseError;
import org.onosproject.lisp.msg.exceptions.LispWriterException;
+import org.onosproject.lisp.msg.types.LispMacAddress.MacAddressWriter;
+import org.onosproject.lisp.msg.types.LispMacAddress.MacAddressReader;
+
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.is;
-import static org.onosproject.lisp.msg.types.LispMacAddress.MacAddressReader;
-import static org.onosproject.lisp.msg.types.LispMacAddress.MacAddressWriter;
/**
* Unit tests for LispMacAddress class.
@@ -69,7 +70,6 @@
MacAddressReader reader = new MacAddressReader();
LispMacAddress deserialized = reader.readFrom(byteBuf);
- new EqualsTester()
- .addEqualityGroup(address1, deserialized).testEquals();
+ new EqualsTester().addEqualityGroup(address1, deserialized).testEquals();
}
}
diff --git a/protocols/lisp/msg/src/test/java/org/onosproject/lisp/msg/types/LispNatLcafAddressTest.java b/protocols/lisp/msg/src/test/java/org/onosproject/lisp/msg/types/LispNatLcafAddressTest.java
index 2fb6b25..624d7b1 100644
--- a/protocols/lisp/msg/src/test/java/org/onosproject/lisp/msg/types/LispNatLcafAddressTest.java
+++ b/protocols/lisp/msg/src/test/java/org/onosproject/lisp/msg/types/LispNatLcafAddressTest.java
@@ -136,7 +136,6 @@
NatLcafAddressReader reader = new NatLcafAddressReader();
LispNatLcafAddress deserialized = reader.readFrom(byteBuf);
- new EqualsTester()
- .addEqualityGroup(address1, deserialized).testEquals();
+ new EqualsTester().addEqualityGroup(address1, deserialized).testEquals();
}
}
diff --git a/protocols/lisp/msg/src/test/java/org/onosproject/lisp/msg/types/LispSegmentLcafAddressTest.java b/protocols/lisp/msg/src/test/java/org/onosproject/lisp/msg/types/LispSegmentLcafAddressTest.java
index 6fe638b..73246f1 100644
--- a/protocols/lisp/msg/src/test/java/org/onosproject/lisp/msg/types/LispSegmentLcafAddressTest.java
+++ b/protocols/lisp/msg/src/test/java/org/onosproject/lisp/msg/types/LispSegmentLcafAddressTest.java
@@ -25,11 +25,11 @@
import org.onosproject.lisp.msg.exceptions.LispReaderException;
import org.onosproject.lisp.msg.exceptions.LispWriterException;
import org.onosproject.lisp.msg.types.LispSegmentLcafAddress.SegmentAddressBuilder;
+import org.onosproject.lisp.msg.types.LispSegmentLcafAddress.SegmentLcafAddressReader;
+import org.onosproject.lisp.msg.types.LispSegmentLcafAddress.SegmentLcafAddressWriter;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.is;
-import static org.onosproject.lisp.msg.types.LispSegmentLcafAddress.SegmentLcafAddressReader;
-import static org.onosproject.lisp.msg.types.LispSegmentLcafAddress.SegmentLcafAddressWriter;
/**
* Unit tests for LispSegmentLcafAddress class.
@@ -99,7 +99,6 @@
SegmentLcafAddressReader reader = new SegmentLcafAddressReader();
LispSegmentLcafAddress deserialized = reader.readFrom(byteBuf);
- new EqualsTester()
- .addEqualityGroup(address1, deserialized).testEquals();
+ new EqualsTester().addEqualityGroup(address1, deserialized).testEquals();
}
}
diff --git a/protocols/lisp/msg/src/test/java/org/onosproject/lisp/msg/types/LispSourceDestLcafAddressTest.java b/protocols/lisp/msg/src/test/java/org/onosproject/lisp/msg/types/LispSourceDestLcafAddressTest.java
index 8375a8d..f50c52a 100644
--- a/protocols/lisp/msg/src/test/java/org/onosproject/lisp/msg/types/LispSourceDestLcafAddressTest.java
+++ b/protocols/lisp/msg/src/test/java/org/onosproject/lisp/msg/types/LispSourceDestLcafAddressTest.java
@@ -25,11 +25,11 @@
import org.onosproject.lisp.msg.exceptions.LispReaderException;
import org.onosproject.lisp.msg.exceptions.LispWriterException;
import org.onosproject.lisp.msg.types.LispSourceDestLcafAddress.SourceDestAddressBuilder;
+import org.onosproject.lisp.msg.types.LispSourceDestLcafAddress.SourceDestLcafAddressReader;
+import org.onosproject.lisp.msg.types.LispSourceDestLcafAddress.SourceDestLcafAddressWriter;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.is;
-import static org.onosproject.lisp.msg.types.LispSourceDestLcafAddress.SourceDestLcafAddressReader;
-import static org.onosproject.lisp.msg.types.LispSourceDestLcafAddress.SourceDestLcafAddressWriter;
/**
* Unit tests for LispSourceDestLcafAddress class.
@@ -111,7 +111,6 @@
SourceDestLcafAddressReader reader = new SourceDestLcafAddressReader();
LispSourceDestLcafAddress deserialized = reader.readFrom(byteBuf);
- new EqualsTester()
- .addEqualityGroup(address1, deserialized).testEquals();
+ new EqualsTester().addEqualityGroup(address1, deserialized).testEquals();
}
}
diff --git a/protocols/lisp/msg/src/test/java/org/onosproject/lisp/msg/types/LispTeLcafAddressTest.java b/protocols/lisp/msg/src/test/java/org/onosproject/lisp/msg/types/LispTeLcafAddressTest.java
index b800e6e..789b2c6 100644
--- a/protocols/lisp/msg/src/test/java/org/onosproject/lisp/msg/types/LispTeLcafAddressTest.java
+++ b/protocols/lisp/msg/src/test/java/org/onosproject/lisp/msg/types/LispTeLcafAddressTest.java
@@ -156,7 +156,6 @@
TeLcafAddressReader reader = new TeLcafAddressReader();
LispTeLcafAddress deserialized = reader.readFrom(byteBuf);
- new EqualsTester()
- .addEqualityGroup(address1, deserialized).testEquals();
+ new EqualsTester().addEqualityGroup(address1, deserialized).testEquals();
}
}
diff --git a/providers/lisp/device/src/main/java/org/onosproject/provider/lisp/device/impl/LispDeviceProvider.java b/providers/lisp/device/src/main/java/org/onosproject/provider/lisp/device/impl/LispDeviceProvider.java
index 2307808..0183959 100644
--- a/providers/lisp/device/src/main/java/org/onosproject/provider/lisp/device/impl/LispDeviceProvider.java
+++ b/providers/lisp/device/src/main/java/org/onosproject/provider/lisp/device/impl/LispDeviceProvider.java
@@ -22,7 +22,7 @@
import org.apache.felix.scr.annotations.ReferenceCardinality;
import org.onosproject.core.ApplicationId;
import org.onosproject.core.CoreService;
-import org.onosproject.lisp.LispController;
+import org.onosproject.lisp.ctl.LispController;
import org.onosproject.net.DeviceId;
import org.onosproject.net.MastershipRole;
import org.onosproject.net.PortNumber;