[ONOS-4718] Implement DefaultLispMapRecord class with interface mod

Change-Id: I1544fd52adc4081614b5471f8ab263efbd6c840b

@@ -20,79 +20,130 @@ import org.onosproject.lisp.msg.types.LispAfiAddress;
 /**
 /**
  * Default implementation of LispMapRecord.
  * Default implementation of LispMapRecord.
  */
  */
-public class DefaultLispMapRecord implements LispMapRecord {
-
-    private int recordTtl;
-    private int locatorCount;
-    private byte maskLength;
-    private LispMapReplyAction action;
-    private boolean authoritative;
-    private short mapVersionNumber;
-    private LispAfiAddress eidPrefixAfi;
+public final class DefaultLispMapRecord implements LispMapRecord {
+
+    private final int recordTtl;
+    private final int locatorCount;
+    private final byte maskLength;
+    private final LispMapReplyAction action;
+    private final boolean authoritative;
+    private final short mapVersionNumber;
+    private final LispAfiAddress eidPrefixAfi;
+
+    /**
+     * A private constructor that protects object instantiation from external.
+     *
+     * @param recordTtl        record time-to-live value
+     * @param locatorCount     locator's count number
+     * @param maskLength       mask length
+     * @param action           lisp map reply action
+     * @param authoritative    authoritative flag
+     * @param mapVersionNumber map version number
+     * @param eidPrefixAfi     EID prefix AFI address
+     */
+    private DefaultLispMapRecord(int recordTtl, int locatorCount, byte maskLength,
+                                 LispMapReplyAction action, boolean authoritative,
+                                 short mapVersionNumber, LispAfiAddress eidPrefixAfi) {
+        this.recordTtl = recordTtl;
+        this.locatorCount = locatorCount;
+        this.maskLength = maskLength;
+        this.action = action;
+        this.authoritative = authoritative;
+        this.mapVersionNumber = mapVersionNumber;
+        this.eidPrefixAfi = eidPrefixAfi;
+    }
 
 
+    @Override
     public int getRecordTtl() {
     public int getRecordTtl() {
         return recordTtl;
         return recordTtl;
     }
     }
 
 
+    @Override
     public int getLocatorCount() {
     public int getLocatorCount() {
         return locatorCount;
         return locatorCount;
     }
     }
 
 
+    @Override
     public byte getMaskLength() {
     public byte getMaskLength() {
         return maskLength;
         return maskLength;
     }
     }
 
 
+    @Override
     public LispMapReplyAction getAction() {
     public LispMapReplyAction getAction() {
         return action;
         return action;
     }
     }
 
 
+    @Override
     public boolean isAuthoritative() {
     public boolean isAuthoritative() {
         return authoritative;
         return authoritative;
     }
     }
 
 
+    @Override
     public short getMapVersionNumber() {
     public short getMapVersionNumber() {
         return mapVersionNumber;
         return mapVersionNumber;
     }
     }
 
 
+    @Override
     public LispAfiAddress getEidPrefixAfi() {
     public LispAfiAddress getEidPrefixAfi() {
         return eidPrefixAfi;
         return eidPrefixAfi;
     }
     }
 
 
     public static final class DefaultMapRecordBuilder implements MapRecordBuilder {
     public static final class DefaultMapRecordBuilder implements MapRecordBuilder {
 
 
+        private int recordTtl;
+        private int locatorCount;
+        private byte maskLength;
+        private LispMapReplyAction action;
+        private boolean authoritative;
+        private short mapVersionNumber;
+        private LispAfiAddress eidPrefixAfi;
+
         @Override
         @Override
         public MapRecordBuilder withRecordTtl(int recordTtl) {
         public MapRecordBuilder withRecordTtl(int recordTtl) {
-            return null;
+            this.recordTtl = recordTtl;
+            return this;
         }
         }
 
 
         @Override
         @Override
         public MapRecordBuilder withLocatorCount(int locatorCount) {
         public MapRecordBuilder withLocatorCount(int locatorCount) {
-            return null;
+            this.locatorCount = locatorCount;
+            return this;
         }
         }
 
 
         @Override
         @Override
         public MapRecordBuilder withMaskLength(byte maskLength) {
         public MapRecordBuilder withMaskLength(byte maskLength) {
-            return null;
+            this.maskLength = maskLength;
+            return this;
         }
         }
 
 
         @Override
         @Override
         public MapRecordBuilder withAction(LispMapReplyAction action) {
         public MapRecordBuilder withAction(LispMapReplyAction action) {
-            return null;
+            this.action = action;
+            return this;
         }
         }
 
 
         @Override
         @Override
         public MapRecordBuilder withAuthoritative(boolean authoritative) {
         public MapRecordBuilder withAuthoritative(boolean authoritative) {
-            return null;
+            this.authoritative = authoritative;
+            return this;
         }
         }
 
 
         @Override
         @Override
         public MapRecordBuilder withMapVersionNumber(short mapVersionNumber) {
         public MapRecordBuilder withMapVersionNumber(short mapVersionNumber) {
-            return null;
+            this.mapVersionNumber = mapVersionNumber;
+            return this;
         }
         }
 
 
         @Override
         @Override
         public MapRecordBuilder withEidPrefixAfi(LispAfiAddress prefix) {
         public MapRecordBuilder withEidPrefixAfi(LispAfiAddress prefix) {
-            return null;
+            this.eidPrefixAfi = prefix;
+            return this;
+        }
+
+        @Override
+        public LispMapRecord build() {
+            return new DefaultLispMapRecord(recordTtl, locatorCount, maskLength,
+                    action, authoritative, mapVersionNumber, eidPrefixAfi);
         }
         }
     }
     }
 }
 }

@@ -20,7 +20,7 @@ import org.onosproject.lisp.msg.types.LispAfiAddress;
 /**
 /**
  * LISP EID record section which is part of LISP map request message.
  * LISP EID record section which is part of LISP map request message.
  */
  */
-public class LispEidRecord {
+public final class LispEidRecord {
 
 
     private final byte maskLength;
     private final byte maskLength;
     private final LispAfiAddress prefix;
     private final LispAfiAddress prefix;

@@ -131,5 +131,12 @@ public interface LispMapRecord {
          * @return MapRecordBuilder object
          * @return MapRecordBuilder object
          */
          */
         MapRecordBuilder withEidPrefixAfi(LispAfiAddress prefix);
         MapRecordBuilder withEidPrefixAfi(LispAfiAddress prefix);
+
+        /**
+         * Builds map record.
+         *
+         * @return map record instance
+         */
+        LispMapRecord build();
     }
     }
 }
 }