Cleanup AbstractEsiType

[bgpcep.git] / bgp / extensions / evpn / src / main / java / org / opendaylight / protocol / bgp / evpn / impl / esi / types / ASGenParser.java

diff --git a/bgp/extensions/evpn/src/main/java/org/opendaylight/protocol/bgp/evpn/impl/esi/types/ASGenParser.java b/bgp/extensions/evpn/src/main/java/org/opendaylight/protocol/bgp/evpn/impl/esi/types/ASGenParser.java
index 5d43550f42e26320e8c292aaddb87a358c190bd0..bf63114936bab8674f5a31f81c92d51177518c2e 100644 (file)
--- a/bgp/extensions/evpn/src/main/java/org/opendaylight/protocol/bgp/evpn/impl/esi/types/ASGenParser.java
+++ b/bgp/extensions/evpn/src/main/java/org/opendaylight/protocol/bgp/evpn/impl/esi/types/ASGenParser.java
@@ -5,14 +5,13 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-
 package org.opendaylight.protocol.bgp.evpn.impl.esi.types;
 
+import static com.google.common.base.Preconditions.checkArgument;
 import static org.opendaylight.protocol.bgp.evpn.impl.esi.types.EsiModelUtil.extractAS;
 import static org.opendaylight.protocol.bgp.evpn.impl.esi.types.EsiModelUtil.extractLD;
 import static org.opendaylight.protocol.util.ByteBufWriteUtil.writeUnsignedInt;
 
-import com.google.common.base.Preconditions;
 import io.netty.buffer.ByteBuf;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.AsNumber;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.evpn.rev180329.EsiType;
@@ -26,13 +25,12 @@ import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode;
 final class ASGenParser extends AbstractEsiType {
 
     @Override
-    public void serializeBody(final Esi esi, final ByteBuf body) {
-        Preconditions.checkArgument(esi instanceof AsGeneratedCase,
-                "Unknown esi instance. Passed %s. Needed AsGeneratedCase.", esi.getClass());
+    public ByteBuf serializeBody(final Esi esi, final ByteBuf body) {
+        checkArgument(esi instanceof AsGeneratedCase, "Unknown esi instance. Passed %s. Needed AsGeneratedCase.", esi);
         final AsGenerated asGen = ((AsGeneratedCase) esi).getAsGenerated();
         writeUnsignedInt(asGen.getAs().getValue(), body);
         writeUnsignedInt(asGen.getLocalDiscriminator(), body);
-        body.writeZero(ZERO_BYTE);
+        return body.writeZero(ZERO_BYTE);
     }
 
     @Override
@@ -42,16 +40,21 @@ final class ASGenParser extends AbstractEsiType {
 
     @Override
     public Esi serializeEsi(final ContainerNode esi) {
-        final AsGeneratedBuilder builder = new AsGeneratedBuilder();
-        builder.setLocalDiscriminator(extractLD(esi));
-        builder.setAs(extractAS(esi));
-        return new AsGeneratedCaseBuilder().setAsGenerated(builder.build()).build();
+        return new AsGeneratedCaseBuilder()
+                .setAsGenerated(new AsGeneratedBuilder()
+                    .setAs(extractAS(esi))
+                    .setLocalDiscriminator(extractLD(esi))
+                    .build())
+                .build();
     }
 
     @Override
     public Esi parseEsi(final ByteBuf buffer) {
-        final AsGenerated asGen = new AsGeneratedBuilder().setAs(new AsNumber(buffer.readUnsignedInt()))
-            .setLocalDiscriminator(buffer.readUnsignedInt()).build();
-        return new AsGeneratedCaseBuilder().setAsGenerated(asGen).build();
+        return new AsGeneratedCaseBuilder()
+                .setAsGenerated(new AsGeneratedBuilder()
+                    .setAs(new AsNumber(buffer.readUnsignedInt()))
+                    .setLocalDiscriminator(buffer.readUnsignedInt())
+                    .build())
+                .build();
     }
 }