Fix checkstyle warnings for impl/protocol package 10/62210/2
authormiroslav.macko <miroslav.macko@pantheon.tech>
Wed, 23 Aug 2017 14:59:42 +0000 (16:59 +0200)
committermiroslav.macko <miroslav.macko@pantheon.tech>
Thu, 24 Aug 2017 07:54:49 +0000 (09:54 +0200)
See also: bug 8607

Change-Id: I2adea22e939e8cf9bc87505ca4e130c73fc93a0f
Signed-off-by: miroslav.macko <miroslav.macko@pantheon.tech>
159 files changed:
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/ActionDeserializerInjector.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/DeserializerInjector.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/InstructionDeserializerInjector.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/MatchDeserializerInjector.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/MessageDeserializerInjector.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/MultipartDeserializerInjector.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/action/AbstractActionDeserializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/action/CopyTtlInActionDeserializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/action/CopyTtlOutActionDeserializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/action/DecMplsTtlActionDeserializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/action/DecNwTtlActionDeserializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/action/GroupActionDeserializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/action/OutputActionDeserializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/action/PopMplsActionDeserializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/action/PopPbbActionDeserializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/action/PopVlanActionDeserializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/action/PushMplsActionDeserializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/action/PushPbbActionDeserializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/action/PushVlanActionDeserializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/action/SetFieldActionDeserializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/action/SetMplsTtlActionDeserializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/action/SetNwTtlActionDeserializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/action/SetQueueActionDeserializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/instruction/AbstractActionInstructionDeserializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/instruction/AbstractInstructionDeserializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/instruction/ApplyActionsInstructionDeserializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/instruction/ClearActionsInstructionDeserializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/instruction/GoToTableInstructionDeserializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/instruction/MeterInstructionDeserializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/instruction/WriteActionsInstructionDeserializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/instruction/WriteMetadataInstructionDeserializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/key/MessageCodeActionExperimenterKey.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/key/MessageCodeMatchKey.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/AbstractMatchEntryDeserializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/InPhyPortEntryDeserializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/InPortEntryDeserializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/Ipv4DestinationEntryDeserializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/Ipv4SourceEntryDeserializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/Ipv6DestinationEntryDeserializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/Ipv6FlabelEntryDeserializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/Ipv6NdSllEntryDeserializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/Ipv6NdTargetEntryDeserializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/Ipv6NdTllEntryDeserializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/Ipv6SourceEntryDeserializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/MatchDeserializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/MplsBosEntryDeserializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/MplsLabelEntryDeserializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/MplsTcEntryDeserializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/PbbEntryDeserializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/TcpFlagsEntryDeserializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/TunnelIdEntryDeserializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/messages/FlowMessageDeserializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/messages/GroupMessageDeserializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/messages/MeterMessageDeserializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/multipart/MultipartReplyExperimenterDeserializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/multipart/MultipartReplyFlowStatsDeserializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/multipart/MultipartReplyGroupDescDeserializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/multipart/MultipartReplyGroupFeaturesDeserializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/multipart/MultipartReplyMeterConfigDeserializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/multipart/MultipartReplyMeterFeaturesDeserializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/multipart/MultipartReplyPortStatsDeserializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/multipart/MultipartReplyQueueStatsDeserializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/multipart/MultipartReplyTableFeaturesDeserializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/multipart/TableFeaturesMatchFieldDeserializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/util/ActionUtil.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/util/InstructionUtil.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/ActionSerializerInjector.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/InstructionSerializerInjector.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/MatchSerializerInjector.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/MessageSerializerInjector.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/MultipartMatchFieldSerializerInjector.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/MultipartSerializerInjector.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/MultipartTableFeaturesSerializerInjector.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/SerializerInjector.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/actions/AbstractActionSerializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/actions/AbstractSetFieldActionSerializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/actions/SetDlDstActionSerializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/actions/SetDlSrcActionSerializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/actions/SetFieldActionSerializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/actions/SetTpDstActionSerializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/actions/SetTpSrcActionSerializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/actions/SetVlanIdActionSerializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/instructions/AbstractActionInstructionSerializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/instructions/AbstractInstructionSerializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/instructions/WriteMetadataInstructionSerializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/match/AbstractExperimenterMatchEntrySerializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/match/AbstractMatchEntrySerializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/match/ArpOpEntrySerializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/match/ArpSourceHardwareAddressEntrySerializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/match/ArpSourceTransportAddressEntrySerializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/match/ArpTargetHardwareAddressEntrySerializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/match/ArpTargetTransportAddressEntrySerializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/match/EthernetDestinationEntrySerializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/match/EthernetSourceEntrySerializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/match/EthernetTypeEntrySerializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/match/Icmpv4CodeEntrySerializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/match/Icmpv4TypeEntrySerializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/match/Icmpv6CodeEntrySerializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/match/Icmpv6TypeEntrySerializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/match/IpDscpEntrySerializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/match/IpEcnEntrySerializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/match/IpProtoEntrySerializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/match/Ipv4DestinationEntrySerializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/match/Ipv4SourceEntrySerializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/match/Ipv6DestinationEntrySerializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/match/Ipv6ExtHeaderEntrySerializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/match/Ipv6LabelEntrySerializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/match/Ipv6NdSllEntrySerializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/match/Ipv6NdTargetEntrySerializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/match/Ipv6NdTllEntrySerializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/match/Ipv6SourceEntrySerializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/match/MatchEntrySerializerKeyImpl.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/match/MatchSerializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/match/MplsBosEntrySerializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/match/MplsLabelEntrySerializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/match/MplsTcEntrySerializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/match/PbbEntrySerializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/match/SctpDestinationPortEntrySerializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/match/SctpSourcePortEntrySerializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/match/TcpDestinationPortEntrySerializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/match/TcpFlagsEntrySerializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/match/TcpSourcePortEntrySerializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/match/TunnelIdEntrySerializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/match/TunnelIpv4DestinationEntrySerializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/match/TunnelIpv4SourceEntrySerializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/match/UdpDestinationPortEntrySerializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/match/UdpSourcePortEntrySerializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/match/VlanPcpEntrySerializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/match/VlanVidEntrySerializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/messages/AbstractMessageSerializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/messages/FlowMessageSerializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/messages/GroupMessageSerializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/messages/MeterMessageSerializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/messages/PortMessageSerializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/MultipartRequestExperimenterSerializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/MultipartRequestFlowAggregateStatsSerializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/MultipartRequestFlowStatsSerializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/MultipartRequestMessageSerializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/MultipartRequestMeterConfigSerializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/MultipartRequestMeterStatsSerializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/MultipartRequestQueueStatsSerializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/MultipartRequestTableFeaturesSerializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/AbstractTablePropertySerializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/ApplyActionsMissTablePropertySerializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/ApplyActionsTablePropertySerializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/ApplySetfieldMissTablePropertySerializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/ApplySetfieldTablePropertySerializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/InstructionsMissTablePropertySerializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/InstructionsTablePropertySerializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/MatchTablePropertySerializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/WildcardsTablePropertySerializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/WriteActionsMissTablePropertySerializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/WriteActionsTablePropertySerializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/WriteSetfieldMissTablePropertySerializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/WriteSetfieldTablePropertySerializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/matchfield/AbstractMatchFieldSerializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/util/ActionUtil.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/util/InstructionUtil.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/services/AbstractMultipartRequestOnTheFlyCallback.java

index ad1c41dd36da4e98cf95d7af4ba202325f542136..69156c7170bf11066a02cd5ef5c5a395a67c2994 100644 (file)
@@ -8,9 +8,9 @@
 
 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;
 import org.opendaylight.openflowjava.protocol.api.extensibility.OFDeserializer;
 import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants;
@@ -34,12 +34,12 @@ import org.opendaylight.openflowplugin.impl.protocol.deserialization.action.SetN
 import org.opendaylight.openflowplugin.impl.protocol.deserialization.action.SetQueueActionDeserializer;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action;
 
