Do not instantiate Joiner/Splitter
[openflowjava.git] / openflow-protocol-impl / src / main / java / org / opendaylight / openflowjava / protocol / impl / serialization / match / AbstractOxmIpv6AddressSerializer.java
index a0ca6e39f7865d4f8f5fffdc3799fd859bebdc21..61cea69da2c62aec954b7624b69db0889863ca75 100644 (file)
@@ -13,11 +13,11 @@ import java.util.ArrayList;
 import java.util.Arrays;\r
 import java.util.List;\r
 \r
+import org.opendaylight.openflowjava.protocol.impl.util.ByteBufUtils;\r
 import org.opendaylight.openflowjava.protocol.impl.util.EncodeConstants;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.Ipv6AddressMatchEntry;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.oxm.fields.grouping.MatchEntries;\r
 \r
-import com.google.common.base.Splitter;\r
 import com.google.common.collect.Lists;\r
 \r
 /**\r
@@ -27,7 +27,7 @@ import com.google.common.collect.Lists;
 public abstract class AbstractOxmIpv6AddressSerializer extends AbstractOxmMatchEntrySerializer {\r
 \r
     @Override\r
-    public void serialize(MatchEntries entry, ByteBuf outBuffer) {\r
+    public void serialize(final MatchEntries entry, final ByteBuf outBuffer) {\r
         super.serialize(entry, outBuffer);\r
         String textAddress = entry.getAugmentation(Ipv6AddressMatchEntry.class).getIpv6Address().getValue();\r
         List<String> address;\r
@@ -36,7 +36,7 @@ public abstract class AbstractOxmIpv6AddressSerializer extends AbstractOxmMatchE
             Arrays.fill(tmp, "0");\r
             address = Arrays.asList(tmp);\r
         } else {\r
-            address = parseIpv6Address(Lists.newArrayList(Splitter.on(":").split(textAddress)));\r
+            address = parseIpv6Address(Lists.newArrayList(ByteBufUtils.COLON_SPLITTER.split(textAddress)));\r
         }\r
         for (String group : address) {\r
             outBuffer.writeShort(Integer.parseInt(group, 16));\r
@@ -44,7 +44,7 @@ public abstract class AbstractOxmIpv6AddressSerializer extends AbstractOxmMatchE
         writeMask(entry, outBuffer, getValueLength());\r
     }\r
 \r
-    private static List<String> parseIpv6Address(ArrayList<String> addressGroups) {\r
+    private static List<String> parseIpv6Address(final ArrayList<String> addressGroups) {\r
         int countEmpty = 0;\r
         for (String group : addressGroups) {\r
             if (group.equals("")) {\r