Bug 2245 - Fixed 'Hide Utility Class Constructor' 99/12199/3
authorMichal Polkorab <michal.polkorab@pantheon.sk>
Thu, 23 Oct 2014 10:33:30 +0000 (12:33 +0200)
committerMichal Polkorab <michal.polkorab@pantheon.sk>
Thu, 23 Oct 2014 16:03:29 +0000 (18:03 +0200)
 - also fixed 'Method Type(Generic) Parameter Name'

Change-Id: I4323326dba8a371c65a5d9c1bfeefe867dbcbd4e
Signed-off-by: Michal Polkorab <michal.polkorab@pantheon.sk>
23 files changed:
openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/extensibility/DeserializerRegistry.java
openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/extensibility/SerializerExtensionProvider.java
openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/extensibility/SerializerRegistry.java
openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/SslKeyStore.java
openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/UdpConnectionMap.java
openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/ActionDeserializerInitializer.java
openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/DeserializerRegistryImpl.java
openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/InstructionDeserializerInitializer.java
openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/MatchEntryDeserializerInitializer.java
openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/MessageDeserializerInitializer.java [moved from openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/MessageDerializerInitializer.java with 96% similarity]
openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/TypeToClassMapInitializer.java
openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmMaskDeserializer.java
openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/ActionsInitializer.java
openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/InstructionsInitializer.java
openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/MatchEntriesInitializer.java
openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/MessageFactoryInitializer.java
openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/ActionConstants.java
openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/InstructionConstants.java
openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/ListDeserializer.java
simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/ClientSslContextFactory.java
simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/ClientSslKeyStore.java
simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/ClientSslTrustStore.java
simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/ScenarioFactory.java

