X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=openflowplugin-impl%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fopenflowplugin%2Fimpl%2Fprotocol%2Fdeserialization%2FMultipartDeserializerInjector.java;h=ff7805999bbdbb73a2e162d763b2c13f95aa228c;hb=HEAD;hp=a2b47a9aa886b855d9bf7d74555176da99508bfb;hpb=71efea4857d9b2ff99be42581682ecff3ce78238;p=openflowplugin.git

diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/MultipartDeserializerInjector.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/MultipartDeserializerInjector.java
index a2b47a9aa8..ff7805999b 100644
--- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/MultipartDeserializerInjector.java
+++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/MultipartDeserializerInjector.java
@@ -5,10 +5,8 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-
 package org.opendaylight.openflowplugin.impl.protocol.deserialization;
 
-import com.google.common.annotations.VisibleForTesting;
 import java.util.function.Consumer;
 import java.util.function.Function;
 import org.opendaylight.openflowjava.protocol.api.extensibility.DeserializerExtensionProvider;
@@ -32,8 +30,12 @@ import org.opendaylight.openflowplugin.impl.protocol.deserialization.multipart.M
 import org.opendaylight.openflowplugin.impl.protocol.deserialization.multipart.MultipartReplyTableFeaturesDeserializer;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.multipart.types.rev170112.multipart.reply.MultipartReplyBody;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.MultipartType;
+import org.opendaylight.yangtools.yang.common.Uint8;
+
+final class MultipartDeserializerInjector {
 
-class MultipartDeserializerInjector {
+    private MultipartDeserializerInjector() {
+    }
 
     /**
      * Injects message deserializers into provided
@@ -42,7 +44,7 @@ class MultipartDeserializerInjector {
      * @param provider OpenflowJava deserializer extension provider
      */
     static void injectDeserializers(final DeserializerExtensionProvider provider) {
-        final short version = EncodeConstants.OF13_VERSION_ID;
+        final Uint8 version = EncodeConstants.OF_VERSION_1_3;
 
         // Inject new multipart body deserializers here using injector created by createInjector method
         final Function<Integer, Consumer<OFDeserializer<? extends MultipartReplyBody>>> injector =
@@ -78,15 +80,9 @@ class MultipartDeserializerInjector {
      * @param version  Openflow version
      * @return injector
      */
-    @VisibleForTesting
-    static Function<Integer, Consumer<OFDeserializer<? extends MultipartReplyBody>>> createInjector(
-            final DeserializerExtensionProvider provider,
-            final short version) {
-        return code -> deserializer -> {
-            provider.registerDeserializer(
-                    new MessageCodeKey(version, code, MultipartReplyBody.class),
-                    deserializer);
-        };
+    private static Function<Integer, Consumer<OFDeserializer<? extends MultipartReplyBody>>> createInjector(
+            final DeserializerExtensionProvider provider, final Uint8 version) {
+        return code -> deserializer -> provider.registerDeserializer(
+                new MessageCodeKey(version, code, MultipartReplyBody.class), deserializer);
     }
-
 }