Bump MRI upstreams

[lispflowmapping.git] / mappingservice / lisp-proto / src / main / java / org / opendaylight / lispflowmapping / lisp / serializer / MappingRecordSerializer.java

diff --git a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/MappingRecordSerializer.java b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/MappingRecordSerializer.java
index 6f7e1b52c0b992613dbc9e1e508d666caa47559a..15353fb03955dbe46ef9459510fe412d4ea7eb77 100644 (file)
--- a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/MappingRecordSerializer.java
+++ b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/MappingRecordSerializer.java
@@ -9,7 +9,6 @@ package org.opendaylight.lispflowmapping.lisp.serializer;
 
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
-
 import org.apache.commons.lang3.BooleanUtils;
 import org.opendaylight.lispflowmapping.lisp.serializer.address.LispAddressSerializer;
 import org.opendaylight.lispflowmapping.lisp.serializer.address.LispAddressSerializerContext;
@@ -17,12 +16,11 @@ import org.opendaylight.lispflowmapping.lisp.util.ByteUtil;
 import org.opendaylight.lispflowmapping.lisp.util.MaskUtil;
 import org.opendaylight.lispflowmapping.lisp.util.NumberUtil;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.locatorrecords.LocatorRecord;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.mapping.record.container.MappingRecord;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.mapping.record.container.MappingRecord.Action;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.mapping.record.container.MappingRecordBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.mapping._record.container.MappingRecord;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.mapping._record.container.MappingRecord.Action;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.mapping._record.container.MappingRecordBuilder;
 
 public final class MappingRecordSerializer {
-
     private static final MappingRecordSerializer INSTANCE = new MappingRecordSerializer();
 
     // Private constructor prevents instantiation from other classes
@@ -40,9 +38,9 @@ public final class MappingRecordSerializer {
     public MappingRecordBuilder deserializeToBuilder(ByteBuffer buffer) {
         MappingRecordBuilder builder = new MappingRecordBuilder();
         builder.setRecordTtl(buffer.getInt());
-        byte locatorCount = (byte) ByteUtil.getUnsignedByte(buffer);
-        builder.setMaskLength((short) ByteUtil.getUnsignedByte(buffer));
-        byte actionAndAuthoritative = buffer.get();
+        final byte locatorCount = (byte) ByteUtil.getUnsignedByte(buffer);
+        final short maskLength = (short) ByteUtil.getUnsignedByte(buffer);
+        final byte actionAndAuthoritative = buffer.get();
         Action act = Action.forValue(actionAndAuthoritative >> 5);
         if (act == null) {
             act = Action.NoAction;
@@ -52,7 +50,7 @@ public final class MappingRecordSerializer {
         buffer.position(buffer.position() + Length.RESERVED);
         builder.setMapVersion(buffer.getShort());
 
-        LispAddressSerializerContext ctx = new LispAddressSerializerContext(builder.getMaskLength());
+        LispAddressSerializerContext ctx = new LispAddressSerializerContext(maskLength);
         builder.setEid(LispAddressSerializer.getInstance().deserializeEid(buffer, ctx));
 
         builder.setLocatorRecord(new ArrayList<LocatorRecord>());
@@ -60,8 +58,6 @@ public final class MappingRecordSerializer {
             builder.getLocatorRecord().add(LocatorRecordSerializer.getInstance().deserialize(buffer));
         }
 
-        builder.setTimestamp(System.currentTimeMillis());
-
         return builder;
     }
 
@@ -81,8 +77,8 @@ public final class MappingRecordSerializer {
         if (record.getAction() != null) {
             act = record.getAction();
         }
-        replyBuffer.put((byte) ((act.getIntValue() << 5) | //
-                ByteUtil.boolToBit(BooleanUtils.isTrue(record.isAuthoritative()), Flags.AUTHORITATIVE)));
+        replyBuffer.put((byte) (act.getIntValue() << 5
+                | ByteUtil.boolToBit(BooleanUtils.isTrue(record.getAuthoritative()), Flags.AUTHORITATIVE)));
         replyBuffer.position(replyBuffer.position() + Length.RESERVED);
         replyBuffer.putShort(NumberUtil.asShort(record.getMapVersion()));
         if (record.getEid() != null && record.getEid().getAddress() != null) {