Do not use string concat in Preconditions

Precoditions use String.format(), so there is no need to use concat,
saving the happy path from doing some unneeded work.

Change-Id: I2ece566a3450cf0e1349d8685de5beeca39130c7
Signed-off-by: Robert Varga <rovarga@cisco.com>

diff --git a/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/open/GracefulCapabilityHandler.java b/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/open/GracefulCapabilityHandler.java
index 6a0e550cac3d82a78e3533750263830671e85339..567c3d5ee1bc530c964a2cc571eb77993de36810 100644 (file)
--- a/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/open/GracefulCapabilityHandler.java
+++ b/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/open/GracefulCapabilityHandler.java
@@ -79,7 +79,7 @@ public final class GracefulCapabilityHandler implements CapabilityParser, Capabi
         if (time == null) {
             time = 0;
         }
-        Preconditions.checkArgument(time >= 0 && time <= MAX_RESTART_TIME, "Restart time is " + time);
+        Preconditions.checkArgument(time >= 0 && time <= MAX_RESTART_TIME, "Restart time is %s", time);
         timeval = time;
         final RestartFlags flags = grace.getRestartFlags();
         if (flags != null && flags.isRestartState()) {
@@ -92,12 +92,12 @@ public final class GracefulCapabilityHandler implements CapabilityParser, Capabi
             for (final Tables t : tables) {
                 final Class<? extends AddressFamily> afi = t.getAfi();
                 final Integer afival = this.afiReg.numberForClass(afi);
-                Preconditions.checkArgument(afival != null, "Unhandled address family " + afi);
+                Preconditions.checkArgument(afival != null, "Unhandled address family %s", afi);
                 bytes.writeShort(afival);
 
                 final Class<? extends SubsequentAddressFamily> safi = t.getSafi();
                 final Integer safival = this.safiReg.numberForClass(safi);
-                Preconditions.checkArgument(safival != null, "Unhandled subsequent address family " + safi);
+                Preconditions.checkArgument(safival != null, "Unhandled subsequent address family %s", safi);
                 bytes.writeByte(safival);
 
                 if (t.getAfiFlags() != null && t.getAfiFlags().isForwardingState()) {

diff --git a/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/open/MultiProtocolCapabilityHandler.java b/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/open/MultiProtocolCapabilityHandler.java
index 486d0c5788269d0c4dc1ffc71bb49cbdd2923f52..ae53c974345c75792b90cd6432090072ff3fe4c1 100644 (file)
--- a/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/open/MultiProtocolCapabilityHandler.java
+++ b/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/open/MultiProtocolCapabilityHandler.java
@@ -62,15 +62,15 @@ public final class MultiProtocolCapabilityHandler implements CapabilityParser, C
         final ByteBuf capBuffer = Unpooled.buffer();
         final Class<? extends AddressFamily> afi = mp.getMultiprotocolCapability().getAfi();
         final Integer afival = this.afiReg.numberForClass(afi);
-        Preconditions.checkArgument(afival != null, "Unhandled address family " + afi);
+        Preconditions.checkArgument(afival != null, "Unhandled address family %s", afi);
         capBuffer.writeShort(afival);
 
         final Class<? extends SubsequentAddressFamily> safi = mp.getMultiprotocolCapability().getSafi();
         final Integer safival = this.safiReg.numberForClass(safi);
-        Preconditions.checkArgument(safival != null, "Unhandled subsequent address family " + safi);
+        Preconditions.checkArgument(safival != null, "Unhandled subsequent address family %s", safi);
         capBuffer.writeZero(RESERVED);
         capBuffer.writeByte(safival);
 
         CapabilityUtil.formatCapability(CODE, capBuffer, byteAggregator);
     }
-}
\ No newline at end of file
+}

