From 1c2f495ce4f332cb348a2f13f9d128c9dc65d6f9 Mon Sep 17 00:00:00 2001
From: Marian Adamjak <marian.adamjak@pantheon.sk>
Date: Thu, 23 Oct 2014 15:05:23 +0200
Subject: [PATCH] BUG 2245 - Fixed Loose coupling

Change-Id: I0328d47b3817b4c8aa1f64e81b1e1aea304e97c0
Signed-off-by: Marian Adamjak <marian.adamjak@pantheon.sk>
---
 .../openflowjava/protocol/impl/core/UdpConnectionMap.java      | 3 ++-
 .../serialization/match/AbstractOxmIpv6AddressSerializer.java  | 2 +-
 ...atchSerializerTest2.java => OF13MatchSerializer02Test.java} | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)
 rename openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/{OF13MatchSerializerTest2.java => OF13MatchSerializer02Test.java} (98%)

diff --git a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/UdpConnectionMap.java b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/UdpConnectionMap.java
index ce6d17f0..3c048f67 100644
--- a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/UdpConnectionMap.java
+++ b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/UdpConnectionMap.java
@@ -10,6 +10,7 @@ package org.opendaylight.openflowjava.protocol.impl.core;
 
 import java.net.InetSocketAddress;
 import java.util.HashMap;
+import java.util.Map;
 
 import org.opendaylight.openflowjava.protocol.impl.connection.MessageConsumer;
 
@@ -21,7 +22,7 @@ import org.opendaylight.openflowjava.protocol.impl.connection.MessageConsumer;
  */
 public class UdpConnectionMap {
 
-    private static HashMap<InetSocketAddress, MessageConsumer> connectionMap = new HashMap<>();
+    private static Map<InetSocketAddress, MessageConsumer> connectionMap = new HashMap<>();
 
     /**
      * @param address sender's address
diff --git a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/AbstractOxmIpv6AddressSerializer.java b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/AbstractOxmIpv6AddressSerializer.java
index 63b6f42e..c83f9d90 100644
--- a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/AbstractOxmIpv6AddressSerializer.java
+++ b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/AbstractOxmIpv6AddressSerializer.java
@@ -44,7 +44,7 @@ public abstract class AbstractOxmIpv6AddressSerializer extends AbstractOxmMatchE
         writeMask(entry, outBuffer, getValueLength());
     }
 
-    private static List<String> parseIpv6Address(final ArrayList<String> addressGroups) {
+    private static List<String> parseIpv6Address(final List<String> addressGroups) {
         int countEmpty = 0;
         for (String group : addressGroups) {
             if (group.equals("")) {
diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/OF13MatchSerializerTest2.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/OF13MatchSerializer02Test.java
similarity index 98%
rename from openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/OF13MatchSerializerTest2.java
rename to openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/OF13MatchSerializer02Test.java
index e7f1e8d3..6ed7c7e7 100644
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/OF13MatchSerializerTest2.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/OF13MatchSerializer02Test.java
@@ -128,7 +128,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.oxm.
  * @author michal.polkorab
  *
  */
-public class OF13MatchSerializerTest2 {
+public class OF13MatchSerializer02Test {
 
     private SerializerRegistry registry;
     private OFSerializer<Match> matchSerializer;
-- 
2.36.6