Merge "OFPGC_ADD_OR_MOD support in openflowplugin"

diff --combined openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/OpenFlowPluginProviderImpl.java
index 88d3fedd2b446d885d5e56b9726f83d4526c4141,de66946430fcca29ccbf0d960658070baaa53c52..60e5af3c1d9a93d2a38e5105e82885da7d6e5104
--- 1/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/OpenFlowPluginProviderImpl.java
--- 2/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/OpenFlowPluginProviderImpl.java
+++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/OpenFlowPluginProviderImpl.java
@@@ -158,7 -158,8 +158,8 @@@ public class OpenFlowPluginProviderImp
          Futures.addCallback(Futures.allAsList(switchConnectionProviders.stream().map(switchConnectionProvider -> {
              // Inject OpenFlowPlugin custom serializers and deserializers into OpenFlowJava
              if (config.isUseSingleLayerSerialization()) {
-                 SerializerInjector.injectSerializers(switchConnectionProvider);
+                 SerializerInjector.injectSerializers(switchConnectionProvider,
+                         switchConnectionProvider.getConfiguration().isGroupAddModEnabled());
                  DeserializerInjector.injectDeserializers(switchConnectionProvider);
              } else {
                  DeserializerInjector.revertDeserializers(switchConnectionProvider);
@@@ -179,7 -180,7 +180,7 @@@
                  LOG.warn("Some switchConnectionProviders failed to start.", throwable);
                  openflowPluginStatusMonitor.reportStatus(ServiceState.ERROR, "some switch connections failed to start");
              }
 -        });
 +        }, MoreExecutors.directExecutor());
      }
  
      private ListenableFuture<List<Boolean>> shutdownSwitchConnections() {
@@@ -204,7 -205,7 +205,7 @@@
              public void onFailure(@Nonnull final Throwable throwable) {
                  LOG.warn("Some switchConnectionProviders failed to shutdown.", throwable);
              }
 -        });
 +        }, MoreExecutors.directExecutor());
  
          return listListenableFuture;
      }