-import com.google.common.annotations.VisibleForTesting;
-
 class ActionDeserializerInjector {
 
     /**
-     * Injects action deserializers into provided {@link org.opendaylight.openflowjava.protocol.api.extensibility.DeserializerExtensionProvider}
+     * Injects action deserializers into provided
+     * {@link org.opendaylight.openflowjava.protocol.api.extensibility.DeserializerExtensionProvider}.
+     *
      * @param provider OpenflowJava deserializer extension provider
      */
     static void injectDeserializers(final DeserializerExtensionProvider provider) {
@@ -66,9 +66,11 @@ class ActionDeserializerInjector {
     }
 
     /**
-     * Create injector that will inject new deserializers into #{@link org.opendaylight.openflowjava.protocol.api.extensibility.DeserializerExtensionProvider}
+     * Create injector that will inject new deserializers into
+     * #{@link org.opendaylight.openflowjava.protocol.api.extensibility.DeserializerExtensionProvider}.
+     *
      * @param provider OpenflowJava deserializer extension provider
-     * @param version Openflow version
+     * @param version  Openflow version
      * @return injector
      */
     @VisibleForTesting
index 56d9b799ee61c69cbc28ca5994ad7ce6b7eb967b..03c42e2421c10616e7bbde8175cbb52edb4a9586 100644 (file)
@@ -11,12 +11,14 @@ package org.opendaylight.openflowplugin.impl.protocol.deserialization;
 import org.opendaylight.openflowjava.protocol.api.extensibility.DeserializerExtensionProvider;
 
 /**
- * Util class for injecting new deserializers into OpenflowJava
+ * Util class for injecting new deserializers into OpenflowJava.
  */
 public class DeserializerInjector {
 
     /**
-     * Injects deserializers into provided {@link org.opendaylight.openflowjava.protocol.api.extensibility.DeserializerExtensionProvider}
+     * Injects deserializers into provided.
+     * {@link org.opendaylight.openflowjava.protocol.api.extensibility.DeserializerExtensionProvider}
+     *
      * @param provider OpenflowJava deserializer extension provider
      */
     public static void injectDeserializers(final DeserializerExtensionProvider provider) {
@@ -29,7 +31,9 @@ public class DeserializerInjector {
     }
 
     /**
-     * Reverts original deserializers in provided {@link org.opendaylight.openflowjava.protocol.api.extensibility.DeserializerExtensionProvider}
+     * Reverts original deserializers in provided.
+     * {@link org.opendaylight.openflowjava.protocol.api.extensibility.DeserializerExtensionProvider}
+     *
      * @param provider OpenflowJava deserializer extension provider
      */
     public static void revertDeserializers(final DeserializerExtensionProvider provider) {
index de508a0f929a24d39bb0db897ebc27d9615a0f5d..27eb207c236e41e4c9afee232cab0e3710d690b9 100644 (file)
@@ -8,31 +8,31 @@
 
 package org.opendaylight.openflowplugin.impl.protocol.deserialization;
 
+import com.google.common.annotations.VisibleForTesting;
 import java.util.Objects;
 import java.util.function.Consumer;
 import java.util.function.Function;
-
 import org.opendaylight.openflowjava.protocol.api.extensibility.DeserializerExtensionProvider;
 import org.opendaylight.openflowjava.protocol.api.extensibility.OFDeserializer;
 import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants;
 import org.opendaylight.openflowjava.protocol.impl.util.InstructionConstants;
 import org.opendaylight.openflowplugin.api.openflow.protocol.deserialization.MessageCodeExperimenterKey;
 import org.opendaylight.openflowplugin.extension.api.path.ActionPath;
-import org.opendaylight.openflowplugin.impl.protocol.deserialization.key.MessageCodeActionExperimenterKey;
 import org.opendaylight.openflowplugin.impl.protocol.deserialization.instruction.ApplyActionsInstructionDeserializer;
 import org.opendaylight.openflowplugin.impl.protocol.deserialization.instruction.ClearActionsInstructionDeserializer;
 import org.opendaylight.openflowplugin.impl.protocol.deserialization.instruction.GoToTableInstructionDeserializer;
 import org.opendaylight.openflowplugin.impl.protocol.deserialization.instruction.MeterInstructionDeserializer;
 import org.opendaylight.openflowplugin.impl.protocol.deserialization.instruction.WriteActionsInstructionDeserializer;
 import org.opendaylight.openflowplugin.impl.protocol.deserialization.instruction.WriteMetadataInstructionDeserializer;
+import org.opendaylight.openflowplugin.impl.protocol.deserialization.key.MessageCodeActionExperimenterKey;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.instruction.Instruction;
 
-import com.google.common.annotations.VisibleForTesting;
-
 class InstructionDeserializerInjector {
 
     /**
-     * Injects instruction deserializers into provided {@link org.opendaylight.openflowjava.protocol.api.extensibility.DeserializerExtensionProvider}
+     * Injects instruction deserializers into provided
+     * {@link org.opendaylight.openflowjava.protocol.api.extensibility.DeserializerExtensionProvider}.
+     *
      * @param provider OpenflowJava deserializer extension provider
      */
     static void injectDeserializers(final DeserializerExtensionProvider provider) {
@@ -41,20 +41,26 @@ class InstructionDeserializerInjector {
                 createInjector(provider, EncodeConstants.OF13_VERSION_ID);
 
         injector.apply(InstructionConstants.GOTO_TABLE_TYPE).apply(null).accept(new GoToTableInstructionDeserializer());
-        injector.apply(InstructionConstants.WRITE_METADATA_TYPE).apply(null).accept(new WriteMetadataInstructionDeserializer());
-        injector.apply(InstructionConstants.CLEAR_ACTIONS_TYPE).apply(null).accept(new ClearActionsInstructionDeserializer());
+        injector.apply(InstructionConstants.WRITE_METADATA_TYPE)
+                .apply(null).accept(new WriteMetadataInstructionDeserializer());
+        injector.apply(InstructionConstants.CLEAR_ACTIONS_TYPE)
+                .apply(null).accept(new ClearActionsInstructionDeserializer());
         injector.apply(InstructionConstants.METER_TYPE).apply(null).accept(new MeterInstructionDeserializer());
 
         for (ActionPath path : ActionPath.values()) {
-            injector.apply(InstructionConstants.WRITE_ACTIONS_TYPE).apply(path).accept(new WriteActionsInstructionDeserializer(path));
-            injector.apply(InstructionConstants.APPLY_ACTIONS_TYPE).apply(path).accept(new ApplyActionsInstructionDeserializer(path));
+            injector.apply(InstructionConstants.WRITE_ACTIONS_TYPE).apply(path).accept(new
+                    WriteActionsInstructionDeserializer(path));
+            injector.apply(InstructionConstants.APPLY_ACTIONS_TYPE).apply(path).accept(new
+                    ApplyActionsInstructionDeserializer(path));
         }
     }
 
     /**
-     * Create injector that will inject new deserializers into #{@link org.opendaylight.openflowjava.protocol.api.extensibility.DeserializerExtensionProvider}
+     * Create injector that will inject new deserializers into
+     * #{@link org.opendaylight.openflowjava.protocol.api.extensibility.DeserializerExtensionProvider}.
+     *
      * @param provider OpenflowJava deserializer extension provider
-     * @param version Openflow version
+     * @param version  Openflow version
      * @return injector
      */
     @VisibleForTesting
@@ -63,8 +69,8 @@ class InstructionDeserializerInjector {
             final short version) {
         return code -> actionPath -> deserializer -> {
             provider.registerDeserializer((Objects.nonNull(actionPath)
-                    ? new MessageCodeActionExperimenterKey(version, code, Instruction.class, actionPath, null)
-                    : new MessageCodeExperimenterKey(version, code, Instruction.class, null)),
+                            ? new MessageCodeActionExperimenterKey(version, code, Instruction.class, actionPath, null)
+                            : new MessageCodeExperimenterKey(version, code, Instruction.class, null)),
                     deserializer);
         };
     }
index 19ebb8a094c0f53b1633e82189fab78984cf5442..7dd3c1506357c792281a780681e98b99633b8e0f 100644 (file)
@@ -64,12 +64,14 @@ import org.opendaylight.openflowplugin.impl.protocol.deserialization.match.VlanV
 import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.Match;
 
 /**
- * Util class for injecting new match entry deserializers into OpenflowJava
+ * Util class for injecting new match entry deserializers into OpenflowJava.
  */
 public class MatchDeserializerInjector {
 
     /**
-     * Injects deserializers into provided {@link org.opendaylight.openflowjava.protocol.api.extensibility.DeserializerExtensionProvider}
+     * Injects deserializers into provided
+     * {@link org.opendaylight.openflowjava.protocol.api.extensibility.DeserializerExtensionProvider}.
+     *
      * @param provider OpenflowJava deserializer extension provider
      */
     static void injectDeserializers(final DeserializerExtensionProvider provider) {
@@ -77,24 +79,23 @@ public class MatchDeserializerInjector {
             final MatchDeserializer deserializer = new MatchDeserializer(path);
             provider.registerDeserializer(
                     new MessageCodeMatchKey(
-                        EncodeConstants.OF13_VERSION_ID,
-                        EncodeConstants.EMPTY_LENGTH,
-                        Match.class,
-                        path),
+                            EncodeConstants.OF13_VERSION_ID,
+                            EncodeConstants.EMPTY_LENGTH,
+                            Match.class,
+                            path),
                     deserializer);
 
             // Inject new match entry serializers here using injector created by createInjector method
             final Function<Integer, Function<Long, Function<Integer, Consumer<MatchEntryDeserializer>>>> injector =
-                createInjector(deserializer, EncodeConstants.OF13_VERSION_ID);
-
+                    createInjector(deserializer, EncodeConstants.OF13_VERSION_ID);
 
             // Wrapped injector that uses OPENFLOW_BASIC_CLASS
             final Function<Integer, Consumer<MatchEntryDeserializer>> basicInjector =
-                injector.apply(OxmMatchConstants.OPENFLOW_BASIC_CLASS).apply(null);
+                    injector.apply(OxmMatchConstants.OPENFLOW_BASIC_CLASS).apply(null);
 
             // Wrapped injector that uses EXPERIMENTER_CLASS
             final Function<Long, Function<Integer, Consumer<MatchEntryDeserializer>>> experInjector =
-                injector.apply(OxmMatchConstants.EXPERIMENTER_CLASS);
+                    injector.apply(OxmMatchConstants.EXPERIMENTER_CLASS);
 
             basicInjector.apply(OxmMatchConstants.ARP_OP).accept(new ArpOpEntryDeserializer());
             basicInjector.apply(OxmMatchConstants.ARP_SHA).accept(new ArpSourceHardwareAddressEntryDeserializer());
@@ -137,21 +138,23 @@ public class MatchDeserializerInjector {
             basicInjector.apply(OxmMatchConstants.MPLS_TC).accept(new MplsTcEntryDeserializer());
             basicInjector.apply(OxmMatchConstants.PBB_ISID).accept(new PbbEntryDeserializer());
             basicInjector.apply(OxmMatchConstants.TUNNEL_ID).accept(new TunnelIdEntryDeserializer());
-            experInjector.apply(EncodeConstants.ONF_EXPERIMENTER_ID).apply(EncodeConstants.ONFOXM_ET_TCP_FLAGS).accept(new TcpFlagsEntryDeserializer());
+            experInjector.apply(EncodeConstants.ONF_EXPERIMENTER_ID).apply(EncodeConstants.ONFOXM_ET_TCP_FLAGS)
+                    .accept(new TcpFlagsEntryDeserializer());
         }
     }
 
     /**
-     * Create injector that will inject new serializers into {@link org.opendaylight.openflowplugin.api.openflow.protocol.deserialization.MatchEntryDeserializerRegistry}
+     * Create injector that will inject new serializers into
+     * {@link org.opendaylight.openflowplugin.api.openflow.protocol.deserialization.MatchEntryDeserializerRegistry}.
+     *
      * @param registry Match entry deserializer registry
-     * @param version Openflow version
+     * @param version  Openflow version
      * @return injector
      */
     @VisibleForTesting
     static Function<Integer, Function<Long, Function<Integer, Consumer<MatchEntryDeserializer>>>> createInjector(
             final MatchEntryDeserializerRegistry registry,
-            final short version
-            ) {
+            final short version) {
         return oxmClass -> expId -> oxmField -> deserializer -> {
             final MatchEntryDeserializerKey key = new MatchEntryDeserializerKey(version, oxmClass, oxmField);
             key.setExperimenterId(expId);
index 132b96fec3363f68e03d3fadfeee781ef87fb3bd..3ad3e8e9e5a3e680d4fe62e692de62fee4b9685d 100644 (file)
@@ -38,13 +38,15 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731
 class MessageDeserializerInjector {
 
     /**
-     * Injects message deserializers into provided {@link org.opendaylight.openflowjava.protocol.api.extensibility.DeserializerExtensionProvider}
+     * Injects message deserializers into provided.
+     * {@link org.opendaylight.openflowjava.protocol.api.extensibility.DeserializerExtensionProvider}
+     *
      * @param provider OpenflowJava deserializer extension provider
      */
     static void injectDeserializers(final DeserializerExtensionProvider provider) {
         // Inject new message deserializers here using injector created by createInjector method
-        final Function<Integer, Function<Class<? extends OfHeader>, Consumer<OFDeserializer<? extends OfHeader>>>> injector =
-                createInjector(provider, EncodeConstants.OF13_VERSION_ID);
+        final Function<Integer, Function<Class<? extends OfHeader>, Consumer<OFDeserializer<? extends OfHeader>>>>
+                injector = createInjector(provider, EncodeConstants.OF13_VERSION_ID);
 
         injector.apply(10).apply(org.opendaylight.yang.gen.v1.urn.opendaylight.packet.service.rev130709
                 .PacketInMessage.class).accept(new PacketInMessageDeserializer());
@@ -52,24 +54,31 @@ class MessageDeserializerInjector {
     }
 
     /**
-     * Reverts original message deserializers in provided {@link org.opendaylight.openflowjava.protocol.api.extensibility.DeserializerExtensionProvider}
+     * Reverts original message deserializers in provided.
+     * {@link org.opendaylight.openflowjava.protocol.api.extensibility.DeserializerExtensionProvider}
+     *
      * @param provider OpenflowJava deserializer extension provider
      */
     static void revertDeserializers(final DeserializerExtensionProvider provider) {
         provider.unregisterDeserializerMapping(new TypeToClassKey(EncodeConstants.OF13_VERSION_ID, 10));
-        provider.registerDeserializerMapping(new TypeToClassKey(EncodeConstants.OF13_VERSION_ID, 10), PacketInMessage.class);
+        provider.registerDeserializerMapping(new TypeToClassKey(EncodeConstants.OF13_VERSION_ID, 10),
+                PacketInMessage.class);
         provider.unregisterDeserializerMapping(new TypeToClassKey(EncodeConstants.OF13_VERSION_ID, 19));
-        provider.registerDeserializerMapping(new TypeToClassKey(EncodeConstants.OF13_VERSION_ID, 19), MultipartReplyMessage.class);
+        provider.registerDeserializerMapping(new TypeToClassKey(EncodeConstants.OF13_VERSION_ID, 19),
+                MultipartReplyMessage.class);
     }
 
     /**
-     * Create injector that will inject new deserializers into #{@link org.opendaylight.openflowjava.protocol.api.extensibility.DeserializerExtensionProvider}
+     * Create injector that will inject new deserializers into.
+     * #{@link org.opendaylight.openflowjava.protocol.api.extensibility.DeserializerExtensionProvider}
+     *
      * @param provider OpenflowJava deserializer extension provider
-     * @param version Openflow version
+     * @param version  Openflow version
      * @return injector
      */
     @VisibleForTesting
-    static Function<Integer, Function<Class<? extends OfHeader>, Consumer<OFDeserializer<? extends OfHeader>>>> createInjector(
+    static Function<Integer, Function<Class<? extends OfHeader>, Consumer<OFDeserializer<? extends OfHeader>>>>
+        createInjector(
             final DeserializerExtensionProvider provider,
             final short version) {
         return code -> retType -> deserializer -> {
@@ -83,25 +92,29 @@ class MessageDeserializerInjector {
 
     @VisibleForTesting
     static void injectLegacyDeserializers(final DeserializerExtensionProvider provider) {
-        final Function<Integer, Function<Class<? extends OfHeader>, Consumer<OFDeserializer<? extends OfHeader>>>> injector =
-            createInjector(provider, EncodeConstants.OF13_VERSION_ID);
+        final Function<Integer, Function<Class<? extends OfHeader>, Consumer<OFDeserializer<? extends OfHeader>>>>
+                injector = createInjector(provider, EncodeConstants.OF13_VERSION_ID);
 
-         injector.apply(14).apply(FlowMessage.class).accept(new FlowMessageDeserializer());
-         injector.apply(15).apply(GroupMessage.class).accept(new GroupMessageDeserializer());
-         injector.apply(29).apply(MeterMessage.class).accept(new MeterMessageDeserializer());
-         injector.apply(16).apply(PortMessage.class).accept(new PortMessageDeserializer());
+        injector.apply(14).apply(FlowMessage.class).accept(new FlowMessageDeserializer());
+        injector.apply(15).apply(GroupMessage.class).accept(new GroupMessageDeserializer());
+        injector.apply(29).apply(MeterMessage.class).accept(new MeterMessageDeserializer());
+        injector.apply(16).apply(PortMessage.class).accept(new PortMessageDeserializer());
     }
 
     @VisibleForTesting
     static void revertLegacyDeserializers(final DeserializerExtensionProvider provider) {
         provider.unregisterDeserializerMapping(new TypeToClassKey(EncodeConstants.OF13_VERSION_ID, 14));
-        provider.registerDeserializerMapping(new TypeToClassKey(EncodeConstants.OF13_VERSION_ID, 14), FlowModInput.class);
+        provider.registerDeserializerMapping(new TypeToClassKey(EncodeConstants.OF13_VERSION_ID, 14),
+                FlowModInput.class);
         provider.unregisterDeserializerMapping(new TypeToClassKey(EncodeConstants.OF13_VERSION_ID, 15));
-        provider.registerDeserializerMapping(new TypeToClassKey(EncodeConstants.OF13_VERSION_ID, 15), GroupModInput.class);
+        provider.registerDeserializerMapping(new TypeToClassKey(EncodeConstants.OF13_VERSION_ID, 15),
+                GroupModInput.class);
         provider.unregisterDeserializerMapping(new TypeToClassKey(EncodeConstants.OF13_VERSION_ID, 29));
-        provider.registerDeserializerMapping(new TypeToClassKey(EncodeConstants.OF13_VERSION_ID, 29), MeterModInput.class);
+        provider.registerDeserializerMapping(new TypeToClassKey(EncodeConstants.OF13_VERSION_ID, 29),
+                MeterModInput.class);
         provider.unregisterDeserializerMapping(new TypeToClassKey(EncodeConstants.OF13_VERSION_ID, 16));
-        provider.registerDeserializerMapping(new TypeToClassKey(EncodeConstants.OF13_VERSION_ID, 16), PortModInput.class);
+        provider.registerDeserializerMapping(new TypeToClassKey(EncodeConstants.OF13_VERSION_ID, 16),
+                PortModInput.class);
         provider.unregisterDeserializerMapping(new TypeToClassKey(EncodeConstants.OF13_VERSION_ID, 19));
     }
 
index cf83b2861bcdad21b06a6bb24a53afbca80d085d..a2b47a9aa886b855d9bf7d74555176da99508bfb 100644 (file)
@@ -36,7 +36,9 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev13
 class MultipartDeserializerInjector {
 
     /**
-     * Injects message deserializers into provided {@link org.opendaylight.openflowjava.protocol.api.extensibility.DeserializerExtensionProvider}
+     * Injects message deserializers into provided
+     * {@link org.opendaylight.openflowjava.protocol.api.extensibility.DeserializerExtensionProvider}.
+     *
      * @param provider OpenflowJava deserializer extension provider
      */
     static void injectDeserializers(final DeserializerExtensionProvider provider) {
@@ -47,25 +49,33 @@ class MultipartDeserializerInjector {
                 createInjector(provider, version);
         injector.apply(MultipartType.OFPMPDESC.getIntValue()).accept(new MultipartReplyDescDeserializer());
         injector.apply(MultipartType.OFPMPFLOW.getIntValue()).accept(new MultipartReplyFlowStatsDeserializer());
-        injector.apply(MultipartType.OFPMPAGGREGATE.getIntValue()).accept(new MultipartReplyFlowAggregateStatsDeserializer());
+        injector.apply(MultipartType.OFPMPAGGREGATE.getIntValue())
+                .accept(new MultipartReplyFlowAggregateStatsDeserializer());
         injector.apply(MultipartType.OFPMPTABLE.getIntValue()).accept(new MultipartReplyFlowTableStatsDeserializer());
         injector.apply(MultipartType.OFPMPPORTSTATS.getIntValue()).accept(new MultipartReplyPortStatsDeserializer());
         injector.apply(MultipartType.OFPMPQUEUE.getIntValue()).accept(new MultipartReplyQueueStatsDeserializer());
         injector.apply(MultipartType.OFPMPGROUP.getIntValue()).accept(new MultipartReplyGroupStatsDeserializer());
         injector.apply(MultipartType.OFPMPGROUPDESC.getIntValue()).accept(new MultipartReplyGroupDescDeserializer());
-        injector.apply(MultipartType.OFPMPGROUPFEATURES.getIntValue()).accept(new MultipartReplyGroupFeaturesDeserializer());
+        injector.apply(MultipartType.OFPMPGROUPFEATURES.getIntValue())
+                .accept(new MultipartReplyGroupFeaturesDeserializer());
         injector.apply(MultipartType.OFPMPMETER.getIntValue()).accept(new MultipartReplyMeterStatsDeserializer());
-        injector.apply(MultipartType.OFPMPMETERCONFIG.getIntValue()).accept(new MultipartReplyMeterConfigDeserializer());
-        injector.apply(MultipartType.OFPMPMETERFEATURES.getIntValue()).accept(new MultipartReplyMeterFeaturesDeserializer());
-        injector.apply(MultipartType.OFPMPTABLEFEATURES.getIntValue()).accept(new MultipartReplyTableFeaturesDeserializer());
+        injector.apply(MultipartType.OFPMPMETERCONFIG.getIntValue())
+                .accept(new MultipartReplyMeterConfigDeserializer());
+        injector.apply(MultipartType.OFPMPMETERFEATURES.getIntValue())
+                .accept(new MultipartReplyMeterFeaturesDeserializer());
+        injector.apply(MultipartType.OFPMPTABLEFEATURES.getIntValue())
+                .accept(new MultipartReplyTableFeaturesDeserializer());
         injector.apply(MultipartType.OFPMPPORTDESC.getIntValue()).accept(new MultipartReplyPortDescDeserializer());
-        injector.apply(MultipartType.OFPMPEXPERIMENTER.getIntValue()).accept(new MultipartReplyExperimenterDeserializer());
+        injector.apply(MultipartType.OFPMPEXPERIMENTER.getIntValue())
+                .accept(new MultipartReplyExperimenterDeserializer());
     }
 
     /**
-     * Create injector that will inject new deserializers into #{@link org.opendaylight.openflowjava.protocol.api.extensibility.DeserializerExtensionProvider}
+     * Create injector that will inject new deserializers into
+     * #{@link org.opendaylight.openflowjava.protocol.api.extensibility.DeserializerExtensionProvider}.
+     *
      * @param provider OpenflowJava deserializer extension provider
-     * @param version Openflow version
+     * @param version  Openflow version
      * @return injector
      */
     @VisibleForTesting
index 364be3df29c7e244ee418e77e54927503ad2185a..df5f2c61a6698668b78fc2de56d4a776eb59a74a 100644 (file)
@@ -8,17 +8,17 @@
 
 package org.opendaylight.openflowplugin.impl.protocol.deserialization.action;
 
+import io.netty.buffer.ByteBuf;
 import org.opendaylight.openflowjava.protocol.api.extensibility.HeaderDeserializer;
 import org.opendaylight.openflowjava.protocol.api.extensibility.OFDeserializer;
 import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action;
 
-import io.netty.buffer.ByteBuf;
-
 public abstract class AbstractActionDeserializer implements OFDeserializer<Action>, HeaderDeserializer<Action> {
 
     /**
-     * Skip first few bytes of action message because they are irrelevant
+     * Skip first few bytes of action message because they are irrelevant.
+     *
      * @param message Openflow buffered message
      **/
     protected static void processHeader(ByteBuf message) {
index 3649f314063a31172617141481e9744e15a34a18..e5eb95671124c8395860a7a4225b954272c3898d 100644 (file)
@@ -7,12 +7,11 @@
  */
 package org.opendaylight.openflowplugin.impl.protocol.deserialization.action;
 
-import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.CopyTtlInCaseBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.copy.ttl.in._case.CopyTtlInBuilder;
+import io.netty.buffer.ByteBuf;
 import org.opendaylight.openflowjava.protocol.impl.util.ActionConstants;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action;
-
-import io.netty.buffer.ByteBuf;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.CopyTtlInCaseBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.copy.ttl.in._case.CopyTtlInBuilder;
 
 public class CopyTtlInActionDeserializer extends AbstractActionDeserializer {
 
@@ -22,8 +21,8 @@ public class CopyTtlInActionDeserializer extends AbstractActionDeserializer {
         message.skipBytes(ActionConstants.PADDING_IN_ACTION_HEADER);
 
         return new CopyTtlInCaseBuilder()
-            .setCopyTtlIn(new CopyTtlInBuilder().build())
-            .build();
+                .setCopyTtlIn(new CopyTtlInBuilder().build())
+                .build();
     }
 
     @Override
index 38127d36b8f57fa0651869ea8c3639486fc79546..fe3de4b9a9f8fb6bdfd2c7e21f0c29e0df7a2786 100644 (file)
@@ -7,12 +7,11 @@
  */
 package org.opendaylight.openflowplugin.impl.protocol.deserialization.action;
 
+import io.netty.buffer.ByteBuf;
 import org.opendaylight.openflowjava.protocol.impl.util.ActionConstants;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.CopyTtlOutCaseBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.copy.ttl.out._case.CopyTtlOutBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action;
-
-import io.netty.buffer.ByteBuf;
 
 public class CopyTtlOutActionDeserializer extends AbstractActionDeserializer {
 
@@ -22,8 +21,8 @@ public class CopyTtlOutActionDeserializer extends AbstractActionDeserializer {
         message.skipBytes(ActionConstants.PADDING_IN_ACTION_HEADER);
 
         return new CopyTtlOutCaseBuilder()
-            .setCopyTtlOut(new CopyTtlOutBuilder().build())
-            .build();
+                .setCopyTtlOut(new CopyTtlOutBuilder().build())
+                .build();
     }
 
 
index 215a0ae90804337031b1bbba2dc10e5287714dd7..f0f4101c78df7c066583e2122add5cbfe7d00ee4 100644 (file)
@@ -7,13 +7,12 @@
  */
 package org.opendaylight.openflowplugin.impl.protocol.deserialization.action;
 
+import io.netty.buffer.ByteBuf;
 import org.opendaylight.openflowjava.protocol.impl.util.ActionConstants;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.DecMplsTtlCaseBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.dec.mpls.ttl._case.DecMplsTtlBuilder;
 
-import io.netty.buffer.ByteBuf;
-
 public class DecMplsTtlActionDeserializer extends AbstractActionDeserializer {
 
     @Override
@@ -22,8 +21,8 @@ public class DecMplsTtlActionDeserializer extends AbstractActionDeserializer {
         message.skipBytes(ActionConstants.PADDING_IN_ACTION_HEADER);
 
         return new DecMplsTtlCaseBuilder()
-            .setDecMplsTtl(new DecMplsTtlBuilder().build())
-            .build();
+                .setDecMplsTtl(new DecMplsTtlBuilder().build())
+                .build();
     }
 
     @Override
index 26319ddeff91cd92904f3ec954873af5844e155d..a8078a80eff49ec0ffb3de651c0720c5f38a694a 100644 (file)
@@ -7,13 +7,12 @@
  */
 package org.opendaylight.openflowplugin.impl.protocol.deserialization.action;
 
+import io.netty.buffer.ByteBuf;
 import org.opendaylight.openflowjava.protocol.impl.util.ActionConstants;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.DecNwTtlCaseBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.dec.nw.ttl._case.DecNwTtlBuilder;
 
-import io.netty.buffer.ByteBuf;
-
 public class DecNwTtlActionDeserializer extends AbstractActionDeserializer {
 
     @Override
@@ -22,8 +21,8 @@ public class DecNwTtlActionDeserializer extends AbstractActionDeserializer {
         message.skipBytes(ActionConstants.PADDING_IN_ACTION_HEADER);
 
         return new DecNwTtlCaseBuilder()
-            .setDecNwTtl(new DecNwTtlBuilder().build())
-            .build();
+                .setDecNwTtl(new DecNwTtlBuilder().build())
+                .build();
     }
 
     @Override
index c5e159062d7ee126269a6f334a6c3cc26f1b9030..152c92a0e2f55f817aefc941aeea1856d30cb04c 100644 (file)
@@ -7,12 +7,11 @@
  */
 package org.opendaylight.openflowplugin.impl.protocol.deserialization.action;
 
+import io.netty.buffer.ByteBuf;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.GroupActionCaseBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.group.action._case.GroupActionBuilder;
 
-import io.netty.buffer.ByteBuf;
-
 public class GroupActionDeserializer extends AbstractActionDeserializer {
 
     @Override
@@ -20,10 +19,10 @@ public class GroupActionDeserializer extends AbstractActionDeserializer {
         processHeader(message);
 
         return new GroupActionCaseBuilder()
-            .setGroupAction(new GroupActionBuilder()
-                    .setGroupId(message.readUnsignedInt())
-                    .build())
-            .build();
+                .setGroupAction(new GroupActionBuilder()
+                        .setGroupId(message.readUnsignedInt())
+                        .build())
+                .build();
     }
 
     @Override
index 20408c9a131c162e2915cfdb76876836c4d87b27..a0b926ecc6b416fb15796a62d16c541c6664c79b 100644 (file)
@@ -23,17 +23,17 @@ public class OutputActionDeserializer extends AbstractActionDeserializer {
         processHeader(message);
 
         final Uri portUri = OpenflowPortsUtil
-            .getProtocolAgnosticPortUri(EncodeConstants.OF13_VERSION_ID, message.readUnsignedInt());
+                .getProtocolAgnosticPortUri(EncodeConstants.OF13_VERSION_ID, message.readUnsignedInt());
 
         final int maxLength = message.readUnsignedShort();
         message.skipBytes(ActionConstants.OUTPUT_PADDING);
 
         return new OutputActionCaseBuilder()
-            .setOutputAction(new OutputActionBuilder()
-                    .setOutputNodeConnector(portUri)
-                    .setMaxLength(maxLength)
-                    .build())
-            .build();
+                .setOutputAction(new OutputActionBuilder()
+                        .setOutputNodeConnector(portUri)
+                        .setMaxLength(maxLength)
+                        .build())
+                .build();
     }
 
     @Override
index 4c8c109fc377ea11634d30b336904c62e1a898d0..d1f40142c3a4bd98e5f3a1950c1787081ffca8c9 100644 (file)
@@ -7,13 +7,12 @@
  */
 package org.opendaylight.openflowplugin.impl.protocol.deserialization.action;
 
+import io.netty.buffer.ByteBuf;
 import org.opendaylight.openflowjava.protocol.impl.util.ActionConstants;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.PopMplsActionCaseBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.pop.mpls.action._case.PopMplsActionBuilder;
 
-import io.netty.buffer.ByteBuf;
-
 public class PopMplsActionDeserializer extends AbstractActionDeserializer {
 
     @Override
@@ -24,10 +23,10 @@ public class PopMplsActionDeserializer extends AbstractActionDeserializer {
         message.skipBytes(ActionConstants.ETHERTYPE_ACTION_PADDING);
 
         return new PopMplsActionCaseBuilder()
-            .setPopMplsAction(new PopMplsActionBuilder()
-                    .setEthernetType(ethType)
-                    .build())
-            .build();
+                .setPopMplsAction(new PopMplsActionBuilder()
+                        .setEthernetType(ethType)
+                        .build())
+                .build();
     }
 
     @Override
index 13915c204980601d08281427626fec6772df4961..812aa9c5dc7d0cd1e8a6f6ce9908225902f5fd0c 100644 (file)
@@ -7,12 +7,11 @@
  */
 package org.opendaylight.openflowplugin.impl.protocol.deserialization.action;
 
-import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.PopPbbActionCaseBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.pop.pbb.action._case.PopPbbActionBuilder;
+import io.netty.buffer.ByteBuf;
 import org.opendaylight.openflowjava.protocol.impl.util.ActionConstants;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action;
-
-import io.netty.buffer.ByteBuf;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.PopPbbActionCaseBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.pop.pbb.action._case.PopPbbActionBuilder;
 
 public class PopPbbActionDeserializer extends AbstractActionDeserializer {
 
@@ -22,8 +21,8 @@ public class PopPbbActionDeserializer extends AbstractActionDeserializer {
         message.skipBytes(ActionConstants.PADDING_IN_ACTION_HEADER);
 
         return new PopPbbActionCaseBuilder()
-            .setPopPbbAction(new PopPbbActionBuilder().build())
-            .build();
+                .setPopPbbAction(new PopPbbActionBuilder().build())
+                .build();
     }
 
     @Override
index c379912d3ef46c538c740755648cc7a1bb6c1b89..549e7fdc2e544d304cbbffdd707977667576d3be 100644 (file)
@@ -7,12 +7,11 @@
  */
 package org.opendaylight.openflowplugin.impl.protocol.deserialization.action;
 
-import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.PopVlanActionCaseBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.pop.vlan.action._case.PopVlanActionBuilder;
+import io.netty.buffer.ByteBuf;
 import org.opendaylight.openflowjava.protocol.impl.util.ActionConstants;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action;
-
-import io.netty.buffer.ByteBuf;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.PopVlanActionCaseBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.pop.vlan.action._case.PopVlanActionBuilder;
 
 public class PopVlanActionDeserializer extends AbstractActionDeserializer {
 
@@ -22,8 +21,8 @@ public class PopVlanActionDeserializer extends AbstractActionDeserializer {
         message.skipBytes(ActionConstants.PADDING_IN_ACTION_HEADER);
 
         return new PopVlanActionCaseBuilder()
-            .setPopVlanAction(new PopVlanActionBuilder().build())
-            .build();
+                .setPopVlanAction(new PopVlanActionBuilder().build())
+                .build();
     }
 
     @Override
index 99d434babc8f7f8bf339086d66bb7e7632e787ac..f190bbc9459cf9c6adbff2579adc3a838d379947 100644 (file)
@@ -7,12 +7,11 @@
  */
 package org.opendaylight.openflowplugin.impl.protocol.deserialization.action;
 
-import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.PushMplsActionCaseBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.push.mpls.action._case.PushMplsActionBuilder;
+import io.netty.buffer.ByteBuf;
 import org.opendaylight.openflowjava.protocol.impl.util.ActionConstants;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action;
-
-import io.netty.buffer.ByteBuf;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.PushMplsActionCaseBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.push.mpls.action._case.PushMplsActionBuilder;
 
 public class PushMplsActionDeserializer extends AbstractActionDeserializer {
 
@@ -23,10 +22,10 @@ public class PushMplsActionDeserializer extends AbstractActionDeserializer {
         message.skipBytes(ActionConstants.ETHERTYPE_ACTION_PADDING);
 
         return new PushMplsActionCaseBuilder()
-            .setPushMplsAction(new PushMplsActionBuilder()
-                    .setEthernetType(ethType)
-                    .build())
-            .build();
+                .setPushMplsAction(new PushMplsActionBuilder()
+                        .setEthernetType(ethType)
+                        .build())
+                .build();
     }
 
     @Override
index 19522a048be8ab71ca5289c6e9eea177f45f9aed..3912bc2da44fd57143ef57b3dfe36f0f0740d569 100644 (file)
@@ -7,12 +7,11 @@
  */
 package org.opendaylight.openflowplugin.impl.protocol.deserialization.action;
 
-import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.PushPbbActionCaseBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.push.pbb.action._case.PushPbbActionBuilder;
+import io.netty.buffer.ByteBuf;
 import org.opendaylight.openflowjava.protocol.impl.util.ActionConstants;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action;
-
-import io.netty.buffer.ByteBuf;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.PushPbbActionCaseBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.push.pbb.action._case.PushPbbActionBuilder;
 
 public class PushPbbActionDeserializer extends AbstractActionDeserializer {
 
@@ -23,10 +22,10 @@ public class PushPbbActionDeserializer extends AbstractActionDeserializer {
         message.skipBytes(ActionConstants.ETHERTYPE_ACTION_PADDING);
 
         return new PushPbbActionCaseBuilder()
-            .setPushPbbAction(new PushPbbActionBuilder()
-                    .setEthernetType(ethType)
-                    .build())
-            .build();
+                .setPushPbbAction(new PushPbbActionBuilder()
+                        .setEthernetType(ethType)
+                        .build())
+                .build();
     }
 
     @Override
index 4b73492e1a2808ee64c68e13ae990f3bde31dea2..dd730c4dcb0ff3f8d603030f9ca6daf3eac5c2cb 100644 (file)
@@ -7,12 +7,11 @@
  */
 package org.opendaylight.openflowplugin.impl.protocol.deserialization.action;
 
-import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.PushVlanActionCaseBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.push.vlan.action._case.PushVlanActionBuilder;
+import io.netty.buffer.ByteBuf;
 import org.opendaylight.openflowjava.protocol.impl.util.ActionConstants;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action;
-
-import io.netty.buffer.ByteBuf;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.PushVlanActionCaseBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.push.vlan.action._case.PushVlanActionBuilder;
 
 public class PushVlanActionDeserializer extends AbstractActionDeserializer {
 
@@ -23,10 +22,10 @@ public class PushVlanActionDeserializer extends AbstractActionDeserializer {
         message.skipBytes(ActionConstants.ETHERTYPE_ACTION_PADDING);
 
         return new PushVlanActionCaseBuilder()
-            .setPushVlanAction(new PushVlanActionBuilder()
-                    .setEthernetType(ethType)
-                    .build())
-            .build();
+                .setPushVlanAction(new PushVlanActionBuilder()
+                        .setEthernetType(ethType)
+                        .build())
+                .build();
     }
 
     @Override
index 1da9b958f02390f3377bfc1b32d501cabcede675..a5a4c979ee7a3dcd647f99033b4d3c26c640b27d 100644 (file)
@@ -23,7 +23,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.flow.M
 import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.Match;
 
 public class SetFieldActionDeserializer extends AbstractActionDeserializer
-    implements DeserializerRegistryInjector {
+        implements DeserializerRegistryInjector {
 
     private static final MessageCodeKey MATCH_KEY = new MessageCodeMatchKey(
             EncodeConstants.OF13_VERSION_ID,
@@ -48,8 +48,8 @@ public class SetFieldActionDeserializer extends AbstractActionDeserializer
         }
 
         return new SetFieldCaseBuilder()
-            .setSetField(MatchUtil.transformMatch(builder.build(), SetField.class))
-            .build();
+                .setSetField(MatchUtil.transformMatch(builder.build(), SetField.class))
+                .build();
     }
 
     @Override
index b4b0e71a4c5e6be18368f812a37f08491a0701d2..541104ed635ded1f57363121a0b7ef0fff5dcbe8 100644 (file)
@@ -7,12 +7,11 @@
  */
 package org.opendaylight.openflowplugin.impl.protocol.deserialization.action;
 
-import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.SetMplsTtlActionCaseBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.set.mpls.ttl.action._case.SetMplsTtlActionBuilder;
+import io.netty.buffer.ByteBuf;
 import org.opendaylight.openflowjava.protocol.impl.util.ActionConstants;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action;
-
-import io.netty.buffer.ByteBuf;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.SetMplsTtlActionCaseBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.set.mpls.ttl.action._case.SetMplsTtlActionBuilder;
 
 public class SetMplsTtlActionDeserializer extends AbstractActionDeserializer {
 
@@ -23,10 +22,10 @@ public class SetMplsTtlActionDeserializer extends AbstractActionDeserializer {
         message.skipBytes(ActionConstants.SET_MPLS_TTL_PADDING);
 
         return new SetMplsTtlActionCaseBuilder()
-            .setSetMplsTtlAction(new SetMplsTtlActionBuilder()
-                    .setMplsTtl(mplsTtl)
-                    .build())
-            .build();
+                .setSetMplsTtlAction(new SetMplsTtlActionBuilder()
+                        .setMplsTtl(mplsTtl)
+                        .build())
+                .build();
     }
 
     @Override
index 8956e2c53b997931e994a8f89c18e17093b8de43..93c4dc3bee99915d8ad6d652e26d1e4b675662e6 100644 (file)
@@ -7,12 +7,11 @@
  */
 package org.opendaylight.openflowplugin.impl.protocol.deserialization.action;
 
-import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.SetNwTtlActionCaseBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.set.nw.ttl.action._case.SetNwTtlActionBuilder;
+import io.netty.buffer.ByteBuf;
 import org.opendaylight.openflowjava.protocol.impl.util.ActionConstants;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action;
-
-import io.netty.buffer.ByteBuf;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.SetNwTtlActionCaseBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.set.nw.ttl.action._case.SetNwTtlActionBuilder;
 
 public class SetNwTtlActionDeserializer extends AbstractActionDeserializer {
 
@@ -23,10 +22,10 @@ public class SetNwTtlActionDeserializer extends AbstractActionDeserializer {
         message.skipBytes(ActionConstants.SET_NW_TTL_PADDING);
 
         return new SetNwTtlActionCaseBuilder()
-            .setSetNwTtlAction(new SetNwTtlActionBuilder()
-                    .setNwTtl(nwTtl)
-                    .build())
-            .build();
+                .setSetNwTtlAction(new SetNwTtlActionBuilder()
+                        .setNwTtl(nwTtl)
+                        .build())
+                .build();
     }
 
     @Override
index 25a55e3a57035e9029f3236a0196a6d2deecfacc..3199ced02bc3107f831d26fa3ec87c3d4381ac9f 100644 (file)
@@ -7,12 +7,11 @@
  */
 package org.opendaylight.openflowplugin.impl.protocol.deserialization.action;
 
+import io.netty.buffer.ByteBuf;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.SetQueueActionCaseBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.set.queue.action._case.SetQueueActionBuilder;
 
-import io.netty.buffer.ByteBuf;
-
 public class SetQueueActionDeserializer extends AbstractActionDeserializer {
 
     @Override
@@ -21,10 +20,10 @@ public class SetQueueActionDeserializer extends AbstractActionDeserializer {
         final long queueId = message.readUnsignedInt();
 
         return new SetQueueActionCaseBuilder()
-            .setSetQueueAction(new SetQueueActionBuilder()
-                    .setQueueId(queueId)
-                    .build())
-            .build();
+                .setSetQueueAction(new SetQueueActionBuilder()
+                        .setQueueId(queueId)
+                        .build())
+                .build();
     }
 
     @Override
index e98b526a6efb0bdc1049a78c9497879702bad43a..4bf20b8d9b747a7fb226582e4680d421f8e6ab34 100644 (file)
@@ -8,32 +8,27 @@
 
 package org.opendaylight.openflowplugin.impl.protocol.deserialization.instruction;
 
+import io.netty.buffer.ByteBuf;
 import java.util.ArrayList;
 import java.util.List;
-
 import org.opendaylight.openflowjava.protocol.api.extensibility.DeserializerRegistry;
 import org.opendaylight.openflowjava.protocol.api.extensibility.DeserializerRegistryInjector;
 import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants;
+import org.opendaylight.openflowjava.protocol.impl.util.InstructionConstants;
 import org.opendaylight.openflowplugin.extension.api.path.ActionPath;
 import org.opendaylight.openflowplugin.impl.protocol.deserialization.util.ActionUtil;
-import org.opendaylight.openflowplugin.api.openflow.protocol.deserialization.MessageCodeExperimenterKey;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action;
-import org.opendaylight.openflowjava.protocol.impl.util.InstructionConstants;
-import org.opendaylight.openflowplugin.api.openflow.protocol.deserialization.MessageCodeExperimenterKey;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.list.ActionBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.list.ActionKey;
 
-import io.netty.buffer.ByteBuf;
-
 public abstract class AbstractActionInstructionDeserializer extends AbstractInstructionDeserializer
-    implements DeserializerRegistryInjector {
+        implements DeserializerRegistryInjector {
 
     private DeserializerRegistry registry;
     private final ActionPath actionPath;
 
     /**
-     * Create new instacte of action instruction deserializer
+     * Create new instacte of action instruction deserializer.
+     *
      * @param actionPath action extension path
      */
     public AbstractActionInstructionDeserializer(final ActionPath actionPath) {
@@ -41,7 +36,8 @@ public abstract class AbstractActionInstructionDeserializer extends AbstractInst
     }
 
     /**
-     * Skip first few bytes of instruction message because they are irrelevant and then return length
+     * Skip first few bytes of instruction message because they are irrelevant and then return length.
+     *
      * @param message Openflow buffered message
      * @return instruction length
      **/
@@ -51,18 +47,19 @@ public abstract class AbstractActionInstructionDeserializer extends AbstractInst
     }
 
     /**
-     * Read list of actions from message
+     * Read list of actions from message.
+     *
      * @param message Openflow buffered message
-     * @param length instruction length
+     * @param length  instruction length
      * @return list of actions
      **/
     protected List<org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.list
-        .Action> readActions(ByteBuf message, int length) {
+            .Action> readActions(ByteBuf message, int length) {
 
         final int instrLength = length - InstructionConstants.STANDARD_INSTRUCTION_LENGTH;
 
         final List<org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.list
-            .Action> actions = new ArrayList<>();
+                .Action> actions = new ArrayList<>();
 
         if (message.readableBytes() > 0) {
             final int startIndex = message.readerIndex();
@@ -73,7 +70,7 @@ public abstract class AbstractActionInstructionDeserializer extends AbstractInst
                         .setKey(new ActionKey(offset))
                         .setOrder(offset)
                         .setAction(ActionUtil
-                            .readAction(EncodeConstants.OF13_VERSION_ID, message, registry, actionPath))
+                                .readAction(EncodeConstants.OF13_VERSION_ID, message, registry, actionPath))
                         .build());
 
                 offset++;
index c2e26b60e9453a45b3e81a650c7a7b45696e7da6..08252a310b91e9f86955208e39fb9e144dc3bc3d 100644 (file)
@@ -8,17 +8,18 @@
 
 package org.opendaylight.openflowplugin.impl.protocol.deserialization.instruction;
 
+import io.netty.buffer.ByteBuf;
 import org.opendaylight.openflowjava.protocol.api.extensibility.HeaderDeserializer;
 import org.opendaylight.openflowjava.protocol.api.extensibility.OFDeserializer;
 import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.instruction.Instruction;
 
-import io.netty.buffer.ByteBuf;
-
-public abstract class AbstractInstructionDeserializer implements OFDeserializer<Instruction>, HeaderDeserializer<Instruction> {
+public abstract class AbstractInstructionDeserializer implements OFDeserializer<Instruction>,
+        HeaderDeserializer<Instruction> {
 
     /**
-     * Skip first few bytes of instruction message because they are irrelevant
+     * Skip first few bytes of instruction message because they are irrelevant.
+     *
      * @param message Openflow buffered message
      **/
     protected static void processHeader(ByteBuf message) {
index 00d631ff3732af247eff32bd1a030d9e57021eb9..d10125f27dc3e20ba09cc4277ff75d8e7c077a17 100644 (file)
@@ -8,14 +8,13 @@
 
 package org.opendaylight.openflowplugin.impl.protocol.deserialization.instruction;
 
+import io.netty.buffer.ByteBuf;
 import org.opendaylight.openflowjava.protocol.impl.util.InstructionConstants;
 import org.opendaylight.openflowplugin.extension.api.path.ActionPath;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.instruction.Instruction;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.instruction.instruction.ApplyActionsCaseBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.instruction.instruction.apply.actions._case.ApplyActionsBuilder;
 
-import io.netty.buffer.ByteBuf;
-
 public class ApplyActionsInstructionDeserializer extends AbstractActionInstructionDeserializer {
 
     public ApplyActionsInstructionDeserializer(ActionPath path) {
@@ -28,10 +27,10 @@ public class ApplyActionsInstructionDeserializer extends AbstractActionInstructi
         message.skipBytes(InstructionConstants.PADDING_IN_ACTIONS_INSTRUCTION);
 
         return new ApplyActionsCaseBuilder()
-            .setApplyActions(new ApplyActionsBuilder()
-                    .setAction(readActions(message, length))
-                    .build())
-            .build();
+                .setApplyActions(new ApplyActionsBuilder()
+                        .setAction(readActions(message, length))
+                        .build())
+                .build();
     }
 
     @Override
index b33d2d5c8d3cdf5a7aa0c3cbeae2a8f76217c3ca..44cb28bfc1f4037fbe2e62af1ef0488b49353b14 100644 (file)
@@ -8,13 +8,12 @@
 
 package org.opendaylight.openflowplugin.impl.protocol.deserialization.instruction;
 
+import io.netty.buffer.ByteBuf;
 import org.opendaylight.openflowjava.protocol.impl.util.InstructionConstants;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.instruction.Instruction;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.instruction.instruction.ClearActionsCaseBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.instruction.instruction.clear.actions._case.ClearActionsBuilder;
 
-import io.netty.buffer.ByteBuf;
-
 public class ClearActionsInstructionDeserializer extends AbstractInstructionDeserializer {
 
     @Override
@@ -23,8 +22,8 @@ public class ClearActionsInstructionDeserializer extends AbstractInstructionDese
         message.skipBytes(InstructionConstants.PADDING_IN_ACTIONS_INSTRUCTION);
 
         return new ClearActionsCaseBuilder()
-            .setClearActions(new ClearActionsBuilder().build())
-            .build();
+                .setClearActions(new ClearActionsBuilder().build())
+                .build();
     }
 
     @Override
index 6f3585013048e980cdce145c01320b0a95fca6b9..6375cadd11a566b5a469ba463f3d56204cce1439 100644 (file)
@@ -8,13 +8,12 @@
 
 package org.opendaylight.openflowplugin.impl.protocol.deserialization.instruction;
 
+import io.netty.buffer.ByteBuf;
 import org.opendaylight.openflowjava.protocol.impl.util.InstructionConstants;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.instruction.Instruction;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.instruction.instruction.GoToTableCaseBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.instruction.instruction.go.to.table._case.GoToTableBuilder;
 
-import io.netty.buffer.ByteBuf;
-
 public class GoToTableInstructionDeserializer extends AbstractInstructionDeserializer {
 
     @Override
@@ -24,10 +23,10 @@ public class GoToTableInstructionDeserializer extends AbstractInstructionDeseria
         message.skipBytes(InstructionConstants.PADDING_IN_GOTO_TABLE);
 
         return new GoToTableCaseBuilder()
-            .setGoToTable(new GoToTableBuilder()
-                    .setTableId(tableId)
-                    .build())
-            .build();
+                .setGoToTable(new GoToTableBuilder()
+                        .setTableId(tableId)
+                        .build())
+                .build();
     }
 
     @Override
index 1a54c7f422f5cb28b82e73f442c371518495e252..4d1db7c9dc3c5962864b4159acff81fea184ebeb 100644 (file)
@@ -8,13 +8,12 @@
 
 package org.opendaylight.openflowplugin.impl.protocol.deserialization.instruction;
 
+import io.netty.buffer.ByteBuf;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.instruction.Instruction;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.instruction.instruction.MeterCaseBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.instruction.instruction.meter._case.MeterBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.types.rev130918.MeterId;
 
-import io.netty.buffer.ByteBuf;
-
 public class MeterInstructionDeserializer extends AbstractInstructionDeserializer {
 
     @Override
index 9dc3f8a45d84beeac056a3e7ac9eb373f01d9112..f936bf6f2625a3e0e556e596923e4bace9f31eb8 100644 (file)
@@ -8,14 +8,13 @@
 
 package org.opendaylight.openflowplugin.impl.protocol.deserialization.instruction;
 
+import io.netty.buffer.ByteBuf;
 import org.opendaylight.openflowjava.protocol.impl.util.InstructionConstants;
 import org.opendaylight.openflowplugin.extension.api.path.ActionPath;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.instruction.Instruction;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.instruction.instruction.WriteActionsCaseBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.instruction.instruction.write.actions._case.WriteActionsBuilder;
 
-import io.netty.buffer.ByteBuf;
-
 public class WriteActionsInstructionDeserializer extends AbstractActionInstructionDeserializer {
 
     public WriteActionsInstructionDeserializer(ActionPath path) {
@@ -28,10 +27,10 @@ public class WriteActionsInstructionDeserializer extends AbstractActionInstructi
         message.skipBytes(InstructionConstants.PADDING_IN_ACTIONS_INSTRUCTION);
 
         return new WriteActionsCaseBuilder()
-            .setWriteActions(new WriteActionsBuilder()
-                    .setAction(readActions(message, length))
-                    .build())
-            .build();
+                .setWriteActions(new WriteActionsBuilder()
+                        .setAction(readActions(message, length))
+                        .build())
+                .build();
     }
 
     @Override
index 2c87c2d6fccf57991e21cae311fddd6e7d70d7f5..c3751d8a6ae21408b8b9cff512dfbc9c611f6570 100644 (file)
@@ -8,16 +8,14 @@
 
 package org.opendaylight.openflowplugin.impl.protocol.deserialization.instruction;
 
+import io.netty.buffer.ByteBuf;
 import java.math.BigInteger;
-
 import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants;
 import org.opendaylight.openflowjava.protocol.impl.util.InstructionConstants;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.instruction.Instruction;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.instruction.instruction.WriteMetadataCaseBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.instruction.instruction.write.metadata._case.WriteMetadataBuilder;
 
-import io.netty.buffer.ByteBuf;
-
 public class WriteMetadataInstructionDeserializer extends AbstractInstructionDeserializer {
 
     @Override
@@ -31,11 +29,11 @@ public class WriteMetadataInstructionDeserializer extends AbstractInstructionDes
         message.readBytes(metaMask);
 
         return new WriteMetadataCaseBuilder()
-            .setWriteMetadata(new WriteMetadataBuilder()
-                    .setMetadata(new BigInteger(1, meta))
-                    .setMetadataMask(new BigInteger(1, metaMask))
-                    .build())
-            .build();
+                .setWriteMetadata(new WriteMetadataBuilder()
+                        .setMetadata(new BigInteger(1, meta))
+                        .setMetadataMask(new BigInteger(1, metaMask))
+                        .build())
+                .build();
     }
 
     @Override
index a6295f570b511db45ea55f199c059d20c8db77f0..0f4c6aa89aa1755e22faa6284e1252a9eb99c8c8 100644 (file)
@@ -8,7 +8,6 @@
 package org.opendaylight.openflowplugin.impl.protocol.deserialization.key;
 
 import java.util.Objects;
-
 import org.opendaylight.openflowplugin.api.openflow.protocol.deserialization.MessageCodeExperimenterKey;
 import org.opendaylight.openflowplugin.extension.api.path.ActionPath;
 
@@ -17,13 +16,15 @@ public class MessageCodeActionExperimenterKey extends MessageCodeExperimenterKey
     private ActionPath actionPath;
 
     /**
-     * Constructor
-     * @param version wire protocol version
-     * @param value used as distinguisher (read from binary data / buffer)
-     * @param clazz class of object that is going to be deserialized
+     * Constructor.
+     *
+     * @param version        wire protocol version
+     * @param value          used as distinguisher (read from binary data / buffer)
+     * @param clazz          class of object that is going to be deserialized
      * @param experimenterId experimenter id
      */
-    public MessageCodeActionExperimenterKey(short version, int value, Class<?> clazz, ActionPath actionPath, Long experimenterId) {
+    public MessageCodeActionExperimenterKey(short version, int value, Class<?> clazz, ActionPath actionPath, Long
+            experimenterId) {
         super(version, value, clazz, experimenterId);
         this.actionPath = actionPath;
     }
index 5df9e4b71735e148976fc5aa3509de17bae54370..b31bab3b7d4c806f6ce394e8337d6c7e4cd61fce 100644 (file)
@@ -8,7 +8,6 @@
 package org.opendaylight.openflowplugin.impl.protocol.deserialization.key;
 
 import java.util.Objects;
-
 import org.opendaylight.openflowjava.protocol.api.keys.MessageCodeKey;
 import org.opendaylight.openflowplugin.extension.api.path.MatchPath;
 
@@ -17,10 +16,11 @@ public class MessageCodeMatchKey extends MessageCodeKey {
     private MatchPath matchPath;
 
     /**
-     * Constructor
-     * @param version wire protocol version
-     * @param value used as distinguisher (read from binary data / buffer)
-     * @param clazz class of object that is going to be deserialized
+     * Constructor.
+     *
+     * @param version   wire protocol version
+     * @param value     used as distinguisher (read from binary data / buffer)
+     * @param clazz     class of object that is going to be deserialized
      * @param matchPath match extension path
      */
     public MessageCodeMatchKey(short version, int value, Class<?> clazz, MatchPath matchPath) {
index 9243747009d0b24717fef03fa54739142136aa63..e7a80485d48f0fc08e4f3f3b25c593e6c94265f8 100644 (file)
@@ -21,7 +21,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.flow.M
 public abstract class AbstractMatchEntryDeserializer implements MatchEntryDeserializer {
 
     /**
-     * Processes match entry header and returns if it have mask, or not
+     * Processes match entry header and returns if it have mask, or not.
      * @param in input buffer
      * @return true if match entry has mask, false otherwise
      */
@@ -33,7 +33,7 @@ public abstract class AbstractMatchEntryDeserializer implements MatchEntryDeseri
     }
 
     /**
-     * Read Ipv4Prefix from message
+     * Read Ipv4Prefix from message.
      * @param message buffered message
      * @param hasMask determines if prefix has mask or not
      * @return IPv4 prefix
@@ -51,7 +51,7 @@ public abstract class AbstractMatchEntryDeserializer implements MatchEntryDeseri
     }
 
     /**
-     * Throw error on malformed match builder input
+     * Throw error on malformed match builder input.
      * @param builder match builder
      * @param propertyName name of property that already containsData
      */
@@ -61,7 +61,7 @@ public abstract class AbstractMatchEntryDeserializer implements MatchEntryDeseri
     }
 
     /**
-     * Throw error on malformed match builder input
+     * Throw error on malformed match builder input.
      * @param builder match builder
      * @param propertyName name of property that already containsData
      */
index 9ecb2ba958e0098cf1aeb70e0452cf7768b91faa..cf563922311b2421751960481917c249b714bb51 100644 (file)
@@ -23,7 +23,8 @@ public class InPhyPortEntryDeserializer extends AbstractMatchEntryDeserializer {
         final long port = message.readUnsignedInt();
 
         if (Objects.isNull(builder.getInPhyPort())) {
-            builder.setInPhyPort(new NodeConnectorId(OpenflowPortsUtil.getProtocolAgnosticPortUri(EncodeConstants.OF13_VERSION_ID, port)));
+            builder.setInPhyPort(new NodeConnectorId(OpenflowPortsUtil
+                    .getProtocolAgnosticPortUri(EncodeConstants.OF13_VERSION_ID, port)));
         } else {
             throwErrorOnMalformed(builder, "inPhyPort");
         }
index e6b59bec8ab6fc6d5d58900058388670a73d2e34..f8e976820cd711a8e25633a1cb0c8574c51ab617 100644 (file)
@@ -23,7 +23,8 @@ public class InPortEntryDeserializer extends AbstractMatchEntryDeserializer {
         final long port = message.readUnsignedInt();
 
         if (Objects.isNull(builder.getInPort())) {
-            builder.setInPort(new NodeConnectorId(OpenflowPortsUtil.getProtocolAgnosticPortUri(EncodeConstants.OF13_VERSION_ID, port)));
+            builder.setInPort(new NodeConnectorId(OpenflowPortsUtil.getProtocolAgnosticPortUri(EncodeConstants
+                    .OF13_VERSION_ID, port)));
         } else {
             throwErrorOnMalformed(builder, "inPort");
         }
index 943ba8c2e30d2cd82774fdaceec381357a7d81d5..df499ad3a12e47ab1204563cde2f3e06ee125315 100644 (file)
@@ -8,8 +8,8 @@
 
 package org.opendaylight.openflowplugin.impl.protocol.deserialization.match;
 
+import io.netty.buffer.ByteBuf;
 import java.util.Objects;
-
 import javax.annotation.Nullable;
 import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants;
 import org.opendaylight.openflowjava.protocol.impl.deserialization.match.OxmDeserializerHelper;
@@ -22,8 +22,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026
 import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.match.layer._3.match.Ipv4MatchArbitraryBitMaskBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.match.layer._3.match.Ipv4MatchBuilder;
 
-import io.netty.buffer.ByteBuf;
-
 public class Ipv4DestinationEntryDeserializer extends AbstractMatchEntryDeserializer {
 
     @Override
@@ -44,31 +42,34 @@ public class Ipv4DestinationEntryDeserializer extends AbstractMatchEntryDeserial
         }
     }
 
-    private static void setPrefixMatch(final MatchBuilder builder, final Ipv4Address address, @Nullable final byte[] mask) {
+    private static void setPrefixMatch(final MatchBuilder builder, final Ipv4Address address, @Nullable final byte[]
+            mask) {
         if (Objects.isNull(builder.getLayer3Match())) {
             builder.setLayer3Match(new Ipv4MatchBuilder()
-                .setIpv4Destination(IpConversionUtil.createPrefix(address, mask))
-                .build());
+                    .setIpv4Destination(IpConversionUtil.createPrefix(address, mask))
+                    .build());
         } else if (Ipv4Match.class.isInstance(builder.getLayer3Match())
-            && Objects.isNull(Ipv4Match.class.cast(builder.getLayer3Match()).getIpv4Destination())) {
+                && Objects.isNull(Ipv4Match.class.cast(builder.getLayer3Match()).getIpv4Destination())) {
             builder.setLayer3Match(new Ipv4MatchBuilder(Ipv4Match.class.cast(builder.getLayer3Match()))
-                .setIpv4Destination(IpConversionUtil.createPrefix(address, mask))
-                .build());
+                    .setIpv4Destination(IpConversionUtil.createPrefix(address, mask))
+                    .build());
         } else {
             throwErrorOnMalformed(builder, "layer3Match", "ipv4Destination");
         }
     }
 
     private static void setArbitraryMatch(final MatchBuilder builder, final Ipv4Address address,
-            final byte[] mask) {
+                                          final byte[] mask) {
         if (Objects.isNull(builder.getLayer3Match())) {
             builder.setLayer3Match(new Ipv4MatchArbitraryBitMaskBuilder()
                     .setIpv4DestinationAddressNoMask(address)
                     .setIpv4DestinationArbitraryBitmask(IpConversionUtil.createArbitraryBitMask(mask))
                     .build());
         } else if (Ipv4MatchArbitraryBitMask.class.isInstance(builder.getLayer3Match())
-            && Objects.isNull(Ipv4MatchArbitraryBitMask.class.cast(builder.getLayer3Match()).getIpv4DestinationAddressNoMask())) {
-            builder.setLayer3Match(new Ipv4MatchArbitraryBitMaskBuilder(Ipv4MatchArbitraryBitMask.class.cast(builder.getLayer3Match()))
+                && Objects.isNull(Ipv4MatchArbitraryBitMask.class.cast(builder.getLayer3Match())
+                .getIpv4DestinationAddressNoMask())) {
+            builder.setLayer3Match(new Ipv4MatchArbitraryBitMaskBuilder(Ipv4MatchArbitraryBitMask.class.cast(builder
+                    .getLayer3Match()))
                     .setIpv4DestinationAddressNoMask(address)
                     .setIpv4DestinationArbitraryBitmask(IpConversionUtil.createArbitraryBitMask(mask))
                     .build());
index 910fb179b33869e86fc23b654a83ff09c6eb57f4..ca95493d8f26dcfe3ef97279979bd3dc1b0b46a5 100644 (file)
@@ -8,8 +8,8 @@
 
 package org.opendaylight.openflowplugin.impl.protocol.deserialization.match;
 
+import io.netty.buffer.ByteBuf;
 import java.util.Objects;
-
 import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants;
 import org.opendaylight.openflowjava.protocol.impl.deserialization.match.OxmDeserializerHelper;
 import org.opendaylight.openflowjava.util.ByteBufUtils;
@@ -21,8 +21,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026
 import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.match.layer._3.match.Ipv4MatchArbitraryBitMaskBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.match.layer._3.match.Ipv4MatchBuilder;
 
-import io.netty.buffer.ByteBuf;
-
 public class Ipv4SourceEntryDeserializer extends AbstractMatchEntryDeserializer {
 
     @Override
@@ -46,28 +44,30 @@ public class Ipv4SourceEntryDeserializer extends AbstractMatchEntryDeserializer
     private static void setPrefixMatch(final MatchBuilder builder, final Ipv4Address address, final byte[] mask) {
         if (Objects.isNull(builder.getLayer3Match())) {
             builder.setLayer3Match(new Ipv4MatchBuilder()
-                .setIpv4Source(IpConversionUtil.createPrefix(address, mask))
-                .build());
+                    .setIpv4Source(IpConversionUtil.createPrefix(address, mask))
+                    .build());
         } else if (Ipv4Match.class.isInstance(builder.getLayer3Match())
-            && Objects.isNull(Ipv4Match.class.cast(builder.getLayer3Match()).getIpv4Source())) {
+                && Objects.isNull(Ipv4Match.class.cast(builder.getLayer3Match()).getIpv4Source())) {
             builder.setLayer3Match(new Ipv4MatchBuilder(Ipv4Match.class.cast(builder.getLayer3Match()))
-                .setIpv4Source(IpConversionUtil.createPrefix(address, mask))
-                .build());
+                    .setIpv4Source(IpConversionUtil.createPrefix(address, mask))
+                    .build());
         } else {
             throwErrorOnMalformed(builder, "layer3Match", "ipv4Source");
         }
     }
 
     private static void setArbitraryMatch(final MatchBuilder builder, final Ipv4Address address,
-            final byte[] mask) {
+                                          final byte[] mask) {
         if (Objects.isNull(builder.getLayer3Match())) {
             builder.setLayer3Match(new Ipv4MatchArbitraryBitMaskBuilder()
                     .setIpv4SourceAddressNoMask(address)
                     .setIpv4SourceArbitraryBitmask(IpConversionUtil.createArbitraryBitMask(mask))
                     .build());
         } else if (Ipv4MatchArbitraryBitMask.class.isInstance(builder.getLayer3Match())
-            && Objects.isNull(Ipv4MatchArbitraryBitMask.class.cast(builder.getLayer3Match()).getIpv4SourceAddressNoMask())) {
-            builder.setLayer3Match(new Ipv4MatchArbitraryBitMaskBuilder(Ipv4MatchArbitraryBitMask.class.cast(builder.getLayer3Match()))
+                && Objects.isNull(Ipv4MatchArbitraryBitMask.class.cast(builder.getLayer3Match())
+                .getIpv4SourceAddressNoMask())) {
+            builder.setLayer3Match(new Ipv4MatchArbitraryBitMaskBuilder(Ipv4MatchArbitraryBitMask.class.cast(builder
+                    .getLayer3Match()))
                     .setIpv4SourceAddressNoMask(address)
                     .setIpv4SourceArbitraryBitmask(IpConversionUtil.createArbitraryBitMask(mask))
                     .build());
index b5ae535e59f2558851856eded8a78386ad983577..2642baa8b2f184f424139f9c97b527e8890e832c 100644 (file)
@@ -8,8 +8,8 @@
 
 package org.opendaylight.openflowplugin.impl.protocol.deserialization.match;
 
+import io.netty.buffer.ByteBuf;
 import java.util.Objects;
-
 import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants;
 import org.opendaylight.openflowjava.protocol.impl.deserialization.match.OxmDeserializerHelper;
 import org.opendaylight.openflowjava.util.ByteBufUtils;
@@ -21,8 +21,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026
 import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.match.layer._3.match.Ipv6MatchArbitraryBitMaskBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.match.layer._3.match.Ipv6MatchBuilder;
 
-import io.netty.buffer.ByteBuf;
-
 public class Ipv6DestinationEntryDeserializer extends AbstractMatchEntryDeserializer {
 
     @Override
@@ -31,7 +29,8 @@ public class Ipv6DestinationEntryDeserializer extends AbstractMatchEntryDeserial
         final Ipv6Address address = ByteBufUtils.readIetfIpv6Address(message);
 
         if (hasMask) {
-            final byte[] mask = OxmDeserializerHelper.convertMask(message, EncodeConstants.SIZE_OF_IPV6_ADDRESS_IN_BYTES);
+            final byte[] mask = OxmDeserializerHelper.convertMask(message, EncodeConstants
+                    .SIZE_OF_IPV6_ADDRESS_IN_BYTES);
 
             if (IpConversionUtil.isIpv6ArbitraryBitMask(mask)) {
                 setArbitraryMatch(builder, address, mask);
@@ -46,27 +45,28 @@ public class Ipv6DestinationEntryDeserializer extends AbstractMatchEntryDeserial
     private static void setPrefixMatch(final MatchBuilder builder, final Ipv6Address address, final byte[] mask) {
         if (Objects.isNull(builder.getLayer3Match())) {
             builder.setLayer3Match(new Ipv6MatchBuilder()
-                .setIpv6Destination(IpConversionUtil.createPrefix(address, mask))
-                .build());
+                    .setIpv6Destination(IpConversionUtil.createPrefix(address, mask))
+                    .build());
         } else if (Ipv6Match.class.isInstance(builder.getLayer3Match())
-            && Objects.isNull(Ipv6Match.class.cast(builder.getLayer3Match()).getIpv6Destination())) {
+                && Objects.isNull(Ipv6Match.class.cast(builder.getLayer3Match()).getIpv6Destination())) {
             builder.setLayer3Match(new Ipv6MatchBuilder(Ipv6Match.class.cast(builder.getLayer3Match()))
-                .setIpv6Destination(IpConversionUtil.createPrefix(address, mask))
-                .build());
+                    .setIpv6Destination(IpConversionUtil.createPrefix(address, mask))
+                    .build());
         } else {
             throwErrorOnMalformed(builder, "layer3Match", "ipv6Destination");
         }
     }
 
     private static void setArbitraryMatch(final MatchBuilder builder, final Ipv6Address address,
-            final byte[] mask) {
+                                          final byte[] mask) {
         if (Objects.isNull(builder.getLayer3Match())) {
             builder.setLayer3Match(new Ipv6MatchArbitraryBitMaskBuilder()
                     .setIpv6DestinationAddressNoMask(address)
                     .setIpv6DestinationArbitraryBitmask(IpConversionUtil.createIpv6ArbitraryBitMask(mask))
                     .build());
         } else if (Ipv6MatchArbitraryBitMask.class.isInstance(builder.getLayer3Match())
-            && Objects.isNull(Ipv6MatchArbitraryBitMask.class.cast(builder.getLayer3Match()).getIpv6DestinationAddressNoMask())) {
+                && Objects.isNull(Ipv6MatchArbitraryBitMask.class.cast(builder.getLayer3Match())
+                .getIpv6DestinationAddressNoMask())) {
             final Ipv6MatchArbitraryBitMask match = Ipv6MatchArbitraryBitMask.class.cast(builder.getLayer3Match());
             builder.setLayer3Match(new Ipv6MatchArbitraryBitMaskBuilder(match)
                     .setIpv6DestinationAddressNoMask(address)
index 76bf0e89dc148e14871dddd33e379d37f9a70268..81eea64de45b847b33d6d136e8d23e8027c80080 100644 (file)
@@ -8,8 +8,8 @@
 
 package org.opendaylight.openflowplugin.impl.protocol.deserialization.match;
 
+import io.netty.buffer.ByteBuf;
 import java.util.Objects;
-
 import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants;
 import org.opendaylight.openflowjava.protocol.impl.deserialization.match.OxmDeserializerHelper;
 import org.opendaylight.openflowplugin.openflow.md.util.ByteUtil;
@@ -19,8 +19,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026
 import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.match.layer._3.match.Ipv6Match;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.match.layer._3.match.Ipv6MatchBuilder;
 
-import io.netty.buffer.ByteBuf;
-
 public class Ipv6FlabelEntryDeserializer extends AbstractMatchEntryDeserializer {
 
     @Override
index 4e461223d363e0e2ccf4596066502313a5091b50..d452c7212baf7efe822f731620fbc23c66f20964 100644 (file)
@@ -8,16 +8,14 @@
 
 package org.opendaylight.openflowplugin.impl.protocol.deserialization.match;
 
+import io.netty.buffer.ByteBuf;
 import java.util.Objects;
-
 import org.opendaylight.openflowjava.protocol.impl.deserialization.match.OxmDeserializerHelper;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.MacAddress;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.flow.MatchBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.match.layer._3.match.Ipv6Match;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.match.layer._3.match.Ipv6MatchBuilder;
 
-import io.netty.buffer.ByteBuf;
-
 public class Ipv6NdSllEntryDeserializer extends AbstractMatchEntryDeserializer {
 
     @Override
index 53219061656e6587e4545cdcb0664637dd1efe8c..eb51a1b522c0edeb321d91813691fa32dd8adf91 100644 (file)
@@ -8,16 +8,14 @@
 
 package org.opendaylight.openflowplugin.impl.protocol.deserialization.match;
 
+import io.netty.buffer.ByteBuf;
 import java.util.Objects;
-
 import org.opendaylight.openflowjava.util.ByteBufUtils;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6Address;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.flow.MatchBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.match.layer._3.match.Ipv6Match;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.match.layer._3.match.Ipv6MatchBuilder;
 
-import io.netty.buffer.ByteBuf;
-
 public class Ipv6NdTargetEntryDeserializer extends AbstractMatchEntryDeserializer {
 
     @Override
index 4bb750d449849ec7cdb1dc4a104b60397a5b5a10..eecd5b87c153406775dbb23fbdc21ac57f948f1b 100644 (file)
@@ -8,16 +8,14 @@
 
 package org.opendaylight.openflowplugin.impl.protocol.deserialization.match;
 
+import io.netty.buffer.ByteBuf;
 import java.util.Objects;
-
 import org.opendaylight.openflowjava.protocol.impl.deserialization.match.OxmDeserializerHelper;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.MacAddress;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.flow.MatchBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.match.layer._3.match.Ipv6Match;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.match.layer._3.match.Ipv6MatchBuilder;
 
-import io.netty.buffer.ByteBuf;
-
 public class Ipv6NdTllEntryDeserializer extends AbstractMatchEntryDeserializer {
 
     @Override
index 4a700ad695faebc8df15a66352152f71b8543584..81be914bd1e71fab4e48123dd5ca72992822f43c 100644 (file)
@@ -8,8 +8,8 @@
 
 package org.opendaylight.openflowplugin.impl.protocol.deserialization.match;
 
+import io.netty.buffer.ByteBuf;
 import java.util.Objects;
-
 import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants;
 import org.opendaylight.openflowjava.protocol.impl.deserialization.match.OxmDeserializerHelper;
 import org.opendaylight.openflowjava.util.ByteBufUtils;
@@ -21,8 +21,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026
 import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.match.layer._3.match.Ipv6MatchArbitraryBitMaskBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.match.layer._3.match.Ipv6MatchBuilder;
 
-import io.netty.buffer.ByteBuf;
-
 public class Ipv6SourceEntryDeserializer extends AbstractMatchEntryDeserializer {
 
     @Override
@@ -31,7 +29,8 @@ public class Ipv6SourceEntryDeserializer extends AbstractMatchEntryDeserializer
         final Ipv6Address address = ByteBufUtils.readIetfIpv6Address(message);
 
         if (hasMask) {
-            final byte[] mask = OxmDeserializerHelper.convertMask(message, EncodeConstants.SIZE_OF_IPV6_ADDRESS_IN_BYTES);
+            final byte[] mask = OxmDeserializerHelper.convertMask(message, EncodeConstants
+                    .SIZE_OF_IPV6_ADDRESS_IN_BYTES);
 
             if (IpConversionUtil.isIpv6ArbitraryBitMask(mask)) {
                 setArbitraryMatch(builder, address, mask);
@@ -46,27 +45,28 @@ public class Ipv6SourceEntryDeserializer extends AbstractMatchEntryDeserializer
     private static void setPrefixMatch(final MatchBuilder builder, final Ipv6Address address, final byte[] mask) {
         if (Objects.isNull(builder.getLayer3Match())) {
             builder.setLayer3Match(new Ipv6MatchBuilder()
-                .setIpv6Source(IpConversionUtil.createPrefix(address, mask))
-                .build());
+                    .setIpv6Source(IpConversionUtil.createPrefix(address, mask))
+                    .build());
         } else if (Ipv6Match.class.isInstance(builder.getLayer3Match())
-            && Objects.isNull(Ipv6Match.class.cast(builder.getLayer3Match()).getIpv6Source())) {
+                && Objects.isNull(Ipv6Match.class.cast(builder.getLayer3Match()).getIpv6Source())) {
             builder.setLayer3Match(new Ipv6MatchBuilder(Ipv6Match.class.cast(builder.getLayer3Match()))
-                .setIpv6Source(IpConversionUtil.createPrefix(address, mask))
-                .build());
+                    .setIpv6Source(IpConversionUtil.createPrefix(address, mask))
+                    .build());
         } else {
             throwErrorOnMalformed(builder, "layer3Match", "ipv6Source");
         }
     }
 
     private static void setArbitraryMatch(final MatchBuilder builder, final Ipv6Address address,
-            final byte[] mask) {
+                                          final byte[] mask) {
         if (Objects.isNull(builder.getLayer3Match())) {
             builder.setLayer3Match(new Ipv6MatchArbitraryBitMaskBuilder()
                     .setIpv6SourceAddressNoMask(address)
                     .setIpv6SourceArbitraryBitmask(IpConversionUtil.createIpv6ArbitraryBitMask(mask))
                     .build());
         } else if (Ipv6MatchArbitraryBitMask.class.isInstance(builder.getLayer3Match())
-            && Objects.isNull(Ipv6MatchArbitraryBitMask.class.cast(builder.getLayer3Match()).getIpv6SourceAddressNoMask())) {
+                && Objects.isNull(Ipv6MatchArbitraryBitMask.class.cast(builder.getLayer3Match())
+                .getIpv6SourceAddressNoMask())) {
             final Ipv6MatchArbitraryBitMask match = Ipv6MatchArbitraryBitMask.class.cast(builder.getLayer3Match());
             builder.setLayer3Match(new Ipv6MatchArbitraryBitMaskBuilder(match)
                     .setIpv6SourceAddressNoMask(address)
index 8b92ed09a6bb0b61fa3e6709ff5c07be4e0ea063..76423e6acc8a8a9ad224ca1dfba19c7705fb7a36 100644 (file)
@@ -44,7 +44,9 @@ public class MatchDeserializer implements OFDeserializer<Match>, HeaderDeseriali
 
     @Override
     public Match deserialize(ByteBuf inBuffer) {
-        if (inBuffer.readableBytes() <= 0) return null;
+        if (inBuffer.readableBytes() <= 0) {
+            return null;
+        }
 
         final MatchBuilder builder = new MatchBuilder();
 
@@ -77,7 +79,9 @@ public class MatchDeserializer implements OFDeserializer<Match>, HeaderDeseriali
 
     @Override
     public void deserializeEntry(ByteBuf inBuffer, MatchBuilder builder) {
-        if (inBuffer.readableBytes() <= 0) return;
+        if (inBuffer.readableBytes() <= 0) {
+            return;
+        }
         int oxmClass = inBuffer.getUnsignedShort(inBuffer.readerIndex());
         int oxmField = inBuffer.getUnsignedByte(inBuffer.readerIndex()
                 + EncodeConstants.SIZE_OF_SHORT_IN_BYTES) >>> 1;
index b15d1275f5a72a7eedca9c624fb7cd57de20045d..4bdc6b791f62f278a2b4ece02bd2e4e1c81aeb02 100644 (file)
@@ -8,13 +8,11 @@
 
 package org.opendaylight.openflowplugin.impl.protocol.deserialization.match;
 
+import io.netty.buffer.ByteBuf;
 import java.util.Objects;
-
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.flow.MatchBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.match.ProtocolMatchFieldsBuilder;
 
-import io.netty.buffer.ByteBuf;
-
 public class MplsBosEntryDeserializer extends AbstractMatchEntryDeserializer {
 
     @Override
index 8fc0d788890e3c9a7e914aba320996bd6cced6b1..dcfe506a8c2e9fc12d92444392eb7d1820b1a4a6 100644 (file)
@@ -8,13 +8,11 @@
 
 package org.opendaylight.openflowplugin.impl.protocol.deserialization.match;
 
+import io.netty.buffer.ByteBuf;
 import java.util.Objects;
-
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.flow.MatchBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.match.ProtocolMatchFieldsBuilder;
 
-import io.netty.buffer.ByteBuf;
-
 public class MplsLabelEntryDeserializer extends AbstractMatchEntryDeserializer {
 
     @Override
index 26483b6e6f5ff00c3c6fe86e8b73fb43f4e959dc..58bf20677cd0810609fec96a6966438673d4edc5 100644 (file)
@@ -8,13 +8,11 @@
 
 package org.opendaylight.openflowplugin.impl.protocol.deserialization.match;
 
+import io.netty.buffer.ByteBuf;
 import java.util.Objects;
-
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.flow.MatchBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.match.ProtocolMatchFieldsBuilder;
 
-import io.netty.buffer.ByteBuf;
-
 public class MplsTcEntryDeserializer extends AbstractMatchEntryDeserializer {
 
     @Override
index b0b06b86cfe0a3e667063102a2cce880da4fa338..37eaefa36f19edd931f6d121565370a3a25dd817 100644 (file)
@@ -8,14 +8,12 @@
 
 package org.opendaylight.openflowplugin.impl.protocol.deserialization.match;
 
+import io.netty.buffer.ByteBuf;
 import java.util.Objects;
-
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.flow.MatchBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.match.ProtocolMatchFieldsBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.protocol.match.fields.PbbBuilder;
 
-import io.netty.buffer.ByteBuf;
-
 public class PbbEntryDeserializer extends AbstractMatchEntryDeserializer {
 
     @Override
index 1144adda5815d8b31f4780aa98360f44072c2f8b..b17ef1ab08b728b02160e3373432e8f08f35b3e8 100644 (file)
@@ -8,13 +8,11 @@
 
 package org.opendaylight.openflowplugin.impl.protocol.deserialization.match;
 
+import io.netty.buffer.ByteBuf;
 import java.util.Objects;
-
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.flow.MatchBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.match.TcpFlagsMatchBuilder;
 
-import io.netty.buffer.ByteBuf;
-
 public class TcpFlagsEntryDeserializer extends AbstractMatchEntryDeserializer {
 
     @Override
@@ -23,7 +21,7 @@ public class TcpFlagsEntryDeserializer extends AbstractMatchEntryDeserializer {
         message.readUnsignedInt(); // Just skip experimenter ID for now, not used
 
         final TcpFlagsMatchBuilder tcpFlagsBuilder = new TcpFlagsMatchBuilder()
-            .setTcpFlags(message.readUnsignedShort());
+                .setTcpFlags(message.readUnsignedShort());
 
         if (hasMask) {
             tcpFlagsBuilder.setTcpFlagsMask(message.readUnsignedShort());
index f22c4dc7097f8d4533cb563c46b442a5030639ee..3a0076912351260db6cdf7ae6032fb7ce6286bf7 100644 (file)
@@ -8,15 +8,13 @@
 
 package org.opendaylight.openflowplugin.impl.protocol.deserialization.match;
 
+import io.netty.buffer.ByteBuf;
 import java.math.BigInteger;
 import java.util.Objects;
-
 import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.flow.MatchBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.match.TunnelBuilder;
 
-import io.netty.buffer.ByteBuf;
-
 public class TunnelIdEntryDeserializer extends AbstractMatchEntryDeserializer {
 
     @Override
index 871ba568995a260f269ebacaa6cf8a38b7383af2..1803a401e2997f813e7424ed65f0cf4715df61e8 100644 (file)
@@ -8,10 +8,10 @@
 
 package org.opendaylight.openflowplugin.impl.protocol.deserialization.messages;
 
+import io.netty.buffer.ByteBuf;
 import java.math.BigInteger;
 import java.util.ArrayList;
 import java.util.List;
-
 import org.opendaylight.openflowjava.protocol.api.extensibility.DeserializerRegistry;
 import org.opendaylight.openflowjava.protocol.api.extensibility.DeserializerRegistryInjector;
 import org.opendaylight.openflowjava.protocol.api.extensibility.OFDeserializer;
@@ -35,8 +35,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.instru
 import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.Match;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.FlowModCommand;
 
-import io.netty.buffer.ByteBuf;
-
 public class FlowMessageDeserializer implements OFDeserializer<FlowMessage>, DeserializerRegistryInjector {
 
     private static final byte PADDING = 2;
@@ -48,6 +46,7 @@ public class FlowMessageDeserializer implements OFDeserializer<FlowMessage>, Des
     private DeserializerRegistry registry;
 
     @Override
+    @SuppressWarnings("checkstyle:LineLength")
     public FlowMessage deserialize(ByteBuf message) {
         final FlowMessageBuilder builder = new FlowMessageBuilder()
             .setVersion((short) EncodeConstants.OF13_VERSION_ID)
@@ -97,8 +96,8 @@ public class FlowMessageDeserializer implements OFDeserializer<FlowMessage>, Des
                     Long expId = null;
 
                     if (EncodeConstants.EXPERIMENTER_VALUE == type) {
-                        expId = message.getUnsignedInt(message.readerIndex() +
-                                2 * EncodeConstants.SIZE_OF_SHORT_IN_BYTES);
+                        expId = message.getUnsignedInt(message.readerIndex()
+                                2 * EncodeConstants.SIZE_OF_SHORT_IN_BYTES);
                     }
 
                     deserializer = registry.getDeserializer(
@@ -124,13 +123,13 @@ public class FlowMessageDeserializer implements OFDeserializer<FlowMessage>, Des
     }
 
     private static FlowModFlags createFlowModFlagsFromBitmap(int input) {
-        final Boolean _oFPFFSENDFLOWREM = (input & (1 << 0)) > 0;
-        final Boolean _oFPFFCHECKOVERLAP = (input & (1 << 1)) > 0;
-        final Boolean _oFPFFRESETCOUNTS = (input & (1 << 2)) > 0;
-        final Boolean _oFPFFNOPKTCOUNTS = (input & (1 << 3)) > 0;
-        final Boolean _oFPFFNOBYTCOUNTS = (input & (1 << 4)) > 0;
-        return new FlowModFlags(_oFPFFCHECKOVERLAP, _oFPFFNOBYTCOUNTS, _oFPFFNOPKTCOUNTS, _oFPFFRESETCOUNTS,
-                _oFPFFSENDFLOWREM);
+        final Boolean ofp_FF_SendFlowRem = (input & (1 << 0)) > 0;
+        final Boolean ofp_FF_CheckOverlap = (input & (1 << 1)) > 0;
+        final Boolean ofp_FF_ResetCounts = (input & (1 << 2)) > 0;
+        final Boolean ofp_FF_NoPktCounts = (input & (1 << 3)) > 0;
+        final Boolean ofp_FF_NoBytCounts = (input & (1 << 4)) > 0;
+        return new FlowModFlags(ofp_FF_CheckOverlap, ofp_FF_NoBytCounts, ofp_FF_NoPktCounts, ofp_FF_ResetCounts,
+                ofp_FF_SendFlowRem);
     }
 
     @Override
index dfa74c5758a29b7adfecc50deed69553a7194ba2..1f4b7e31dfcc6237999d016d3caebf069c17210f 100644 (file)
@@ -36,7 +36,9 @@ public class GroupMessageDeserializer implements OFDeserializer<GroupMessage>, D
     private static final byte BUCKETS_HEADER_LENGTH = 16;
 
     private static final Comparator<Bucket> COMPARATOR = (bucket1, bucket2) -> {
-        if (bucket1.getBucketId() == null || bucket2.getBucketId() == null) return 0;
+        if (bucket1.getBucketId() == null || bucket2.getBucketId() == null) {
+            return 0;
+        }
         return bucket1.getBucketId().getValue().compareTo(bucket2.getBucketId().getValue());
     };
 
index 6c34260f3deb5d182badd23455c106e8f8d92173..e1e0679ef5e419387cf17fea44f83c9dd6b678cf 100644 (file)
@@ -29,8 +29,11 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.types.rev130918.meter
 import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.types.rev130918.meter.meter.band.headers.MeterBandHeaderBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.types.rev130918.meter.meter.band.headers.meter.band.header.MeterBandTypesBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.MeterModCommand;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class MeterMessageDeserializer implements OFDeserializer<MeterMessage>, DeserializerRegistryInjector {
+    private static final Logger LOG = LoggerFactory.getLogger(MeterMessageDeserializer.class);
     private static final int OFPMBTDROP = 1;
     private static final int OFPMBTDSCP = 2;
     private static final int OFPMBTEXPERIMENTER = 0xFFFF;
@@ -82,11 +85,13 @@ public class MeterMessageDeserializer implements OFDeserializer<MeterMessage>, D
                 }
                 case OFPMBTEXPERIMENTER: {
                     // TODO: Finish meter band experimenter deserialization
-                    long expId = message.getUnsignedInt(message.readerIndex() + 2 * EncodeConstants.SIZE_OF_INT_IN_BYTES);
+                    long expId =
+                            message.getUnsignedInt(message.readerIndex() + 2 * EncodeConstants.SIZE_OF_INT_IN_BYTES);
                     message.readerIndex(bandStartIndex);
 
                     OFDeserializer<Experimenter> deserializer = registry.getDeserializer(
-                            new ExperimenterIdDeserializerKey(EncodeConstants.OF13_VERSION_ID, expId, Experimenter.class));
+                            new ExperimenterIdDeserializerKey(EncodeConstants.OF13_VERSION_ID, expId,
+                                    Experimenter.class));
 
                     bandBuilder
                             .setMeterBandTypes(new MeterBandTypesBuilder()
@@ -95,6 +100,8 @@ public class MeterMessageDeserializer implements OFDeserializer<MeterMessage>, D
                             .setBandType(deserializer.deserialize(message));
                     break;
                 }
+                default:
+                    // no operation
             }
 
             bands.add(bandBuilder.build());
@@ -115,11 +122,11 @@ public class MeterMessageDeserializer implements OFDeserializer<MeterMessage>, D
 
     private static MeterFlags readMeterFlags(ByteBuf message) {
         int input = message.readUnsignedShort();
-        final Boolean mfKBPS = (input & (1)) != 0;
-        final Boolean mfPKTPS = (input & (1 << 1)) != 0;
-        final Boolean mfBURST = (input & (1 << 2)) != 0;
-        final Boolean mfSTATS = (input & (1 << 3)) != 0;
-        return new MeterFlags(mfBURST, mfKBPS, mfPKTPS, mfSTATS);
+        final Boolean mfKbps = (input & (1)) != 0;
+        final Boolean mfPktps = (input & (1 << 1)) != 0;
+        final Boolean mfBurst = (input & (1 << 2)) != 0;
+        final Boolean mfStats = (input & (1 << 3)) != 0;
+        return new MeterFlags(mfBurst, mfKbps, mfPktps, mfStats);
     }
 
 }
index cd948ec6ef68fbff7c58b45fb981480c0b349394..1fe6e35f2699e10bdea3737cceadaff7785c4c11 100644 (file)
@@ -27,7 +27,8 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.experimenter
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class MultipartReplyExperimenterDeserializer implements OFDeserializer<MultipartReplyBody>, DeserializerRegistryInjector {
+public class MultipartReplyExperimenterDeserializer implements OFDeserializer<MultipartReplyBody>,
+        DeserializerRegistryInjector {
     private static final Logger LOG = LoggerFactory.getLogger(MultipartReplyExperimenterDeserializer.class);
     private DeserializerRegistry registry;
 
@@ -40,14 +41,14 @@ public class MultipartReplyExperimenterDeserializer implements OFDeserializer<Mu
 
         try {
             final OFDeserializer<ExperimenterMessageOfChoice> deserializer = registry
-                .getDeserializer(new ExperimenterIdTypeDeserializerKey(
+                    .getDeserializer(new ExperimenterIdTypeDeserializerKey(
                             EncodeConstants.OF13_VERSION_ID, expId, expType, ExperimenterMessageOfChoice.class));
 
             builder.setExperimenterMessageOfChoice(deserializer.deserialize(message));
         } catch (ClassCastException | IllegalStateException es) {
             final OFDeserializer<ExperimenterDataOfChoice> deserializer = registry.getDeserializer(
                     ExperimenterDeserializerKeyFactory.createMultipartReplyMessageDeserializerKey(
-                        EncodeConstants.OF13_VERSION_ID, expId, expType));
+                            EncodeConstants.OF13_VERSION_ID, expId, expType));
 
             final ExperimenterDataOfChoice data = deserializer.deserialize(message);
             final MessageTypeKey<? extends ExperimenterDataOfChoice> key = new MessageTypeKey<>(
@@ -55,8 +56,8 @@ public class MultipartReplyExperimenterDeserializer implements OFDeserializer<Mu
                     (Class<? extends ExperimenterDataOfChoice>) data.getImplementedInterface());
 
             final ConvertorMessageFromOFJava<ExperimenterDataOfChoice, MessagePath> convertor = OFSessionUtil
-                .getExtensionConvertorProvider()
-                .getMessageConverter(key);
+                    .getExtensionConvertorProvider()
+                    .getMessageConverter(key);
 
             try {
                 builder.setExperimenterMessageOfChoice(convertor.convert(data, MessagePath.MPMESSAGE_RPC_OUTPUT));
index 9e6f4d7e49b1badfc1ccca131db466347e5ccc32..13fa7c22d021ab8844b93451b8e8557b38f631ad 100644 (file)
@@ -36,7 +36,8 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026
 import org.opendaylight.yang.gen.v1.urn.opendaylight.model.statistics.types.rev130925.duration.DurationBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.multipart.types.rev170112.multipart.reply.MultipartReplyBody;
 
-public class MultipartReplyFlowStatsDeserializer implements OFDeserializer<MultipartReplyBody>, DeserializerRegistryInjector {
+public class MultipartReplyFlowStatsDeserializer implements OFDeserializer<MultipartReplyBody>,
+        DeserializerRegistryInjector {
 
     private static final MessageCodeKey MATCH_KEY = new MessageCodeMatchKey(EncodeConstants.OF13_VERSION_ID,
             EncodeConstants.EMPTY_VALUE, Match.class,
@@ -60,14 +61,14 @@ public class MultipartReplyFlowStatsDeserializer implements OFDeserializer<Multi
             itemMessage.skipBytes(PADDING_IN_FLOW_STATS_HEADER_01);
 
             itemBuilder
-                .setDuration(new DurationBuilder()
-                        .setSecond(new Counter32(itemMessage.readUnsignedInt()))
-                        .setNanosecond(new Counter32(itemMessage.readUnsignedInt()))
-                        .build())
-                .setPriority(itemMessage.readUnsignedShort())
-                .setIdleTimeout(itemMessage.readUnsignedShort())
-                .setHardTimeout(itemMessage.readUnsignedShort())
-                .setFlags(createFlowModFlagsFromBitmap(itemMessage.readUnsignedShort()));
+                    .setDuration(new DurationBuilder()
+                            .setSecond(new Counter32(itemMessage.readUnsignedInt()))
+                            .setNanosecond(new Counter32(itemMessage.readUnsignedInt()))
+                            .build())
+                    .setPriority(itemMessage.readUnsignedShort())
+                    .setIdleTimeout(itemMessage.readUnsignedShort())
+                    .setHardTimeout(itemMessage.readUnsignedShort())
+                    .setFlags(createFlowModFlagsFromBitmap(itemMessage.readUnsignedShort()));
 
             itemMessage.skipBytes(PADDING_IN_FLOW_STATS_HEADER_02);
 
@@ -79,10 +80,10 @@ public class MultipartReplyFlowStatsDeserializer implements OFDeserializer<Multi
             itemMessage.readBytes(byteCount);
 
             itemBuilder
-                .setCookie(new FlowCookie(new BigInteger(1, cookie)))
-                .setCookieMask(new FlowCookie(OFConstants.DEFAULT_COOKIE_MASK))
-                .setPacketCount(new Counter64(new BigInteger(1, packetCount)))
-                .setByteCount(new Counter64(new BigInteger(1, byteCount)));
+                    .setCookie(new FlowCookie(new BigInteger(1, cookie)))
+                    .setCookieMask(new FlowCookie(OFConstants.DEFAULT_COOKIE_MASK))
+                    .setPacketCount(new Counter64(new BigInteger(1, packetCount)))
+                    .setByteCount(new Counter64(new BigInteger(1, byteCount)));
 
             final OFDeserializer<Match> matchDeserializer = registry.getDeserializer(MATCH_KEY);
             itemBuilder.setMatch(MatchUtil.transformMatch(matchDeserializer.deserialize(itemMessage),
@@ -92,7 +93,7 @@ public class MultipartReplyFlowStatsDeserializer implements OFDeserializer<Multi
 
             if (length > 0) {
                 final List<org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.instruction.list
-                    .Instruction> instructions = new ArrayList<>();
+                        .Instruction> instructions = new ArrayList<>();
                 final int startIndex = itemMessage.readerIndex();
                 int offset = 0;
 
@@ -101,7 +102,7 @@ public class MultipartReplyFlowStatsDeserializer implements OFDeserializer<Multi
                             .setKey(new InstructionKey(offset))
                             .setOrder(offset)
                             .setInstruction(InstructionUtil
-                                .readInstruction(EncodeConstants.OF13_VERSION_ID, itemMessage, registry))
+                                    .readInstruction(EncodeConstants.OF13_VERSION_ID, itemMessage, registry))
                             .build());
 
                     offset++;
@@ -116,18 +117,18 @@ public class MultipartReplyFlowStatsDeserializer implements OFDeserializer<Multi
         }
 
         return builder
-            .setFlowAndStatisticsMapList(items)
-            .build();
+                .setFlowAndStatisticsMapList(items)
+                .build();
     }
 
     private static FlowModFlags createFlowModFlagsFromBitmap(int input) {
-        final Boolean _oFPFFSENDFLOWREM = (input & (1)) > 0;
-        final Boolean _oFPFFCHECKOVERLAP = (input & (1 << 1)) > 0;
-        final Boolean _oFPFFRESETCOUNTS = (input & (1 << 2)) > 0;
-        final Boolean _oFPFFNOPKTCOUNTS = (input & (1 << 3)) > 0;
-        final Boolean _oFPFFNOBYTCOUNTS = (input & (1 << 4)) > 0;
-        return new FlowModFlags(_oFPFFCHECKOVERLAP, _oFPFFNOBYTCOUNTS, _oFPFFNOPKTCOUNTS, _oFPFFRESETCOUNTS,
-                _oFPFFSENDFLOWREM);
+        final Boolean ofp_FF_SendFlowRem = (input & (1)) > 0;
+        final Boolean ofp_FF_CheckOverlap = (input & (1 << 1)) > 0;
+        final Boolean ofp_FF_ResetCounts = (input & (1 << 2)) > 0;
+        final Boolean ofp_FF_NoPktCounts = (input & (1 << 3)) > 0;
+        final Boolean ofp_FF_NoBytCounts = (input & (1 << 4)) > 0;
+        return new FlowModFlags(ofp_FF_CheckOverlap, ofp_FF_NoBytCounts, ofp_FF_NoPktCounts, ofp_FF_ResetCounts,
+                ofp_FF_SendFlowRem);
     }
 
     @Override
index 14795a8c9637401878ed0058d5be2f23d6585060..330c672a4b421900d67bec1d576a8d053c477ee4 100644 (file)
@@ -32,7 +32,8 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.group
 import org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.group.desc.stats.reply.GroupDescStatsKey;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.multipart.types.rev170112.multipart.reply.MultipartReplyBody;
 
-public class MultipartReplyGroupDescDeserializer implements OFDeserializer<MultipartReplyBody>, DeserializerRegistryInjector {
+public class MultipartReplyGroupDescDeserializer implements OFDeserializer<MultipartReplyBody>,
+        DeserializerRegistryInjector {
 
     private static final byte PADDING_IN_GROUP_DESC_HEADER = 1;
     private static final byte PADDING_IN_BUCKETS_HEADER = 4;
@@ -49,7 +50,7 @@ public class MultipartReplyGroupDescDeserializer implements OFDeserializer<Multi
             final int itemLength = message.readUnsignedShort();
 
             final GroupDescStatsBuilder itemBuilder = new GroupDescStatsBuilder()
-                .setGroupType(GroupTypes.forValue(message.readUnsignedByte()));
+                    .setGroupType(GroupTypes.forValue(message.readUnsignedByte()));
 
             message.skipBytes(PADDING_IN_GROUP_DESC_HEADER);
             itemBuilder.setGroupId(new GroupId(message.readUnsignedInt()));
@@ -63,15 +64,15 @@ public class MultipartReplyGroupDescDeserializer implements OFDeserializer<Multi
                 final int bucketsLength = message.readUnsignedShort();
 
                 final BucketBuilder bucketBuilder = new BucketBuilder()
-                    .setBucketId(new BucketId(bucketKey))
-                    .setKey(new BucketKey(new BucketId(bucketKey)))
-                    .setWeight(message.readUnsignedShort())
-                    .setWatchPort(message.readUnsignedInt())
-                    .setWatchGroup(message.readUnsignedInt());
+                        .setBucketId(new BucketId(bucketKey))
+                        .setKey(new BucketKey(new BucketId(bucketKey)))
+                        .setWeight(message.readUnsignedShort())
+                        .setWatchPort(message.readUnsignedInt())
+                        .setWatchGroup(message.readUnsignedInt());
 
                 message.skipBytes(PADDING_IN_BUCKETS_HEADER);
                 final List<org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.list
-                    .Action> actions = new ArrayList<>();
+                        .Action> actions = new ArrayList<>();
                 final int startIndex = message.readerIndex();
                 final int bucketLength = bucketsLength - BUCKETS_HEADER_LENGTH;
                 int offset = 0;
@@ -94,15 +95,15 @@ public class MultipartReplyGroupDescDeserializer implements OFDeserializer<Multi
             }
 
             items.add(itemBuilder
-                .setBuckets(new BucketsBuilder()
-                    .setBucket(subItems)
-                    .build())
-                .build());
+                    .setBuckets(new BucketsBuilder()
+                            .setBucket(subItems)
+                            .build())
+                    .build());
         }
 
         return builder
-            .setGroupDescStats(items)
-            .build();
+                .setGroupDescStats(items)
+                .build();
     }
 
     @Override
index 580f880f90179c06b207c537e542ce087f2d4e2b..257f37471ee8d97341003eaa16e5a4de30b0269c 100644 (file)
@@ -58,10 +58,18 @@ public class MultipartReplyGroupFeaturesDeserializer implements OFDeserializer<M
         final boolean gcChaining = ((capabilitiesMask) & (1 << 2)) != 0;
         final boolean gcChainingChecks = ((capabilitiesMask) & (1 << 3)) != 0;
 
-        if (gcSelectWeight) groupCapabilities.add(SelectWeight.class);
-        if (gcSelectLiveness) groupCapabilities.add(SelectLiveness.class);
-        if (gcChaining) groupCapabilities.add(Chaining.class);
-        if (gcChainingChecks) groupCapabilities.add(ChainingChecks.class);
+        if (gcSelectWeight) {
+            groupCapabilities.add(SelectWeight.class);
+        }
+        if (gcSelectLiveness) {
+            groupCapabilities.add(SelectLiveness.class);
+        }
+        if (gcChaining) {
+            groupCapabilities.add(Chaining.class);
+        }
+        if (gcChainingChecks) {
+            groupCapabilities.add(ChainingChecks.class);
+        }
 
         return groupCapabilities;
     }
@@ -75,10 +83,18 @@ public class MultipartReplyGroupFeaturesDeserializer implements OFDeserializer<M
         final boolean gtIndirect = ((typesMask) & (1 << 2)) != 0;
         final boolean gtFF = ((typesMask) & (1 << 3)) != 0;
 
-        if (gtAll) groupTypes.add(GroupAll.class);
-        if (gtSelect) groupTypes.add(GroupSelect.class);
-        if (gtIndirect) groupTypes.add(GroupIndirect.class);
-        if (gtFF) groupTypes.add(GroupFf.class);
+        if (gtAll) {
+            groupTypes.add(GroupAll.class);
+        }
+        if (gtSelect) {
+            groupTypes.add(GroupSelect.class);
+        }
+        if (gtIndirect) {
+            groupTypes.add(GroupIndirect.class);
+        }
+        if (gtFF) {
+            groupTypes.add(GroupFf.class);
+        }
 
         return groupTypes;
     }
index 632a6c769f007700af0da004249cfc07897cfd66..808cd3d78ab1b163253569df31de75cef6724eeb 100644 (file)
@@ -31,11 +31,15 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.types.rev130918.meter
 import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.types.rev130918.meter.meter.band.headers.MeterBandHeaderBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.types.rev130918.meter.meter.band.headers.meter.band.header.MeterBandTypesBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.multipart.types.rev170112.multipart.reply.MultipartReplyBody;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
-public class MultipartReplyMeterConfigDeserializer implements OFDeserializer<MultipartReplyBody>, DeserializerRegistryInjector {
+public class MultipartReplyMeterConfigDeserializer implements OFDeserializer<MultipartReplyBody>,
+        DeserializerRegistryInjector {
 
-    private static final byte METER_CONFIG_LENGTH = 8;
+    private static final Logger LOG = LoggerFactory.getLogger(MultipartReplyMeterConfigDeserializer.class);
 
+    private static final byte METER_CONFIG_LENGTH = 8;
     private static final int OFPMBTDROP = 1;
     private static final int OFPMBTDSCP = 2;
     private static final int OFPMBTEXPERIMENTER = 0xFFFF;
@@ -53,8 +57,8 @@ public class MultipartReplyMeterConfigDeserializer implements OFDeserializer<Mul
             final int itemLength = message.readUnsignedShort();
 
             final MeterConfigStatsBuilder itemBuilder = new MeterConfigStatsBuilder()
-                .setFlags(readMeterFlags(message))
-                .setMeterId(new MeterId(message.readUnsignedInt()));
+                    .setFlags(readMeterFlags(message))
+                    .setMeterId(new MeterId(message.readUnsignedInt()));
 
             final List<MeterBandHeader> subItems = new ArrayList<>();
             int actualLength = METER_CONFIG_LENGTH;
@@ -68,68 +72,72 @@ public class MultipartReplyMeterConfigDeserializer implements OFDeserializer<Mul
                 switch (itemBandType) {
                     case OFPMBTDROP:
                         subItemBuilder
-                            .setMeterBandTypes(new MeterBandTypesBuilder()
-                                    .setFlags(new MeterBandType(true, false, false))
-                                    .build())
-                            .setBandType(new DropBuilder()
-                                    .setDropRate(message.readUnsignedInt())
-                                    .setDropBurstSize(message.readUnsignedInt())
-                                    .build());
+                                .setMeterBandTypes(new MeterBandTypesBuilder()
+                                        .setFlags(new MeterBandType(true, false, false))
+                                        .build())
+                                .setBandType(new DropBuilder()
+                                        .setDropRate(message.readUnsignedInt())
+                                        .setDropBurstSize(message.readUnsignedInt())
+                                        .build());
                         message.skipBytes(PADDING_IN_METER_BAND_DROP_HEADER);
                         break;
 
                     case OFPMBTDSCP:
                         subItemBuilder
-                            .setMeterBandTypes(new MeterBandTypesBuilder()
-                                    .setFlags(new MeterBandType(false, true, false))
-                                    .build())
-                            .setBandType(new DscpRemarkBuilder()
-                                    .setDscpRemarkRate(message.readUnsignedInt())
-                                    .setDscpRemarkBurstSize(message.readUnsignedInt())
-                                    .setPrecLevel(message.readUnsignedByte())
-                                    .build());
+                                .setMeterBandTypes(new MeterBandTypesBuilder()
+                                        .setFlags(new MeterBandType(false, true, false))
+                                        .build())
+                                .setBandType(new DscpRemarkBuilder()
+                                        .setDscpRemarkRate(message.readUnsignedInt())
+                                        .setDscpRemarkBurstSize(message.readUnsignedInt())
+                                        .setPrecLevel(message.readUnsignedByte())
+                                        .build());
                         message.skipBytes(PADDING_IN_METER_BAND_DSCP_HEADER);
                         break;
 
                     case OFPMBTEXPERIMENTER:
                         // TODO: Finish meter band experimenter deserialization
-                        final long expId = message.getUnsignedInt(message.readerIndex() + 2 * EncodeConstants.SIZE_OF_INT_IN_BYTES);
+                        final long expId = message.getUnsignedInt(message.readerIndex() + 2 * EncodeConstants
+                                .SIZE_OF_INT_IN_BYTES);
                         message.readerIndex(itemStartIndex);
 
                         final OFDeserializer<Experimenter> deserializer = registry.getDeserializer(
-                                new ExperimenterIdDeserializerKey(EncodeConstants.OF13_VERSION_ID, expId, Experimenter.class));
+                                new ExperimenterIdDeserializerKey(EncodeConstants.OF13_VERSION_ID, expId,
+                                        Experimenter.class));
 
                         subItemBuilder
-                            .setMeterBandTypes(new MeterBandTypesBuilder()
-                                    .setFlags(new MeterBandType(false, false, true))
-                                    .build())
-                            .setBandType(deserializer.deserialize(message));
+                                .setMeterBandTypes(new MeterBandTypesBuilder()
+                                        .setFlags(new MeterBandType(false, false, true))
+                                        .build())
+                                .setBandType(deserializer.deserialize(message));
                         break;
+                    default:
+                        // no operation
 
                 }
                 subItems.add(subItemBuilder.build());
             }
 
             items.add(itemBuilder
-                .setKey(new MeterConfigStatsKey(itemBuilder.getMeterId()))
-                .setMeterBandHeaders(new MeterBandHeadersBuilder()
-                    .setMeterBandHeader(subItems)
-                    .build())
-                .build());
+                    .setKey(new MeterConfigStatsKey(itemBuilder.getMeterId()))
+                    .setMeterBandHeaders(new MeterBandHeadersBuilder()
+                            .setMeterBandHeader(subItems)
+                            .build())
+                    .build());
         }
 
         return builder
-            .setMeterConfigStats(items)
-            .build();
+                .setMeterConfigStats(items)
+                .build();
     }
 
     private static MeterFlags readMeterFlags(ByteBuf message) {
         int input = message.readUnsignedShort();
-        final Boolean mfKBPS = (input & (1)) != 0;
-        final Boolean mfPKTPS = (input & (1 << 1)) != 0;
-        final Boolean mfBURST = (input & (1 << 2)) != 0;
-        final Boolean mfSTATS = (input & (1 << 3)) != 0;
-        return new MeterFlags(mfBURST, mfKBPS, mfPKTPS, mfSTATS);
+        final Boolean mfKbps = (input & (1)) != 0;
+        final Boolean mfPktps = (input & (1 << 1)) != 0;
+        final Boolean mfBurst = (input & (1 << 2)) != 0;
+        final Boolean mfStats = (input & (1 << 3)) != 0;
+        return new MeterFlags(mfBurst, mfKbps, mfPktps, mfStats);
     }
 
     @Override
index 1ffc8c34c7230e0a172e6ce336eee7378198a46a..b2e3d9352f989aec146085f95ad3b0bedc5671fe 100644 (file)
@@ -29,22 +29,26 @@ public class MultipartReplyMeterFeaturesDeserializer implements OFDeserializer<M
     @Override
     public MultipartReplyBody deserialize(ByteBuf message) {
         return new MultipartReplyMeterFeaturesBuilder()
-            .setMaxMeter(new Counter32(message.readUnsignedInt()))
-            .setMeterBandSupported(readMeterBands(message))
-            .setMeterCapabilitiesSupported(readMeterCapabilities(message))
-            .setMaxBands(message.readUnsignedByte())
-            .setMaxColor(message.readUnsignedByte())
-            .build();
+                .setMaxMeter(new Counter32(message.readUnsignedInt()))
+                .setMeterBandSupported(readMeterBands(message))
+                .setMeterCapabilitiesSupported(readMeterCapabilities(message))
+                .setMaxBands(message.readUnsignedByte())
+                .setMaxColor(message.readUnsignedByte())
+                .build();
     }
 
     private static List<Class<? extends MeterBand>> readMeterBands(ByteBuf message) {
         final List<Class<? extends MeterBand>> bandTypes = new ArrayList<>();
         final long typesMask = message.readUnsignedInt();
-        final boolean mbtDROP = (typesMask & (1)) != 0;
-        final boolean mbtDSCPREMARK = (typesMask & (1 << 1)) != 0;
+        final boolean mbtDrop = (typesMask & (1)) != 0;
+        final boolean mbtDscpRemark = (typesMask & (1 << 1)) != 0;
 
-        if (mbtDROP) bandTypes.add(MeterBandDrop.class);
-        if (mbtDSCPREMARK) bandTypes.add(MeterBandDscpRemark.class);
+        if (mbtDrop) {
+            bandTypes.add(MeterBandDrop.class);
+        }
+        if (mbtDscpRemark) {
+            bandTypes.add(MeterBandDscpRemark.class);
+        }
 
         return bandTypes;
     }
@@ -53,15 +57,23 @@ public class MultipartReplyMeterFeaturesDeserializer implements OFDeserializer<M
         final List<Class<? extends MeterCapability>> meterCapabilities = new ArrayList<>();
         final long capabilitiesMask = message.readUnsignedInt();
 
-        final boolean mfKBPS = (capabilitiesMask & (1)) != 0;
-        final boolean mfPKTPS = (capabilitiesMask & (1 << 1)) != 0;
-        final boolean mfBURST = (capabilitiesMask & (1 << 2)) != 0;
-        final boolean mfSTATS = (capabilitiesMask & (1 << 3)) != 0;
+        final boolean mfKbps = (capabilitiesMask & (1)) != 0;
+        final boolean mfPktps = (capabilitiesMask & (1 << 1)) != 0;
+        final boolean mfBurst = (capabilitiesMask & (1 << 2)) != 0;
+        final boolean mfStats = (capabilitiesMask & (1 << 3)) != 0;
 
-        if (mfKBPS) meterCapabilities.add(MeterKbps.class);
-        if (mfPKTPS) meterCapabilities.add(MeterPktps.class);
-        if (mfBURST) meterCapabilities.add(MeterBurst.class);
-        if (mfSTATS) meterCapabilities.add(MeterStats.class);
+        if (mfKbps) {
+            meterCapabilities.add(MeterKbps.class);
+        }
+        if (mfPktps) {
+            meterCapabilities.add(MeterPktps.class);
+        }
+        if (mfBurst) {
+            meterCapabilities.add(MeterBurst.class);
+        }
+        if (mfStats) {
+            meterCapabilities.add(MeterStats.class);
+        }
 
         return meterCapabilities;
     }
index 020e8ccadfde46f4697f0ea8339a04281e1b0b10..92f44a53f1a72250ec8eb17e6497232b34a9c4db 100644 (file)
@@ -37,10 +37,11 @@ public class MultipartReplyPortStatsDeserializer implements OFDeserializer<Multi
 
         while (message.readableBytes() > 0) {
             final NodeConnectorStatisticsAndPortNumberMapBuilder itemBuilder =
-                new NodeConnectorStatisticsAndPortNumberMapBuilder();
+                    new NodeConnectorStatisticsAndPortNumberMapBuilder();
 
             final long port = message.readUnsignedInt();
-            itemBuilder.setNodeConnectorId(new NodeConnectorId(OpenflowPortsUtil.getProtocolAgnosticPortUri(EncodeConstants.OF13_VERSION_ID, port)));
+            itemBuilder.setNodeConnectorId(new NodeConnectorId(OpenflowPortsUtil
+                    .getProtocolAgnosticPortUri(EncodeConstants.OF13_VERSION_ID, port)));
 
             message.skipBytes(PADDING_IN_PORT_STATS_HEADER);
 
@@ -70,33 +71,33 @@ public class MultipartReplyPortStatsDeserializer implements OFDeserializer<Multi
             message.readBytes(collisionCount);
 
             items.add(itemBuilder
-                .setKey(new NodeConnectorStatisticsAndPortNumberMapKey(itemBuilder.getNodeConnectorId()))
-                .setPackets(new PacketsBuilder()
-                    .setReceived(new BigInteger(1, recPack))
-                    .setTransmitted(new BigInteger(1, txPack))
-                    .build())
-                .setBytes(new BytesBuilder()
-                    .setReceived(new BigInteger(1, recByt))
-                    .setTransmitted(new BigInteger(1, txByt))
-                    .build())
-                .setReceiveDrops(new BigInteger(1, recDrop))
-                .setTransmitDrops(new BigInteger(1, txDrop))
-                .setReceiveErrors(new BigInteger(1, recError))
-                .setTransmitErrors(new BigInteger(1, txError))
-                .setReceiveFrameError(new BigInteger(1, recFrameError))
-                .setReceiveOverRunError(new BigInteger(1, recOverRunError))
-                .setReceiveCrcError(new BigInteger(1, recCrcError))
-                .setCollisionCount(new BigInteger(1, collisionCount))
-                .setDuration(new DurationBuilder()
-                    .setSecond(new Counter32(message.readUnsignedInt()))
-                    .setNanosecond(new Counter32(message.readUnsignedInt()))
-                    .build())
-                .build());
+                    .setKey(new NodeConnectorStatisticsAndPortNumberMapKey(itemBuilder.getNodeConnectorId()))
+                    .setPackets(new PacketsBuilder()
+                            .setReceived(new BigInteger(1, recPack))
+                            .setTransmitted(new BigInteger(1, txPack))
+                            .build())
+                    .setBytes(new BytesBuilder()
+                            .setReceived(new BigInteger(1, recByt))
+                            .setTransmitted(new BigInteger(1, txByt))
+                            .build())
+                    .setReceiveDrops(new BigInteger(1, recDrop))
+                    .setTransmitDrops(new BigInteger(1, txDrop))
+                    .setReceiveErrors(new BigInteger(1, recError))
+                    .setTransmitErrors(new BigInteger(1, txError))
+                    .setReceiveFrameError(new BigInteger(1, recFrameError))
+                    .setReceiveOverRunError(new BigInteger(1, recOverRunError))
+                    .setReceiveCrcError(new BigInteger(1, recCrcError))
+                    .setCollisionCount(new BigInteger(1, collisionCount))
+                    .setDuration(new DurationBuilder()
+                            .setSecond(new Counter32(message.readUnsignedInt()))
+                            .setNanosecond(new Counter32(message.readUnsignedInt()))
+                            .build())
+                    .build());
         }
 
         return builder
-            .setNodeConnectorStatisticsAndPortNumberMap(items)
-            .build();
+                .setNodeConnectorStatisticsAndPortNumberMap(items)
+                .build();
     }
 
 }
index 23d21d32ca412a3b490ec1619b1e494c1308daf3..79ea9bd3f8ac98f612f05a66f301e50f88f4281f 100644 (file)
@@ -35,7 +35,8 @@ public class MultipartReplyQueueStatsDeserializer implements OFDeserializer<Mult
 
         while (message.readableBytes() > 0) {
             final long port = message.readUnsignedInt();
-            final NodeConnectorId nodeConnectorId = new NodeConnectorId(OpenflowPortsUtil.getProtocolAgnosticPortUri(EncodeConstants.OF13_VERSION_ID, port));
+            final NodeConnectorId nodeConnectorId = new NodeConnectorId(OpenflowPortsUtil
+                    .getProtocolAgnosticPortUri(EncodeConstants.OF13_VERSION_ID, port));
             final QueueId queueId = new QueueId(message.readUnsignedInt());
 
             final byte[] txBytes = new byte[EncodeConstants.SIZE_OF_LONG_IN_BYTES];
index 3a0e4685be223e8ae71792e6fe4b5be7016cf594..32dd0b54bb85470f1c9032c338679398a1f79976 100644 (file)
@@ -60,14 +60,15 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class MultipartReplyTableFeaturesDeserializer implements OFDeserializer<MultipartReplyBody>, DeserializerRegistryInjector {
+public class MultipartReplyTableFeaturesDeserializer implements OFDeserializer<MultipartReplyBody>,
+        DeserializerRegistryInjector {
     private static final Logger LOG = LoggerFactory.getLogger(MultipartReplyTableFeaturesDeserializer.class);
     private static final byte PADDING_IN_MULTIPART_REPLY_TABLE_FEATURES = 5;
     private static final byte MAX_TABLE_NAME_LENGTH = 32;
     private static final byte MULTIPART_REPLY_TABLE_FEATURES_STRUCTURE_LENGTH = 64;
     private static final byte COMMON_PROPERTY_LENGTH = 4;
     private static final TableFeaturesMatchFieldDeserializer MATCH_FIELD_DESERIALIZER =
-        new TableFeaturesMatchFieldDeserializer();
+            new TableFeaturesMatchFieldDeserializer();
 
     private DeserializerRegistry registry;
 
@@ -79,7 +80,7 @@ public class MultipartReplyTableFeaturesDeserializer implements OFDeserializer<M
         while (message.readableBytes() > 0) {
             final int itemLength = message.readUnsignedShort();
             final TableFeaturesBuilder itemBuilder = new TableFeaturesBuilder()
-                .setTableId(message.readUnsignedByte());
+                    .setTableId(message.readUnsignedByte());
 
             message.skipBytes(PADDING_IN_MULTIPART_REPLY_TABLE_FEATURES);
 
@@ -90,30 +91,30 @@ public class MultipartReplyTableFeaturesDeserializer implements OFDeserializer<M
             message.readBytes(write);
 
             items.add(itemBuilder
-                .setKey(new TableFeaturesKey(itemBuilder.getTableId()))
-                .setName(name)
-                .setMetadataMatch(new BigInteger(1, match))
-                .setMetadataWrite(new BigInteger(1, write))
-                .setConfig(readTableConfig(message))
-                .setMaxEntries(message.readUnsignedInt())
-                .setTableProperties(readTableProperties(message,
-                    itemLength - MULTIPART_REPLY_TABLE_FEATURES_STRUCTURE_LENGTH))
-                .build());
+                    .setKey(new TableFeaturesKey(itemBuilder.getTableId()))
+                    .setName(name)
+                    .setMetadataMatch(new BigInteger(1, match))
+                    .setMetadataWrite(new BigInteger(1, write))
+                    .setConfig(readTableConfig(message))
+                    .setMaxEntries(message.readUnsignedInt())
+                    .setTableProperties(readTableProperties(message,
+                            itemLength - MULTIPART_REPLY_TABLE_FEATURES_STRUCTURE_LENGTH))
+                    .build());
         }
 
         return builder
-            .setTableFeatures(items)
-            .build();
+                .setTableFeatures(items)
+                .build();
     }
 
-    private final TableConfig readTableConfig(ByteBuf message) {
+    private TableConfig readTableConfig(ByteBuf message) {
         final long input = message.readUnsignedInt();
         final boolean deprecated = (input & 3) != 0;
 
         return new TableConfig(deprecated);
     }
 
-    private final TableProperties readTableProperties(ByteBuf message, int length) {
+    private TableProperties readTableProperties(ByteBuf message, int length) {
         final List<TableFeatureProperties> items = new ArrayList<>();
         int tableFeaturesLength = length;
         int order = 0;
@@ -257,6 +258,8 @@ public class MultipartReplyTableFeaturesDeserializer implements OFDeserializer<M
                     propDeserializer.deserialize(message);
                     LOG.debug("Table feature property type {} is not handled yet.", propType);
                     break;
+                default:
+                    // no operation
             }
 
 
@@ -282,12 +285,12 @@ public class MultipartReplyTableFeaturesDeserializer implements OFDeserializer<M
 
         while ((message.readerIndex() - startIndex) < length) {
             MATCH_FIELD_DESERIALIZER
-                .deserialize(message)
-                .map(matchFields::add)
-                .orElseGet(() -> {
-                    message.skipBytes(2 * EncodeConstants.SIZE_OF_SHORT_IN_BYTES);
-                    return Boolean.FALSE;
-                });
+                    .deserialize(message)
+                    .map(matchFields::add)
+                    .orElseGet(() -> {
+                        message.skipBytes(2 * EncodeConstants.SIZE_OF_SHORT_IN_BYTES);
+                        return Boolean.FALSE;
+                    });
         }
 
         return matchFields;
@@ -309,18 +312,18 @@ public class MultipartReplyTableFeaturesDeserializer implements OFDeserializer<M
             .Instruction> readInstructions(ByteBuf message, int length) {
 
         final List<org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.instruction.list
-            .Instruction> instructions = new ArrayList<>();
+                .Instruction> instructions = new ArrayList<>();
         final int startIndex = message.readerIndex();
         int offset = 0;
 
         while ((message.readerIndex() - startIndex) < length) {
             try {
                 instructions.add(new InstructionBuilder()
-                    .setKey(new InstructionKey(offset))
-                    .setOrder(offset)
-                    .setInstruction(InstructionUtil
-                        .readInstructionHeader(EncodeConstants.OF13_VERSION_ID, message, registry))
-                    .build());
+                        .setKey(new InstructionKey(offset))
+                        .setOrder(offset)
+                        .setInstruction(InstructionUtil
+                                .readInstructionHeader(EncodeConstants.OF13_VERSION_ID, message, registry))
+                        .build());
 
                 offset++;
             } catch (ClassCastException | IllegalStateException e) {
@@ -331,6 +334,7 @@ public class MultipartReplyTableFeaturesDeserializer implements OFDeserializer<M
         return instructions;
     }
 
+    @SuppressWarnings("checkstyle:LineLength")
     private List<Action> readActions(ByteBuf message, int length) {
         final List<Action> actions = new ArrayList<>();
         final int startIndex = message.readerIndex();
@@ -342,7 +346,8 @@ public class MultipartReplyTableFeaturesDeserializer implements OFDeserializer<M
                         .setKey(new ActionKey(offset))
                         .setOrder(offset)
                         .setAction(ActionUtil.readActionHeader(EncodeConstants.OF13_VERSION_ID, message, registry,
-                                ActionPath.FLOWSSTATISTICSUPDATE_FLOWANDSTATISTICSMAPLIST_INSTRUCTIONS_INSTRUCTION_INSTRUCTION_APPLYACTIONSCASE_APPLYACTIONS_ACTION_ACTION))
+                                ActionPath
+                                        .FLOWSSTATISTICSUPDATE_FLOWANDSTATISTICSMAPLIST_INSTRUCTIONS_INSTRUCTION_INSTRUCTION_APPLYACTIONSCASE_APPLYACTIONS_ACTION_ACTION))
                         .build());
 
                 offset++;
index 257d6e9a5eb16cdf6e3ca38479f856d71bce9ae8..d12680eba399bf9c22f1cda11ef76004cccb5929 100644 (file)
@@ -63,9 +63,9 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.set.f
 public class TableFeaturesMatchFieldDeserializer {
 
     /**
-     * Mapping of match entry code to match set field class
+     * Mapping of match entry code to match set field class.
      */
-    private final Map<MatchEntryDeserializerKey, Class<? extends MatchField>> CODE_TO_FIELD = ImmutableMap
+    private final Map<MatchEntryDeserializerKey, Class<? extends MatchField>> codeToFieldMap = ImmutableMap
         .<MatchEntryDeserializerKey, Class<? extends MatchField>>builder()
         .put(new MatchEntryDeserializerKey(
                     EncodeConstants.OF13_VERSION_ID,
@@ -229,8 +229,9 @@ public class TableFeaturesMatchFieldDeserializer {
                     OxmMatchConstants.NXM_NX_TCP_FLAG), TcpFlags.class)
         .build();
 
-/**
-     * Processes match entry header and returns if it have mask, or not
+    /**
+     * Processes match entry header and returns if it have mask, or not.
+     *
      * @param in input buffer
      * @return SetFieldMatchBuilder with hasMask properly set
      */
@@ -240,11 +241,12 @@ public class TableFeaturesMatchFieldDeserializer {
         in.skipBytes(EncodeConstants.SIZE_OF_BYTE_IN_BYTES); // skip match entry length
 
         return new SetFieldMatchBuilder()
-            .setHasMask(hasMask);
+                .setHasMask(hasMask);
     }
 
     /**
-     * Deserialize match field if deserializer supports it, otherwise returns empty optional
+     * Deserialize match field if deserializer supports it, otherwise returns empty optional.
+     *
      * @param message input buffer
      * @return set field match
      */
@@ -260,14 +262,15 @@ public class TableFeaturesMatchFieldDeserializer {
         }
 
         final MatchEntryDeserializerKey key =
-            new MatchEntryDeserializerKey(EncodeConstants.OF13_VERSION_ID, oxmClass, oxmField);
+                new MatchEntryDeserializerKey(EncodeConstants.OF13_VERSION_ID, oxmClass, oxmField);
 
         key.setExperimenterId(expId);
 
         return Optional
-            .ofNullable(CODE_TO_FIELD.get(key))
-            .map(clazz -> processHeader(message)
-                    .setKey(new SetFieldMatchKey(clazz))
-                    .setMatchType(clazz)
-                    .build());
-    }}
+                .ofNullable(codeToFieldMap.get(key))
+                .map(clazz -> processHeader(message)
+                        .setKey(new SetFieldMatchKey(clazz))
+                        .setMatchType(clazz)
+                        .build());
+    }
+}
index 57adfdb1910a6c0439662b6441c424a75046100e..a2f45730060a9480f8d963f4ec8fc4751016fc90 100644 (file)
@@ -8,8 +8,8 @@
 
 package org.opendaylight.openflowplugin.impl.protocol.deserialization.util;
 
+import io.netty.buffer.ByteBuf;
 import java.util.Objects;
-
 import org.opendaylight.openflowjava.protocol.api.extensibility.DeserializerRegistry;
 import org.opendaylight.openflowjava.protocol.api.extensibility.HeaderDeserializer;
 import org.opendaylight.openflowjava.protocol.api.extensibility.OFDeserializer;
@@ -23,24 +23,22 @@ import org.opendaylight.openflowplugin.extension.api.path.ActionPath;
 import org.opendaylight.openflowplugin.openflow.md.core.extension.ActionExtensionHelper;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action;
 
-import io.netty.buffer.ByteBuf;
-
 /**
- * Utility class for action deserialization
+ * Utility class for action deserialization.
  */
 public class ActionUtil {
 
     /**
-     * Deserialize OpenFlow action, using extension converter if available
+     * Deserialize OpenFlow action, using extension converter if available.
      * TODO: Remove also extension converters
      *
-     * @param version OpenFlow version
-     * @param message OpenFlow buffered message
+     * @param version  OpenFlow version
+     * @param message  OpenFlow buffered message
      * @param registry deserializer registry
-     * @param path Action path
+     * @param path     Action path
      */
     public static Action readAction(short version, ByteBuf message, DeserializerRegistry registry,
-            ActionPath path) {
+                                    ActionPath path) {
         int type = message.getUnsignedShort(message.readerIndex());
         Long expId = null;
 
@@ -51,18 +49,18 @@ public class ActionUtil {
 
         try {
             final MessageCodeExperimenterKey key = new MessageCodeExperimenterKey(
-                version, type, Action.class, expId);
+                    version, type, Action.class, expId);
 
             final OFDeserializer<Action> deserializer = registry.getDeserializer(key);
 
             return deserializer.deserialize(message);
         } catch (ClassCastException | IllegalStateException e) {
             final MessageCodeKey key = Objects.nonNull(expId)
-                ? new ExperimenterActionDeserializerKey(version, expId)
-                : new ActionDeserializerKey(version, type, expId);
+                    ? new ExperimenterActionDeserializerKey(version, expId)
+                    : new ActionDeserializerKey(version, type, expId);
 
             final OFDeserializer<org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203
-                .actions.grouping.Action> deserializer = registry.getDeserializer(key);
+                    .actions.grouping.Action> deserializer = registry.getDeserializer(key);
 
             return ActionExtensionHelper.processAlienAction(deserializer.deserialize(message),
                     OpenflowVersion.get(version), path);
@@ -70,16 +68,16 @@ public class ActionUtil {
     }
 
     /**
-     * Deserialize OpenFlow action header, using extension converter if available
+     * Deserialize OpenFlow action header, using extension converter if available.
      * TODO: Remove also extension converters
      *
-     * @param version OpenFlow version
-     * @param message OpenFlow buffered message
+     * @param version  OpenFlow version
+     * @param message  OpenFlow buffered message
      * @param registry deserializer registry
-     * @param path Action path
+     * @param path     Action path
      */
     public static Action readActionHeader(short version, ByteBuf message, DeserializerRegistry registry,
-            ActionPath path) {
+                                          ActionPath path) {
         int type = message.getUnsignedShort(message.readerIndex());
         Long expId = null;
 
@@ -90,18 +88,18 @@ public class ActionUtil {
 
         try {
             final MessageCodeExperimenterKey key = new MessageCodeExperimenterKey(
-                version, type, Action.class, expId);
+                    version, type, Action.class, expId);
 
             final HeaderDeserializer<Action> deserializer = registry.getDeserializer(key);
 
             return deserializer.deserializeHeader(message);
         } catch (ClassCastException | IllegalStateException e) {
             final MessageCodeKey key = Objects.nonNull(expId)
-                ? new ExperimenterActionDeserializerKey(version, expId)
-                : new ActionDeserializerKey(version, type, expId);
+                    ? new ExperimenterActionDeserializerKey(version, expId)
+                    : new ActionDeserializerKey(version, type, expId);
 
             final HeaderDeserializer<org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203
-                .actions.grouping.Action> deserializer = registry.getDeserializer(key);
+                    .actions.grouping.Action> deserializer = registry.getDeserializer(key);
 
             return ActionExtensionHelper.processAlienAction(deserializer.deserializeHeader(message),
                     OpenflowVersion.get(version), path);
index e66a65c230619a32d1d09ed56afb968925cf44d9..50388d5962b53319c90e46755b2c2d07d6594b97 100644 (file)
@@ -20,17 +20,18 @@ import org.opendaylight.openflowplugin.impl.protocol.deserialization.key.Message
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.instruction.Instruction;
 
 /**
- * Utility class for action deserialization
+ * Utility class for action deserialization.
  */
 public class InstructionUtil {
 
     /**
-     * Deserialize OpenFlow instruction
+     * Deserialize OpenFlow instruction.
      *
-     * @param version OpenFlow version
-     * @param message OpenFlow buffered message
+     * @param version  OpenFlow version
+     * @param message  OpenFlow buffered message
      * @param registry deserializer registry
      */
+    @SuppressWarnings("checkstyle:LineLength")
     public static Instruction readInstruction(final short version,
                                               final ByteBuf message,
                                               final DeserializerRegistry registry) {
@@ -39,16 +40,18 @@ public class InstructionUtil {
 
         if (InstructionConstants.APPLY_ACTIONS_TYPE == type) {
             deserializer = registry.getDeserializer(
-                new MessageCodeActionExperimenterKey(
-                    version, type, Instruction.class,
-                    ActionPath.FLOWSSTATISTICSUPDATE_FLOWANDSTATISTICSMAPLIST_INSTRUCTIONS_INSTRUCTION_INSTRUCTION_APPLYACTIONSCASE_APPLYACTIONS_ACTION_ACTION,
-                    null));
+                    new MessageCodeActionExperimenterKey(
+                            version, type, Instruction.class,
+                            ActionPath
+                                    .FLOWSSTATISTICSUPDATE_FLOWANDSTATISTICSMAPLIST_INSTRUCTIONS_INSTRUCTION_INSTRUCTION_APPLYACTIONSCASE_APPLYACTIONS_ACTION_ACTION,
+                            null));
         } else if (InstructionConstants.WRITE_ACTIONS_TYPE == type) {
             deserializer = registry.getDeserializer(
-                new MessageCodeActionExperimenterKey(
-                    version, type, Instruction.class,
-                    ActionPath.FLOWSSTATISTICSUPDATE_FLOWANDSTATISTICSMAPLIST_INSTRUCTIONS_INSTRUCTION_INSTRUCTION_WRITEACTIONSCASE_WRITEACTIONS_ACTION_ACTION,
-                    null));
+                    new MessageCodeActionExperimenterKey(
+                            version, type, Instruction.class,
+                            ActionPath
+                                    .FLOWSSTATISTICSUPDATE_FLOWANDSTATISTICSMAPLIST_INSTRUCTIONS_INSTRUCTION_INSTRUCTION_WRITEACTIONSCASE_WRITEACTIONS_ACTION_ACTION,
+                            null));
         } else {
             Long expId = null;
 
@@ -57,20 +60,21 @@ public class InstructionUtil {
             }
 
             deserializer = registry.getDeserializer(
-                new MessageCodeExperimenterKey(
-                    version, type, Instruction.class, expId));
+                    new MessageCodeExperimenterKey(
+                            version, type, Instruction.class, expId));
         }
 
         return deserializer.deserialize(message);
     }
 
     /**
-     * Deserialize OpenFlow instruction header
+     * Deserialize OpenFlow instruction header.
      *
-     * @param version OpenFlow version
-     * @param message OpenFlow buffered message
+     * @param version  OpenFlow version
+     * @param message  OpenFlow buffered message
      * @param registry deserializer registry
      */
+    @SuppressWarnings("checkstyle:LineLength")
     public static Instruction readInstructionHeader(final short version,
                                                     final ByteBuf message,
                                                     final DeserializerRegistry registry) {
@@ -79,16 +83,18 @@ public class InstructionUtil {
 
         if (InstructionConstants.APPLY_ACTIONS_TYPE == type) {
             deserializer = registry.getDeserializer(
-                new MessageCodeActionExperimenterKey(
-                    version, type, Instruction.class,
-                    ActionPath.NODES_NODE_TABLE_FLOW_INSTRUCTIONS_INSTRUCTION_APPLYACTIONSCASE_APPLYACTIONS_ACTION_ACTION_EXTENSIONLIST_EXTENSION,
-                    null));
+                    new MessageCodeActionExperimenterKey(
+                            version, type, Instruction.class,
+                            ActionPath
+                                    .NODES_NODE_TABLE_FLOW_INSTRUCTIONS_INSTRUCTION_APPLYACTIONSCASE_APPLYACTIONS_ACTION_ACTION_EXTENSIONLIST_EXTENSION,
+                            null));
         } else if (InstructionConstants.WRITE_ACTIONS_TYPE == type) {
             deserializer = registry.getDeserializer(
-                new MessageCodeActionExperimenterKey(
-                    version, type, Instruction.class,
-                    ActionPath.NODES_NODE_TABLE_FLOW_INSTRUCTIONS_INSTRUCTION_WRITEACTIONSCASE_WRITEACTIONS_ACTION_ACTION_EXTENSIONLIST_EXTENSION,
-                    null));
+                    new MessageCodeActionExperimenterKey(
+                            version, type, Instruction.class,
+                            ActionPath
+                                    .NODES_NODE_TABLE_FLOW_INSTRUCTIONS_INSTRUCTION_WRITEACTIONSCASE_WRITEACTIONS_ACTION_ACTION_EXTENSIONLIST_EXTENSION,
+                            null));
         } else {
             Long expId = null;
 
@@ -97,8 +103,8 @@ public class InstructionUtil {
             }
 
             deserializer = registry.getDeserializer(
-                new MessageCodeExperimenterKey(
-                    version, type, Instruction.class, expId));
+                    new MessageCodeExperimenterKey(
+                            version, type, Instruction.class, expId));
         }
 
         return deserializer.deserializeHeader(message);
index 08cfcaaf160af1070a8f5fc98c6f946ff35996f4..104a3e6a33c454ab5396fd8c3e33f7a4fd90fe00 100644 (file)
@@ -72,12 +72,14 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.acti
 import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.StripVlanActionCase;
 
 /**
- * Util class for injecting new action serializers into OpenflowJava
+ * Util class for injecting new action serializers into OpenflowJava.
  */
 class ActionSerializerInjector {
 
     /**
-     * Injects serializers into provided {@link org.opendaylight.openflowjava.protocol.api.extensibility.SerializerExtensionProvider}
+     * Injects serializers into provided
+     * {@link org.opendaylight.openflowjava.protocol.api.extensibility.SerializerExtensionProvider}.
+     *
      * @param provider OpenflowJava serializer extension provider
      */
     static void injectSerializers(final SerializerExtensionProvider provider) {
@@ -115,9 +117,11 @@ class ActionSerializerInjector {
     }
 
     /**
-     * Create injector that will inject new serializers into #{@link org.opendaylight.openflowjava.protocol.api.extensibility.SerializerExtensionProvider}
+     * Create injector that will inject new serializers into
+     * #{@link org.opendaylight.openflowjava.protocol.api.extensibility.SerializerExtensionProvider}.
+     *
      * @param provider OpenflowJava serializer extension provider
-     * @param version Openflow version
+     * @param version  Openflow version
      * @return injector
      */
     @VisibleForTesting
index e39a103ff6a4b05ee28c3cbb82fe8e5fbd034fea..f7c53aaff6d69cf3309cc127f527b07cad9f7785 100644 (file)
@@ -30,12 +30,14 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.instru
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.instruction.instruction.WriteMetadataCase;
 
 /**
- * Util class for injecting new instruction serializers into OpenflowJava
+ * Util class for injecting new instruction serializers into OpenflowJava.
  */
 class InstructionSerializerInjector {
 
     /**
-     * Injects serializers into provided {@link org.opendaylight.openflowjava.protocol.api.extensibility.SerializerExtensionProvider}
+     * Injects serializers into provided
+     * {@link org.opendaylight.openflowjava.protocol.api.extensibility.SerializerExtensionProvider}.
+     *
      * @param provider OpenflowJava serializer extension provider
      */
     static void injectSerializers(final SerializerExtensionProvider provider) {
@@ -51,14 +53,17 @@ class InstructionSerializerInjector {
     }
 
     /**
-     * Create injector that will inject new serializers into #{@link org.opendaylight.openflowjava.protocol.api.extensibility.SerializerExtensionProvider}
+     * Create injector that will inject new serializers into
+     * #{@link org.opendaylight.openflowjava.protocol.api.extensibility.SerializerExtensionProvider}.
+     *
      * @param provider OpenflowJava serializer extension provider
-     * @param version Openflow version
+     * @param version  Openflow version
      * @return injector
      */
     @VisibleForTesting
-    static Function<Class<? extends Instruction>, Consumer<OFSerializer<? extends Instruction>>> createInjector(final SerializerExtensionProvider provider,
-                                                                                                final byte version) {
+    static Function<Class<? extends Instruction>, Consumer<OFSerializer<? extends Instruction>>> createInjector(
+            final SerializerExtensionProvider provider,
+            final byte version) {
         return type -> serializer ->
                 provider.registerSerializer(
                         new MessageTypeKey<>(version, type),
index 8812f3fad5a8f55283d6bbe1486a6a9a095b1fe5..50f45733297710eb5a568376311249506dd4d5b2 100644 (file)
@@ -65,12 +65,14 @@ import org.opendaylight.openflowplugin.impl.protocol.serialization.match.VlanVid
 import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.Match;
 
 /**
- * Util class for injecting new match serializers into OpenflowJava
+ * Util class for injecting new match serializers into OpenflowJava.
  */
 class MatchSerializerInjector {
 
     /**
-     * Injects match serializers into provided {@link org.opendaylight.openflowjava.protocol.api.extensibility.SerializerExtensionProvider}
+     * Injects match serializers into provided
+     * {@link org.opendaylight.openflowjava.protocol.api.extensibility.SerializerExtensionProvider}.
+     *
      * @param provider OpenflowJava serializer extension provider
      */
     static void injectSerializers(final SerializerExtensionProvider provider) {
@@ -135,9 +137,11 @@ class MatchSerializerInjector {
     }
 
     /**
-     * Create injector that will inject new match entry serializers into #{@link org.opendaylight.openflowplugin.api.openflow.protocol.serialization.MatchEntrySerializerRegistry}
+     * Create injector that will inject new match entry serializers into
+     * #{@link org.opendaylight.openflowplugin.api.openflow.protocol.serialization.MatchEntrySerializerRegistry}.
+     *
      * @param registry Match entry serializer registry
-     * @param version Openflow version
+     * @param version  Openflow version
      * @return injector
      */
     @VisibleForTesting
index cf34d19d44986d86b884b888533a7aa8fa22e0a1..0b31b2b049179475d3009834372948a248f29072 100644 (file)
@@ -28,12 +28,14 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.multipart.types.rev170112.M
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.OfHeader;
 
 /**
- * Util class for injecting new message serializers into OpenflowJava
+ * Util class for injecting new message serializers into OpenflowJava.
  */
 class MessageSerializerInjector {
 
     /**
-     * Injects message serializers into provided {@link org.opendaylight.openflowjava.protocol.api.extensibility.SerializerExtensionProvider}
+     * Injects message serializers into provided
+     * {@link org.opendaylight.openflowjava.protocol.api.extensibility.SerializerExtensionProvider}.
+     *
      * @param provider OpenflowJava serializer extension provider
      */
     static void injectSerializers(final SerializerExtensionProvider provider) {
@@ -49,14 +51,17 @@ class MessageSerializerInjector {
     }
 
     /**
-     * Create injector that will inject new serializers into #{@link org.opendaylight.openflowjava.protocol.api.extensibility.SerializerExtensionProvider}
+     * Create injector that will inject new serializers into
+     * #{@link org.opendaylight.openflowjava.protocol.api.extensibility.SerializerExtensionProvider}.
+     *
      * @param provider OpenflowJava serializer extension provider
-     * @param version Openflow version
+     * @param version  Openflow version
      * @return injector
      */
     @VisibleForTesting
-    static Function<Class<?>, Consumer<OFSerializer<? extends OfHeader>>> createInjector(final SerializerExtensionProvider provider,
-                                                                                                 final byte version) {
+    static Function<Class<?>, Consumer<OFSerializer<? extends OfHeader>>> createInjector(
+            final SerializerExtensionProvider provider,
+            final byte version) {
         return type -> serializer ->
                 provider.registerSerializer(
                         new MessageTypeKey<>(version, type),
index 389e628e66aea231769afb6c0c060087d38c4f9f..69c3eed50b3547cffb64718daad54a6b6bb95090 100644 (file)
@@ -103,18 +103,20 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.VlanV
 import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.set.field.match.SetFieldMatch;
 
 /**
- * Util class for injecting new multipart match field serializers into OpenflowJava
+ * Util class for injecting new multipart match field serializers into OpenflowJava.
  */
 class MultipartMatchFieldSerializerInjector {
 
     /**
-     * Injects multipart match field serializers into provided {@link org.opendaylight.openflowjava.protocol.api.extensibility.SerializerExtensionProvider}
+     * Injects multipart match field serializers into provided
+     * {@link org.opendaylight.openflowjava.protocol.api.extensibility.SerializerExtensionProvider}.
+     *
      * @param provider OpenflowJava serializer extension provider
      */
     static void injectSerializers(final SerializerExtensionProvider provider) {
         // Inject new message serializers here using injector created by createInjector method
         final Function<Class<? extends MatchField>, Consumer<OFSerializer<SetFieldMatch>>> injector =
-            createInjector(provider, EncodeConstants.OF13_VERSION_ID);
+                createInjector(provider, EncodeConstants.OF13_VERSION_ID);
 
         injector.apply(ArpOp.class).accept(new ArpOpMatchFieldSerializer());
         injector.apply(ArpSha.class).accept(new ArpShaMatchFieldSerializer());
@@ -163,19 +165,21 @@ class MultipartMatchFieldSerializerInjector {
     }
 
     /**
-     * Create injector that will inject new multipart match field features serializers into #{@link org.opendaylight.openflowjava.protocol.api.extensibility.SerializerExtensionProvider}
+     * Create injector that will inject new multipart match field features serializers into
+     * #{@link org.opendaylight.openflowjava.protocol.api.extensibility.SerializerExtensionProvider}.
+     *
      * @param provider OpenflowJava serializer extension provider
-     * @param version Openflow version
+     * @param version  Openflow version
      * @return injector
      */
     @VisibleForTesting
     static Function<Class<? extends MatchField>, Consumer<OFSerializer<SetFieldMatch>>> createInjector(
-        final SerializerExtensionProvider provider,
-        final byte version) {
+            final SerializerExtensionProvider provider,
+            final byte version) {
         return type -> serializer ->
-            provider.registerSerializer(
-                new MessageTypeKey<>(version, type),
-                serializer);
+                provider.registerSerializer(
+                        new MessageTypeKey<>(version, type),
+                        serializer);
     }
 
 }
index 4dda5730c406f8b849bb3455e4389d65ab31f36c..dbf61d1eb6cb7a09018703d296e97d909058623f 100644 (file)
@@ -48,18 +48,20 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.queue.statistics.rev131216.
 import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.multipart.request.multipart.request.body.MultipartRequestTableFeatures;
 
 /**
- * Util class for injecting new multipart serializers into OpenflowJava
+ * Util class for injecting new multipart serializers into OpenflowJava.
  */
 class MultipartSerializerInjector {
 
     /**
-     * Injects multipart serializers into provided {@link org.opendaylight.openflowjava.protocol.api.extensibility.SerializerExtensionProvider}
+     * Injects multipart serializers into provided
+     * {@link org.opendaylight.openflowjava.protocol.api.extensibility.SerializerExtensionProvider}.
+     *
      * @param provider OpenflowJava serializer extension provider
      */
     static void injectSerializers(final SerializerExtensionProvider provider) {
         // Inject new message serializers here using injector created by createInjector method
         final Function<Class<? extends MultipartRequestBody>, Consumer<OFSerializer<MultipartRequestBody>>> injector =
-            createInjector(provider, EncodeConstants.OF13_VERSION_ID);
+                createInjector(provider, EncodeConstants.OF13_VERSION_ID);
 
         MultipartMatchFieldSerializerInjector.injectSerializers(provider);
         MultipartTableFeaturesSerializerInjector.injectSerializers(provider);
@@ -76,25 +78,28 @@ class MultipartSerializerInjector {
         injector.apply(MultipartRequestPortStats.class).accept(new MultipartRequestPortStatsSerializer());
         injector.apply(MultipartRequestQueueStats.class).accept(new MultipartRequestQueueStatsSerializer());
         injector.apply(MultipartRequestFlowStats.class).accept(new MultipartRequestFlowStatsSerializer());
-        injector.apply(MultipartRequestFlowAggregateStats.class).accept(new MultipartRequestFlowAggregateStatsSerializer());
+        injector.apply(MultipartRequestFlowAggregateStats.class)
+                .accept(new MultipartRequestFlowAggregateStatsSerializer());
         injector.apply(MultipartRequestExperimenter.class).accept(new MultipartRequestExperimenterSerializer());
         injector.apply(MultipartRequestTableFeatures.class).accept(new MultipartRequestTableFeaturesSerializer());
     }
 
     /**
-     * Create injector that will inject new multipart serializers into #{@link org.opendaylight.openflowjava.protocol.api.extensibility.SerializerExtensionProvider}
+     * Create injector that will inject new multipart serializers into
+     * #{@link org.opendaylight.openflowjava.protocol.api.extensibility.SerializerExtensionProvider}.
+     *
      * @param provider OpenflowJava serializer extension provider
-     * @param version Openflow version
+     * @param version  Openflow version
      * @return injector
      */
     @VisibleForTesting
     static Function<Class<? extends MultipartRequestBody>, Consumer<OFSerializer<MultipartRequestBody>>> createInjector(
-        final SerializerExtensionProvider provider,
-        final byte version) {
+            final SerializerExtensionProvider provider,
+            final byte version) {
         return type -> serializer ->
-            provider.registerSerializer(
-                new MessageTypeKey<>(version, type),
-                serializer);
+                provider.registerSerializer(
+                        new MessageTypeKey<>(version, type),
+                        serializer);
     }
 
 }
index 90972b73cfe29f081e0df5628ef832961ab111e9..0721490600cb0126dd2c052b1919f7df90e4e6e2 100644 (file)
@@ -46,18 +46,20 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table
 import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.feature.prop.type.table.feature.prop.type.WriteSetfieldMiss;
 
 /**
- * Util class for injecting new multipart table features serializers into OpenflowJava
+ * Util class for injecting new multipart table features serializers into OpenflowJava.
  */
 class MultipartTableFeaturesSerializerInjector {
 
     /**
-     * Injects multipart table features serializers into provided {@link org.opendaylight.openflowjava.protocol.api.extensibility.SerializerExtensionProvider}
+     * Injects multipart table features serializers into provided
+     * {@link org.opendaylight.openflowjava.protocol.api.extensibility.SerializerExtensionProvider}.
+     *
      * @param provider OpenflowJava serializer extension provider
      */
     static void injectSerializers(final SerializerExtensionProvider provider) {
         // Inject new message serializers here using injector created by createInjector method
         final Function<Class<? extends TableFeaturePropType>, Consumer<OFSerializer<TableFeaturePropType>>> injector =
-            createInjector(provider, EncodeConstants.OF13_VERSION_ID);
+                createInjector(provider, EncodeConstants.OF13_VERSION_ID);
 
         injector.apply(Instructions.class).accept(new InstructionsTablePropertySerializer());
         injector.apply(InstructionsMiss.class).accept(new InstructionsMissTablePropertySerializer());
@@ -77,19 +79,21 @@ class MultipartTableFeaturesSerializerInjector {
     }
 
     /**
-     * Create injector that will inject new multipart table features serializers into #{@link org.opendaylight.openflowjava.protocol.api.extensibility.SerializerExtensionProvider}
+     * Create injector that will inject new multipart table features serializers into
+     * #{@link org.opendaylight.openflowjava.protocol.api.extensibility.SerializerExtensionProvider}.
+     *
      * @param provider OpenflowJava serializer extension provider
-     * @param version Openflow version
+     * @param version  Openflow version
      * @return injector
      */
     @VisibleForTesting
     static Function<Class<? extends TableFeaturePropType>, Consumer<OFSerializer<TableFeaturePropType>>> createInjector(
-        final SerializerExtensionProvider provider,
-        final byte version) {
+            final SerializerExtensionProvider provider,
+            final byte version) {
         return type -> serializer ->
-            provider.registerSerializer(
-                new MessageTypeKey<>(version, type),
-                serializer);
+                provider.registerSerializer(
+                        new MessageTypeKey<>(version, type),
+                        serializer);
     }
 
 }
index b8654060c58785af6e3b673c7d55c93448b26a0b..330d5fa993eeeccd5a9646472b808fab083c849f 100644 (file)
@@ -11,12 +11,14 @@ package org.opendaylight.openflowplugin.impl.protocol.serialization;
 import org.opendaylight.openflowjava.protocol.api.extensibility.SerializerExtensionProvider;
 
 /**
- * Util class for injecting new serializers into OpenflowJava
+ * Util class for injecting new serializers into OpenflowJava.
  */
 public class SerializerInjector {
 
     /**
-     * Injects serializers into provided {@link org.opendaylight.openflowjava.protocol.api.extensibility.SerializerExtensionProvider}
+     * Injects serializers into provided
+     * {@link org.opendaylight.openflowjava.protocol.api.extensibility.SerializerExtensionProvider}.
+     *
      * @param provider OpenflowJava serializer extension provider
      */
     public static void injectSerializers(final SerializerExtensionProvider provider) {
index 1c159913a99975b2259ccbd3c115f0898951fa2d..23bedd401fe8cdfb6f5f1149254df2c38def4b30 100644 (file)
@@ -28,11 +28,15 @@ public abstract class AbstractActionSerializer implements OFSerializer<Action>,
     }
 
     /**
+     * Get type.
+     *
      * @return numeric representation of action type
      */
     protected abstract int getType();
 
     /**
+     * Get length.
+     *
      * @return action length
      */
     protected abstract int getLength();
index 17cdd527a0f8146d2f0410759c2070ae46eedbc3..0b58b262f95d72f57b25afdeab6dc78e1525d4f7 100644 (file)
@@ -18,39 +18,41 @@ import org.opendaylight.openflowjava.protocol.impl.util.ActionConstants;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.SetFieldCase;
 
-public abstract class AbstractSetFieldActionSerializer extends AbstractActionSerializer implements SerializerRegistryInjector {
+public abstract class AbstractSetFieldActionSerializer extends AbstractActionSerializer implements
+        SerializerRegistryInjector {
 
-     private SerializerRegistry registry;
+    private SerializerRegistry registry;
 
-     @Override
-     public void serialize(Action input, ByteBuf outBuffer) {
-          final OFSerializer<Action> serializer = registry
+    @Override
+    public void serialize(Action input, ByteBuf outBuffer) {
+        final OFSerializer<Action> serializer = registry
                 .getSerializer(new MessageTypeKey<>(EncodeConstants.OF13_VERSION_ID, SetFieldCase.class));
 
-          serializer.serialize(buildAction(input), outBuffer);
-     }
-
-     /**
-      * Build #{@link org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.SetFieldCase}
-      * from #{@link org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action}
-      * @param input input action
-      * @return set field action
-      */
-     protected abstract SetFieldCase buildAction(Action input);
-
-     @Override
-     protected int getType() {
-          return ActionConstants.SET_FIELD_CODE;
-     }
-
-     @Override
-     protected int getLength() {
-          return ActionConstants.GENERAL_ACTION_LENGTH;
-     }
-
-     @Override
-     public void injectSerializerRegistry(SerializerRegistry serializerRegistry) {
-          registry = serializerRegistry;
-     }
+        serializer.serialize(buildAction(input), outBuffer);
+    }
+
+    /**
+     * Build #{@link org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.SetFieldCase}
+     * from #{@link org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action}.
+     *
+     * @param input input action
+     * @return set field action
+     */
+    protected abstract SetFieldCase buildAction(Action input);
+
+    @Override
+    protected int getType() {
+        return ActionConstants.SET_FIELD_CODE;
+    }
+
+    @Override
+    protected int getLength() {
+        return ActionConstants.GENERAL_ACTION_LENGTH;
+    }
+
+    @Override
+    public void injectSerializerRegistry(SerializerRegistry serializerRegistry) {
+        registry = serializerRegistry;
+    }
 
 }
index 471118bfd93627fed0ab35efbebb82f5bca013e6..7d8065402cc3e7f7676d80f0e2d5726c6550d15a 100644 (file)
@@ -24,7 +24,8 @@ public class SetDlDstActionSerializer extends AbstractSetFieldActionSerializer {
                 .setSetField(new SetFieldBuilder()
                         .setEthernetMatch(new EthernetMatchBuilder()
                                 .setEthernetDestination(new EthernetDestinationBuilder()
-                                        .setAddress(SetDlDstActionCase.class.cast(input).getSetDlDstAction().getAddress())
+                                        .setAddress(SetDlDstActionCase.class.cast(input).getSetDlDstAction()
+                                                .getAddress())
                                         .build())
                                 .build())
                         .build())
index b2431f9944c61c30d96fc4a73a3374dcbb2a8705..5b73b4f1ca83d33ad43b85dcca716a1a02942874 100644 (file)
@@ -24,7 +24,8 @@ public class SetDlSrcActionSerializer extends AbstractSetFieldActionSerializer {
                 .setSetField(new SetFieldBuilder()
                         .setEthernetMatch(new EthernetMatchBuilder()
                                 .setEthernetSource(new EthernetSourceBuilder()
-                                        .setAddress(SetDlSrcActionCase.class.cast(input).getSetDlSrcAction().getAddress())
+                                        .setAddress(SetDlSrcActionCase.class.cast(input).getSetDlSrcAction()
+                                                .getAddress())
                                         .build())
                                 .build())
                         .build())
index 297e200ce289b76c04698263f4d931f2974c31e9..4c009504495a0ec5ed053fe36b061d0337fb6e0c 100644 (file)
@@ -26,9 +26,9 @@ public class SetFieldActionSerializer extends AbstractActionSerializer implement
     @Override
     public void serialize(Action action, ByteBuf outBuffer) {
         // Serialize field type and save position
-        int startIndex = outBuffer.writerIndex();
+        final int startIndex = outBuffer.writerIndex();
         outBuffer.writeShort(getType());
-        int lengthIndex = outBuffer.writerIndex();
+        final int lengthIndex = outBuffer.writerIndex();
         outBuffer.writeShort(EncodeConstants.EMPTY_LENGTH);
 
         // Serialize match (using small workaround with serializeHeader method to serialize only match entries)
index 31b828ba866a07b2af4d06220c80cc40c64ac5a3..f5fb05212ca05fb7d447328010fc540768d31489 100644 (file)
@@ -21,8 +21,11 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026
 import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.match.Icmpv6MatchBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.match.layer._4.match.TcpMatchBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.match.layer._4.match.UdpMatchBuilder;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class SetTpDstActionSerializer extends AbstractSetFieldActionSerializer {
+    private static final Logger LOG = LoggerFactory.getLogger(SetTpDstActionSerializer.class);
 
     @Override
     protected SetFieldCase buildAction(Action input) {
@@ -56,6 +59,8 @@ public class SetTpDstActionSerializer extends AbstractSetFieldActionSerializer {
                             .build());
                     break;
                 }
+                default:
+                    // no operation
             }
         });
 
index b2cf4fa1b3f0c7f6ca218c20d4661c548c6911d1..dfebf7ef5d96e9a9df3d26fc40d0be5b0c3c6487 100644 (file)
@@ -21,8 +21,11 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026
 import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.match.Icmpv6MatchBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.match.layer._4.match.TcpMatchBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.match.layer._4.match.UdpMatchBuilder;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class SetTpSrcActionSerializer extends AbstractSetFieldActionSerializer {
+    private static final Logger LOG = LoggerFactory.getLogger(SetTpSrcActionSerializer.class);
 
     @Override
     protected SetFieldCase buildAction(Action input) {
@@ -56,6 +59,8 @@ public class SetTpSrcActionSerializer extends AbstractSetFieldActionSerializer {
                             .build());
                     break;
                 }
+                default:
+                    // no operation
             }
         });
 
index f6ffd7568eaea5c9a088863ef6d54d6805822a45..d2d5b2eff4a0a7133a304cf32c0f6d0ee4edeb72 100644 (file)
@@ -25,7 +25,8 @@ public class SetVlanIdActionSerializer extends AbstractSetFieldActionSerializer
                         .setVlanMatch(new VlanMatchBuilder()
                                 .setVlanId(new VlanIdBuilder()
                                         .setVlanIdPresent(true)
-                                        .setVlanId(SetVlanIdActionCase.class.cast(input).getSetVlanIdAction().getVlanId())
+                                        .setVlanId(SetVlanIdActionCase.class.cast(input).getSetVlanIdAction()
+                                                .getVlanId())
                                         .build())
                                 .build())
                         .build())
index 0de90d0fde94faafcb164636e9525203e3d0e963..393f6bfc90b15a152f085479c21cb67ef8ef2744 100644 (file)
@@ -19,7 +19,8 @@ import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.common.Ord
 import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.ActionList;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.instruction.Instruction;
 
-public abstract class AbstractActionInstructionSerializer extends AbstractInstructionSerializer implements SerializerRegistryInjector {
+public abstract class AbstractActionInstructionSerializer extends AbstractInstructionSerializer implements
+        SerializerRegistryInjector {
 
     private SerializerRegistry registry;
 
@@ -29,14 +30,15 @@ public abstract class AbstractActionInstructionSerializer extends AbstractInstru
     }
 
     /**
-     * Try to write list of OpenFlowPlugin actions to output buffer
+     * Try to write list of OpenFlowPlugin actions to output buffer.
+     *
      * @param actions List of OpenFlowPlugin actions
      * @param outBuffer output buffer
      * @param startIndex start index of byte buffer
      */
     protected void writeActions(ActionList actions, short version, ByteBuf outBuffer, int startIndex) {
         Optional.ofNullable(actions).flatMap(as -> Optional.ofNullable(as.getAction())).map(as -> {
-            int lengthIndex = outBuffer.writerIndex();
+            final int lengthIndex = outBuffer.writerIndex();
             outBuffer.writeShort(EncodeConstants.EMPTY_LENGTH);
             outBuffer.writeZero(InstructionConstants.PADDING_IN_ACTIONS_INSTRUCTION);
             as.stream().sorted(OrderComparator.build()).forEach(a -> ActionUtil
index 2eb20f9b9ce931f381eceed0cf451ad5b80d333e..b747d89e36408f6f133b5319a70da4f07eacb3a0 100644 (file)
@@ -14,7 +14,8 @@ import org.opendaylight.openflowjava.protocol.api.extensibility.OFSerializer;
 import org.opendaylight.openflowjava.protocol.impl.util.InstructionConstants;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.instruction.Instruction;
 
-public abstract class AbstractInstructionSerializer implements OFSerializer<Instruction>, HeaderSerializer<Instruction> {
+public abstract class AbstractInstructionSerializer implements OFSerializer<Instruction>,
+        HeaderSerializer<Instruction> {
 
     @Override
     public void serialize(Instruction input, ByteBuf outBuffer) {
@@ -29,12 +30,16 @@ public abstract class AbstractInstructionSerializer implements OFSerializer<Inst
     }
 
     /**
-     * @return numeric representation of instruction type
+     * Get type.
+     *
+     * @return numeric representation of instruction type.
      */
     protected abstract int getType();
 
     /**
-     * @return instruction length
+     * Get length.
+     *
+     * @return instruction length.
      */
     protected abstract int getLength();
 
index eb4f292371402b9b9ff6148bc00f1758601c5325..8fa8c9578cd970aa02ac5c6720427a2de5677d19 100644 (file)
@@ -23,8 +23,10 @@ public class WriteMetadataInstructionSerializer extends AbstractInstructionSeria
         super.serialize(input, outBuffer);
         final WriteMetadata writeMetadata = WriteMetadataCase.class.cast(input).getWriteMetadata();
         outBuffer.writeZero(InstructionConstants.PADDING_IN_WRITE_METADATA);
-        outBuffer.writeBytes(ByteUtil.convertBigIntegerToNBytes(writeMetadata.getMetadata(), EncodeConstants.SIZE_OF_LONG_IN_BYTES));
-        outBuffer.writeBytes(ByteUtil.convertBigIntegerToNBytes(writeMetadata.getMetadataMask(), EncodeConstants.SIZE_OF_LONG_IN_BYTES));
+        outBuffer.writeBytes(ByteUtil
+                .convertBigIntegerToNBytes(writeMetadata.getMetadata(), EncodeConstants.SIZE_OF_LONG_IN_BYTES));
+        outBuffer.writeBytes(ByteUtil
+                .convertBigIntegerToNBytes(writeMetadata.getMetadataMask(), EncodeConstants.SIZE_OF_LONG_IN_BYTES));
     }
 
     @Override
index 810a41cb49ac8aa195600620930533afb9d2a5c7..9f0d1689b939e89def83175f9c0de13d78fe1c92 100644 (file)
@@ -39,6 +39,8 @@ public abstract class AbstractExperimenterMatchEntrySerializer extends AbstractM
     }
 
     /**
+     * Get experimenter id.
+     *
      * @return experimenter match entry id
      */
     protected abstract long getExperimenterId();
index 956f921b7c3a52efd5254627be23b22460b3b6ba..a62ab0ae7de2646d4c96b93701ada04796965df8 100644 (file)
@@ -49,22 +49,24 @@ public abstract class AbstractMatchEntrySerializer implements HeaderSerializer<M
     }
 
     /**
-     * Serialize byte mask to bytes. checking for mask length
+     * Serialize byte mask to bytes. checking for mask length.
+     *
      * @param mask byte mask
      * @param outBuffer output buffer
      * @param length mask length
      */
     protected static void writeMask(byte[] mask, ByteBuf outBuffer, int length) {
         if (mask != null && mask.length != length) {
-            throw new IllegalArgumentException("incorrect length of mask: "+
-                    mask.length + ", expected: " + length);
+            throw new IllegalArgumentException("incorrect length of mask: "
+                    mask.length + ", expected: " + length);
         }
 
         outBuffer.writeBytes(mask);
     }
 
     /**
-     * Serialize Ipv4 address to bytes
+     * Serialize Ipv4 address to bytes.
+     *
      * @param address Ipv4 address
      * @param outBuffer output buffer
      */
@@ -73,7 +75,8 @@ public abstract class AbstractMatchEntrySerializer implements HeaderSerializer<M
     }
 
     /**
-     * Serialize Ipv6 address to bytes
+     * Serialize Ipv6 address to bytes.
+     *
      * @param address Ipv6 address
      * @param outBuffer output buffer
      */
@@ -82,7 +85,8 @@ public abstract class AbstractMatchEntrySerializer implements HeaderSerializer<M
     }
 
     /**
-     * Serialize Mac address to bytes
+     * Serialize Mac address to bytes.
+     *
      * @param address Mac address
      * @param outBuffer output buffer
      */
@@ -91,7 +95,8 @@ public abstract class AbstractMatchEntrySerializer implements HeaderSerializer<M
     }
 
     /**
-     * Serialize Ipv4 prefix (address and mask)
+     * Serialize Ipv4 prefix (address and mask).
+     *
      * @param prefix Ipv4 prefix
      * @param outBuffer output buffer
      */
@@ -108,7 +113,8 @@ public abstract class AbstractMatchEntrySerializer implements HeaderSerializer<M
     }
 
     /**
-     * Serialize Ipv6 prefix (address and mask)
+     * Serialize Ipv6 prefix (address and mask).
+     *
      * @param prefix Ipv6 prefix
      * @param outBuffer output buffer
      */
@@ -123,22 +129,30 @@ public abstract class AbstractMatchEntrySerializer implements HeaderSerializer<M
     }
 
     /**
+     * Has mask getter.
+     *
      * @param match Openflow match
      * @return if field has or has not mask
      */
-    protected abstract boolean getHasMask(final Match match);
+    protected abstract boolean getHasMask(Match match);
 
     /**
+     * Oxm field numeric representation.
+     *
      * @return numeric representation of oxm_field
      */
     protected abstract int getOxmFieldCode();
 
     /**
+     * Oxm class code.
+     *
      * @return numeric representation of oxm_class
      */
     protected abstract int getOxmClassCode();
 
     /**
+     * Get value length.
+     *
      * @return match entry value length (without mask length)
      */
     protected abstract int getValueLength();
index 87c9c5b4bbae6c90d909aab622109a9954a4106e..1d38002f91b1a544e6ab6b430842582e9a369b75 100644 (file)
@@ -25,9 +25,9 @@ public class ArpOpEntrySerializer extends AbstractMatchEntrySerializer {
 
     @Override
     public boolean matchTypeCheck(Match match) {
-        return Objects.nonNull(match.getLayer3Match()) &&
-                ArpMatch.class.isInstance(match.getLayer3Match()) &&
-                Objects.nonNull(ArpMatch.class.cast(match.getLayer3Match()).getArpOp());
+        return Objects.nonNull(match.getLayer3Match())
+                && ArpMatch.class.isInstance(match.getLayer3Match())
+                && Objects.nonNull(ArpMatch.class.cast(match.getLayer3Match()).getArpOp());
     }
 
     @Override
index 7d8af0974d93b141fe531bb6e6f7827033f29a7f..4d8f21bf3b8d6efcb846b9bb0b78f613eeaeb981 100644 (file)
@@ -36,9 +36,9 @@ public class ArpSourceHardwareAddressEntrySerializer extends AbstractMatchEntryS
 
     @Override
     public boolean matchTypeCheck(Match match) {
-        return Objects.nonNull(match.getLayer3Match()) &&
-                ArpMatch.class.isInstance(match.getLayer3Match()) &&
-                Objects.nonNull(ArpMatch.class.cast(match.getLayer3Match()).getArpSourceHardwareAddress());
+        return Objects.nonNull(match.getLayer3Match())
+                && ArpMatch.class.isInstance(match.getLayer3Match())
+                && Objects.nonNull(ArpMatch.class.cast(match.getLayer3Match()).getArpSourceHardwareAddress());
     }
 
     @Override
index e3b9feec36c4f372f741c84d4d3c7ed3e13744d9..3a2e1d2b6f39f8cbfe59108bb1d79b375c236f2c 100644 (file)
@@ -27,9 +27,9 @@ public class ArpSourceTransportAddressEntrySerializer extends AbstractMatchEntry
 
     @Override
     public boolean matchTypeCheck(Match match) {
-        return Objects.nonNull(match.getLayer3Match()) &&
-                ArpMatch.class.isInstance(match.getLayer3Match()) &&
-                Objects.nonNull(ArpMatch.class.cast(match.getLayer3Match()).getArpSourceTransportAddress());
+        return Objects.nonNull(match.getLayer3Match())
+                && ArpMatch.class.isInstance(match.getLayer3Match())
+                && Objects.nonNull(ArpMatch.class.cast(match.getLayer3Match()).getArpSourceTransportAddress());
     }
 
     @Override
index bd7b800f3252e33c576bbe587984d47748e51c93..13a62d0d067c8e5ab4d9babb00bfda2ab7befaea 100644 (file)
@@ -36,9 +36,9 @@ public class ArpTargetHardwareAddressEntrySerializer extends AbstractMatchEntryS
 
     @Override
     public boolean matchTypeCheck(Match match) {
-        return Objects.nonNull(match.getLayer3Match()) &&
-                ArpMatch.class.isInstance(match.getLayer3Match()) &&
-                Objects.nonNull(ArpMatch.class.cast(match.getLayer3Match()).getArpTargetHardwareAddress());
+        return Objects.nonNull(match.getLayer3Match())
+                && ArpMatch.class.isInstance(match.getLayer3Match())
+                && Objects.nonNull(ArpMatch.class.cast(match.getLayer3Match()).getArpTargetHardwareAddress());
     }
 
     @Override
index b92e9a265c7f88431518966ed18f79da4c024ccf..f26fc48eb96f9066747095d476f371f41a0681b8 100644 (file)
@@ -27,9 +27,9 @@ public class ArpTargetTransportAddressEntrySerializer extends AbstractMatchEntry
 
     @Override
     public boolean matchTypeCheck(Match match) {
-        return Objects.nonNull(match.getLayer3Match()) &&
-                ArpMatch.class.isInstance(match.getLayer3Match()) &&
-                Objects.nonNull(ArpMatch.class.cast(match.getLayer3Match()).getArpTargetTransportAddress());
+        return Objects.nonNull(match.getLayer3Match())
+                && ArpMatch.class.isInstance(match.getLayer3Match())
+                && Objects.nonNull(ArpMatch.class.cast(match.getLayer3Match()).getArpTargetTransportAddress());
     }
 
     @Override
index 64d29b7e1b136c14dd4b9ca1b78586a8304d36cd..a0f2ca0cd61ee82ee9f8371049c779d71af53c79 100644 (file)
@@ -32,8 +32,8 @@ public class EthernetDestinationEntrySerializer extends AbstractMatchEntrySerial
 
     @Override
     public boolean matchTypeCheck(Match match) {
-        return Objects.nonNull(match.getEthernetMatch()) &&
-                Objects.nonNull(match.getEthernetMatch().getEthernetDestination());
+        return Objects.nonNull(match.getEthernetMatch())
+                && Objects.nonNull(match.getEthernetMatch().getEthernetDestination());
     }
 
     @Override
index 5b92a7661bfe11fe640f2ba8a083786cccd4a1a0..67618adf51aa0c6b5c9baf2f5e01a002fddc9a84 100644 (file)
@@ -32,8 +32,8 @@ public class EthernetSourceEntrySerializer extends AbstractMatchEntrySerializer
 
     @Override
     public boolean matchTypeCheck(Match match) {
-        return Objects.nonNull(match.getEthernetMatch()) &&
-                Objects.nonNull(match.getEthernetMatch().getEthernetSource());
+        return Objects.nonNull(match.getEthernetMatch())
+                && Objects.nonNull(match.getEthernetMatch().getEthernetSource());
     }
 
     @Override
index 173e47612f9605e0f0fe439ed0ea21746b164fee..f77b9ee5e4874d4310d1a79089a9555ffdf90ac1 100644 (file)
@@ -24,8 +24,8 @@ public class EthernetTypeEntrySerializer extends AbstractMatchEntrySerializer {
 
     @Override
     public boolean matchTypeCheck(Match match) {
-        return Objects.nonNull(match.getEthernetMatch()) &&
-                Objects.nonNull(match.getEthernetMatch().getEthernetType());
+        return Objects.nonNull(match.getEthernetMatch())
+                && Objects.nonNull(match.getEthernetMatch().getEthernetType());
     }
 
     @Override
index 2644ff7d2230d56088e24b97225aa137ccd8ed10..d13cbd36c9741def9e17c283b59e5b01024aa99e 100644 (file)
@@ -24,8 +24,8 @@ public class Icmpv4CodeEntrySerializer extends AbstractMatchEntrySerializer {
 
     @Override
     public boolean matchTypeCheck(Match match) {
-        return Objects.nonNull(match.getIcmpv4Match()) &&
-                Objects.nonNull(match.getIcmpv4Match().getIcmpv4Code());
+        return Objects.nonNull(match.getIcmpv4Match())
+                && Objects.nonNull(match.getIcmpv4Match().getIcmpv4Code());
     }
 
     @Override
index 4f346f1d2815851ae69aa42c2522d8067e0219d2..42398ab7516de1ba2c61ebc4f3e49e5926cb8319 100644 (file)
@@ -24,8 +24,8 @@ public class Icmpv4TypeEntrySerializer extends AbstractMatchEntrySerializer {
 
     @Override
     public boolean matchTypeCheck(Match match) {
-        return Objects.nonNull(match.getIcmpv4Match()) &&
-                Objects.nonNull(match.getIcmpv4Match().getIcmpv4Type());
+        return Objects.nonNull(match.getIcmpv4Match())
+                && Objects.nonNull(match.getIcmpv4Match().getIcmpv4Type());
     }
 
     @Override
index b8752e14da517dd9b0e10adb3baf7ee12fdece1b..7f74fd162dba7a18b7051d5944ba23ed4867d27a 100644 (file)
@@ -24,8 +24,8 @@ public class Icmpv6CodeEntrySerializer extends AbstractMatchEntrySerializer {
 
     @Override
     public boolean matchTypeCheck(Match match) {
-        return Objects.nonNull(match.getIcmpv6Match()) &&
-                Objects.nonNull(match.getIcmpv6Match().getIcmpv6Code());
+        return Objects.nonNull(match.getIcmpv6Match())
+                && Objects.nonNull(match.getIcmpv6Match().getIcmpv6Code());
     }
 
     @Override
index 25ca1c476d5ed84c3fff7ad7838e0da3c3ba1fd9..79d812ef70f8fd30921315ab8be6d3692ee88ff9 100644 (file)
@@ -24,8 +24,8 @@ public class Icmpv6TypeEntrySerializer extends AbstractMatchEntrySerializer {
 
     @Override
     public boolean matchTypeCheck(Match match) {
-        return Objects.nonNull(match.getIcmpv6Match()) &&
-                Objects.nonNull(match.getIcmpv6Match().getIcmpv6Type());
+        return Objects.nonNull(match.getIcmpv6Match())
+                && Objects.nonNull(match.getIcmpv6Match().getIcmpv6Type());
     }
 
     @Override
index 4b3bae6cdd1eff52cf67c236530414e0391a5412..f0fba7a0d9c8630000f21a87a15610f512afe567 100644 (file)
@@ -24,8 +24,8 @@ public class IpDscpEntrySerializer extends AbstractMatchEntrySerializer {
 
     @Override
     public boolean matchTypeCheck(Match match) {
-        return Objects.nonNull(match.getIpMatch()) &&
-                Objects.nonNull(match.getIpMatch().getIpDscp());
+        return Objects.nonNull(match.getIpMatch())
+                && Objects.nonNull(match.getIpMatch().getIpDscp());
     }
 
     @Override
index 70af5d10ee6949ec42aacbc54363a9d547307ee8..a7edcd23b0438bb5ee1a35edb72bb5b6674a020c 100644 (file)
@@ -24,8 +24,8 @@ public class IpEcnEntrySerializer extends AbstractMatchEntrySerializer {
 
     @Override
     public boolean matchTypeCheck(Match match) {
-        return Objects.nonNull(match.getIpMatch()) &&
-                Objects.nonNull(match.getIpMatch().getIpEcn());
+        return Objects.nonNull(match.getIpMatch())
+                && Objects.nonNull(match.getIpMatch().getIpEcn());
     }
 
     @Override
index 11df69f4a2172db4d089ba6de69348753b01bb80..6f84e123edf74dc7ddd3ef07108f773d09ef1dcd 100644 (file)
@@ -25,8 +25,8 @@ public class IpProtoEntrySerializer extends AbstractMatchEntrySerializer {
 
     @Override
     public boolean matchTypeCheck(Match match) {
-        return Objects.nonNull(match.getIpMatch()) &&
-                Objects.nonNull(match.getIpMatch().getIpProtocol());
+        return Objects.nonNull(match.getIpMatch())
+                && Objects.nonNull(match.getIpMatch().getIpProtocol());
     }
 
     @Override
index c5c206b26be4976f291ee99da1fbda672ada21ae..62dfc28f90c3b7fd95a946be7064d4f32807ad40 100644 (file)
@@ -41,11 +41,12 @@ public class Ipv4DestinationEntrySerializer extends AbstractMatchEntrySerializer
     @Override
     public boolean matchTypeCheck(Match match) {
         if (isPrefix(match)) {
-            return Objects.nonNull(match.getLayer3Match()) &&
-                    Objects.nonNull(Ipv4Match.class.cast(match.getLayer3Match()).getIpv4Destination());
+            return Objects.nonNull(match.getLayer3Match())
+                    && Objects.nonNull(Ipv4Match.class.cast(match.getLayer3Match()).getIpv4Destination());
         } else if (isArbitrary(match)) {
-            return Objects.nonNull(match.getLayer3Match()) &&
-                    Objects.nonNull(Ipv4MatchArbitraryBitMask.class.cast(match.getLayer3Match()).getIpv4DestinationAddressNoMask());
+            return Objects.nonNull(match.getLayer3Match())
+                    && Objects.nonNull(Ipv4MatchArbitraryBitMask.class.cast(match.getLayer3Match())
+                    .getIpv4DestinationAddressNoMask());
         }
 
         return false;
index 9643d4afa7217fa805fd5fbe9e488c3e05924cf7..abdfd32e7e3c2738c6d68183072d0ff9a23385e5 100644 (file)
@@ -41,11 +41,12 @@ public class Ipv4SourceEntrySerializer extends AbstractMatchEntrySerializer {
     @Override
     public boolean matchTypeCheck(Match match) {
         if (isPrefix(match)) {
-            return Objects.nonNull(match.getLayer3Match()) &&
-                    Objects.nonNull(Ipv4Match.class.cast(match.getLayer3Match()).getIpv4Source());
+            return Objects.nonNull(match.getLayer3Match())
+                    && Objects.nonNull(Ipv4Match.class.cast(match.getLayer3Match()).getIpv4Source());
         } else if (isArbitrary(match)) {
-            return Objects.nonNull(match.getLayer3Match()) &&
-                    Objects.nonNull(Ipv4MatchArbitraryBitMask.class.cast(match.getLayer3Match()).getIpv4SourceAddressNoMask());
+            return Objects.nonNull(match.getLayer3Match())
+                    && Objects.nonNull(Ipv4MatchArbitraryBitMask.class.cast(match.getLayer3Match())
+                    .getIpv4SourceAddressNoMask());
         }
 
         return false;
index 47d1f90e48af30df166730a32486aa6d4a5b91bc..1db091a6911eb348a4ea73e45dcaa4e9fec3673d 100644 (file)
@@ -30,7 +30,8 @@ public class Ipv6DestinationEntrySerializer extends AbstractMatchEntrySerializer
             writeIpv6Address(ipv6.getIpv6DestinationAddressNoMask(), outBuffer);
 
             if (getHasMask(match)) {
-                writeMask(IpConversionUtil.convertIpv6ArbitraryMaskToByteArray(ipv6.getIpv6DestinationArbitraryBitmask()),
+                writeMask(IpConversionUtil
+                                .convertIpv6ArbitraryMaskToByteArray(ipv6.getIpv6DestinationArbitraryBitmask()),
                         outBuffer,
                         getValueLength());
             }
@@ -40,12 +41,13 @@ public class Ipv6DestinationEntrySerializer extends AbstractMatchEntrySerializer
     @Override
     public boolean matchTypeCheck(Match match) {
         if (isPrefix(match)) {
-            return Objects.nonNull(match.getLayer3Match()) &&
-                    Objects.nonNull(Ipv6Match.class.cast(match.getLayer3Match()).getIpv6Destination());
+            return Objects.nonNull(match.getLayer3Match())
+                    && Objects.nonNull(Ipv6Match.class.cast(match.getLayer3Match()).getIpv6Destination());
         } else if (isArbitrary(match)) {
 
-            return Objects.nonNull(match.getLayer3Match()) &&
-                    Objects.nonNull(Ipv6MatchArbitraryBitMask.class.cast(match.getLayer3Match()).getIpv6DestinationAddressNoMask());
+            return Objects.nonNull(match.getLayer3Match())
+                    && Objects.nonNull(Ipv6MatchArbitraryBitMask.class.cast(match.getLayer3Match())
+                    .getIpv6DestinationAddressNoMask());
         }
 
         return false;
@@ -54,12 +56,14 @@ public class Ipv6DestinationEntrySerializer extends AbstractMatchEntrySerializer
     @Override
     protected boolean getHasMask(Match match) {
         if (isPrefix(match)) {
-            if (null != IpConversionUtil.hasIpv6Prefix(Ipv6Match.class.cast(match.getLayer3Match()).getIpv6Destination())) {
+            if (null != IpConversionUtil.hasIpv6Prefix(Ipv6Match.class.cast(match.getLayer3Match())
+                    .getIpv6Destination())) {
                 return Objects.nonNull(IpConversionUtil
                         .extractIpv6Prefix(Ipv6Match.class.cast(match.getLayer3Match()).getIpv6Destination()));
             }
         } else if (isArbitrary(match)) {
-            return Objects.nonNull(Ipv6MatchArbitraryBitMask.class.cast(match.getLayer3Match()).getIpv6DestinationArbitraryBitmask());
+            return Objects.nonNull(Ipv6MatchArbitraryBitMask.class.cast(match.getLayer3Match())
+                    .getIpv6DestinationArbitraryBitmask());
         }
 
         return false;
index c063f105aa43f062a4ffdaff4dc40fe4fdcdf262..37f38a346e8fceda6796209f4e91ac13bf25e26a 100644 (file)
@@ -35,9 +35,9 @@ public class Ipv6ExtHeaderEntrySerializer extends AbstractMatchEntrySerializer {
 
     @Override
     public boolean matchTypeCheck(Match match) {
-        return Objects.nonNull(match.getLayer3Match()) &&
-                Ipv6Match.class.isInstance(match.getLayer3Match()) &&
-                Objects.nonNull(Ipv6Match.class.cast(match.getLayer3Match()).getIpv6ExtHeader());
+        return Objects.nonNull(match.getLayer3Match())
+                && Ipv6Match.class.isInstance(match.getLayer3Match())
+                && Objects.nonNull(Ipv6Match.class.cast(match.getLayer3Match()).getIpv6ExtHeader());
     }
 
     @Override
index 45f230783d76a4598a4c0cf2615cc9c414067ebb..0f436c6e394052384f09b2a94d5b0b39cc0bd03d 100644 (file)
@@ -35,9 +35,9 @@ public class Ipv6LabelEntrySerializer extends AbstractMatchEntrySerializer {
 
     @Override
     public boolean matchTypeCheck(Match match) {
-        return Objects.nonNull(match.getLayer3Match()) &&
-                Ipv6Match.class.isInstance(match.getLayer3Match()) &&
-                Objects.nonNull(Ipv6Match.class.cast(match.getLayer3Match()).getIpv6Label());
+        return Objects.nonNull(match.getLayer3Match())
+                && Ipv6Match.class.isInstance(match.getLayer3Match())
+                && Objects.nonNull(Ipv6Match.class.cast(match.getLayer3Match()).getIpv6Label());
     }
 
     @Override
index cefe381dc8d4c7240e496a8e682add476b21fbb1..32cb8fd2e68a47efb2fb4bc9e3b59b729c3442bc 100644 (file)
@@ -25,9 +25,9 @@ public class Ipv6NdSllEntrySerializer extends AbstractMatchEntrySerializer {
 
     @Override
     public boolean matchTypeCheck(Match match) {
-        return Objects.nonNull(match.getLayer3Match()) &&
-                Ipv6Match.class.isInstance(match.getLayer3Match()) &&
-                Objects.nonNull(Ipv6Match.class.cast(match.getLayer3Match()).getIpv6NdSll());
+        return Objects.nonNull(match.getLayer3Match())
+                && Ipv6Match.class.isInstance(match.getLayer3Match())
+                && Objects.nonNull(Ipv6Match.class.cast(match.getLayer3Match()).getIpv6NdSll());
     }
 
     @Override
index 27fd8d10b305a89afe1f442ae46eb844ba3998bc..325b2ed1d00a9ac401ca12e49ae28d710e129af8 100644 (file)
@@ -25,9 +25,9 @@ public class Ipv6NdTargetEntrySerializer extends AbstractMatchEntrySerializer {
 
     @Override
     public boolean matchTypeCheck(Match match) {
-        return Objects.nonNull(match.getLayer3Match()) &&
-                Ipv6Match.class.isInstance(match.getLayer3Match()) &&
-                Objects.nonNull(Ipv6Match.class.cast(match.getLayer3Match()).getIpv6NdTarget());
+        return Objects.nonNull(match.getLayer3Match())
+                && Ipv6Match.class.isInstance(match.getLayer3Match())
+                && Objects.nonNull(Ipv6Match.class.cast(match.getLayer3Match()).getIpv6NdTarget());
     }
 
     @Override
index fef8f716f2225a8d482fd6f2a745bf67d11f68ad..c004d1030a6d7b5736df08fd654323275f79192a 100644 (file)
@@ -25,9 +25,9 @@ public class Ipv6NdTllEntrySerializer extends AbstractMatchEntrySerializer {
 
     @Override
     public boolean matchTypeCheck(Match match) {
-        return Objects.nonNull(match.getLayer3Match()) &&
-                Ipv6Match.class.isInstance(match.getLayer3Match()) &&
-                Objects.nonNull(Ipv6Match.class.cast(match.getLayer3Match()).getIpv6NdTll());
+        return Objects.nonNull(match.getLayer3Match())
+                && Ipv6Match.class.isInstance(match.getLayer3Match())
+                && Objects.nonNull(Ipv6Match.class.cast(match.getLayer3Match()).getIpv6NdTll());
     }
 
     @Override
index bb9f285fd91db509598bda33737a4d6f22857906..79ed19f07a94e36a44034f292774bff13023d22e 100644 (file)
@@ -40,12 +40,13 @@ public class Ipv6SourceEntrySerializer extends AbstractMatchEntrySerializer {
     @Override
     public boolean matchTypeCheck(Match match) {
         if (isPrefix(match)) {
-            return Objects.nonNull(match.getLayer3Match()) &&
-                    Objects.nonNull(Ipv6Match.class.cast(match.getLayer3Match()).getIpv6Source());
+            return Objects.nonNull(match.getLayer3Match())
+                    && Objects.nonNull(Ipv6Match.class.cast(match.getLayer3Match()).getIpv6Source());
         } else if (isArbitrary(match)) {
 
-            return Objects.nonNull(match.getLayer3Match()) &&
-                    Objects.nonNull(Ipv6MatchArbitraryBitMask.class.cast(match.getLayer3Match()).getIpv6SourceAddressNoMask());
+            return Objects.nonNull(match.getLayer3Match())
+                    && Objects.nonNull(Ipv6MatchArbitraryBitMask.class.cast(match.getLayer3Match())
+                    .getIpv6SourceAddressNoMask());
         }
 
         return false;
@@ -59,7 +60,8 @@ public class Ipv6SourceEntrySerializer extends AbstractMatchEntrySerializer {
                         .extractIpv6Prefix(Ipv6Match.class.cast(match.getLayer3Match()).getIpv6Source()));
             }
         } else if (isArbitrary(match)) {
-            return Objects.nonNull(Ipv6MatchArbitraryBitMask.class.cast(match.getLayer3Match()).getIpv6SourceArbitraryBitmask());
+            return Objects.nonNull(Ipv6MatchArbitraryBitMask.class.cast(match.getLayer3Match())
+                    .getIpv6SourceArbitraryBitmask());
         }
 
         return false;
index 525f7e840f5932e1dd242e09e4ff71032ab22557..4dba8a010e3ed38a504d7f08f98520c71e2af0a1 100644 (file)
@@ -17,7 +17,8 @@ public class MatchEntrySerializerKeyImpl implements MatchEntrySerializerKey {
     private final int oxmField;
 
     /**
-     * Create new instance of MatchEntrySerializerKeyImpl
+     * Create new instance of MatchEntrySerializerKeyImpl.
+     *
      * @param version openflow version
      * @param oxmClass match entry oxm class
      * @param oxmField match entry field code
index fc82a5c42787ea4a8c7a93c5f21fc954c3889d1d..51b9137a1ddf71d5909a4de00cb3cd2386a6fa2c 100644 (file)
@@ -40,14 +40,14 @@ public class MatchSerializer implements OFSerializer<Match>, HeaderSerializer<Ma
 
     private static final Logger LOG = LoggerFactory.getLogger(MatchSerializer.class);
     private static final byte OXM_MATCH_TYPE_CODE = 1;
-    private final Map<org.opendaylight.openflowplugin.api.openflow.protocol.serialization.
-            MatchEntrySerializerKey, MatchEntrySerializer> entryRegistry = new LinkedHashMap<>();
+    private final Map<org.opendaylight.openflowplugin.api.openflow.protocol.serialization.MatchEntrySerializerKey,
+            MatchEntrySerializer> entryRegistry = new LinkedHashMap<>();
     private SerializerRegistry registry;
 
     @Override
     public void serialize(Match match, ByteBuf outBuffer) {
         // Save start index in buffer
-        int matchStartIndex = outBuffer.writerIndex();
+        final int matchStartIndex = outBuffer.writerIndex();
 
         // With OpenflowPlugin models, we cannot check difference between OXM and Standard match type
         // so all matches will be OXM
@@ -132,7 +132,8 @@ public class MatchSerializer implements OFSerializer<Match>, HeaderSerializer<Ma
     }
 
     @Override
-    public void registerEntrySerializer(org.opendaylight.openflowplugin.api.openflow.protocol.serialization.MatchEntrySerializerKey key, MatchEntrySerializer serializer) {
+    public void registerEntrySerializer(org.opendaylight.openflowplugin.api.openflow.protocol.serialization
+                                                    .MatchEntrySerializerKey key, MatchEntrySerializer serializer) {
         if (Objects.isNull(key) || Objects.isNull(serializer)) {
             throw new IllegalArgumentException("MatchEntrySerializerKey or Serializer is null");
         }
@@ -145,7 +146,8 @@ public class MatchSerializer implements OFSerializer<Match>, HeaderSerializer<Ma
     }
 
     @Override
-    public boolean unregisterEntrySerializer(org.opendaylight.openflowplugin.api.openflow.protocol.serialization.MatchEntrySerializerKey key) {
+    public boolean unregisterEntrySerializer(org.opendaylight.openflowplugin.api.openflow.protocol.serialization
+                                                         .MatchEntrySerializerKey key) {
         return Objects.nonNull(entryRegistry.remove(key));
     }
 }
index 79b6499cd1cdbe60e397abc8a21d87dc459c8935..e4e6038c5b427906df7485714a06968ef7c7a536 100644 (file)
@@ -24,8 +24,8 @@ public class MplsBosEntrySerializer extends AbstractMatchEntrySerializer {
 
     @Override
     public boolean matchTypeCheck(Match match) {
-        return Objects.nonNull(match.getProtocolMatchFields()) &&
-                Objects.nonNull(match.getProtocolMatchFields().getMplsBos());
+        return Objects.nonNull(match.getProtocolMatchFields())
+                && Objects.nonNull(match.getProtocolMatchFields().getMplsBos());
     }
 
     @Override
index 7c9f0f813fcaf8001ab280be8b0d58a14126af4e..44d3c579464b9772e19b291dc02f72af4ce3fd5e 100644 (file)
@@ -24,8 +24,8 @@ public class MplsLabelEntrySerializer extends AbstractMatchEntrySerializer {
 
     @Override
     public boolean matchTypeCheck(Match match) {
-        return Objects.nonNull(match.getProtocolMatchFields()) &&
-                Objects.nonNull(match.getProtocolMatchFields().getMplsLabel());
+        return Objects.nonNull(match.getProtocolMatchFields())
+                && Objects.nonNull(match.getProtocolMatchFields().getMplsLabel());
     }
 
     @Override
index dd8633e8f8bbc5f661cb012c1d3abbc7e83ae2ec..2ad813ea8c12a224d736b5179e82e0a32809d598 100644 (file)
@@ -24,8 +24,8 @@ public class MplsTcEntrySerializer extends AbstractMatchEntrySerializer {
 
     @Override
     public boolean matchTypeCheck(Match match) {
-        return Objects.nonNull(match.getProtocolMatchFields()) &&
-                Objects.nonNull(match.getProtocolMatchFields().getMplsTc());
+        return Objects.nonNull(match.getProtocolMatchFields())
+                && Objects.nonNull(match.getProtocolMatchFields().getMplsTc());
     }
 
     @Override
index a89ac2799bced258dcfee135c5e9c459b4d163a9..ec2665fc39b7d6e994afa5299e1ccb489302edcc 100644 (file)
@@ -32,8 +32,8 @@ public class PbbEntrySerializer extends AbstractMatchEntrySerializer {
 
     @Override
     public boolean matchTypeCheck(Match match) {
-        return Objects.nonNull(match.getProtocolMatchFields()) &&
-                Objects.nonNull(match.getProtocolMatchFields().getPbb());
+        return Objects.nonNull(match.getProtocolMatchFields())
+                && Objects.nonNull(match.getProtocolMatchFields().getPbb());
     }
 
     @Override
index 7018b27e0066c52e4ab3b91dc7e8a435955d18dc..0119fc27d978436bcffbc03940c70e906bb0bf4c 100644 (file)
@@ -25,9 +25,9 @@ public class SctpDestinationPortEntrySerializer extends AbstractMatchEntrySerial
 
     @Override
     public boolean matchTypeCheck(Match match) {
-        return Objects.nonNull(match.getLayer4Match()) &&
-                SctpMatch.class.isInstance(match.getLayer4Match()) &&
-                Objects.nonNull(SctpMatch.class.cast(match.getLayer4Match()).getSctpDestinationPort());
+        return Objects.nonNull(match.getLayer4Match())
+                && SctpMatch.class.isInstance(match.getLayer4Match())
+                && Objects.nonNull(SctpMatch.class.cast(match.getLayer4Match()).getSctpDestinationPort());
     }
 
     @Override
index a509357e403d57179f8f2de27d1d7ba9856b51f2..ed2d244b3b3d118f6399eed99b8d48fe06b63dfa 100644 (file)
@@ -25,9 +25,9 @@ public class SctpSourcePortEntrySerializer extends AbstractMatchEntrySerializer
 
     @Override
     public boolean matchTypeCheck(Match match) {
-        return Objects.nonNull(match.getLayer4Match()) &&
-                SctpMatch.class.isInstance(match.getLayer4Match()) &&
-                Objects.nonNull(SctpMatch.class.cast(match.getLayer4Match()).getSctpSourcePort());
+        return Objects.nonNull(match.getLayer4Match())
+                && SctpMatch.class.isInstance(match.getLayer4Match())
+                && Objects.nonNull(SctpMatch.class.cast(match.getLayer4Match()).getSctpSourcePort());
     }
 
     @Override
index 199f2daf6122484c9719f0e10856283bfd38c05c..f55ac575fa084548682b60b010810d1de4e45d6c 100644 (file)
@@ -25,9 +25,9 @@ public class TcpDestinationPortEntrySerializer extends AbstractMatchEntrySeriali
 
     @Override
     public boolean matchTypeCheck(Match match) {
-        return Objects.nonNull(match.getLayer4Match()) &&
-                TcpMatch.class.isInstance(match.getLayer4Match()) &&
-                Objects.nonNull(TcpMatch.class.cast(match.getLayer4Match()).getTcpDestinationPort());
+        return Objects.nonNull(match.getLayer4Match())
+                && TcpMatch.class.isInstance(match.getLayer4Match())
+                && Objects.nonNull(TcpMatch.class.cast(match.getLayer4Match()).getTcpDestinationPort());
     }
 
     @Override
index 4ec162db9a9ad3ac1c2abc3397134c52aadd3326..ad136a7be208c00fce19dcb234f6952f8012a7cf 100644 (file)
@@ -32,8 +32,8 @@ public class TcpFlagsEntrySerializer extends AbstractExperimenterMatchEntrySeria
 
     @Override
     public boolean matchTypeCheck(Match match) {
-        return Objects.nonNull(match.getTcpFlagsMatch()) &&
-                Objects.nonNull(match.getTcpFlagsMatch().getTcpFlags());
+        return Objects.nonNull(match.getTcpFlagsMatch())
+                && Objects.nonNull(match.getTcpFlagsMatch().getTcpFlags());
     }
 
     @Override
index 48e124d18ad82364a3b78db9ffa798fe26548154..4db42845d324b042b9989809c97d5f591a10fe64 100644 (file)
@@ -25,9 +25,9 @@ public class TcpSourcePortEntrySerializer extends AbstractMatchEntrySerializer {
 
     @Override
     public boolean matchTypeCheck(Match match) {
-        return Objects.nonNull(match.getLayer4Match()) &&
-                TcpMatch.class.isInstance(match.getLayer4Match()) &&
-                Objects.nonNull(TcpMatch.class.cast(match.getLayer4Match()).getTcpSourcePort());
+        return Objects.nonNull(match.getLayer4Match())
+                && TcpMatch.class.isInstance(match.getLayer4Match())
+                && Objects.nonNull(TcpMatch.class.cast(match.getLayer4Match()).getTcpSourcePort());
     }
 
     @Override
index f3e2c60cc2c06171b1e341c4fa0522870df781dc..dd7a373a4d1181fffd7224961c6f6d02db47dda1 100644 (file)
@@ -32,8 +32,8 @@ public class TunnelIdEntrySerializer extends AbstractMatchEntrySerializer {
 
     @Override
     public boolean matchTypeCheck(Match match) {
-        return Objects.nonNull(match.getTunnel()) &&
-                Objects.nonNull(match.getTunnel().getTunnelId());
+        return Objects.nonNull(match.getTunnel())
+                && Objects.nonNull(match.getTunnel().getTunnelId());
     }
 
     @Override
index 783f121d24794f564295d1781d5a7034dd4914de..d361a15ca594160d71416871e89754186e8b77c9 100644 (file)
@@ -28,9 +28,9 @@ public class TunnelIpv4DestinationEntrySerializer extends AbstractMatchEntrySeri
 
     @Override
     public boolean matchTypeCheck(Match match) {
-        return Objects.nonNull(match.getLayer3Match()) &&
-                TunnelIpv4Match.class.isInstance(match.getLayer3Match()) &&
-                Objects.nonNull(TunnelIpv4Match.class.cast(match.getLayer3Match()).getTunnelIpv4Destination());
+        return Objects.nonNull(match.getLayer3Match())
+                && TunnelIpv4Match.class.isInstance(match.getLayer3Match())
+                && Objects.nonNull(TunnelIpv4Match.class.cast(match.getLayer3Match()).getTunnelIpv4Destination());
     }
 
     @Override
index ce77e9d1a4a619e5d4aaa348602085ec9da27292..c47cb666b3e1d73e5af410abff285d3f94be8f8d 100644 (file)
@@ -28,9 +28,9 @@ public class TunnelIpv4SourceEntrySerializer extends AbstractMatchEntrySerialize
 
     @Override
     public boolean matchTypeCheck(Match match) {
-        return Objects.nonNull(match.getLayer3Match()) &&
-                TunnelIpv4Match.class.isInstance(match.getLayer3Match()) &&
-                Objects.nonNull(TunnelIpv4Match.class.cast(match.getLayer3Match()).getTunnelIpv4Source());
+        return Objects.nonNull(match.getLayer3Match())
+                && TunnelIpv4Match.class.isInstance(match.getLayer3Match())
+                && Objects.nonNull(TunnelIpv4Match.class.cast(match.getLayer3Match()).getTunnelIpv4Source());
     }
 
     @Override
index 81796f55b2405afb86e246e2bbbced9bb3a0b099..f825b1bf36ea8ec93907ccf9b80a9c5178b083dd 100644 (file)
@@ -25,9 +25,9 @@ public class UdpDestinationPortEntrySerializer extends AbstractMatchEntrySeriali
 
     @Override
     public boolean matchTypeCheck(Match match) {
-        return Objects.nonNull(match.getLayer4Match()) &&
-                UdpMatch.class.isInstance(match.getLayer4Match()) &&
-                Objects.nonNull(UdpMatch.class.cast(match.getLayer4Match()).getUdpDestinationPort());
+        return Objects.nonNull(match.getLayer4Match())
+                && UdpMatch.class.isInstance(match.getLayer4Match())
+                && Objects.nonNull(UdpMatch.class.cast(match.getLayer4Match()).getUdpDestinationPort());
     }
 
     @Override
index 2929a47a902fb34010bde18090c3d4fbe4f97dd1..b05120eb85b6fd1a824852cffedf54d236b06a27 100644 (file)
@@ -25,9 +25,9 @@ public class UdpSourcePortEntrySerializer extends AbstractMatchEntrySerializer {
 
     @Override
     public boolean matchTypeCheck(Match match) {
-        return Objects.nonNull(match.getLayer4Match()) &&
-                UdpMatch.class.isInstance(match.getLayer4Match()) &&
-                Objects.nonNull(UdpMatch.class.cast(match.getLayer4Match()).getUdpSourcePort());
+        return Objects.nonNull(match.getLayer4Match())
+                && UdpMatch.class.isInstance(match.getLayer4Match())
+                && Objects.nonNull(UdpMatch.class.cast(match.getLayer4Match()).getUdpSourcePort());
     }
 
     @Override
index 8a443e4446f8cb31d0b7cfd29abf51a5faa05fe1..8980664da2ea3bd7ab4e369d7811feb2b309e9fc 100644 (file)
@@ -24,8 +24,8 @@ public class VlanPcpEntrySerializer extends AbstractMatchEntrySerializer {
 
     @Override
     public boolean matchTypeCheck(Match match) {
-        return Objects.nonNull(match.getVlanMatch()) &&
-                Objects.nonNull(match.getVlanMatch().getVlanPcp());
+        return Objects.nonNull(match.getVlanMatch())
+                && Objects.nonNull(match.getVlanMatch().getVlanPcp());
     }
 
     @Override
index 4e48398232f826047e8905685f4dc7b61215c027..c9df43cc4132e4b417c2df30bb548cfe18e3d7e7 100644 (file)
@@ -40,15 +40,15 @@ public class VlanVidEntrySerializer extends AbstractMatchEntrySerializer {
 
     @Override
     public boolean matchTypeCheck(Match match) {
-        return Objects.nonNull(match.getVlanMatch()) &&
-                Objects.nonNull(match.getVlanMatch().getVlanId());
+        return Objects.nonNull(match.getVlanMatch())
+                && Objects.nonNull(match.getVlanMatch().getVlanId());
     }
 
     @Override
     protected boolean getHasMask(Match match) {
         final VlanId vlanId = match.getVlanMatch().getVlanId();
-        return Boolean.TRUE.equals(vlanId.isVlanIdPresent()) &&
-                (Objects.isNull(vlanId.getVlanId()) || vlanId.getVlanId().getValue() == 0);
+        return Boolean.TRUE.equals(vlanId.isVlanIdPresent())
+                && (Objects.isNull(vlanId.getVlanId()) || vlanId.getVlanId().getValue() == 0);
     }
 
     @Override
index a71997636773139e5d282190f2efad41587d6ff2..b965071c1534f54843a690e5f8851dff0b9c6ed0 100644 (file)
@@ -28,6 +28,8 @@ public abstract class AbstractMessageSerializer<T extends OfHeader> implements O
     }
 
     /**
+     * Message type getter.
+     *
      * @return of message type
      */
     protected abstract byte getMessageType();
index fb645268e1c2711ff819eca31d8cd10139d22b12..49be46c0b487a7d6f6cd614ed4684d422b0d2029 100644 (file)
@@ -61,7 +61,8 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026
  * Translates FlowMod messages.
  * OF protocol versions: 1.3
  */
-public class FlowMessageSerializer extends AbstractMessageSerializer<FlowMessage> implements SerializerRegistryInjector {
+public class FlowMessageSerializer extends AbstractMessageSerializer<FlowMessage> implements
+        SerializerRegistryInjector {
     private static final FlowCookie DEFAULT_COOKIE = new FlowCookie(OFConstants.DEFAULT_COOKIE);
     private static final FlowCookie DEFAULT_COOKIE_MASK = new FlowCookie(OFConstants.DEFAULT_COOKIE_MASK);
     private static final Short DEFAULT_TABLE_ID = (short) 0;
@@ -102,15 +103,17 @@ public class FlowMessageSerializer extends AbstractMessageSerializer<FlowMessage
 
     /**
      * Serialize flow message. Needs to be separated from main serialize method to prevent recursion
-     * when serializing SetVlanId flows
-     * @param message flow message
+     * when serializing SetVlanId flows.
+     *
+     * @param message   flow message
      * @param outBuffer output buffer
      */
     private void writeFlow(final FlowMessage message, final ByteBuf outBuffer) {
-        int index = outBuffer.writerIndex();
+        final int index = outBuffer.writerIndex();
         super.serialize(message, outBuffer);
         outBuffer.writeLong(MoreObjects.firstNonNull(message.getCookie(), DEFAULT_COOKIE).getValue().longValue());
-        outBuffer.writeLong(MoreObjects.firstNonNull(message.getCookieMask(), DEFAULT_COOKIE_MASK).getValue().longValue());
+        outBuffer.writeLong(MoreObjects.firstNonNull(message.getCookieMask(), DEFAULT_COOKIE_MASK).getValue()
+                .longValue());
         outBuffer.writeByte(MoreObjects.firstNonNull(message.getTableId(), DEFAULT_TABLE_ID));
         outBuffer.writeByte(message.getCommand().getIntValue());
         outBuffer.writeShort(MoreObjects.firstNonNull(message.getIdleTimeout(), DEFAULT_IDLE_TIMEOUT));
@@ -128,34 +131,36 @@ public class FlowMessageSerializer extends AbstractMessageSerializer<FlowMessage
 
     /**
      * Instead of serializing this flow normally, we need to split it to two parts if flow contains
-     * #{@link org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.SetVlanIdActionCase}
-     * @param message flow mod message
+     * #{@link org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.SetVlanIdActionCase}.
+     *
+     * @param message   flow mod message
      * @param outBuffer output buffer
      */
     private void writeVlanFlow(final FlowMessage message, final ByteBuf outBuffer) {
         writeFlow(
-            new FlowMessageBuilder(message)
-                .setMatch(new MatchBuilder(message.getMatch())
-                    .setVlanMatch(VLAN_MATCH_FALSE)
-                    .build())
-                .setInstructions(new InstructionsBuilder()
-                    .setInstruction(updateSetVlanIdAction(message))
-                    .build())
-                .build(),
-            outBuffer);
+                new FlowMessageBuilder(message)
+                        .setMatch(new MatchBuilder(message.getMatch())
+                                .setVlanMatch(VLAN_MATCH_FALSE)
+                                .build())
+                        .setInstructions(new InstructionsBuilder()
+                                .setInstruction(updateSetVlanIdAction(message))
+                                .build())
+                        .build(),
+                outBuffer);
 
         writeFlow(
-            new FlowMessageBuilder(message)
-                .setMatch(new MatchBuilder(message.getMatch())
-                    .setVlanMatch(VLAN_MATCH_TRUE)
-                    .build())
-                .build(),
-            outBuffer);
+                new FlowMessageBuilder(message)
+                        .setMatch(new MatchBuilder(message.getMatch())
+                                .setVlanMatch(VLAN_MATCH_TRUE)
+                                .build())
+                        .build(),
+                outBuffer);
     }
 
     /**
-     * Serialize OpenFlowPlugin match to raw bytes
-     * @param message OpenFlow flow mod message
+     * Serialize OpenFlowPlugin match to raw bytes.
+     *
+     * @param message   OpenFlow flow mod message
      * @param outBuffer output buffer
      */
     private void writeMatch(final FlowMessage message, final ByteBuf outBuffer) {
@@ -165,8 +170,9 @@ public class FlowMessageSerializer extends AbstractMessageSerializer<FlowMessage
     }
 
     /**
-     * Serialize OpenFlowPlugin instructions and set ip protocol of set-tp-src and set-tp-dst actions of need
-     * @param message OpenFlow flow mod message
+     * Serialize OpenFlowPlugin instructions and set ip protocol of set-tp-src and set-tp-dst actions of need.
+     *
+     * @param message   OpenFlow flow mod message
      * @param outBuffer output buffer
      */
     @SuppressWarnings("unchecked")
@@ -184,40 +190,44 @@ public class FlowMessageSerializer extends AbstractMessageSerializer<FlowMessage
                         .stream()
                         .filter(Objects::nonNull)
                         .sorted(OrderComparator.build())
-                        .map(org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.Instruction::getInstruction)
+                        .map(org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types
+                                .rev131026.Instruction::getInstruction)
                         .filter(Objects::nonNull)
                         .map(i -> protocol.flatMap(p -> updateInstruction(i, p)).orElse(i))
-                        .forEach(i -> InstructionUtil.writeInstruction(i, EncodeConstants.OF13_VERSION_ID, registry, outBuffer)));
+                        .forEach(i -> InstructionUtil.writeInstruction(i, EncodeConstants.OF13_VERSION_ID, registry,
+                                outBuffer)));
     }
 
     /**
-     * Determine type of instruction and update it's actions if it is apply-actions instruction
+     * Determine type of instruction and update it's actions if it is apply-actions instruction.
+     *
      * @param instruction instruction
-     * @param protocol protocol
+     * @param protocol    protocol
      * @return updated instruction or empty
      */
     private static Optional<Instruction> updateInstruction(final Instruction instruction, final Short protocol) {
-        ifApplyActionsCase.class.isInstance(instruction)) {
+        if (ApplyActionsCase.class.isInstance(instruction)) {
             return Optional
-                .ofNullable(ApplyActionsCase.class.cast(instruction).getApplyActions())
-                .flatMap(aa -> Optional.ofNullable(aa.getAction()))
-                .map(as -> new ApplyActionsCaseBuilder()
-                    .setApplyActions(new ApplyActionsBuilder()
-                        .setAction(as
-                            .stream()
-                            .filter(Objects::nonNull)
-                            .map(a -> updateSetTpActions(a, protocol))
-                            .collect(Collectors.toList()))
-                        .build())
-                    .build());
+                    .ofNullable(ApplyActionsCase.class.cast(instruction).getApplyActions())
+                    .flatMap(aa -> Optional.ofNullable(aa.getAction()))
+                    .map(as -> new ApplyActionsCaseBuilder()
+                            .setApplyActions(new ApplyActionsBuilder()
+                                    .setAction(as
+                                            .stream()
+                                            .filter(Objects::nonNull)
+                                            .map(a -> updateSetTpActions(a, protocol))
+                                            .collect(Collectors.toList()))
+                                    .build())
+                            .build());
         }
 
         return Optional.empty();
     }
 
     /**
-     * If action is set-tp-src or set-tp-dst, inject IP protocol into it, otherwise return original action
-     * @param action OpenFlow action
+     * If action is set-tp-src or set-tp-dst, inject IP protocol into it, otherwise return original action.
+     *
+     * @param action   OpenFlow action
      * @param protocol IP protocol
      * @return updated OpenFlow action
      */
@@ -251,8 +261,11 @@ public class FlowMessageSerializer extends AbstractMessageSerializer<FlowMessage
     }
 
     /**
-     * Create copy of instructions of original flow but insert #{@link org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.PushVlanActionCase}
-     * before each #{@link org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.SetVlanIdActionCase}
+     * Create copy of instructions of original flow but insert
+     * #{@link org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.PushVlanActionCase}
+     * before each
+     * #{@link org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.SetVlanIdActionCase}.
+     *
      * @param message OpenFlowPlugin flow mod message
      * @return list of instructions
      */
@@ -261,7 +274,7 @@ public class FlowMessageSerializer extends AbstractMessageSerializer<FlowMessage
         return message.getInstructions().getInstruction()
                 .stream()
                 .map(i -> {
-                    final int[] offset = { 0 };
+                    final int[] offset = {0};
 
                     return ApplyActionsCase.class.isInstance(i.getInstruction())
                             ? Optional
@@ -270,34 +283,38 @@ public class FlowMessageSerializer extends AbstractMessageSerializer<FlowMessage
                             .map(a -> a.stream()
                                     .sorted(OrderComparator.build())
                                     .flatMap(action -> {
-                                final List<org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112
-                                        .action.list.Action> actions = new ArrayList<>();
+                                        final List<org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112
+                                                .action.list.Action> actions = new ArrayList<>();
 
-                                // If current action is SetVlanId, insert PushVlan action before it and update order
-                                if (SetVlanIdActionCase.class.isInstance(action.getAction())) {
-                                    actions.add(new ActionBuilder()
-                                            .setAction(new PushVlanActionCaseBuilder()
-                                                    .setPushVlanAction(new PushVlanActionBuilder()
-                                                            .setCfi(new VlanCfi(1))
-                                                            .setVlanId(SetVlanIdActionCase.class.cast(action.getAction()).getSetVlanIdAction().getVlanId())
-                                                            .setEthernetType(PUSH_VLAN)
-                                                            .setTag(PUSH_VLAN)
+                                        // If current action is SetVlanId, insert PushVlan action before it and
+                                        // update order
+                                        if (SetVlanIdActionCase.class.isInstance(action.getAction())) {
+                                            actions.add(new ActionBuilder()
+                                                    .setAction(new PushVlanActionCaseBuilder()
+                                                            .setPushVlanAction(new PushVlanActionBuilder()
+                                                                    .setCfi(new VlanCfi(1))
+                                                                    .setVlanId(SetVlanIdActionCase.class.cast(action
+                                                                            .getAction()).getSetVlanIdAction()
+                                                                            .getVlanId())
+                                                                    .setEthernetType(PUSH_VLAN)
+                                                                    .setTag(PUSH_VLAN)
+                                                                    .build())
                                                             .build())
-                                                    .build())
-                                            .setKey(action.getKey())
-                                            .setOrder(action.getOrder() + offset[0])
-                                            .build());
+                                                    .setKey(action.getKey())
+                                                    .setOrder(action.getOrder() + offset[0])
+                                                    .build());
 
-                                    offset[0]++;
-                                }
+                                            offset[0]++;
+                                        }
 
-                                // Update offset of action if there is any inserted PushVlan actions
-                                actions.add(offset[0] > 0
-                                        ? new ActionBuilder(action).setOrder(action.getOrder() + offset[0]).build()
-                                        : action);
+                                        // Update offset of action if there is any inserted PushVlan actions
+                                        actions.add(offset[0] > 0
+                                                ? new ActionBuilder(action).setOrder(action.getOrder() + offset[0])
+                                                .build()
+                                                : action);
 
-                                return actions.stream();
-                            }))
+                                        return actions.stream();
+                                    }))
                             .map(as -> new InstructionBuilder(i)
                                     .setInstruction(new ApplyActionsCaseBuilder()
                                             .setApplyActions(new ApplyActionsBuilder()
@@ -311,7 +328,9 @@ public class FlowMessageSerializer extends AbstractMessageSerializer<FlowMessage
     }
 
     /**
-     * Create integer bit mask from #{@link org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.FlowModFlags}
+     * Create integer bit mask from
+     * #{@link org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.FlowModFlags}.
+     *
      * @param flags flow mod flags
      * @return bit mask
      */
@@ -325,20 +344,25 @@ public class FlowMessageSerializer extends AbstractMessageSerializer<FlowMessage
     }
 
     /**
-     * Determine if flow contains vlan match
+     * Determine if flow contains vlan match.
+     *
      * @param flow flow
      * @return true if flow contains vlan match
      */
     private static boolean isVlanMatchPresent(final Flow flow) {
         return Optional
-            .ofNullable(flow.getMatch())
-            .flatMap(m -> Optional.ofNullable(m.getVlanMatch()))
-            .isPresent();
+                .ofNullable(flow.getMatch())
+                .flatMap(m -> Optional.ofNullable(m.getVlanMatch()))
+                .isPresent();
     }
 
     /**
-     * Determine if flow contains #{@link org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.instruction.instruction.ApplyActionsCase}
-     * instruction with #{@link org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.SetVlanIdActionCase} action
+     * Determine if flow contains
+     * #{@link org.opendaylight.yang.gen.v1.urn.opendaylight
+     * .flow.types.rev131026.instruction.instruction.ApplyActionsCase} instruction with
+     * #{@link org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.SetVlanIdActionCase}
+     * action.
+     *
      * @param flow OpenFlowPlugin flow
      * @return true if flow contains SetVlanIdAction
      */
@@ -348,7 +372,8 @@ public class FlowMessageSerializer extends AbstractMessageSerializer<FlowMessage
                 .flatMap(is -> Optional.ofNullable(is.getInstruction()))
                 .flatMap(is -> is
                         .stream()
-                        .map(org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.Instruction::getInstruction)
+                        .map(org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types
+                                .rev131026.Instruction::getInstruction)
                         .filter(ApplyActionsCase.class::isInstance)
                         .map(i -> ApplyActionsCase.class.cast(i).getApplyActions())
                         .filter(Objects::nonNull)
index 768b5c48a87bd1d44ef0e9ea66cd0e1823df814f..f0d49a34642ebcf3e0f2608720eb86156081f89f 100644 (file)
@@ -25,12 +25,15 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev13
  * Translates GroupMod messages.
  * OF protocol versions: 1.3.
  */
-public class GroupMessageSerializer extends AbstractMessageSerializer<GroupMessage> implements SerializerRegistryInjector {
+public class GroupMessageSerializer extends AbstractMessageSerializer<GroupMessage> implements
+        SerializerRegistryInjector {
     private static final byte PADDING_IN_GROUP_MOD_MESSAGE = 1;
     private static final byte PADDING_IN_BUCKET = 4;
 
     private static final Comparator<Bucket> COMPARATOR = (bucket1, bucket2) -> {
-        if (bucket1.getBucketId() == null || bucket2.getBucketId() == null) return 0;
+        if (bucket1.getBucketId() == null || bucket2.getBucketId() == null) {
+            return 0;
+        }
         return bucket1.getBucketId().getValue().compareTo(bucket2.getBucketId().getValue());
     };
 
@@ -38,7 +41,7 @@ public class GroupMessageSerializer extends AbstractMessageSerializer<GroupMessa
 
     @Override
     public void serialize(GroupMessage message, ByteBuf outBuffer) {
-        int index = outBuffer.writerIndex();
+        final int index = outBuffer.writerIndex();
         super.serialize(message, outBuffer);
         outBuffer.writeShort(message.getCommand().getIntValue());
         outBuffer.writeByte(message.getGroupType().getIntValue());
@@ -51,11 +54,13 @@ public class GroupMessageSerializer extends AbstractMessageSerializer<GroupMessa
             .ifPresent(b -> b.stream()
                 .sorted(COMPARATOR)
                 .forEach(bucket -> {
-                    int bucketIndex = outBuffer.writerIndex();
+                    final int bucketIndex = outBuffer.writerIndex();
                     outBuffer.writeShort(EncodeConstants.EMPTY_LENGTH);
                     outBuffer.writeShort(MoreObjects.firstNonNull(bucket.getWeight(), 0));
-                    outBuffer.writeInt(MoreObjects.firstNonNull(bucket.getWatchPort(), OFConstants.OFPG_ANY).intValue());
-                    outBuffer.writeInt(MoreObjects.firstNonNull(bucket.getWatchGroup(), OFConstants.OFPG_ANY).intValue());
+                    outBuffer.writeInt(MoreObjects.firstNonNull(bucket.getWatchPort(), OFConstants.OFPG_ANY)
+                            .intValue());
+                    outBuffer.writeInt(MoreObjects.firstNonNull(bucket.getWatchGroup(), OFConstants.OFPG_ANY)
+                            .intValue());
                     outBuffer.writeZero(PADDING_IN_BUCKET);
 
                     Optional.ofNullable(bucket.getAction()).ifPresent(as -> as.forEach(a ->
index cbc5ed4aa9bcc92ca7c19848597a51e0e69254bf..7482886965bca1af40830ff256432d0d4b2cfb74 100644 (file)
@@ -32,7 +32,8 @@ import org.slf4j.LoggerFactory;
  * Translates MeterMod messages
  * OF protocol versions: 1.3.
  */
-public class MeterMessageSerializer extends AbstractMessageSerializer<MeterMessage> implements SerializerRegistryInjector {
+public class MeterMessageSerializer extends AbstractMessageSerializer<MeterMessage> implements
+        SerializerRegistryInjector {
     private static final Logger LOG = LoggerFactory.getLogger(MeterMessageSerializer.class);
     private static final short LENGTH_OF_METER_BANDS = 16;
     private static final short PADDING_IN_METER_BAND_DROP = 4;
@@ -42,7 +43,7 @@ public class MeterMessageSerializer extends AbstractMessageSerializer<MeterMessa
 
     @Override
     public void serialize(final MeterMessage message, final ByteBuf outBuffer) {
-        int index = outBuffer.writerIndex();
+        final int index = outBuffer.writerIndex();
         super.serialize(message, outBuffer);
         outBuffer.writeShort(message.getCommand().getIntValue());
         outBuffer.writeShort(createMeterFlagsBitMask(
index c11f8b3b109dfacb3477173aa20464c9cae32d4b..63058b70d1acc6e6ab4ebfb5afee77531bde3b60 100644 (file)
@@ -34,14 +34,16 @@ public class PortMessageSerializer extends AbstractMessageSerializer<PortMessage
 
     @Override
     public void serialize(final PortMessage message, final ByteBuf outBuffer) {
-        int index = outBuffer.writerIndex();
+        final int index = outBuffer.writerIndex();
         super.serialize(message, outBuffer);
-        outBuffer.writeInt(OpenflowPortsUtil.getProtocolPortNumber(OpenflowVersion.OF13, message.getPortNumber()).intValue());
+        outBuffer.writeInt(OpenflowPortsUtil
+                .getProtocolPortNumber(OpenflowVersion.OF13, message.getPortNumber()).intValue());
         outBuffer.writeZero(PADDING_IN_PORT_MOD_MESSAGE_01);
         outBuffer.writeBytes(IetfYangUtil.INSTANCE.bytesFor(message.getHardwareAddress()));
         outBuffer.writeZero(PADDING_IN_PORT_MOD_MESSAGE_02);
         outBuffer.writeInt(createPortConfigBitMask(message.getConfiguration()));
-        outBuffer.writeInt(MoreObjects.firstNonNull(createPortConfigBitMask(message.getMask()), DEFAULT_PORT_CONFIG_MASK));
+        outBuffer.writeInt(MoreObjects
+                .firstNonNull(createPortConfigBitMask(message.getMask()), DEFAULT_PORT_CONFIG_MASK));
         outBuffer.writeInt(createPortFeaturesBitMask(message.getAdvertisedFeatures()));
         outBuffer.writeZero(PADDING_IN_PORT_MOD_MESSAGE_03);
         outBuffer.setShort(index + 2, outBuffer.writerIndex() - index);
index 9f623307eabf2960412c4ed3be3560465693b0b9..838bf806666a9d1084944a13b96597fb06a6019a 100644 (file)
@@ -25,7 +25,8 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.experimenter.types.rev151020.experimenter.core.message.ExperimenterMessageOfChoice;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.experimenter.types.rev151020.multipart.request.multipart.request.body.MultipartRequestExperimenter;
 
-public class MultipartRequestExperimenterSerializer implements OFSerializer<MultipartRequestBody>, SerializerRegistryInjector {
+public class MultipartRequestExperimenterSerializer implements OFSerializer<MultipartRequestBody>,
+        SerializerRegistryInjector {
 
     private SerializerRegistry registry;
 
@@ -33,35 +34,38 @@ public class MultipartRequestExperimenterSerializer implements OFSerializer<Mult
     @SuppressWarnings("unchecked")
     public void serialize(final MultipartRequestBody multipartRequestBody, final ByteBuf byteBuf) {
         final MultipartRequestExperimenter multipartRequestExperimenter = MultipartRequestExperimenter
-            .class
-            .cast(multipartRequestBody);
+                .class
+                .cast(multipartRequestBody);
 
         try {
             final OFSerializer<ExperimenterMessageOfChoice> serializer = registry
-                .getSerializer(new MessageTypeKey<>(
-                    EncodeConstants.OF13_VERSION_ID,
-                    multipartRequestExperimenter.getExperimenterMessageOfChoice().getImplementedInterface()));
+                    .getSerializer(new MessageTypeKey<>(
+                            EncodeConstants.OF13_VERSION_ID,
+                            multipartRequestExperimenter.getExperimenterMessageOfChoice().getImplementedInterface()));
 
             serializer.serialize(multipartRequestExperimenter.getExperimenterMessageOfChoice(), byteBuf);
         } catch (ClassCastException | IllegalStateException ex) {
             Optional
-                .ofNullable(OFSessionUtil.getExtensionConvertorProvider().<ExperimenterMessageOfChoice, ExperimenterDataOfChoice>getMessageConverter(new TypeVersionKey<>(
-                    (Class<ExperimenterMessageOfChoice>)multipartRequestExperimenter.getExperimenterMessageOfChoice().getImplementedInterface(),
-                    OFConstants.OFP_VERSION_1_3)))
-                .ifPresent(converter -> {
-                    final OFSerializer<ExperimenterDataOfChoice> serializer = registry
-                        .getSerializer(ExperimenterSerializerKeyFactory
-                            .createMultipartRequestSerializerKey(
-                                EncodeConstants.OF13_VERSION_ID,
-                                converter.getExperimenterId().getValue(),
-                                converter.getType()));
+                    .ofNullable(OFSessionUtil.getExtensionConvertorProvider().<ExperimenterMessageOfChoice,
+                            ExperimenterDataOfChoice>getMessageConverter(new TypeVersionKey<>(
+                            (Class<ExperimenterMessageOfChoice>) multipartRequestExperimenter
+                                    .getExperimenterMessageOfChoice().getImplementedInterface(),
+                            OFConstants.OFP_VERSION_1_3)))
+                    .ifPresent(converter -> {
+                        final OFSerializer<ExperimenterDataOfChoice> serializer = registry
+                                .getSerializer(ExperimenterSerializerKeyFactory
+                                        .createMultipartRequestSerializerKey(
+                                                EncodeConstants.OF13_VERSION_ID,
+                                                converter.getExperimenterId().getValue(),
+                                                converter.getType()));
 
-                    try {
-                        serializer.serialize(converter.convert(multipartRequestExperimenter.getExperimenterMessageOfChoice()), byteBuf);
-                    } catch (ConversionException e) {
-                        throw new IllegalStateException(e);
-                    }
-                });
+                        try {
+                            serializer.serialize(converter.convert(multipartRequestExperimenter
+                                    .getExperimenterMessageOfChoice()), byteBuf);
+                        } catch (ConversionException e) {
+                            throw new IllegalStateException(e);
+                        }
+                    });
         }
     }
 
index 53c6762d7a6dc85e400fa6a60b904e91d9a183ba..9c6cb9ba39905ce9d67309458029c797a43ae11c 100644 (file)
@@ -21,7 +21,8 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.multip
 import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.Match;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.multipart.types.rev170112.multipart.request.MultipartRequestBody;
 
-public class MultipartRequestFlowAggregateStatsSerializer implements OFSerializer<MultipartRequestBody>, SerializerRegistryInjector {
+public class MultipartRequestFlowAggregateStatsSerializer implements OFSerializer<MultipartRequestBody>,
+        SerializerRegistryInjector {
 
     private static final byte PADDING_IN_MULTIPART_REQUEST_FLOW_BODY_01 = 3;
     private static final byte PADDING_IN_MULTIPART_REQUEST_FLOW_BODY_02 = 4;
@@ -30,20 +31,25 @@ public class MultipartRequestFlowAggregateStatsSerializer implements OFSerialize
     @Override
     public void serialize(final MultipartRequestBody multipartRequestBody, final ByteBuf byteBuf) {
         final MultipartRequestFlowAggregateStats multipartRequestFlowAggregateStats = MultipartRequestFlowAggregateStats
-            .class
-            .cast(multipartRequestBody);
+                .class
+                .cast(multipartRequestBody);
 
-        byteBuf.writeByte(MoreObjects.firstNonNull(multipartRequestFlowAggregateStats.getTableId(), OFConstants.OFPTT_ALL).byteValue());
+        byteBuf.writeByte(MoreObjects.firstNonNull(multipartRequestFlowAggregateStats.getTableId(),
+                OFConstants.OFPTT_ALL).byteValue());
         byteBuf.writeZero(PADDING_IN_MULTIPART_REQUEST_FLOW_BODY_01);
-        byteBuf.writeInt(MoreObjects.firstNonNull(multipartRequestFlowAggregateStats.getOutPort(), OFConstants.OFPP_ANY).intValue());
-        byteBuf.writeInt(MoreObjects.firstNonNull(multipartRequestFlowAggregateStats.getOutGroup(), OFConstants.OFPG_ANY).intValue());
+        byteBuf.writeInt(MoreObjects.firstNonNull(multipartRequestFlowAggregateStats.getOutPort(),
+                OFConstants.OFPP_ANY).intValue());
+        byteBuf.writeInt(MoreObjects.firstNonNull(multipartRequestFlowAggregateStats.getOutGroup(),
+                OFConstants.OFPG_ANY).intValue());
         byteBuf.writeZero(PADDING_IN_MULTIPART_REQUEST_FLOW_BODY_02);
-        byteBuf.writeLong(MoreObjects.firstNonNull(multipartRequestFlowAggregateStats.getCookie(), new FlowCookie(OFConstants.DEFAULT_COOKIE)).getValue().longValue());
-        byteBuf.writeLong(MoreObjects.firstNonNull(multipartRequestFlowAggregateStats.getCookieMask(), new FlowCookie(OFConstants.DEFAULT_COOKIE_MASK)).getValue().longValue());
+        byteBuf.writeLong(MoreObjects.firstNonNull(multipartRequestFlowAggregateStats.getCookie(),
+                new FlowCookie(OFConstants.DEFAULT_COOKIE)).getValue().longValue());
+        byteBuf.writeLong(MoreObjects.firstNonNull(multipartRequestFlowAggregateStats.getCookieMask(),
+                new FlowCookie(OFConstants.DEFAULT_COOKIE_MASK)).getValue().longValue());
 
         registry.<Match, OFSerializer<Match>>getSerializer(
-            new MessageTypeKey<>(EncodeConstants.OF13_VERSION_ID, Match.class))
-            .serialize(multipartRequestFlowAggregateStats.getMatch(), byteBuf);
+                new MessageTypeKey<>(EncodeConstants.OF13_VERSION_ID, Match.class))
+                .serialize(multipartRequestFlowAggregateStats.getMatch(), byteBuf);
     }
 
     @Override
index bf150be9c8e40110c77c2567e83daf18ec0fabb2..e2fef3a1a16e7b2a614b604655bc2ccac0c25240 100644 (file)
@@ -21,7 +21,8 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.multip
 import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.Match;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.multipart.types.rev170112.multipart.request.MultipartRequestBody;
 
-public class MultipartRequestFlowStatsSerializer implements OFSerializer<MultipartRequestBody>, SerializerRegistryInjector {
+public class MultipartRequestFlowStatsSerializer implements OFSerializer<MultipartRequestBody>,
+        SerializerRegistryInjector {
 
     private static final byte PADDING_IN_MULTIPART_REQUEST_FLOW_BODY_01 = 3;
     private static final byte PADDING_IN_MULTIPART_REQUEST_FLOW_BODY_02 = 4;
@@ -33,13 +34,18 @@ public class MultipartRequestFlowStatsSerializer implements OFSerializer<Multipa
             .class
             .cast(multipartRequestBody);
 
-        byteBuf.writeByte(MoreObjects.firstNonNull(multipartRequestFlowStats.getTableId(), OFConstants.OFPTT_ALL).byteValue());
+        byteBuf.writeByte(MoreObjects.firstNonNull(multipartRequestFlowStats.getTableId(),
+                OFConstants.OFPTT_ALL).byteValue());
         byteBuf.writeZero(PADDING_IN_MULTIPART_REQUEST_FLOW_BODY_01);
-        byteBuf.writeInt(MoreObjects.firstNonNull(multipartRequestFlowStats.getOutPort(), OFConstants.OFPP_ANY).intValue());
-        byteBuf.writeInt(MoreObjects.firstNonNull(multipartRequestFlowStats.getOutGroup(), OFConstants.OFPG_ANY).intValue());
+        byteBuf.writeInt(MoreObjects.firstNonNull(multipartRequestFlowStats.getOutPort(),
+                OFConstants.OFPP_ANY).intValue());
+        byteBuf.writeInt(MoreObjects.firstNonNull(multipartRequestFlowStats.getOutGroup(),
+                OFConstants.OFPG_ANY).intValue());
         byteBuf.writeZero(PADDING_IN_MULTIPART_REQUEST_FLOW_BODY_02);
-        byteBuf.writeLong(MoreObjects.firstNonNull(multipartRequestFlowStats.getCookie(), new FlowCookie(OFConstants.DEFAULT_COOKIE)).getValue().longValue());
-        byteBuf.writeLong(MoreObjects.firstNonNull(multipartRequestFlowStats.getCookieMask(), new FlowCookie(OFConstants.DEFAULT_COOKIE_MASK)).getValue().longValue());
+        byteBuf.writeLong(MoreObjects.firstNonNull(multipartRequestFlowStats.getCookie(),
+                new FlowCookie(OFConstants.DEFAULT_COOKIE)).getValue().longValue());
+        byteBuf.writeLong(MoreObjects.firstNonNull(multipartRequestFlowStats.getCookieMask(),
+                new FlowCookie(OFConstants.DEFAULT_COOKIE_MASK)).getValue().longValue());
 
         registry.<Match, OFSerializer<Match>>getSerializer(
             new MessageTypeKey<>(EncodeConstants.OF13_VERSION_ID, Match.class))
index 61081b2b12f98b6bd2e67abd67c438c44e122c56..272d2b138a9fce3316f50cb879765c7f3b47b0fd 100644 (file)
@@ -37,7 +37,8 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.queue.statistics.rev131216.
 import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.multipart.request.multipart.request.body.MultipartRequestTableFeatures;
 import org.opendaylight.yangtools.yang.binding.DataContainer;
 
-public class MultipartRequestMessageSerializer extends AbstractMessageSerializer<MultipartRequest> implements SerializerRegistryInjector {
+public class MultipartRequestMessageSerializer extends AbstractMessageSerializer<MultipartRequest> implements
+        SerializerRegistryInjector {
     private static final byte PADDING_IN_MULTIPART_REQUEST_MESSAGE = 4;
     private SerializerRegistry registry;
 
@@ -46,7 +47,7 @@ public class MultipartRequestMessageSerializer extends AbstractMessageSerializer
         final MultipartRequestBody multipartRequestBody = message.getMultipartRequestBody();
         final MultipartType multipartType = getMultipartType(multipartRequestBody);
 
-        int index = outBuffer.writerIndex();
+        final int index = outBuffer.writerIndex();
         super.serialize(message, outBuffer);
         outBuffer.writeShort(multipartType.getIntValue());
         outBuffer.writeShort(ByteBufUtils.fillBitMask(0, message.isRequestMore()));
index 01c27c0d2dc13faea6a0b2d73ebe496a5bfaa00c..19bbc5a8e0e4a166e20dbe838e988498759b59b1 100644 (file)
@@ -26,8 +26,8 @@ public class MultipartRequestMeterConfigSerializer implements OFSerializer<Multi
             .class
             .cast(multipartRequestBody);
 
-        byteBuf.writeInt(MoreObjects.firstNonNull(multipartRequestMeterConfig.getMeterId(), new MeterId(OFConstants.OFPM_ALL))
-                .getValue().intValue());
+        byteBuf.writeInt(MoreObjects.firstNonNull(multipartRequestMeterConfig.getMeterId(),
+                new MeterId(OFConstants.OFPM_ALL)).getValue().intValue());
         byteBuf.writeZero(PADDING_IN_MULTIPART_REQUEST_METER_CONFIG_BODY);
     }
 
index a962e7d341b743d138546e6262ced0af00b44640..e9dca48dcffab9879e2a2238a5580fdb494ac429 100644 (file)
@@ -27,7 +27,8 @@ public class MultipartRequestMeterStatsSerializer implements OFSerializer<Multip
             .cast(multipartRequestBody);
 
         byteBuf.writeInt(MoreObjects
-            .firstNonNull(multipartRequestMeterStats.getMeterId(), new MeterId(OFConstants.OFPM_ALL)).getValue().intValue());
+            .firstNonNull(multipartRequestMeterStats.getMeterId(), new MeterId(OFConstants.OFPM_ALL))
+                .getValue().intValue());
         byteBuf.writeZero(PADDING_IN_MULTIPART_REQUEST_METER_BODY);
     }
 
index 120f6b082e546ebbd0f3f8c3c0af6d0937ce0ff6..9820624faae848c6bef762845b18b790bf0157ad 100644 (file)
@@ -37,7 +37,8 @@ public class MultipartRequestQueueStatsSerializer implements OFSerializer<Multip
         }
 
         byteBuf.writeInt(MoreObjects
-            .firstNonNull(multipartRequestQueueStats.getQueueId(), new QueueId(OFConstants.OFPQ_ALL)).getValue().intValue());
+            .firstNonNull(multipartRequestQueueStats.getQueueId(), new QueueId(OFConstants.OFPQ_ALL))
+                .getValue().intValue());
     }
 
 }
index 5fb6f5b73d85c2eefe2e610f00ac998b95bce7f9..c184952d3ddc994eab665a1b671c6f7217d7b49c 100644 (file)
@@ -22,7 +22,8 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.multi
 import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.feature.prop.type.TableFeaturePropType;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.features.table.features.TableProperties;
 
-public class MultipartRequestTableFeaturesSerializer implements OFSerializer<MultipartRequestBody>, SerializerRegistryInjector {
+public class MultipartRequestTableFeaturesSerializer implements OFSerializer<MultipartRequestBody>,
+        SerializerRegistryInjector {
 
     private static final byte PADDING_IN_MULTIPART_REQUEST_TABLE_FEATURES_BODY = 5;
     private SerializerRegistry registry;
@@ -67,8 +68,7 @@ public class MultipartRequestTableFeaturesSerializer implements OFSerializer<Mul
                         .getTableFeaturePropType()
                         .getImplementedInterface();
 
-                    registry.
-                        <TableFeaturePropType, OFSerializer<TableFeaturePropType>>getSerializer(
+                    registry.<TableFeaturePropType, OFSerializer<TableFeaturePropType>>getSerializer(
                             new MessageTypeKey<>(EncodeConstants.OF13_VERSION_ID, clazz))
                         .serialize(property.getTableFeaturePropType(), byteBuf);
                 }));
index 349ae34985c441559ecb4f7922cf45a1eadbea6b..0133d7ea311bbf4e223726581ff1d38c2fb81b58 100644 (file)
@@ -14,7 +14,8 @@ import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.TableFeaturesPropType;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.feature.prop.type.TableFeaturePropType;
 
-public abstract class AbstractTablePropertySerializer<T extends TableFeaturePropType> implements OFSerializer<TableFeaturePropType> {
+public abstract class AbstractTablePropertySerializer<T extends TableFeaturePropType> implements
+        OFSerializer<TableFeaturePropType> {
 
     @Override
     public void serialize(final TableFeaturePropType tableFeaturePropType, final ByteBuf byteBuf) {
@@ -38,8 +39,10 @@ public abstract class AbstractTablePropertySerializer<T extends TableFeatureProp
         byteBuf.writeZero(padding);
     }
 
-    protected abstract void serializeProperty(final T property, final ByteBuf byteBuf);
+    protected abstract void serializeProperty(T property, ByteBuf byteBuf);
+
     protected abstract TableFeaturesPropType getType();
+
     protected abstract Class<T> getClazz();
 
 }
index 6aea103385a4fad6c2332702f6e0cb2270d45e16..23969502185ee1896a35fc75ccf6af608d8367e1 100644 (file)
@@ -18,7 +18,8 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.Acti
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.TableFeaturesPropType;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.feature.prop.type.table.feature.prop.type.ApplyActionsMiss;
 
-public class ApplyActionsMissTablePropertySerializer extends AbstractTablePropertySerializer<ApplyActionsMiss> implements SerializerRegistryInjector {
+public class ApplyActionsMissTablePropertySerializer extends
+        AbstractTablePropertySerializer<ApplyActionsMiss> implements SerializerRegistryInjector {
 
     private SerializerRegistry registry;
 
index d9689db68c45e7acb87bdec2b5e0f59a65460cf5..796fee6b91bf3532dd47614ba980f827e98f58b9 100644 (file)
@@ -18,7 +18,8 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.Acti
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.TableFeaturesPropType;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.feature.prop.type.table.feature.prop.type.ApplyActions;
 
-public class ApplyActionsTablePropertySerializer extends AbstractTablePropertySerializer<ApplyActions> implements SerializerRegistryInjector {
+public class ApplyActionsTablePropertySerializer extends AbstractTablePropertySerializer<ApplyActions> implements
+        SerializerRegistryInjector {
 
     private SerializerRegistry registry;
 
index ba7967445f735ae3a3cb893557276487182d62f8..312db2f5f37358decdca04ef8a783d6972f71ce9 100644 (file)
@@ -19,7 +19,8 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Match
 import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.set.field.match.SetFieldMatch;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.feature.prop.type.table.feature.prop.type.ApplySetfieldMiss;
 
-public class ApplySetfieldMissTablePropertySerializer extends AbstractTablePropertySerializer<ApplySetfieldMiss> implements SerializerRegistryInjector {
+public class ApplySetfieldMissTablePropertySerializer extends
+        AbstractTablePropertySerializer<ApplySetfieldMiss> implements SerializerRegistryInjector {
 
     private SerializerRegistry registry;
 
index 4767f79a3a626f66f33dbd5a66cecf2a1edd60b8..a16f2d215562ccf8361b610761d4668d7d44c3bf 100644 (file)
@@ -19,7 +19,8 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Match
 import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.set.field.match.SetFieldMatch;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.feature.prop.type.table.feature.prop.type.ApplySetfield;
 
-public class ApplySetfieldTablePropertySerializer extends AbstractTablePropertySerializer<ApplySetfield> implements SerializerRegistryInjector {
+public class ApplySetfieldTablePropertySerializer extends AbstractTablePropertySerializer<ApplySetfield> implements
+        SerializerRegistryInjector {
 
     private SerializerRegistry registry;
 
index 8f0c431ee303bb65162b0c6a573c01e3758d4c9f..ad855a0d96f1e66d1b8532a8e0ea392dac0929e3 100644 (file)
@@ -18,7 +18,8 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.Instru
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.TableFeaturesPropType;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.feature.prop.type.table.feature.prop.type.InstructionsMiss;
 
-public class InstructionsMissTablePropertySerializer extends AbstractTablePropertySerializer<InstructionsMiss> implements SerializerRegistryInjector {
+public class InstructionsMissTablePropertySerializer extends
+        AbstractTablePropertySerializer<InstructionsMiss> implements SerializerRegistryInjector {
 
     private SerializerRegistry registry;
 
index d58c23c457c72679e7a9af07da84a9d06b229a1b..b4ed106ce11b8499e2bb6c8ceb64879cbbb36add 100644 (file)
@@ -18,7 +18,8 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.Instru
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.TableFeaturesPropType;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.feature.prop.type.table.feature.prop.type.Instructions;
 
-public class InstructionsTablePropertySerializer extends AbstractTablePropertySerializer<Instructions> implements SerializerRegistryInjector {
+public class InstructionsTablePropertySerializer extends AbstractTablePropertySerializer<Instructions> implements
+        SerializerRegistryInjector {
 
     private SerializerRegistry registry;
 
index 06d5e5d3fa05c4915c56b7b0f8fc0e375391551e..4012f00571c460f868270debf23716191b34f657 100644 (file)
@@ -19,7 +19,8 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Match
 import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.set.field.match.SetFieldMatch;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.feature.prop.type.table.feature.prop.type.Match;
 
-public class MatchTablePropertySerializer extends AbstractTablePropertySerializer<Match> implements SerializerRegistryInjector {
+public class MatchTablePropertySerializer extends AbstractTablePropertySerializer<Match> implements
+        SerializerRegistryInjector {
 
     private SerializerRegistry registry;
 
index 9bc59530d9d6c4f4f3e31ff3f0d3f6960d087a0a..500d89f67cbb217467978f37bf7f227519aa6d98 100644 (file)
@@ -19,7 +19,8 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Match
 import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.set.field.match.SetFieldMatch;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.feature.prop.type.table.feature.prop.type.Wildcards;
 
-public class WildcardsTablePropertySerializer extends AbstractTablePropertySerializer<Wildcards> implements SerializerRegistryInjector {
+public class WildcardsTablePropertySerializer extends AbstractTablePropertySerializer<Wildcards> implements
+        SerializerRegistryInjector {
 
     private SerializerRegistry registry;
 
index 1c0d240ce3d399038ed479389eb08e252db23ca8..437aadbc36269d4766d183dd6f36c679d2a2a9f1 100644 (file)
@@ -18,7 +18,8 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.Acti
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.TableFeaturesPropType;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.feature.prop.type.table.feature.prop.type.WriteActionsMiss;
 
-public class WriteActionsMissTablePropertySerializer extends AbstractTablePropertySerializer<WriteActionsMiss> implements SerializerRegistryInjector {
+public class WriteActionsMissTablePropertySerializer extends
+        AbstractTablePropertySerializer<WriteActionsMiss> implements SerializerRegistryInjector {
 
     private SerializerRegistry registry;
 
index c0e96fd3ecb4d996f6115885e8675750786cdea0..5b9d2f3c9cc13f745891d1721533fd11a530cc66 100644 (file)
@@ -18,7 +18,8 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.Acti
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.TableFeaturesPropType;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.feature.prop.type.table.feature.prop.type.WriteActions;
 
-public class WriteActionsTablePropertySerializer extends AbstractTablePropertySerializer<WriteActions> implements SerializerRegistryInjector {
+public class WriteActionsTablePropertySerializer extends AbstractTablePropertySerializer<WriteActions> implements
+        SerializerRegistryInjector {
 
     private SerializerRegistry registry;
 
index bd64f146d33a5a3a3c24270a934c9ba699bc3a89..39a1d4ac949395dd9ee3b3b35efee98127f7f514 100644 (file)
@@ -19,7 +19,8 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Match
 import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.set.field.match.SetFieldMatch;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.feature.prop.type.table.feature.prop.type.WriteSetfieldMiss;
 
-public class WriteSetfieldMissTablePropertySerializer extends AbstractTablePropertySerializer<WriteSetfieldMiss> implements SerializerRegistryInjector {
+public class WriteSetfieldMissTablePropertySerializer extends
+        AbstractTablePropertySerializer<WriteSetfieldMiss> implements SerializerRegistryInjector {
 
     private SerializerRegistry registry;
 
index 043fe7e438f4565ff8e1883f948dc0266cff2cbc..b3605e7a8f8bb19fd5878a59eee96cd84995af7b 100644 (file)
@@ -19,7 +19,8 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Match
 import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.set.field.match.SetFieldMatch;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.feature.prop.type.table.feature.prop.type.WriteSetfield;
 
-public class WriteSetfieldTablePropertySerializer extends AbstractTablePropertySerializer<WriteSetfield> implements SerializerRegistryInjector {
+public class WriteSetfieldTablePropertySerializer extends AbstractTablePropertySerializer<WriteSetfield> implements
+        SerializerRegistryInjector {
 
     private SerializerRegistry registry;
 
index 7cb7188229656a44d872821e4b2339acb3020278..fa13526a7172a7cc9f8b5fb8dfcfb3a358258045 100644 (file)
@@ -28,13 +28,13 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
- * Utility class for action serialization
+ * Utility class for action serialization.
  */
 public class ActionUtil {
     private static final Logger LOG = LoggerFactory.getLogger(ActionUtil.class);
 
     /**
-     * Serialize OpenFlow action, using extension converter if available
+     * Serialize OpenFlow action, using extension converter if available.
      * TODO: Remove also extension converters
      *
      * @param action    OpenFlowPlugin action
@@ -46,34 +46,34 @@ public class ActionUtil {
     public static void writeAction(Action action, short version, SerializerRegistry registry, ByteBuf outBuffer) {
         try {
             Optional.ofNullable(OFSessionUtil.getExtensionConvertorProvider())
-                .flatMap(provider ->
-                    (GeneralExtensionGrouping.class.isInstance(action)
-                        ? convertExtensionGrouping(provider, action, version)
-                        : convertGenericAction(provider, action, version))
-                        .map(ofjAction -> {
-                            final OFSerializer<org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common
-                                .action.rev150203.actions.grouping.Action> serializer = registry
-                                .getSerializer(TypeKeyMakerFactory.createActionKeyMaker(version)
-                                    .make(ofjAction));
-
-                            serializer.serialize(ofjAction, outBuffer);
-                            return action;
-                        })
-                ).orElseGet(() -> {
-                final OFSerializer<Action> serializer = registry.getSerializer(
-                    new MessageTypeKey<>(
-                        version, (Class<? extends Action>) action.getImplementedInterface()));
-
-                serializer.serialize(action, outBuffer);
-                return action;
-            });
+                    .flatMap(provider ->
+                            (GeneralExtensionGrouping.class.isInstance(action)
+                                    ? convertExtensionGrouping(provider, action, version)
+                                    : convertGenericAction(provider, action, version))
+                                    .map(ofjAction -> {
+                                        final OFSerializer<org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common
+                                                .action.rev150203.actions.grouping.Action> serializer = registry
+                                                .getSerializer(TypeKeyMakerFactory.createActionKeyMaker(version)
+                                                        .make(ofjAction));
+
+                                        serializer.serialize(ofjAction, outBuffer);
+                                        return action;
+                                    })
+                    ).orElseGet(() -> {
+                        final OFSerializer<Action> serializer = registry.getSerializer(
+                                new MessageTypeKey<>(
+                                        version, (Class<? extends Action>) action.getImplementedInterface()));
+
+                        serializer.serialize(action, outBuffer);
+                        return action;
+                    });
         } catch (final IllegalStateException | ClassCastException e) {
             LOG.warn("Serializer for action {} for version {} not found.", action.getImplementedInterface(), version);
         }
     }
 
     /**
-     * Serialize OpenFlow action header, using extension converter if available
+     * Serialize OpenFlow action header, using extension converter if available.
      * TODO: Remove also extension converters
      *
      * @param action    OpenFlowPlugin action
@@ -85,39 +85,43 @@ public class ActionUtil {
     public static void writeActionHeader(Action action, short version, SerializerRegistry registry, ByteBuf outBuffer) {
         try {
             Optional.ofNullable(OFSessionUtil.getExtensionConvertorProvider())
-                .flatMap(provider ->
-                    (GeneralExtensionGrouping.class.isInstance(action)
-                        ? convertExtensionGrouping(provider, action, version)
-                        : convertGenericAction(provider, action, version))
-                        .map(ofjAction -> {
-                            final HeaderSerializer<org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common
-                                .action.rev150203.actions.grouping.Action> serializer = registry
-                                .getSerializer(TypeKeyMakerFactory.createActionKeyMaker(version)
-                                    .make(ofjAction));
-
-                            serializer.serializeHeader(ofjAction, outBuffer);
-                            return action;
-                        })
-                ).orElseGet(() -> {
-                final HeaderSerializer<Action> serializer = registry.getSerializer(
-                    new MessageTypeKey<>(
-                        version, (Class<? extends Action>) action.getImplementedInterface()));
-
-                serializer.serializeHeader(action, outBuffer);
-                return action;
-            });
+                    .flatMap(provider ->
+                            (GeneralExtensionGrouping.class.isInstance(action)
+                                    ? convertExtensionGrouping(provider, action, version)
+                                    : convertGenericAction(provider, action, version))
+                                    .map(ofjAction -> {
+                                        final HeaderSerializer<org.opendaylight.yang.gen.v1.urn.opendaylight.openflow
+                                                .common
+                                                .action.rev150203.actions.grouping.Action> serializer = registry
+                                                .getSerializer(TypeKeyMakerFactory.createActionKeyMaker(version)
+                                                        .make(ofjAction));
+
+                                        serializer.serializeHeader(ofjAction, outBuffer);
+                                        return action;
+                                    })
+                    ).orElseGet(() -> {
+                        final HeaderSerializer<Action> serializer = registry.getSerializer(
+                                new MessageTypeKey<>(
+                                        version, (Class<? extends Action>) action.getImplementedInterface()));
+
+                        serializer.serializeHeader(action, outBuffer);
+                        return action;
+                    });
         } catch (final IllegalStateException | ClassCastException e) {
-            LOG.warn("Header Serializer for action {} for version {} not found.", action.getImplementedInterface(), version);
+            LOG.warn("Header Serializer for action {} for version {} not found.", action.getImplementedInterface(),
+                    version);
         }
     }
 
     /**
-     * Try to convert action that implements #{@link org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.GeneralExtensionGrouping}
+     * Try to convert action that implements
+     * #{@link org.opendaylight.yang.gen.v1.urn
+     * .opendaylight.openflowplugin.extension.general.rev140714.GeneralExtensionGrouping}.
      * to OpenFlowJava action
      *
      * @param provider extension converter provider
-     * @param action OpenFlowPlugin action
-     * @param version OpenFlow version
+     * @param action   OpenFlowPlugin action
+     * @param version  OpenFlow version
      * @return optional OpenFlowJava action
      */
     private static Optional<org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.actions
@@ -134,11 +138,11 @@ public class ActionUtil {
     }
 
     /**
-     * Try to convert generic OpenFlowPlugin action to OpenFlowJava action
+     * Try to convert generic OpenFlowPlugin action to OpenFlowJava action.
      *
      * @param provider extension converter provider
-     * @param action OpenFlowPlugin action
-     * @param version OpenFlow version
+     * @param action   OpenFlowPlugin action
+     * @param version  OpenFlow version
      * @return optional OpenFlowJava action
      */
     @SuppressWarnings("unchecked")
index eb65b15222678fb93467deff4ae24f1448ac18a0..95cdb10e14cca685fab2fe20e818be4081f7485a 100644 (file)
@@ -8,7 +8,6 @@
 
 package org.opendaylight.openflowplugin.impl.protocol.serialization.util;
 
-
 import io.netty.buffer.ByteBuf;
 import org.opendaylight.openflowjava.protocol.api.extensibility.HeaderSerializer;
 import org.opendaylight.openflowjava.protocol.api.extensibility.OFSerializer;
@@ -17,12 +16,13 @@ import org.opendaylight.openflowjava.protocol.api.keys.MessageTypeKey;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.instruction.Instruction;
 
 /**
- * Utility class for instruction serialization
+ * Utility class for instruction serialization.
  */
 public class InstructionUtil {
 
     /**
-     * Serialize instruction
+     * Serialize instruction.
+     *
      * @param instruction OpenFlow instruction
      * @param version OpenFlow version
      * @param registry OpenFlowJava serializer registry
@@ -43,7 +43,8 @@ public class InstructionUtil {
 
 
     /**
-     * Serialize instruction header
+     * Serialize instruction header.
+     *
      * @param instruction OpenFlow instruction
      * @param version OpenFlow version
      * @param registry OpenFlowJava serializer registry
index 43a3450d40e6eba648e4bb78e9eb920bf156f74d..a1b5e19d7d11e95f39dda3e7201eca813d45b985 100644 (file)
@@ -154,7 +154,7 @@ public abstract class AbstractMultipartRequestOnTheFlyCallback<T extends OfHeade
                         deviceRegistry.getDeviceGroupRegistry());
                 break;
             default:
-                LOG.warn("Unsupported type {}", getMultipartType());
+                // no operation
         }
     }
 
@@ -185,7 +185,7 @@ public abstract class AbstractMultipartRequestOnTheFlyCallback<T extends OfHeade
                 deviceRegistry.getDeviceGroupRegistry().processMarks();
                 break;
             default:
-                LOG.warn("Unsupported type {}", getMultipartType());
+                // no operation
         }
     }