index 26ac8c8bb0b3e0333df24d71d4cf78c84e59f10d..eeeac0a4e609223dc3a5ba27e178b8fddbaf3cda 100644 (file)
@@ -23,8 +23,8 @@ public interface DeserializerRegistry {
      * @param key used for deserializer lookup\r
      * @return deserializer found\r
      */\r
-    public <SERIALIZER_TYPE extends OFGeneralDeserializer>\r
-            SERIALIZER_TYPE getDeserializer(MessageCodeKey key);\r
+    public <SERIALIZERTYPE extends OFGeneralDeserializer>\r
+            SERIALIZERTYPE getDeserializer(MessageCodeKey key);\r
 \r
     /**\r
      * Registers deserializer.\r
index 422a1500668757f00082a52fe5d41c650cb031e0..9bbc85c3bc258bfd36652dd927b477b5cf05a682 100644 (file)
@@ -63,8 +63,8 @@ public interface SerializerExtensionProvider {
      * @param key used for serializer lookup\r
      * @param serializer serializer implementation\r
      */\r
-    public <OXM_CLASS extends OxmClassBase, OXM_TYPE extends MatchField> void registerMatchEntrySerializer(\r
-            MatchEntrySerializerKey<OXM_CLASS, OXM_TYPE> key,OFGeneralSerializer serializer);\r
+    public <OXMCLASS extends OxmClassBase, OXMTYPE extends MatchField> void registerMatchEntrySerializer(\r
+            MatchEntrySerializerKey<OXMCLASS, OXMTYPE> key,OFGeneralSerializer serializer);\r
 \r
     /**\r
      * Registers experimenter (vendor) message serializer\r
index 388338e2864f5977a9a25b18eac6860b9dd684a7..a53faa5c1367494f4b3c21dc93d1affdfaeda18a 100644 (file)
@@ -26,8 +26,8 @@ public interface SerializerRegistry {
      * @param msgTypeKey lookup key\r
      * @return serializer or NullPointerException if no serializer was found\r
      */\r
-    public <KEY_TYPE, SERIALIZER_TYPE extends OFGeneralSerializer> SERIALIZER_TYPE \r
-        getSerializer(MessageTypeKey<KEY_TYPE> msgTypeKey);\r
+    public <KEYTYPE, SERIALIZERTYPE extends OFGeneralSerializer> SERIALIZERTYPE \r
+        getSerializer(MessageTypeKey<KEYTYPE> msgTypeKey);\r
 \r
     /**\r
      * Registers serializer\r
@@ -40,7 +40,7 @@ public interface SerializerRegistry {
      * @param key used for serializer lookup\r
      * @param serializer serializer implementation\r
      */\r
-    public <KEY_TYPE> void registerSerializer(MessageTypeKey<KEY_TYPE> key,\r
+    public <KEYTYPE> void registerSerializer(MessageTypeKey<KEYTYPE> key,\r
             OFGeneralSerializer serializer);\r
 \r
     /**\r
@@ -50,5 +50,5 @@ public interface SerializerRegistry {
      * @return true if serializer was removed,\r
      *  false if no serializer was found under specified key\r
      */\r
-    public <KEY_TYPE> boolean unregisterSerializer(MessageTypeKey<KEY_TYPE> key);\r
+    public <KEYTYPE> boolean unregisterSerializer(MessageTypeKey<KEYTYPE> key);\r
 }\r
index 25c2e0b2f8a14381b831d18d19501da6631be8ef..983a03e99f5bd930fefd4a46c424ee6b33873090 100644 (file)
@@ -26,6 +26,10 @@ public final class SslKeyStore {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(SslKeyStore.class);
 
+    private SslKeyStore() {
+        throw new UnsupportedOperationException("Utility class shouldn't be instantiated");
+    }
+
     /**
      * InputStream instance of key - key location is on classpath
      * @param filename keystore location
index 3c048f6714ce04e05e34a43cc9951ca1f27521fe..aeb73056d05adf8e6a31668e3d5186af88979625 100644 (file)
@@ -20,10 +20,14 @@ import org.opendaylight.openflowjava.protocol.impl.connection.MessageConsumer;
 \r
  * @author michal.polkorab\r
  */\r
-public class UdpConnectionMap {\r
+public final class UdpConnectionMap {\r
 \r
     private static Map<InetSocketAddress, MessageConsumer> connectionMap = new HashMap<>();\r
 \r
+    private UdpConnectionMap() {\r
+        throw new UnsupportedOperationException("Utility class shouldn't be instantiated");\r
+    }\r
+\r
     /**\r
      * @param address sender's address\r
      * @return corresponding MessageConsumer\r
index e641ee93518fe82124f85553518d6d5cbc8b8dce..cbec7394db3e51e7d8451f167a1db87a917be7b2 100644 (file)
@@ -44,7 +44,11 @@ import org.opendaylight.openflowjava.protocol.impl.util.ActionDeserializerRegist
  * @author michal.polkorab\r
  *\r
  */\r
-public class ActionDeserializerInitializer {\r
+public final class ActionDeserializerInitializer {\r
+\r
+    private ActionDeserializerInitializer() {\r
+        throw new UnsupportedOperationException("Utility class shouldn't be instantiated");\r
+    }\r
 \r
     /**\r
      * Registers action deserializers\r
index f36b684fb6be9d504c0772d9ac0e384bc6ba4298..5c7ad39c6f2cb9c5200f8ac9e8c73cc463fd240d 100644 (file)
@@ -39,7 +39,7 @@ public class DeserializerRegistryImpl implements DeserializerRegistry {
     public void init() {
         registry = new HashMap<>();
         // register message deserializers
-        MessageDerializerInitializer.registerMessageDeserializers(this);
+        MessageDeserializerInitializer.registerMessageDeserializers(this);
 
         // register common structure deserializers
         registerDeserializer(new MessageCodeKey(EncodeConstants.OF10_VERSION_ID,
index a09f51479435648aeb5e69d569ccc75f36693d7b..9fcfd4d6d930a2da35701fd5ce92703d019f224c 100644 (file)
@@ -22,7 +22,11 @@ import org.opendaylight.openflowjava.protocol.impl.util.InstructionDeserializerR
  * @author michal.polkorab\r
  *\r
  */\r
-public class InstructionDeserializerInitializer {\r
+public final class InstructionDeserializerInitializer {\r
+\r
+    private InstructionDeserializerInitializer() {\r
+        throw new UnsupportedOperationException("Utility class shouldn't be instantiated");\r
+    }\r
 \r
     /**\r
      * Registers instruction deserializers\r
index fe15b917411739602a6f17940f9d65726a7e1a12..28f87a4cc402e7e35b9e86a1ecfca7d5a1d24165 100644 (file)
@@ -59,7 +59,11 @@ import org.opendaylight.openflowjava.protocol.api.util.OxmMatchConstants;
  * @author michal.polkorab\r
  *\r
  */\r
-public class MatchEntryDeserializerInitializer {\r
+public final class MatchEntryDeserializerInitializer {\r
+\r
+    private MatchEntryDeserializerInitializer() {\r
+        throw new UnsupportedOperationException("Utility class shouldn't be instantiated");\r
+    }\r
 \r
     /**\r
      * Registers match entry deserializers\r
@@ -55,7 +55,11 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731
  * @author michal.polkorab\r
  *\r
  */\r
-public class MessageDerializerInitializer {\r
+public final class MessageDeserializerInitializer {\r
+\r
+    private MessageDeserializerInitializer() {\r
+        throw new UnsupportedOperationException("Utility class shouldn't be instantiated");\r
+    }\r
 \r
     /**\r
      * Registers message deserializers\r
index 017e24544564e58bb68bae158ed85547cde430aa..213723c17fbb55e79a088331462b8ea0ad10c775 100644 (file)
@@ -31,7 +31,11 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731
  * @author michal.polkorab\r
  *\r
  */\r
-public class TypeToClassMapInitializer {\r
+public final class TypeToClassMapInitializer {\r
+\r
+    private TypeToClassMapInitializer() {\r
+        throw new UnsupportedOperationException("Utility class shouldn't be instantiated");\r
+    }\r
 \r
     /**\r
      * Initializes type to class map\r
index d4246fd221049d67ca501e65d730003f232888ed..728d42fa7cc86474e664cf2b01c07c97eeffd164 100644 (file)
@@ -17,7 +17,11 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.oxm.
  * @author michal.polkorab\r
  *\r
  */\r
-public class OxmMaskDeserializer {\r
+public final class OxmMaskDeserializer {\r
+\r
+    private OxmMaskDeserializer() {\r
+        throw new UnsupportedOperationException("Utility class shouldn't be instantiated");\r
+    }\r
 \r
     /**\r
      * Appends mask to match entry (match entry builder)\r
index 818a842b11ccbd377054848e5be5f4482c10886c..d3e74b5c8b1a5156ccb534041341e22ad4074acd 100644 (file)
@@ -70,7 +70,11 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev1
  * Initializes serializer registry with action serializers\r
  * @author michal.polkorab\r
  */\r
-public class ActionsInitializer {\r
+public final class ActionsInitializer {\r
+\r
+    private ActionsInitializer() {\r
+        throw new UnsupportedOperationException("Utility class shouldn't be instantiated");\r
+    }\r
 \r
     /**\r
      * Registers action serializers into provided registry\r
index 09bfe0cea48e259434444ecabf2a84d48e826b78..f60898ed0ac3e4366ee418e7b325417ba4bcea24 100644 (file)
@@ -28,7 +28,11 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.instruction
  * @author michal.polkorab\r
  *\r
  */\r
-public class InstructionsInitializer {\r
+public final class InstructionsInitializer {\r
+\r
+    private InstructionsInitializer() {\r
+        throw new UnsupportedOperationException("Utility class shouldn't be instantiated");\r
+    }\r
 \r
     /**\r
      * Registers instruction serializers into provided registry\r
index 50827a77f1448142d07b6238c92a50dba81148aa..4889fcbd252885553774128e9cf3c44fcd7c941d 100644 (file)
@@ -103,7 +103,11 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.Vlan
  * Initializes serializer registry with match entry serializers\r
  * @author michal.polkorab\r
  */\r
-public class MatchEntriesInitializer {\r
+public final class MatchEntriesInitializer {\r
+\r
+    private MatchEntriesInitializer() {\r
+        throw new UnsupportedOperationException("Utility class shouldn't be instantiated");\r
+    }\r
 \r
     /**\r
      * Registers match entry serializers into provided registry\r
index 094b4fde7ea25c21397117cbf6f622e4f60de3d8..70db90bed8df50a4018fa1666e4d9cab44df99c3 100644 (file)
@@ -60,7 +60,11 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731
  * @author michal.polkorab\r
  *\r
  */\r
-public class MessageFactoryInitializer {\r
+public final class MessageFactoryInitializer {\r
+\r
+    private MessageFactoryInitializer() {\r
+        throw new UnsupportedOperationException("Utility class shouldn't be instantiated");\r
+    }\r
 \r
     /**\r
      * Registers message serializers into provided registry\r
index d09d2dd520b9233f40916f86219b3fa39fc8dd06..cb7b051e9c7c535700a5bade4eb9b64b6e887d06 100644 (file)
@@ -12,7 +12,7 @@ package org.opendaylight.openflowjava.protocol.impl.util;
  * @author michal.polkorab\r
  *\r
  */\r
-public class ActionConstants {\r
+public final class ActionConstants {\r
 \r
     /** Openflow v1.0 & v1.3 OFPAT_OUTPUT code */\r
     public static final byte OUTPUT_CODE = 0;\r
@@ -101,4 +101,7 @@ public class ActionConstants {
     /** Action header size */\r
     public static final byte ACTION_IDS_LENGTH = 4;\r
 \r
+    private ActionConstants() {\r
+        throw new UnsupportedOperationException("Utility class shouldn't be instantiated");\r
+    }\r
 }\r
index 8e0ae6ec69e74f867e2a0cb554d8471a308b61d9..2476c4e90a41e0f35d802506c73c552db46c7aa3 100644 (file)
@@ -12,7 +12,7 @@ package org.opendaylight.openflowjava.protocol.impl.util;
  * @author michal.polkorab\r
  *\r
  */\r
-public class InstructionConstants {\r
+public final class InstructionConstants {\r
 \r
     /** Openflow v1.3 OFPIT_GOTO_TABLE code */\r
     public static final byte GOTO_TABLE_TYPE = 1;\r
@@ -41,4 +41,8 @@ public class InstructionConstants {
     public static final byte WRITE_METADATA_LENGTH = 24;\r
     /** Openflow v1.3 header length (only type and length fields) */\r
     public static final byte INSTRUCTION_IDS_LENGTH = 4;\r
+\r
+    private InstructionConstants() {\r
+        throw new UnsupportedOperationException("Utility class shouldn't be instantiated");\r
+    }\r
 }\r
index 160f3be59faeafb320cfd9a1c2533f51df052829..6e32f86fa712bc33292947794b3a6f7eb00dfcfc 100644 (file)
@@ -22,7 +22,11 @@ import org.opendaylight.yangtools.yang.binding.DataObject;
  * @author michal.polkorab\r
  *\r
  */\r
-public class ListDeserializer {\r
+public final class ListDeserializer {\r
+\r
+    private ListDeserializer() {\r
+        throw new UnsupportedOperationException("Utility class shouldn't be instantiated");\r
+    }\r
 \r
     /**\r
      * Deserializes items into list\r
index c1199c1e66527bca2a92d61d7f40d048edaaad25..a6d93abac30843d01f405c1e2f6946dd46219ac8 100644 (file)
@@ -22,7 +22,10 @@ import javax.net.ssl.TrustManagerFactory;
  */
 public final class ClientSslContextFactory {
 
-    
+    private ClientSslContextFactory() {
+        throw new UnsupportedOperationException("Utility class shouldn't be instantiated");
+    }
+
     // "TLS" - supports some version of TLS
     // Use "TLSv1", "TLSv1.1", "TLSv1.2" for specific TLS version
     private static final String PROTOCOL = "TLS";
index 279072fa7fe6ae9ca88cb9b212bbe458eb3684ed..233b1c1148c7750848dd366dde1ec4d36fa11265 100644 (file)
@@ -19,6 +19,10 @@ public final class ClientSslKeyStore {
 
     private static final String filename = "/selfSignedSwitch";
 
+    private ClientSslKeyStore() {
+        throw new UnsupportedOperationException("Utility class shouldn't be instantiated");
+    }
+
     /**
      * InputStream instance of key
      *
index 1379c8dd8a488b9356472c677d34f3f5c6f9fabd..c346ba1e1df9f04f232819f0c9f1b02d389205b5 100644 (file)
@@ -19,6 +19,10 @@ public final class ClientSslTrustStore {
 
     private static final String filename = "/selfSignedController";
 
+    private ClientSslTrustStore() {
+        throw new UnsupportedOperationException("Utility class shouldn't be instantiated");
+    }
+
     /**
      * InputStream instance of key
      *
index 318d7226b1f202d1ffff9ca086041498707d3f05..264bedfd6651e9b033abe26844a1a5eb0bf4a455 100644 (file)
@@ -17,7 +17,11 @@ import org.opendaylight.openflowjava.util.ByteBufUtils;
  * 
  * @author michal.polkorab
  */
-public class ScenarioFactory {
+public final class ScenarioFactory {
+
+    private ScenarioFactory() {
+        throw new UnsupportedOperationException("Utility class shouldn't be instantiated");
+    }
 
     /**
      * Creates stack with handshake needed messages.