diff --git a/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/pojo/AbstractFamilyRegistry.java b/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/pojo/AbstractFamilyRegistry.java
index 41d863fe970fdfbff9d405c9f2c56c669fb11f6b..2411bc1eb1a63c6e781255e5fccf65dbf36c20d5 100644 (file)
--- a/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/pojo/AbstractFamilyRegistry.java
+++ b/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/pojo/AbstractFamilyRegistry.java
@@ -22,10 +22,10 @@ abstract class AbstractFamilyRegistry<C, N> {
         Preconditions.checkNotNull(clazz);
 
         final Class<?> c = numberToClass.get(number);
-        Preconditions.checkState(c == null, "Number " + number + " already registered to " + c);
+        Preconditions.checkState(c == null, "Number %s already registered to %s", clazz, c);
 
         final N n = classToNumber.get(clazz);
-        Preconditions.checkState(n == null, "Class " + clazz + " already registered to " + n);
+        Preconditions.checkState(n == null, "Class %s already registered to %s", clazz, n);
 
         numberToClass.put(number, clazz);
         classToNumber.put(clazz, number);

diff --git a/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/pojo/SimpleNlriRegistry.java b/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/pojo/SimpleNlriRegistry.java
index dea47e4e38f77a8f05a7374b22a72aa1c8cdeb18..d9eff10b6fd1b0baf5619c0f1a3470eaa3580d9a 100644 (file)
--- a/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/pojo/SimpleNlriRegistry.java
+++ b/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/pojo/SimpleNlriRegistry.java
@@ -54,7 +54,7 @@ final class SimpleNlriRegistry implements NlriRegistry {
 
     synchronized AutoCloseable registerNlriSerializer(final Class<? extends DataObject> nlriClass, final NlriSerializer serializer){
         final NlriSerializer prev = this.serializers.get(nlriClass);
-        Preconditions.checkState(prev == null, "Serializer already bound to class " + prev);
+        Preconditions.checkState(prev == null, "Serializer already bound to class %s", prev);
 
         this.serializers.put(nlriClass, serializer);
         final Object lock = this;
@@ -72,7 +72,7 @@ final class SimpleNlriRegistry implements NlriRegistry {
             final Class<? extends SubsequentAddressFamily> safi, final NlriParser parser) {
         final BgpTableType key = createKey(afi, safi);
         final NlriParser prev = this.handlers.get(key);
-        Preconditions.checkState(prev == null, "AFI/SAFI is already bound to parser " + prev);
+        Preconditions.checkState(prev == null, "AFI/SAFI is already bound to parser %s", prev);
 
         this.handlers.put(key, parser);
         final Object lock = this;

diff --git a/bgp/util/src/main/java/org/opendaylight/protocol/bgp/util/BinaryBGPDumpFileParser.java b/bgp/util/src/main/java/org/opendaylight/protocol/bgp/util/BinaryBGPDumpFileParser.java
index a7f3ac846449679075299b3850c0beadc38a719b..b37b1f6f1ba3d3ed645e9649ae6c00d4c796b777 100644 (file)
--- a/bgp/util/src/main/java/org/opendaylight/protocol/bgp/util/BinaryBGPDumpFileParser.java
+++ b/bgp/util/src/main/java/org/opendaylight/protocol/bgp/util/BinaryBGPDumpFileParser.java
@@ -58,8 +58,8 @@ public final class BinaryBGPDumpFileParser {
                             // Parse length
                             final int length = ByteArray.bytesToInt(new byte[]{ byteArray[j], byteArray[j + 1] });
 
-                            Preconditions.checkArgument(length >= MINIMAL_LENGTH, "Invalid message at index " + start
-                                    + ", length atribute is lower than " + MINIMAL_LENGTH);
+                            Preconditions.checkArgument(length >= MINIMAL_LENGTH,
+                                    "Invalid message at index %s, length atribute is lower than %s", start, MINIMAL_LENGTH);
 
                             final byte[] message = Arrays.copyOfRange(byteArray, start, start + length);
                             messages.add(message);

diff --git a/bgp/util/src/main/java/org/opendaylight/protocol/bgp/util/HexDumpBGPFileParser.java b/bgp/util/src/main/java/org/opendaylight/protocol/bgp/util/HexDumpBGPFileParser.java
index bf0b13a7d4b162fd5a7d7bd05d388fac37cd9935..63c5b4aee76cbd792b8f299c2bb5145bc656a21b 100644 (file)
--- a/bgp/util/src/main/java/org/opendaylight/protocol/bgp/util/HexDumpBGPFileParser.java
+++ b/bgp/util/src/main/java/org/opendaylight/protocol/bgp/util/HexDumpBGPFileParser.java
@@ -77,8 +77,8 @@ public final class HexDumpBGPFileParser {
 
             // Assert that message is longer than minimum 19(header.length == 19)
             // If length in BGP message would be 0, loop would never end
-            Preconditions.checkArgument(length >= MINIMAL_LENGTH, "Invalid message at index " + idx + ", length atribute is lower than "
-                    + MINIMAL_LENGTH);
+            Preconditions.checkArgument(length >= MINIMAL_LENGTH, "Invalid message at index %s, length atribute is lower than %s",
+                    idx, MINIMAL_LENGTH);
 
             final String hexMessage = content.substring(idx, messageEndIdx);
             byte[] message = null;

diff --git a/util/src/main/java/org/opendaylight/protocol/util/Ipv4Util.java b/util/src/main/java/org/opendaylight/protocol/util/Ipv4Util.java
index 3174ec7affbfb7067a900019ea2c88d579c0c99e..a12ce4490834ac0b50ad6f2072c830729ebca833 100644 (file)
--- a/util/src/main/java/org/opendaylight/protocol/util/Ipv4Util.java
+++ b/util/src/main/java/org/opendaylight/protocol/util/Ipv4Util.java
@@ -153,7 +153,7 @@ public final class Ipv4Util {
     public static Ipv4Prefix prefixForByteBuf(final ByteBuf bytes) {
         final int prefixLength = bytes.readByte();
         final int size = prefixLength / Byte.SIZE + ((prefixLength % Byte.SIZE == 0) ? 0 : 1);
-        Preconditions.checkArgument(size <= bytes.readableBytes(), "Illegal length of IP prefix: " + (bytes.readableBytes()));
+        Preconditions.checkArgument(size <= bytes.readableBytes(), "Illegal length of IP prefix: %s", bytes.readableBytes());
         return Ipv4Util.prefixForBytes(ByteArray.readBytes(bytes, size), prefixLength);
     }
 

diff --git a/util/src/main/java/org/opendaylight/protocol/util/Ipv6Util.java b/util/src/main/java/org/opendaylight/protocol/util/Ipv6Util.java
index c43883bb8d78762c2abc004a49272183afebaff0..feac37a72098e74df32371e3f30dce721d876148 100644 (file)
--- a/util/src/main/java/org/opendaylight/protocol/util/Ipv6Util.java
+++ b/util/src/main/java/org/opendaylight/protocol/util/Ipv6Util.java
@@ -139,7 +139,7 @@ public final class Ipv6Util {
     public static Ipv6Prefix prefixForByteBuf(final ByteBuf bytes) {
         final int prefixLength = bytes.readByte();
         final int size = prefixLength / Byte.SIZE + ((prefixLength % Byte.SIZE == 0) ? 0 : 1);
-        Preconditions.checkArgument(size <= bytes.readableBytes(), "Illegal length of IP prefix: " + (bytes.readableBytes()));
+        Preconditions.checkArgument(size <= bytes.readableBytes(), "Illegal length of IP prefix: %s", bytes.readableBytes());
         return Ipv6Util.prefixForBytes(ByteArray.readBytes(bytes, size), prefixLength);
     }
 

diff --git a/util/src/main/java/org/opendaylight/protocol/util/PCEPHexDumpParser.java b/util/src/main/java/org/opendaylight/protocol/util/PCEPHexDumpParser.java
index 803104476faf304e1190200ecca559ca1df88c98..bff2eb26bd14ecf92c9ad0546306a021d5dd12dd 100644 (file)
--- a/util/src/main/java/org/opendaylight/protocol/util/PCEPHexDumpParser.java
+++ b/util/src/main/java/org/opendaylight/protocol/util/PCEPHexDumpParser.java
@@ -64,8 +64,8 @@ public final class PCEPHexDumpParser {
 
             // Assert that message is longer than minimum 4(header.length == 4)
             // If length in PCEP message would be 0, loop would never end
-            Preconditions.checkArgument(length >= MINIMAL_LENGTH, "Invalid message at index " + idx + ", length atribute is lower than "
-                + MINIMAL_LENGTH);
+            Preconditions.checkArgument(length >= MINIMAL_LENGTH, "Invalid message at index %s, length atribute is lower than %s",
+                idx, MINIMAL_LENGTH);
 
             // dot
             final String hexMessage = content.substring(messageIdx + 1, messageEndIdx);