X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=openflow-protocol-ext%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fopenflowjava%2Fprotocol%2Fext%2Fserialization%2FDefaultExperimenterSerializerInitializer.java;fp=openflow-protocol-ext%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fopenflowjava%2Fprotocol%2Fext%2Fserialization%2FDefaultExperimenterInitializer.java;h=7f80a67d700bb9d012bf5a5ab67bba6ade452d2a;hb=5c2b2f88da58e2e629eb5a06fdcb281ff8010656;hp=a3509fabf3c97df0c0f476c9a40b131e119410b4;hpb=774bedf030142fd05a31e02b21c4079745cf83f0;p=openflowjava.git diff --git a/openflow-protocol-ext/src/main/java/org/opendaylight/openflowjava/protocol/ext/serialization/DefaultExperimenterInitializer.java b/openflow-protocol-ext/src/main/java/org/opendaylight/openflowjava/protocol/ext/serialization/DefaultExperimenterSerializerInitializer.java similarity index 76% rename from openflow-protocol-ext/src/main/java/org/opendaylight/openflowjava/protocol/ext/serialization/DefaultExperimenterInitializer.java rename to openflow-protocol-ext/src/main/java/org/opendaylight/openflowjava/protocol/ext/serialization/DefaultExperimenterSerializerInitializer.java index a3509fab..7f80a67d 100644 --- a/openflow-protocol-ext/src/main/java/org/opendaylight/openflowjava/protocol/ext/serialization/DefaultExperimenterInitializer.java +++ b/openflow-protocol-ext/src/main/java/org/opendaylight/openflowjava/protocol/ext/serialization/DefaultExperimenterSerializerInitializer.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Pantheon Technologies s.r.o. and others. All rights reserved. + * Copyright (c) 2014 Pantheon Technologies s.r.o. and others. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0 which accompanies this distribution, @@ -10,8 +10,8 @@ package org.opendaylight.openflowjava.protocol.ext.serialization; import org.opendaylight.openflowjava.protocol.api.extensibility.EnhancedMessageTypeKey; import org.opendaylight.openflowjava.protocol.api.extensibility.MessageTypeKey; -import org.opendaylight.openflowjava.protocol.api.extensibility.SerializerRegistry; import org.opendaylight.openflowjava.protocol.ext.util.ExtConstants; +import org.opendaylight.openflowjava.protocol.spi.connection.SwitchConnectionProvider; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.Experimenter; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.actions.grouping.Action; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.instruction.rev130731.instructions.grouping.Instruction; @@ -24,45 +24,45 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731 * @author michal.polkorab * */ -public class DefaultExperimenterInitializer { +public class DefaultExperimenterSerializerInitializer { /** * Registers message serializers into provided registry - * @param registry registry to be initialized with message serializers + * @param provider provider to be initialized with message serializers */ - public static void registerDefaultExperimenterSerializers(SerializerRegistry registry) { + public static void registerSerializers(SwitchConnectionProvider provider) { // register OF v1.0 default experimenter serializers short version = ExtConstants.OF10_VERSION_ID; // - default vendor (experimenter) message serializer - registry.registerSerializer(new MessageTypeKey<>(version, ExperimenterInput.class), + provider.registerSerializer(new MessageTypeKey<>(version, ExperimenterInput.class), new OF10VendorInputMessageFactory()); // - default vendor (experimenter) action serializer - registry.registerSerializer(new EnhancedMessageTypeKey<>(version, Action.class, + provider.registerSerializer(new EnhancedMessageTypeKey<>(version, Action.class, Experimenter.class), new OF10VendorActionSerializer()); // - default vendor stats (experimenter multipart) serializer - registry.registerSerializer(new MessageTypeKey<>(version, MultipartRequestExperimenter.class), + provider.registerSerializer(new MessageTypeKey<>(version, MultipartRequestExperimenter.class), new OF10StatsRequestVendorSerializer()); // register OF v1.3 default experimenter serializers version = ExtConstants.OF13_VERSION_ID; // - default experimenter message serializer - registry.registerSerializer(new MessageTypeKey<>(version, ExperimenterInput.class), + provider.registerSerializer(new MessageTypeKey<>(version, ExperimenterInput.class), new OF13ExperimenterInputMessageFactory()); // - default experimenter action serializer - registry.registerSerializer(new EnhancedMessageTypeKey<>(version, Action.class, + provider.registerSerializer(new EnhancedMessageTypeKey<>(version, Action.class, Experimenter.class), new OF13ExperimenterActionSerializer()); // - default vendor stats (experimenter multipart) serializer - registry.registerSerializer(new MessageTypeKey<>(version, MultipartRequestExperimenter.class), + provider.registerSerializer(new MessageTypeKey<>(version, MultipartRequestExperimenter.class), new OF13MultipartExperimenterSerializer()); // - default experimenter instruction serializer - registry.registerSerializer(new EnhancedMessageTypeKey<>(version, Instruction.class, + provider.registerSerializer(new EnhancedMessageTypeKey<>(version, Instruction.class, org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common .instruction.rev130731.Experimenter.class), new OF13ExperimenterInstructionSerializer()); // - default experimenter message serializer - registry.registerSerializer(new MessageTypeKey<>(version, TableFeatureProperties.class), + provider.registerSerializer(new MessageTypeKey<>(version, TableFeatureProperties.class), new OF13TableFeatExpSerializer()); // - default experimenter message serializer - registry.registerSerializer(new MessageTypeKey<>(version, MeterBandExperimenter.class), + provider.registerSerializer(new MessageTypeKey<>(version, MeterBandExperimenter.class), new OF13MeterBandExperimenterSerializer()); } }