From 7e7f2856ba17c660fa70766157757c61bde101c1 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Fri, 16 Aug 2019 13:40:52 +0200 Subject: [PATCH] Fix string duplication in Ipv6Utils This is minor code smell, create a method to concentrate common functionality. Change-Id: I32fb6c5c29a099885413cf18361e53098593054e Signed-off-by: Robert Varga (cherry picked from commit 749e7035fb1c8a6a7da82462d4e07c4c3fb72385) --- .../opendaylight/mdsal/model/ietf/util/Ipv6Utils.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/model/ietf/ietf-type-util/src/main/java/org/opendaylight/mdsal/model/ietf/util/Ipv6Utils.java b/model/ietf/ietf-type-util/src/main/java/org/opendaylight/mdsal/model/ietf/util/Ipv6Utils.java index 86fcb224da..c5e94e8292 100644 --- a/model/ietf/ietf-type-util/src/main/java/org/opendaylight/mdsal/model/ietf/util/Ipv6Utils.java +++ b/model/ietf/ietf-type-util/src/main/java/org/opendaylight/mdsal/model/ietf/util/Ipv6Utils.java @@ -118,19 +118,23 @@ final class Ipv6Utils { } if (haveVal) { - verify(j + INT16SZ <= INADDR6SZ, "Overrun in parsing of '%s', should not occur", str); + verifySize(j + INT16SZ <= INADDR6SZ, str); bytes[j++] = (byte) (val >> 8 & 0xff); bytes[j++] = (byte) (val & 0xff); } if (colonp != -1) { - verify(j != INADDR6SZ, "Overrun in parsing of '%s', should not occur", str); + verifySize(j != INADDR6SZ, str); expandZeros(bytes, colonp, j); } else { - verify(j == INADDR6SZ, "Overrun in parsing of '%s', should not occur", str); + verifySize(j == INADDR6SZ, str); } } + private static void verifySize(final boolean expression, final String str) { + verify(expression, "Overrun in parsing of '%s', should not occur", str); + } + private static void expandZeros(final byte[] bytes, final int where, final int filledBytes) { final int tailLength = filledBytes - where; final int tailOffset = INADDR6SZ - tailLength; -- 2.36.6