Reduce Ipv4Util.byteBufForAddress() users

Plenty of users are just writing the resulting buffer into a ByteBuf.
Skip the ceremony and operate on byte[]s.

Change-Id: I6e7a6b510222342ed6977dcc298df4329994abf9
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/bgp/extensions/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/impl/attribute/NodeAttributesParser.java b/bgp/extensions/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/impl/attribute/NodeAttributesParser.java
index 78e6ce2c97aa00e4343d61a81d24fd30ffbc3c7a..a4cbae9e67bd561611868be5b257769ac550ac60 100644 (file)
--- a/bgp/extensions/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/impl/attribute/NodeAttributesParser.java
+++ b/bgp/extensions/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/impl/attribute/NodeAttributesParser.java
@@ -33,7 +33,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.link
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.linkstate.rev200120.linkstate.path.attribute.LinkStateAttribute;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.linkstate.rev200120.linkstate.path.attribute.link.state.attribute.NodeAttributesCase;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.linkstate.rev200120.linkstate.path.attribute.link.state.attribute.NodeAttributesCaseBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.linkstate.rev200120.linkstate.path.attribute.link.state.attribute.node.attributes._case.NodeAttributes;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.linkstate.rev200120.linkstate.path.attribute.link.state.attribute.node.attributes._case.NodeAttributesBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.linkstate.rev200120.node.state.SrAlgorithm;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.linkstate.rev200120.node.state.SrCapabilities;
@@ -153,36 +152,38 @@ public final class NodeAttributesParser {
 
     static void serializeNodeAttributes(final NodeAttributesCase nodeAttributesCase, final ByteBuf byteAggregator) {
         LOG.trace("Started serializing Node Attributes");
-        final NodeAttributes nodeAttributes = nodeAttributesCase.getNodeAttributes();
+        final var nodeAttributes = nodeAttributesCase.getNodeAttributes();
         serializeTopologyId(nodeAttributes.getTopologyIdentifier(), byteAggregator);
         serializeNodeFlagBits(nodeAttributes.getNodeFlags(), byteAggregator);
         if (nodeAttributes.getDynamicHostname() != null) {
             TlvUtil.writeTLV(DYNAMIC_HOSTNAME, Unpooled.wrappedBuffer(StandardCharsets.UTF_8.encode(
                 nodeAttributes.getDynamicHostname())), byteAggregator);
         }
-        final Set<IsisAreaIdentifier> isisList = nodeAttributes.getIsisAreaId();
+        final var isisList = nodeAttributes.getIsisAreaId();
         if (isisList != null) {
-            for (final IsisAreaIdentifier isisAreaIdentifier : isisList) {
+            for (var isisAreaIdentifier : isisList) {
                 TlvUtil.writeTLV(ISIS_AREA_IDENTIFIER, Unpooled.wrappedBuffer(isisAreaIdentifier.getValue()),
                     byteAggregator);
             }
         }
-        if (nodeAttributes.getIpv4RouterId() != null) {
-            TlvUtil.writeTLV(TlvUtil.LOCAL_IPV4_ROUTER_ID, Ipv4Util.byteBufForAddress(nodeAttributes.getIpv4RouterId()),
-                byteAggregator);
+        final var ipv4 = nodeAttributes.getIpv4RouterId();
+        if (ipv4 != null) {
+            TlvUtil.writeTLV(TlvUtil.LOCAL_IPV4_ROUTER_ID, Ipv4Util.byteBufForAddress(ipv4), byteAggregator);
         }
-        if (nodeAttributes.getIpv6RouterId() != null) {
-            TlvUtil.writeTLV(TlvUtil.LOCAL_IPV6_ROUTER_ID, Ipv6Util.byteBufForAddress(nodeAttributes.getIpv6RouterId()),
-                byteAggregator);
+        final var ipv6 = nodeAttributes.getIpv6RouterId();
+        if (ipv6 != null) {
+            TlvUtil.writeTLV(TlvUtil.LOCAL_IPV6_ROUTER_ID, Ipv6Util.byteBufForAddress(ipv6), byteAggregator);
         }
-        if (nodeAttributes.getSrCapabilities() != null) {
-            final ByteBuf capBuffer = Unpooled.buffer();
-            SrNodeAttributesParser.serializeSrCapabilities(nodeAttributes.getSrCapabilities(), capBuffer);
+        final var srCapabilities = nodeAttributes.getSrCapabilities();
+        if (srCapabilities != null) {
+            final var capBuffer = Unpooled.buffer();
+            SrNodeAttributesParser.serializeSrCapabilities(srCapabilities, capBuffer);
             TlvUtil.writeTLV(SR_CAPABILITIES, capBuffer, byteAggregator);
         }
-        if (nodeAttributes.getSrAlgorithm() != null) {
-            final ByteBuf capBuffer = Unpooled.buffer();
-            SrNodeAttributesParser.serializeSrAlgorithms(nodeAttributes.getSrAlgorithm(), capBuffer);
+        final var srAlgorithm = nodeAttributes.getSrAlgorithm();
+        if (srAlgorithm != null) {
+            final var capBuffer = Unpooled.buffer();
+            SrNodeAttributesParser.serializeSrAlgorithms(srAlgorithm, capBuffer);
             TlvUtil.writeTLV(SR_ALGORITHMS, capBuffer, byteAggregator);
         }
         LOG.trace("Finished serializing Node Attributes");

diff --git a/bgp/extensions/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/impl/attribute/sr/SrLinkAttributesParser.java b/bgp/extensions/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/impl/attribute/sr/SrLinkAttributesParser.java
index ff082ea05a2842fac34c118bcf7e86cad9673be6..46f3817d54bbb462bb9a8d6db5e8b2c9a9dc16d0 100644 (file)
--- a/bgp/extensions/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/impl/attribute/sr/SrLinkAttributesParser.java
+++ b/bgp/extensions/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/impl/attribute/sr/SrLinkAttributesParser.java
@@ -179,27 +179,22 @@ public final class SrLinkAttributesParser {
         if (protocol == null) {
             return null;
         }
-        switch (protocol) {
-            case IsisLevel1:
-            case IsisLevel2:
-                return new IsisAdjFlagsCaseBuilder()
-                        .setIsisAdjFlags(new IsisAdjFlagsBuilder()
-                            .setAddressFamily(flags.get(ADDRESS_FAMILY_FLAG))
-                            .setBackup(flags.get(BACKUP_ISIS))
-                            .setSet(flags.get(SET_ISIS))
-                            .build())
-                        .build();
-            case Ospf:
-            case OspfV3:
-                return new OspfAdjFlagsCaseBuilder()
-                        .setOspfAdjFlags(new OspfAdjFlagsBuilder()
-                            .setBackup(flags.get(BACKUP_OSPF))
-                            .setSet(flags.get(SET_OSPF))
-                            .build())
-                        .build();
-            default:
-                return null;
-        }
+        return switch (protocol) {
+            case IsisLevel1, IsisLevel2 -> new IsisAdjFlagsCaseBuilder()
+                .setIsisAdjFlags(new IsisAdjFlagsBuilder()
+                    .setAddressFamily(flags.get(ADDRESS_FAMILY_FLAG))
+                    .setBackup(flags.get(BACKUP_ISIS))
+                    .setSet(flags.get(SET_ISIS))
+                    .build())
+                .build();
+            case Ospf, OspfV3 -> new OspfAdjFlagsCaseBuilder()
+                .setOspfAdjFlags(new OspfAdjFlagsBuilder()
+                    .setBackup(flags.get(BACKUP_OSPF))
+                    .setSet(flags.get(SET_OSPF))
+                    .build())
+                .build();
+            default -> null;
+        };
     }
 
     public static <T extends EpeAdjSidTlv> void serializeAdjacencySegmentIdentifiers(final List<T> adjSids,
@@ -237,7 +232,7 @@ public final class SrLinkAttributesParser {
         if (srLanAdjId.getIsoSystemId() != null) {
             value.writeBytes(srLanAdjId.getIsoSystemId().getValue());
         } else if (srLanAdjId.getNeighborId() != null) {
-            value.writeBytes(Ipv4Util.byteBufForAddress(srLanAdjId.getNeighborId()));
+            value.writeBytes(Ipv4Util.bytesForAddress(srLanAdjId.getNeighborId()));
         }
         value.writeBytes(SidLabelIndexParser.serializeSidValue(srLanAdjId.getSidLabelIndex()));
         return value;

diff --git a/bgp/extensions/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/impl/attribute/sr/SrNodeAttributesParser.java b/bgp/extensions/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/impl/attribute/sr/SrNodeAttributesParser.java
index 3029b7234fd38814da9e738b7736dd20b6aa429a..263ac047997387976a99c0eac8d9f40bde230e56 100644 (file)
--- a/bgp/extensions/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/impl/attribute/sr/SrNodeAttributesParser.java
+++ b/bgp/extensions/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/impl/attribute/sr/SrNodeAttributesParser.java
@@ -68,7 +68,7 @@ public final class SrNodeAttributesParser {
     }
 
     public static SrAlgorithm parseSrAlgorithms(final ByteBuf buffer) {
-        final SrAlgorithmBuilder builder = new SrAlgorithmBuilder();
+        final var builder = new SrAlgorithmBuilder();
         final var algs = ImmutableSet.<Algorithm>builder();
         while (buffer.isReadable()) {
             algs.add(Algorithm.forValue(buffer.readUnsignedByte()));
@@ -78,8 +78,9 @@ public final class SrNodeAttributesParser {
     }
 
     public static void serializeSrAlgorithms(final SrAlgorithm alg, final ByteBuf buffer) {
-        if (alg.getAlgorithms() != null) {
-            for (final Algorithm a : alg.getAlgorithms()) {
+        final var algorithms = alg.getAlgorithms();
+        if (algorithms != null) {
+            for (var a : algorithms) {
                 buffer.writeByte(a.getIntValue());
             }
         }

diff --git a/bgp/extensions/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/impl/attribute/sr/binding/sid/sub/tlvs/Ipv4EroParser.java b/bgp/extensions/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/impl/attribute/sr/binding/sid/sub/tlvs/Ipv4EroParser.java
index babb745d6e68236fc6be376d257476425bec0aa9..8e7bc568ddca4a608bd32fe2bcae9e53a9a5b3d5 100644 (file)
--- a/bgp/extensions/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/impl/attribute/sr/binding/sid/sub/tlvs/Ipv4EroParser.java
+++ b/bgp/extensions/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/impl/attribute/sr/binding/sid/sub/tlvs/Ipv4EroParser.java
@@ -72,7 +72,7 @@ public final class Ipv4EroParser implements BindingSubTlvsParser, BindingSubTlvs
     static ByteBuf serializeIpv4EroCase(final Boolean loose, final Ipv4AddressNoZone address) {
         final ByteBuf buffer = Unpooled.buffer();
         serializeEroFlags(buffer, loose);
-        buffer.writeBytes(Ipv4Util.byteBufForAddress(address));
+        buffer.writeBytes(Ipv4Util.bytesForAddress(address));
         return buffer;
     }
 

diff --git a/rsvp/impl/src/main/java/org/opendaylight/protocol/rsvp/parser/impl/te/AbstractAssociationParser.java b/rsvp/impl/src/main/java/org/opendaylight/protocol/rsvp/parser/impl/te/AbstractAssociationParser.java
index bf74ea312b3df8eb00793be769da9adfac0558ec..c9af6ae1f988c613e1a323487178a1611615584c 100644 (file)
--- a/rsvp/impl/src/main/java/org/opendaylight/protocol/rsvp/parser/impl/te/AbstractAssociationParser.java
+++ b/rsvp/impl/src/main/java/org/opendaylight/protocol/rsvp/parser/impl/te/AbstractAssociationParser.java
@@ -41,12 +41,12 @@ public abstract class AbstractAssociationParser extends AbstractRSVPObjectParser
             serializeAttributeHeader(BODY_SIZE_IPV4, CLASS_NUM, CTYPE_IPV4, output);
             output.writeShort(assObject.getAssociationType().getIntValue());
             writeUint16(output, assObject.getAssociationId());
-            output.writeBytes(Ipv4Util.byteBufForAddress(ipAddress.getIpv4AddressNoZone()));
+            output.writeBytes(Ipv4Util.bytesForAddress(ipAddress.getIpv4AddressNoZone()));
         } else {
             serializeAttributeHeader(BODY_SIZE_IPV6, CLASS_NUM, CTYPE_IPV6, output);
             output.writeShort(assObject.getAssociationType().getIntValue());
             writeUint16(output, assObject.getAssociationId());
-            output.writeBytes(Ipv6Util.byteBufForAddress(ipAddress.getIpv6AddressNoZone()));
+            output.writeBytes(Ipv6Util.bytesForAddress(ipAddress.getIpv6AddressNoZone()));
         }
     }