Merge "Make model/pom.xml inherit from odlparent-lite"
authorArunprakash D <d.arunprakash@ericsson.com>
Thu, 7 Nov 2019 05:45:32 +0000 (05:45 +0000)
committerGerrit Code Review <gerrit@opendaylight.org>
Thu, 7 Nov 2019 05:45:32 +0000 (05:45 +0000)
242 files changed:
applications/forwardingrules-manager/pom.xml
applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/DeviceMastershipManager.java
applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/ForwardingRulesManagerImpl.java
applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/nodeconfigurator/JobEntry.java
applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/nodeconfigurator/JobQueue.java
applications/forwardingrules-sync/pom.xml
applications/forwardingrules-sync/src/main/java/org/opendaylight/openflowplugin/applications/frsync/SemaphoreKeeper.java
applications/forwardingrules-sync/src/main/java/org/opendaylight/openflowplugin/applications/frsync/dao/FlowCapableNodeCachedDao.java
applications/forwardingrules-sync/src/main/java/org/opendaylight/openflowplugin/applications/frsync/dao/FlowCapableNodeDao.java
applications/forwardingrules-sync/src/main/java/org/opendaylight/openflowplugin/applications/frsync/dao/FlowCapableNodeOdlDao.java
applications/forwardingrules-sync/src/main/java/org/opendaylight/openflowplugin/applications/frsync/dao/FlowCapableNodeSnapshotDao.java
applications/forwardingrules-sync/src/main/java/org/opendaylight/openflowplugin/applications/frsync/impl/AbstractFrmSyncListener.java
applications/forwardingrules-sync/src/main/java/org/opendaylight/openflowplugin/applications/frsync/impl/SimplifiedConfigListener.java
applications/forwardingrules-sync/src/main/java/org/opendaylight/openflowplugin/applications/frsync/impl/SimplifiedOperationalListener.java
applications/forwardingrules-sync/src/main/java/org/opendaylight/openflowplugin/applications/frsync/util/FlowCapableNodeLookups.java
applications/forwardingrules-sync/src/main/java/org/opendaylight/openflowplugin/applications/frsync/util/SemaphoreKeeperGuavaImpl.java
applications/lldp-speaker/pom.xml
applications/lldp-speaker/src/main/java/org/opendaylight/openflowplugin/applications/lldpspeaker/LLDPUtil.java
applications/lldp-speaker/src/main/java/org/opendaylight/openflowplugin/applications/lldpspeaker/NodeConnectorInventoryEventTranslator.java
applications/reconciliation-framework/pom.xml
applications/reconciliation-framework/src/main/java/org/opendaylight/openflowplugin/applications/reconciliation/impl/ReconciliationManagerImpl.java
applications/southbound-cli/pom.xml
applications/southbound-cli/src/main/java/org/opendaylight/openflowplugin/applications/southboundcli/util/ShellUtil.java
applications/topology-lldp-discovery/pom.xml
applications/topology-lldp-discovery/src/main/java/org/opendaylight/openflowplugin/applications/topology/lldp/LLDPLinkAger.java
extension/openflowplugin-extension-nicira/pom.xml
extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/RegLoad2Convertor.java
libraries/liblldp/pom.xml
libraries/liblldp/src/main/java/org/opendaylight/openflowplugin/libraries/liblldp/BitBufferHelper.java
openflowjava/openflow-protocol-api/pom.xml
openflowjava/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/connection/DeviceRequestFailedException.java
openflowjava/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/connection/OutboundQueue.java
openflowjava/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/connection/OutboundQueueHandler.java
openflowjava/openflow-protocol-impl/pom.xml
openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/SwitchConnectionProviderImpl.java
openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/connection/AbstractConnectionAdapter.java
openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/connection/AbstractOutboundQueueManager.java
openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/connection/AbstractStackedOutboundQueue.java
openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/connection/StackedOutboundQueueNoBarrier.java
openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/VersionAssignableFactory.java
openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/connection/OutboundQueueEntryTest.java
openflowplugin-api/pom.xml
openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/OFPContext.java
openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/configuration/ConfigurationListener.java
openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/configuration/ConfigurationService.java
openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/device/DeviceManager.java
openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/device/RequestContext.java
openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/device/RequestContextStack.java
openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/device/handlers/MultiMsgCollector.java
openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/lifecycle/ContextChain.java
openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/lifecycle/ContextChainMastershipWatcher.java
openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/lifecycle/OwnershipChangeListener.java
openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/mastership/MastershipChangeService.java
openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/mastership/MastershipChangeServiceManager.java
openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/mastership/ReconciliationFrameworkEvent.java
openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/registry/flow/DeviceFlowRegistry.java
openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/role/RoleManager.java
openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/rpc/RpcManager.java
openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/statistics/StatisticsManager.java
openflowplugin-common/pom.xml
openflowplugin-common/src/main/java/org/opendaylight/openflowplugin/common/txchain/TransactionChainManager.java
openflowplugin-impl/pom.xml
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/common/MultipartReplyTranslatorUtil.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/common/MultipartRequestInputFactory.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/configuration/ConfigurationServiceFactoryImpl.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/connection/OutboundQueueProviderImpl.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/connection/listener/SystemNotificationsListenerImpl.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/device/DeviceContextImpl.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/device/DeviceManagerImpl.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/device/SimpleRatelimiter.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/device/initialization/AbstractDeviceInitializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/device/initialization/OF10DeviceInitializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/device/initialization/OF13DeviceInitializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/device/listener/MultiMsgCollectorImpl.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/lifecycle/ContextChainHolderImpl.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/lifecycle/ContextChainImpl.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/lifecycle/GuardedContextImpl.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/mastership/MastershipChangeServiceManagerImpl.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/mastership/MastershipServiceDelegate.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/mastership/ReconciliationFrameworkServiceDelegate.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/Ipv4DestinationEntryDeserializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/registry/flow/DeviceFlowRegistryImpl.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/registry/flow/FlowDescriptorFactory.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/registry/flow/FlowRegistryKeyFactory.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/registry/group/DeviceGroupRegistryImpl.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/registry/meter/DeviceMeterRegistryImpl.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/role/RoleContextImpl.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/role/RoleManagerImpl.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/rpc/RpcContextImpl.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/rpc/RpcManagerImpl.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/services/AbstractMultipartService.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/services/AbstractRequestCallback.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/services/AbstractService.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/services/AbstractSilentErrorService.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/StatisticsContextImpl.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/StatisticsManagerImpl.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/StatisticsPollingService.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/ofpspecific/MessageIntelligenceAgencyImpl.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/util/AddressNormalizationUtil.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/util/FlowUtil.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/util/MatchNormalizationUtil.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/util/MatchUtil.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/util/MdSalRegistrationUtils.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/util/NodeConnectorRefToPortTranslator.java
openflowplugin-it/src/test/java/org/opendaylight/openflowplugin/openflow/md/it/OFPluginFlowTest.java
openflowplugin/pom.xml
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/action/cases/OfToSalCopyTtlInCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/action/cases/OfToSalCopyTtlOutCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/action/cases/OfToSalDecMplsTtlCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/action/cases/OfToSalDecNwTtlCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/action/cases/OfToSalGroupCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/action/cases/OfToSalOutputActionCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/action/cases/OfToSalPopMplsCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/action/cases/OfToSalPopPbbCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/action/cases/OfToSalPopVlanCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/action/cases/OfToSalPushMplsCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/action/cases/OfToSalPushPbbCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/action/cases/OfToSalPushVlanCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/action/cases/OfToSalSetDlDstCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/action/cases/OfToSalSetDlSrcCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/action/cases/OfToSalSetFieldCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/action/cases/OfToSalSetMplsTtlCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/action/cases/OfToSalSetNwDstCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/action/cases/OfToSalSetNwSrcCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/action/cases/OfToSalSetNwTosCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/action/cases/OfToSalSetNwTtlCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/action/cases/OfToSalSetQueueCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/action/cases/OfToSalSetTpDstCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/action/cases/OfToSalSetTpSrcCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/action/cases/OfToSalSetVlanIdCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/action/cases/OfToSalSetVlanPcpCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/action/cases/OfToSalStripVlanCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/action/cases/SalToOfCopyTtlInCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/action/cases/SalToOfCopyTtlOutCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/action/cases/SalToOfDecMplsTtlCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/action/cases/SalToOfDecNwTtlCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/action/cases/SalToOfDropActionCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/action/cases/SalToOfGeneralExtensionGroupingCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/action/cases/SalToOfGroupActionCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/action/cases/SalToOfOutputActionCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/action/cases/SalToOfPopMplsActionCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/action/cases/SalToOfPopPbbActionCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/action/cases/SalToOfPopVlanActionCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/action/cases/SalToOfPopVlanActionV10Case.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/action/cases/SalToOfPushMplsActionCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/action/cases/SalToOfPushPbbActionCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/action/cases/SalToOfPushVlanActionCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/action/cases/SalToOfSetDlDstActionCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/action/cases/SalToOfSetDlDstActionV10Case.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/action/cases/SalToOfSetDlSrcActionCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/action/cases/SalToOfSetDlSrcActionV10Case.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/action/cases/SalToOfSetFieldCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/action/cases/SalToOfSetFieldV10Case.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/action/cases/SalToOfSetMplsTtlActionCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/action/cases/SalToOfSetNwDstActionCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/action/cases/SalToOfSetNwDstActionV10Case.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/action/cases/SalToOfSetNwSrcActionCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/action/cases/SalToOfSetNwSrcActionV10Case.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/action/cases/SalToOfSetNwTosActionCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/action/cases/SalToOfSetNwTosActionV10Case.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/action/cases/SalToOfSetNwTtlActionCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/action/cases/SalToOfSetQueueActionCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/action/cases/SalToOfSetTpDstActionCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/action/cases/SalToOfSetTpDstActionV10Case.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/action/cases/SalToOfSetTpSrcActionCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/action/cases/SalToOfSetTpSrcActionV10Case.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/action/cases/SalToOfSetVlanIdActionCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/action/cases/SalToOfSetVlanIdActionV10Case.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/action/cases/SalToOfSetVlanPcpActionCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/action/cases/SalToOfSetVlanPcpActionV10Case.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/action/cases/SalToOfStripVlanActionCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/action/cases/SalToOfStripVlanActionV10Case.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/action/cases/SalToOfVendorCodecCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/common/ConvertorCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/common/IpConversionUtil.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/flow/cases/ApplyActionsCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/flow/cases/ClearActionsCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/flow/cases/GoToTableCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/flow/cases/MeterCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/flow/cases/WriteActionsCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/flow/cases/WriteMetadataCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/MatchConvertorUtil.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/cases/OfToSalArpOpCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/cases/OfToSalArpShaCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/cases/OfToSalArpSpaCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/cases/OfToSalArpThaCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/cases/OfToSalArpTpaCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/cases/OfToSalEthDstCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/cases/OfToSalEthSrcCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/cases/OfToSalEthTypeCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/cases/OfToSalExperimenterIdCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/cases/OfToSalIcmpv4CodeCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/cases/OfToSalIcmpv4TypeCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/cases/OfToSalIcmpv6CodeCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/cases/OfToSalIcmpv6TypeCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/cases/OfToSalInPhyPortCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/cases/OfToSalInPortCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/cases/OfToSalIpDscpCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/cases/OfToSalIpEcnCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/cases/OfToSalIpProtoCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/cases/OfToSalIpv4DstCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/cases/OfToSalIpv4SrcCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/cases/OfToSalIpv6DstCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/cases/OfToSalIpv6ExthdrCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/cases/OfToSalIpv6FlabelCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/cases/OfToSalIpv6NdSllCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/cases/OfToSalIpv6NdTargetCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/cases/OfToSalIpv6NdTllCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/cases/OfToSalIpv6SrcCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/cases/OfToSalMetadataCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/cases/OfToSalMplsBosCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/cases/OfToSalMplsLabelCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/cases/OfToSalMplsTcCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/cases/OfToSalPacketTypeCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/cases/OfToSalPbbIsidCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/cases/OfToSalSctpDstCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/cases/OfToSalSctpSrcCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/cases/OfToSalTcpDstCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/cases/OfToSalTcpSrcCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/cases/OfToSalTunnelIdCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/cases/OfToSalTunnelIpv4DstCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/cases/OfToSalTunnelIpv4SrcCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/cases/OfToSalUdpDstCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/cases/OfToSalUdpSrcCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/cases/OfToSalVlanPcpCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/cases/OfToSalVlanVidCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/cases/SalToOfArpMatchCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/cases/SalToOfIpv4MatchArbitraryBitMaskCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/cases/SalToOfIpv4MatchCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/cases/SalToOfIpv6MatchArbitraryBitMaskCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/cases/SalToOfIpv6MatchCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/cases/SalToOfSctpMatchCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/cases/SalToOfTcpMatchCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/cases/SalToOfTunnelIpv4MatchCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/cases/SalToOfUdpMatchCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/util/ByteUtil.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/util/InventoryDataServiceUtil.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/util/OpenflowPortsUtil.java
samples/learning-switch/pom.xml
samples/learning-switch/src/main/java/org/opendaylight/openflowplugin/learningswitch/LearningSwitchHandlerSimpleImpl.java
samples/learning-switch/src/main/java/org/opendaylight/openflowplugin/learningswitch/WakeupOnNode.java
samples/learning-switch/src/main/java/org/opendaylight/openflowplugin/learningswitch/multi/MultipleLearningSwitchHandlerFacadeImpl.java

index 7dec34b697770486797c41d17c44555e8a12443d..677063e92a8460146031ec734b8151be8e7d6da6 100644 (file)
       <artifactId>javax.annotation-api</artifactId>
       <optional>true</optional>
     </dependency>
-    <dependency>
-      <groupId>com.google.code.findbugs</groupId>
-      <artifactId>jsr305</artifactId>
-      <version>3.0.2</version>
-      <optional>true</optional>
-    </dependency>
     <dependency>
       <groupId>org.opendaylight.mdsal</groupId>
       <artifactId>mdsal-binding-api</artifactId>
index d7fd461d46f3dbcb12ddbc2df086e77533d54d14..4194a540239fc9c6a47fd230335d4ef3b2b73ea6 100644 (file)
@@ -15,7 +15,7 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.mdsal.binding.api.ClusteredDataTreeChangeListener;
 import org.opendaylight.mdsal.binding.api.DataBroker;
 import org.opendaylight.mdsal.binding.api.DataObjectModification;
@@ -94,7 +94,7 @@ public class DeviceMastershipManager implements ClusteredDataTreeChangeListener<
     }
 
     @Override
-    public void onDataTreeChanged(@Nonnull final Collection<DataTreeModification<FlowCapableNode>> changes) {
+    public void onDataTreeChanged(@NonNull final Collection<DataTreeModification<FlowCapableNode>> changes) {
         Preconditions.checkNotNull(changes, "Changes may not be null!");
 
         for (DataTreeModification<FlowCapableNode> change : changes) {
@@ -211,7 +211,7 @@ public class DeviceMastershipManager implements ClusteredDataTreeChangeListener<
     }
 
     @Override
-    public void onBecomeOwner(@Nonnull final DeviceInfo deviceInfo) {
+    public void onBecomeOwner(@NonNull final DeviceInfo deviceInfo) {
         LOG.debug("Mastership role notification received for device : {}", deviceInfo.getDatapathId());
         DeviceMastership membership = deviceMasterships.computeIfAbsent(deviceInfo.getNodeId(),
             device -> new DeviceMastership(deviceInfo.getNodeId()));
@@ -220,7 +220,7 @@ public class DeviceMastershipManager implements ClusteredDataTreeChangeListener<
     }
 
     @Override
-    public void onLoseOwnership(@Nonnull final DeviceInfo deviceInfo) {
+    public void onLoseOwnership(@NonNull final DeviceInfo deviceInfo) {
         final DeviceMastership mastership = deviceMasterships.remove(deviceInfo.getNodeId());
         if (mastership != null) {
             mastership.deregisterReconciliationRpc();
index 0803b8ef59405e4f8864d3f9c75aa0d892f6796b..db6da55a5b28038055a71d98fc0c91229721573f 100644 (file)
@@ -13,12 +13,12 @@ import com.google.common.util.concurrent.ListenableFuture;
 import java.util.Optional;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.atomic.AtomicLong;
-import javax.annotation.Nonnull;
 import javax.annotation.PostConstruct;
 import javax.annotation.PreDestroy;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import org.apache.aries.blueprint.annotation.service.Reference;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.mdsal.binding.api.DataBroker;
 import org.opendaylight.mdsal.binding.api.ReadTransaction;
 import org.opendaylight.mdsal.binding.api.RpcConsumerRegistry;
@@ -363,7 +363,7 @@ public class ForwardingRulesManagerImpl implements ForwardingRulesManager {
     }
 
     @Override
-    public void onPropertyChanged(@Nonnull final String propertyName, @Nonnull final String propertyValue) {
+    public void onPropertyChanged(@NonNull final String propertyName, @NonNull final String propertyValue) {
         final ForwardingRulesProperty forwardingRulesProperty = ForwardingRulesProperty.forValue(propertyName);
         if (forwardingRulesProperty != null) {
             switch (forwardingRulesProperty) {
index 76ccaabf76db733f9ee4648129a92b9bcf360dcb..116fbf7b4c2cf936caa5714f02d09f19261c30fc 100644 (file)
@@ -10,7 +10,7 @@ package org.opendaylight.openflowplugin.applications.frm.nodeconfigurator;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.SettableFuture;
 import java.util.concurrent.Callable;
-import javax.annotation.Nullable;
+import org.eclipse.jdt.annotation.Nullable;
 
 /**
  * JobEntry is the entity built per job submitted by the application and
index 77528fd1ae4778099e25fe44058e5ada7daae5dc..4490e69490078295659997adb5c85a4c08d699b6 100644 (file)
@@ -10,7 +10,7 @@ package org.opendaylight.openflowplugin.applications.frm.nodeconfigurator;
 import com.google.common.base.MoreObjects;
 import java.util.Queue;
 import java.util.concurrent.ConcurrentLinkedQueue;
-import javax.annotation.Nullable;
+import org.eclipse.jdt.annotation.Nullable;
 
 /**
  * A queue which holds job entries and the current running job.
index cb768d82f3522d7874459d03237b42bd01adc588..f1c3843a690520485faf9b87660a4203e2c4af0f 100644 (file)
             <artifactId>javax.annotation-api</artifactId>
             <optional>true</optional>
         </dependency>
-        <dependency>
-            <groupId>com.google.code.findbugs</groupId>
-            <artifactId>jsr305</artifactId>
-            <version>3.0.2</version>
-            <optional>true</optional>
-        </dependency>
 
         <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
index e74f89fc29ff4290d875ab31c99e5213595d7f12..42c775e7cb4f19b5d2f4dc6ce77131cff0ee8cc9 100644 (file)
@@ -8,8 +8,8 @@
 package org.opendaylight.openflowplugin.applications.frsync;
 
 import java.util.concurrent.Semaphore;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.Nullable;
 
 /**
  * Key based semaphore provider.
@@ -22,14 +22,14 @@ public interface SemaphoreKeeper<K> {
      * @param key semaphore identifier
      * @return new or existing semaphore for given key, for one key there is always only one semaphore available
      */
-    Semaphore summonGuard(@Nonnull K key);
+    Semaphore summonGuard(@NonNull K key);
 
     /**
      * Get guard and lock for key.
      * @param key for which guard should be created and acquired
      * @return semaphore guard
      */
-    Semaphore summonGuardAndAcquire(@Nonnull K key);
+    Semaphore summonGuardAndAcquire(@NonNull K key);
 
     /**
      * Unlock and release guard.
index 19a0543f76ad0c4f4ba154a19960d0e7eb53bd15..2fb9721fb6f9b02f79519ffea577800701b1a56b 100644 (file)
@@ -8,7 +8,7 @@
 package org.opendaylight.openflowplugin.applications.frsync.dao;
 
 import java.util.Optional;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.FlowCapableNode;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeId;
 
@@ -27,7 +27,7 @@ public class FlowCapableNodeCachedDao implements FlowCapableNodeDao {
     }
 
     @Override
-    public Optional<FlowCapableNode> loadByNodeId(@Nonnull NodeId nodeId) {
+    public Optional<FlowCapableNode> loadByNodeId(@NonNull NodeId nodeId) {
         final Optional<FlowCapableNode> node = snapshotDao.loadByNodeId(nodeId);
 
         if (node.isPresent()) {
index 9baf1d52c92aca6d2c31ad607fb3a1ca874b1b61..7182477f066eac51e517d2b937efafa2fc1effb6 100644 (file)
@@ -8,7 +8,7 @@
 package org.opendaylight.openflowplugin.applications.frsync.dao;
 
 import java.util.Optional;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.FlowCapableNode;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeId;
 
@@ -16,5 +16,5 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeId;
  * Data access object for {@link FlowCapableNode}.
  */
 public interface FlowCapableNodeDao {
-    Optional<FlowCapableNode> loadByNodeId(@Nonnull NodeId nodeId);
+    Optional<FlowCapableNode> loadByNodeId(@NonNull NodeId nodeId);
 }
index 67b0bfe8bc1f379ae97832eabc534c9a59f012a5..69074adec28036a4b6fa738e805fff88fc14fb21 100644 (file)
@@ -11,7 +11,7 @@ import java.util.Optional;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.mdsal.binding.api.DataBroker;
 import org.opendaylight.mdsal.binding.api.ReadTransaction;
 import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
@@ -41,7 +41,7 @@ public class FlowCapableNodeOdlDao implements FlowCapableNodeDao {
     }
 
     @Override
-    public Optional<FlowCapableNode> loadByNodeId(@Nonnull NodeId nodeId) {
+    public Optional<FlowCapableNode> loadByNodeId(@NonNull NodeId nodeId) {
         try (ReadTransaction roTx = dataBroker.newReadOnlyTransaction()) {
             final InstanceIdentifier<FlowCapableNode> path =
                     NODES_IID.child(Node.class, new NodeKey(nodeId)).augmentation(FlowCapableNode.class);
index 76805af1a089399a1371c1e22ef1ab29e6e78803..e362ff52971b8478668384353c6a5623c52c2541 100644 (file)
@@ -9,7 +9,7 @@ package org.opendaylight.openflowplugin.applications.frsync.dao;
 
 import java.util.Optional;
 import java.util.concurrent.ConcurrentHashMap;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.FlowCapableNode;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeId;
 
@@ -20,7 +20,7 @@ public class FlowCapableNodeSnapshotDao implements FlowCapableNodeDao {
 
     private final ConcurrentHashMap<String, FlowCapableNode> cache = new ConcurrentHashMap<>();
 
-    public void updateCache(@Nonnull NodeId nodeId, Optional<FlowCapableNode> dataAfter) {
+    public void updateCache(@NonNull NodeId nodeId, Optional<FlowCapableNode> dataAfter) {
         if (dataAfter.isPresent()) {
             cache.put(nodeId.getValue(), dataAfter.get());
         } else {
@@ -29,7 +29,7 @@ public class FlowCapableNodeSnapshotDao implements FlowCapableNodeDao {
     }
 
     @Override
-    public Optional<FlowCapableNode> loadByNodeId(@Nonnull NodeId nodeId) {
+    public Optional<FlowCapableNode> loadByNodeId(@NonNull NodeId nodeId) {
         final FlowCapableNode node = cache.get(nodeId.getValue());
         return Optional.ofNullable(node);
     }
index 0dfc60a470d3c5607a79387bb23a3595e28a9117..102a17672d457ede89c694bcaf0567fdc387e825 100644 (file)
@@ -13,7 +13,7 @@ import java.util.Optional;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.mdsal.binding.api.DataTreeModification;
 import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
 import org.opendaylight.openflowplugin.applications.frsync.NodeListener;
@@ -31,7 +31,7 @@ public abstract class AbstractFrmSyncListener<T extends DataObject> implements N
     private static final Logger LOG = LoggerFactory.getLogger(AbstractFrmSyncListener.class);
 
     @Override
-    public void onDataTreeChanged(@Nonnull final Collection<DataTreeModification<T>> modifications) {
+    public void onDataTreeChanged(@NonNull final Collection<DataTreeModification<T>> modifications) {
         for (DataTreeModification<T> modification : modifications) {
             final NodeId nodeId = PathUtil.digNodeId(modification.getRootPath().getRootIdentifier());
             if (LOG.isTraceEnabled()) {
index 595a85d27f82f0413592036d9bc3f31390890e23..fecc2ec2fd1751f60bb6d8b363becb76502f28f6 100644 (file)
@@ -10,7 +10,7 @@ package org.opendaylight.openflowplugin.applications.frsync.impl;
 import com.google.common.util.concurrent.ListenableFuture;
 import java.util.Collection;
 import java.util.Optional;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.mdsal.binding.api.DataObjectModification;
 import org.opendaylight.mdsal.binding.api.DataTreeModification;
 import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
@@ -44,7 +44,7 @@ public class SimplifiedConfigListener extends AbstractFrmSyncListener<FlowCapabl
     }
 
     @Override
-    public void onDataTreeChanged(@Nonnull final Collection<DataTreeModification<FlowCapableNode>> modifications) {
+    public void onDataTreeChanged(@NonNull final Collection<DataTreeModification<FlowCapableNode>> modifications) {
         super.onDataTreeChanged(modifications);
     }
 
index 2fd114d6865f3ce6b8fe87cb8771c5869999522b..08dee38766a6fcdf1b8313684f6a50ea85d0f080 100644 (file)
@@ -14,7 +14,7 @@ import java.util.Collection;
 import java.util.Date;
 import java.util.List;
 import java.util.Optional;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.mdsal.binding.api.DataObjectModification;
 import org.opendaylight.mdsal.binding.api.DataTreeModification;
 import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
@@ -64,7 +64,7 @@ public class SimplifiedOperationalListener extends AbstractFrmSyncListener<Node>
     }
 
     @Override
-    public void onDataTreeChanged(@Nonnull final Collection<DataTreeModification<Node>> modifications) {
+    public void onDataTreeChanged(@NonNull final Collection<DataTreeModification<Node>> modifications) {
         super.onDataTreeChanged(modifications);
     }
 
index f36be7d814f62c2821cf9479206a5ee2edd1596c..9fdb17d070eeadf4c803a9ab66480a70457ff910 100644 (file)
@@ -11,8 +11,8 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.Nullable;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.FlowCapableNode;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.meters.Meter;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.tables.Table;
@@ -35,7 +35,7 @@ public final class FlowCapableNodeLookups {
         throw new IllegalAccessError("non instantiable util class");
     }
 
-    @Nonnull
+    @NonNull
     public static Map<Uint8, Table> wrapTablesToMap(@Nullable final List<Table> tables) {
         final Map<Uint8, Table> tableMap;
 
@@ -52,7 +52,7 @@ public final class FlowCapableNodeLookups {
         return tableMap;
     }
 
-    @Nonnull
+    @NonNull
     public static Map<FlowDescriptor, Flow> wrapFlowsToMap(@Nullable final List<Flow> flows) {
         final Map<FlowDescriptor, Flow> flowMap;
 
@@ -73,7 +73,7 @@ public final class FlowCapableNodeLookups {
         return flowConfigMap.get(new FlowDescriptor(flow));
     }
 
-    @Nonnull
+    @NonNull
     public static Map<MeterId, Meter> wrapMetersToMap(@Nullable final List<Meter> meters) {
         final Map<MeterId, Meter> meterMap;
 
@@ -90,7 +90,7 @@ public final class FlowCapableNodeLookups {
         return meterMap;
     }
 
-    @Nonnull
+    @NonNull
     public static Map<Uint32, Group> wrapGroupsToMap(@Nullable final List<Group> groups) {
         final Map<Uint32, Group> groupMap;
 
index 9f8fad3db516b79b799503dd70f8f0b52882cc23..c9b714e78718b254781be46699516bd6e6c9af55 100644 (file)
@@ -12,8 +12,8 @@ import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.CacheLoader;
 import com.google.common.cache.LoadingCache;
 import java.util.concurrent.Semaphore;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.Nullable;
 import org.opendaylight.openflowplugin.applications.frsync.SemaphoreKeeper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -36,12 +36,12 @@ public class SemaphoreKeeperGuavaImpl<K> implements SemaphoreKeeper<K> {
     }
 
     @Override
-    public Semaphore summonGuard(@Nonnull final K key) {
+    public Semaphore summonGuard(@NonNull final K key) {
         return semaphoreCache.getUnchecked(key);
     }
 
     @Override
-    public Semaphore summonGuardAndAcquire(@Nonnull final K key) {
+    public Semaphore summonGuardAndAcquire(@NonNull final K key) {
         final Semaphore guard = Preconditions.checkNotNull(summonGuard(key), "Guard not available for " + key);
         try {
             guard.acquire();
index 972e3428dd066fb126e2c4b23c19080d6acf40b4..71cf32867afae5965a0aeff6ffc26d53a2a6d9ee 100644 (file)
             <artifactId>javax.annotation-api</artifactId>
             <optional>true</optional>
         </dependency>
-        <dependency>
-            <groupId>com.google.code.findbugs</groupId>
-            <artifactId>jsr305</artifactId>
-            <version>3.0.2</version>
-            <optional>true</optional>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.openflowplugin</groupId>
             <artifactId>openflowplugin-api</artifactId>
index 91c8743639d7b214ed4fdbf69322771255ca84d6..a087dd67d59c578913db72afbc657f1948e7dbb1 100644 (file)
@@ -11,7 +11,7 @@ import static org.opendaylight.openflowplugin.applications.topology.lldp.utils.L
 
 import com.google.common.base.Strings;
 import java.math.BigInteger;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowplugin.libraries.liblldp.EtherTypes;
 import org.opendaylight.openflowplugin.libraries.liblldp.Ethernet;
 import org.opendaylight.openflowplugin.libraries.liblldp.HexEncode;
@@ -36,7 +36,7 @@ public final class LLDPUtil {
     private LLDPUtil() {
     }
 
-    @Nonnull
+    @NonNull
     static byte[] buildLldpFrame(final NodeId nodeId, final NodeConnectorId nodeConnectorId, final MacAddress src,
             final Uint32 outPortNo, final MacAddress destinationAddress)
                     throws PacketException {
@@ -102,7 +102,7 @@ public final class LLDPUtil {
         return ethPkt.serialize();
     }
 
-    @Nonnull
+    @NonNull
     static byte[] buildLldpFrame(final NodeId nodeId, final NodeConnectorId nodeConnectorId,
             final MacAddress srcMacAddress, final Uint32 outputPortNo) throws PacketException {
         return buildLldpFrame(nodeId, nodeConnectorId, srcMacAddress, outputPortNo, null);
index dd0244e83c557acd7e5a0a45b7ad83a555be9483..5534f6967dbb6aa5ab38eeec1eb50551cfc68618 100644 (file)
@@ -13,7 +13,7 @@ import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.mdsal.binding.api.ClusteredDataTreeChangeListener;
 import org.opendaylight.mdsal.binding.api.DataBroker;
 import org.opendaylight.mdsal.binding.api.DataTreeChangeListener;
@@ -93,7 +93,7 @@ public class NodeConnectorInventoryEventTranslator<T extends DataObject>
     }
 
     @Override
-    public void onDataTreeChanged(@Nonnull Collection<DataTreeModification<T>> modifications) {
+    public void onDataTreeChanged(@NonNull Collection<DataTreeModification<T>> modifications) {
         for (DataTreeModification modification : modifications) {
             LOG.trace("Node connectors in inventory changed -> {}", modification.getRootNode().getModificationType());
             switch (modification.getRootNode().getModificationType()) {
index 497405fe43f24b52b0b7308a0352117c2befa0c3..1ef4016643d1c0e33468642d5f708b75c4f61060 100644 (file)
             <artifactId>blueprint-maven-plugin-annotation</artifactId>
             <optional>true</optional>
         </dependency>
-        <dependency>
-            <groupId>com.google.code.findbugs</groupId>
-            <artifactId>jsr305</artifactId>
-            <version>3.0.2</version>
-            <optional>true</optional>
-        </dependency>
     </dependencies>
 
     <build>
index 14b28a585898394b4be2865555d65bf361096fa5..3760223f6355bf693ee1305f06b7b0a91d1c1744 100644 (file)
@@ -20,13 +20,13 @@ import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentSkipListMap;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Collectors;
-import javax.annotation.Nonnull;
 import javax.annotation.PostConstruct;
 import javax.annotation.PreDestroy;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import org.apache.aries.blueprint.annotation.service.Reference;
 import org.apache.aries.blueprint.annotation.service.Service;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowplugin.api.openflow.device.DeviceInfo;
 import org.opendaylight.openflowplugin.api.openflow.mastership.MastershipChangeException;
 import org.opendaylight.openflowplugin.api.openflow.mastership.MastershipChangeServiceManager;
@@ -103,13 +103,13 @@ public class ReconciliationManagerImpl implements ReconciliationManager, Reconci
     }
 
     @Override
-    public ListenableFuture<ResultState> onDevicePrepared(@Nonnull DeviceInfo node) {
+    public ListenableFuture<ResultState> onDevicePrepared(@NonNull DeviceInfo node) {
         LOG.debug("Triggering reconciliation for node : {}", node.getNodeId());
         return futureMap.computeIfAbsent(node, value -> reconcileNode(node));
     }
 
     @Override
-    public ListenableFuture<Void> onDeviceDisconnected(@Nonnull DeviceInfo node) {
+    public ListenableFuture<Void> onDeviceDisconnected(@NonNull DeviceInfo node) {
         LOG.info("Stopping reconciliation for node {}", node.getNodeId());
         if (futureMap.containsKey(node)) {
             return cancelNodeReconciliation(node);
index 9b94f7d91440fe172d6ccb90986a906015e19ace..166c4c150fdceb72ccf635a755636c55d23f3256 100644 (file)
             <artifactId>javax.annotation-api</artifactId>
             <optional>true</optional>
         </dependency>
-        <dependency>
-            <groupId>com.google.code.findbugs</groupId>
-            <artifactId>jsr305</artifactId>
-            <version>3.0.2</version>
-            <optional>true</optional>
-        </dependency>
     </dependencies>
 
 </project>
index 731d27b68e3228a2d510b64d9eaed705d450ba24..fc43de58bdc7c2279d67b39e37f8b41ea2b47b81 100644 (file)
@@ -13,7 +13,7 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
 import java.util.concurrent.ExecutionException;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.mdsal.binding.api.DataBroker;
 import org.opendaylight.mdsal.binding.api.ReadTransaction;
 import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
@@ -38,7 +38,7 @@ public final class ShellUtil {
     private ShellUtil() {
     }
 
-    @Nonnull
+    @NonNull
     public static List<OFNode> getAllNodes(final DataBroker broker) {
         List<Node> nodes = null;
         InstanceIdentifier<Nodes> path = InstanceIdentifier.builder(Nodes.class).build();
index da9afd5054a59a01316c0e65849c1603263c1de4..c97a0d7ebe8cad793b08416bd3a81440652b9e7a 100644 (file)
       <groupId>org.apache.aries.blueprint</groupId>
       <artifactId>blueprint-maven-plugin-annotation</artifactId>
       <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>com.google.code.findbugs</groupId>
-      <artifactId>jsr305</artifactId>
-      <version>3.0.2</version>
-      <optional>true</optional>
     </dependency>
       <dependency>
           <groupId>org.opendaylight.openflowplugin</groupId>
index 5d4bdbfe26fe321759a6116921a1f7eed083f6f1..c6a38365cefbd9c5d3b796e3fc5a0726b0d33d23 100644 (file)
@@ -15,7 +15,6 @@ import java.util.Map.Entry;
 import java.util.Timer;
 import java.util.TimerTask;
 import java.util.concurrent.ConcurrentHashMap;
-import javax.annotation.Nonnull;
 import javax.annotation.PreDestroy;
 import javax.inject.Inject;
 import javax.inject.Singleton;
@@ -134,7 +133,7 @@ public class LLDPLinkAger implements ConfigurationListener, ClusteredDataTreeCha
     }
 
     @Override
-    public void onPropertyChanged(@Nonnull final String propertyName, @Nonnull final String propertyValue) {
+    public void onPropertyChanged(@NonNull final String propertyName, @NonNull final String propertyValue) {
         final TopologyLLDPDiscoveryProperty lldpDiscoveryProperty = TopologyLLDPDiscoveryProperty.forValue(
                 propertyName);
         if (lldpDiscoveryProperty != null) {
index 73676354975cc16d63cfd155fd8541ba396bcef8..9da6f046c2ee6feaa23b526d83993b212b85a4d2 100644 (file)
             <artifactId>javax.annotation-api</artifactId>
             <optional>true</optional>
         </dependency>
-        <dependency>
-            <groupId>com.google.code.findbugs</groupId>
-            <artifactId>jsr305</artifactId>
-            <version>3.0.2</version>
-            <optional>true</optional>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>openflowplugin-extension-api</artifactId>
index 397b626cdbd17655c20b025edfc9d4d53c273fd3..ab9997f6cae549e332b847367d290584648cb1c3 100644 (file)
@@ -12,7 +12,7 @@ import com.google.common.base.Preconditions;
 import com.google.common.math.LongMath;
 import java.math.RoundingMode;
 import java.util.Collections;
-import javax.annotation.Nullable;
+import org.eclipse.jdt.annotation.Nullable;
 import org.opendaylight.openflowjava.nx.codec.match.NiciraMatchCodecs;
 import org.opendaylight.openflowplugin.extension.api.ConvertorActionFromOFJava;
 import org.opendaylight.openflowplugin.extension.api.ConvertorActionToOFJava;
index e1cd411f839a03686eea1faea76c0f4a87e133c4..9bbeac64fae55a59ce410ac5dbee8c10437ee093 100644 (file)
       <groupId>javax.xml.bind</groupId>
       <artifactId>jaxb-api</artifactId>
     </dependency>
-    <dependency>
-      <groupId>com.google.code.findbugs</groupId>
-      <artifactId>jsr305</artifactId>
-      <version>3.0.2</version>
-      <optional>true</optional>
-    </dependency>
   </dependencies>
 
   <build>
index 7522b4ed637c2359a891cf59e464a9d196f9ed1a..d3bcb1c3fdf6303b230a409298d2908cd30b7587 100644 (file)
@@ -8,7 +8,7 @@
 package org.opendaylight.openflowplugin.libraries.liblldp;
 
 import java.util.Arrays;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -163,7 +163,7 @@ public abstract class BitBufferHelper {
      *             when the startOffset and numBits parameters are not congruent
      *             with the data buffer size
      */
-    @Nonnull
+    @NonNull
     public static byte[] getBits(final byte[] data, final int startOffset, final int numBits) throws BufferException {
         int startByteOffset;
         int extranumBits = numBits % NetUtils.NUM_BITS_IN_A_BYTE;
index fc6f26653d3829b1e3c40324581fc97bb563fc37..8d92e18c7a36cade7bc0d007c429ffdd48c9d9d6 100644 (file)
             <version>${infrautils.version}</version>
             <scope>compile</scope>
         </dependency>
-        <dependency>
-            <groupId>com.google.code.findbugs</groupId>
-            <artifactId>jsr305</artifactId>
-            <version>3.0.2</version>
-            <optional>true</optional>
-        </dependency>
     </dependencies>
 </project>
index 17f83239847d5d0e17700401f40056ad694240f1..e5df8529e7494aa56ad70ee277531c34c6371c6f 100644 (file)
@@ -8,7 +8,7 @@
 package org.opendaylight.openflowjava.protocol.api.connection;
 
 import com.google.common.base.Preconditions;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.Error;
 
 /**
@@ -19,17 +19,17 @@ public class DeviceRequestFailedException extends OutboundQueueException {
     private static final long serialVersionUID = 1L;
     private final transient Error error;
 
-    public DeviceRequestFailedException(final String message, @Nonnull final Error error) {
+    public DeviceRequestFailedException(final String message, @NonNull final Error error) {
         super(message);
         this.error = Preconditions.checkNotNull(error);
     }
 
-    public DeviceRequestFailedException(final String message, @Nonnull final Error error, final Throwable cause) {
+    public DeviceRequestFailedException(final String message, @NonNull final Error error, final Throwable cause) {
         super(message, cause);
         this.error = Preconditions.checkNotNull(error);
     }
 
-    @Nonnull public Error getError() {
+    @NonNull public Error getError() {
         return error;
     }
 }
index 0ce24cf9023dcb94cd4478bc486d45e8e930b481..250cc8b08bfc9e73533024ced8513ab9175916d1 100644 (file)
@@ -10,8 +10,8 @@ package org.opendaylight.openflowjava.protocol.api.connection;
 import com.google.common.annotations.Beta;
 import com.google.common.util.concurrent.FutureCallback;
 import java.util.function.Function;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.Nullable;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.OfHeader;
 
 @Beta
@@ -48,7 +48,7 @@ public interface OutboundQueue {
      * @throws IllegalArgumentException if the slot is already committed or was never reserved.
      */
     void commitEntry(
-            @Nonnull Long xid,
+            @NonNull Long xid,
             @Nullable OfHeader message,
             @Nullable FutureCallback<OfHeader> callback);
 
@@ -79,7 +79,7 @@ public interface OutboundQueue {
      * @throws IllegalArgumentException if the slot is already committed or was never reserved.
      */
     void commitEntry(
-            @Nonnull Long xid,
+            @NonNull Long xid,
             @Nullable OfHeader message,
             @Nullable FutureCallback<OfHeader> callback,
             @Nullable Function<OfHeader, Boolean> isComplete);
index 08007985f2e8039ff905b2fdc360f794f0dc4d64..a345fbb9be8408bdcb615655eba67e657132266d 100644 (file)
@@ -8,7 +8,7 @@
 package org.opendaylight.openflowjava.protocol.api.connection;
 
 import com.google.common.annotations.Beta;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.BarrierInput;
 
 /**
@@ -25,7 +25,7 @@ public interface OutboundQueueHandler {
      * @param xid XID for the barrier message
      * @return New barrier message.
      */
-    @Nonnull BarrierInput createBarrierRequest(@Nonnull Long xid);
+    @NonNull BarrierInput createBarrierRequest(@NonNull Long xid);
 
     /**
      * Invoked whenever the underlying queue is refreshed. Implementations should
index 8cf2d0a0887420a9fc777dff27c87199e9a5123c..d6ff50a8ea05d064b2260660e4704c405f746f5a 100644 (file)
             <!-- Explicitly bring in the linux classifier, test may fail on 32-bit linux -->
             <classifier>linux-x86_64</classifier>
         </dependency>
-        <dependency>
-            <groupId>com.google.code.findbugs</groupId>
-            <artifactId>jsr305</artifactId>
-            <version>3.0.2</version>
-            <optional>true</optional>
-        </dependency>
     </dependencies>
 </project>
index 212b59e3e6e0100fe7dc408f9fc2553a3ade7dfb..6314d59c4a1e0eb874a852ea7111e4c69fe70b46 100755 (executable)
@@ -16,7 +16,7 @@ import com.google.common.util.concurrent.ListeningExecutorService;
 import com.google.common.util.concurrent.MoreExecutors;
 import io.netty.channel.EventLoopGroup;
 import io.netty.channel.epoll.Epoll;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import org.eclipse.jdt.annotation.Nullable;
 import org.opendaylight.infrautils.diagstatus.ServiceState;
 import org.opendaylight.infrautils.utils.concurrent.Executors;
 import org.opendaylight.openflowjava.protocol.api.connection.ConnectionConfiguration;
index 311fca4d473a613205454aa8aa7e190a988933b7..a07725951e0aeefb2468873fdddaa2643fb4617d 100644 (file)
@@ -22,8 +22,8 @@ import java.net.InetSocketAddress;
 import java.util.concurrent.Future;
 import java.util.concurrent.RejectedExecutionException;
 import java.util.concurrent.TimeUnit;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.Nullable;
 import org.opendaylight.openflowjava.protocol.api.connection.ConnectionAdapter;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.BarrierInput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.BarrierOutput;
@@ -99,7 +99,7 @@ abstract class AbstractConnectionAdapter implements ConnectionAdapter {
     protected Cache<RpcResponseKey, ResponseExpectedRpcListener<?>> responseCache;
 
 
-    AbstractConnectionAdapter(@Nonnull final Channel channel, @Nullable final InetSocketAddress address,
+    AbstractConnectionAdapter(@NonNull final Channel channel, @Nullable final InetSocketAddress address,
                               @Nullable final int channelOutboundQueueSize) {
         this.channel = Preconditions.checkNotNull(channel);
         this.address = address;
index 927d7310f620e512181f03ac1965dc2e704b191f..f07895b44b902858a04496338b94e1283d1d334c 100644 (file)
@@ -17,7 +17,7 @@ import java.math.BigInteger;
 import java.net.InetSocketAddress;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowjava.protocol.api.connection.OutboundQueueHandler;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.EchoReplyInput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.EchoReplyInputBuilder;
@@ -260,7 +260,7 @@ abstract class AbstractOutboundQueueManager<T extends OutboundQueueHandler, O ex
      * which is send to OFEncoder for serialization. Correct wrapper is
      * selected by communication pipeline.
      */
-    protected Object makeMessageListenerWrapper(@Nonnull final OfHeader msg) {
+    protected Object makeMessageListenerWrapper(@NonNull final OfHeader msg) {
         Preconditions.checkArgument(msg != null);
 
         if (address == null) {
index 92ef79bd3490f5389cd699411dad2fd76ed907e9..8cdc59aa2e993979290855990a4a719261492873 100644 (file)
@@ -16,8 +16,9 @@ import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicLongFieldUpdater;
-import javax.annotation.Nonnull;
-import javax.annotation.concurrent.GuardedBy;
+import org.checkerframework.checker.lock.qual.GuardedBy;
+import org.checkerframework.checker.lock.qual.Holding;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowjava.protocol.api.connection.OutboundQueue;
 import org.opendaylight.openflowjava.protocol.api.connection.OutboundQueueException;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.OfHeader;
@@ -60,7 +61,7 @@ abstract class AbstractStackedOutboundQueue implements OutboundQueue {
         commitEntry(xid, message, callback, OutboundQueueEntry.DEFAULT_IS_COMPLETE);
     }
 
-    @GuardedBy("unflushedSegments")
+    @Holding("unflushedSegments")
     protected void ensureSegment(final StackedSegment first, final int offset) {
         final int segmentOffset = offset / StackedSegment.SEGMENT_SIZE;
         LOG.debug("Queue {} slow offset {} maps to {} segments {}", this, offset, segmentOffset,
@@ -125,7 +126,7 @@ abstract class AbstractStackedOutboundQueue implements OutboundQueue {
      * @param now time stamp
      * @return Number of entries written out
      */
-    int writeEntries(@Nonnull final Channel channel, final long now) {
+    int writeEntries(@NonNull final Channel channel, final long now) {
         // Local cache
         StackedSegment segment = firstSegment;
         int entries = 0;
index faddce6f8fec4877f154fb76ac310c74c19f871d..119a5438f6a3396af5755cec5b2e5b6ffa0d0ec0 100644 (file)
@@ -11,7 +11,7 @@ package org.opendaylight.openflowjava.protocol.impl.core.connection;
 import com.google.common.util.concurrent.FutureCallback;
 import io.netty.channel.Channel;
 import java.util.function.Function;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.FlowModInput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.OfHeader;
 import org.slf4j.Logger;
@@ -49,7 +49,7 @@ public class StackedOutboundQueueNoBarrier extends AbstractStackedOutboundQueue
     }
 
     @Override
-    int writeEntries(@Nonnull final Channel channel, final long now) {
+    int writeEntries(@NonNull final Channel channel, final long now) {
         // Local cache
         StackedSegment segment = firstSegment;
         int entries = 0;
index 366ef95afa2f298e1d429cab4ca39d9fb09e7ed5..c6286c938e1b1d2388609886bbca50eae97a0ea7 100644 (file)
@@ -8,7 +8,7 @@
 
 package org.opendaylight.openflowjava.protocol.impl.util;
 
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 
 /**
  * Abstract factory class to support OF protocol version assigning and reading.
@@ -21,7 +21,7 @@ public abstract class VersionAssignableFactory {
      *
      * @param newVersion OpenFlow protocol version
      */
-    public void assignVersion(@Nonnull final Short newVersion) {
+    public void assignVersion(@NonNull final Short newVersion) {
         if (this.version == null) {
             this.version = newVersion;
         } else {
index a494b22515155c9256a8b585fac4061464750f7e..214fe8a8a66964d6075c6de16602bc6cce7ee694 100644 (file)
@@ -8,7 +8,7 @@
 package org.opendaylight.openflowjava.protocol.impl.core.connection;
 
 import com.google.common.util.concurrent.FutureCallback;
-import javax.annotation.Nullable;
+import org.eclipse.jdt.annotation.Nullable;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
index 06a8494c916530831745b3dd5a0b0ac1033f2501..a675d1759a652b8ae5ba242146d2c5c5d8019ff0 100644 (file)
             <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>mdsal-eos-binding-api</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.google.code.findbugs</groupId>
-            <artifactId>jsr305</artifactId>
-            <version>3.0.2</version>
-            <optional>true</optional>
-        </dependency>
     </dependencies>
 
 </project>
index b073d4ceb1ca1be61e0f6f18f802b17089bb39f9..855114d948e3a0a3e0ab5c20c32eb4f353cd2357 100644 (file)
@@ -7,7 +7,7 @@
  */
 package org.opendaylight.openflowplugin.api.openflow;
 
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.mdsal.singleton.common.api.ClusterSingletonService;
 import org.opendaylight.openflowplugin.api.openflow.device.DeviceInfo;
 import org.opendaylight.openflowplugin.api.openflow.lifecycle.ContextChainMastershipWatcher;
@@ -26,7 +26,7 @@ public interface OFPContext extends AutoCloseable, ClusterSingletonService {
      * Registers mastership change listener to context.
      * @param contextChainMastershipWatcher mastership change listener
      */
-    void registerMastershipWatcher(@Nonnull ContextChainMastershipWatcher contextChainMastershipWatcher);
+    void registerMastershipWatcher(@NonNull ContextChainMastershipWatcher contextChainMastershipWatcher);
 
     @Override
     void close();
index a03a59729ca3704436556ee8b7d7913ce5e3b58b..e2d1dba0d227446cd3037b9bf9c74587f2b59f0d 100644 (file)
@@ -8,7 +8,7 @@
 
 package org.opendaylight.openflowplugin.api.openflow.configuration;
 
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 
 /**
  * Listens for changes in OpenFlowPlugin configuration.
@@ -21,6 +21,6 @@ public interface ConfigurationListener {
      * @param propertyName  the property name
      * @param propertyValue the property value
      */
-    void onPropertyChanged(@Nonnull String propertyName, @Nonnull String propertyValue);
+    void onPropertyChanged(@NonNull String propertyName, @NonNull String propertyValue);
 
 }
index 8b5ed933bca2bdec615d4bfa112b72c63b094c1b..4a4baed77d2a61783026a2acf5eef1cffbaf2d8d 100644 (file)
@@ -10,7 +10,7 @@ package org.opendaylight.openflowplugin.api.openflow.configuration;
 
 import java.util.Map;
 import java.util.function.Function;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 
 /**
  * Manages OpenFlowPlugin configuration.
@@ -22,7 +22,7 @@ public interface ConfigurationService extends AutoCloseable {
      *
      * @param properties properties
      */
-    void update(@Nonnull Map<String, String> properties);
+    void update(@NonNull Map<String, String> properties);
 
     /**
      * Register listener for configuration changes.
@@ -30,8 +30,8 @@ public interface ConfigurationService extends AutoCloseable {
      * @param listener the listener
      * @return the auto closeable listener registration
      */
-    @Nonnull
-    AutoCloseable registerListener(@Nonnull ConfigurationListener listener);
+    @NonNull
+    AutoCloseable registerListener(@NonNull ConfigurationListener listener);
 
     /**
      * Get single property from configuration service.
@@ -41,7 +41,7 @@ public interface ConfigurationService extends AutoCloseable {
      * @param transformer property type transformer
      * @return property property
      */
-    @Nonnull
-    <T> T getProperty(@Nonnull String key, @Nonnull Function<String, T> transformer);
+    @NonNull
+    <T> T getProperty(@NonNull String key, @NonNull Function<String, T> transformer);
 
 }
index 69deccb03f5aac5a100eabfb1d9fac7bd7382c61..39e04c25e5a720998b0afb75abbf7a9009e0ebd8 100644 (file)
@@ -8,7 +8,7 @@
 package org.opendaylight.openflowplugin.api.openflow.device;
 
 import com.google.common.util.concurrent.ListenableFuture;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowplugin.api.openflow.OFPManager;
 import org.opendaylight.openflowplugin.api.openflow.connection.ConnectionContext;
 import org.opendaylight.openflowplugin.api.openflow.lifecycle.ContextChainHolder;
@@ -31,17 +31,17 @@ public interface DeviceManager extends
      */
     void initialize();
 
-    ListenableFuture<?> removeDeviceFromOperationalDS(@Nonnull KeyedInstanceIdentifier<Node, NodeKey> ii);
+    ListenableFuture<?> removeDeviceFromOperationalDS(@NonNull KeyedInstanceIdentifier<Node, NodeKey> ii);
 
-    DeviceContext createContext(@Nonnull ConnectionContext connectionContext);
+    DeviceContext createContext(@NonNull ConnectionContext connectionContext);
 
 
     void sendNodeAddedNotification(
-            @Nonnull KeyedInstanceIdentifier<Node, NodeKey> instanceIdentifier);
+            @NonNull KeyedInstanceIdentifier<Node, NodeKey> instanceIdentifier);
 
     void sendNodeRemovedNotification(
-            @Nonnull KeyedInstanceIdentifier<Node, NodeKey> instanceIdentifier);
+            @NonNull KeyedInstanceIdentifier<Node, NodeKey> instanceIdentifier);
 
-    void setContextChainHolder(@Nonnull ContextChainHolder contextChainHolder);
+    void setContextChainHolder(@NonNull ContextChainHolder contextChainHolder);
 }
 
index 911c4ae4a7d3f143e0f508a4637c239da76d90b1..87bf7ceef115d10417b991f930e5d9586646beca 100644 (file)
@@ -7,7 +7,7 @@
  */
 package org.opendaylight.openflowplugin.api.openflow.device;
 
-import javax.annotation.Nullable;
+import org.eclipse.jdt.annotation.Nullable;
 
 /**
  * Request context handles all requests on device. Number of requests is limited by request quota. When this quota is
index 1e7bf718f15ff5baa9552cbc3f9a0ef985c12e86..6907f57b2d1df9181f6e8b5aa61a29b71f6560a0 100644 (file)
@@ -7,7 +7,7 @@
  */
 package org.opendaylight.openflowplugin.api.openflow.device;
 
-import javax.annotation.Nullable;
+import org.eclipse.jdt.annotation.Nullable;
 
 /**
  * Request context stack.
index 3a4b8e83b1220c50cba0f9a035280769351deaff..b453b9ccbeecda5f98a5f91673bdbf16e740eaef 100644 (file)
@@ -7,8 +7,8 @@
  */
 package org.opendaylight.openflowplugin.api.openflow.device.handlers;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.Nullable;
 import org.opendaylight.openflowplugin.api.openflow.statistics.ofpspecific.EventIdentifier;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.OfHeader;
 
@@ -24,7 +24,7 @@ public interface MultiMsgCollector<T extends OfHeader> {
      * @param reqMore request more replies
      * @param eventIdentifier event identifier
      */
-    void addMultipartMsg(@Nonnull T reply, boolean reqMore, @Nullable EventIdentifier eventIdentifier);
+    void addMultipartMsg(@NonNull T reply, boolean reqMore, @Nullable EventIdentifier eventIdentifier);
 
     /**
      * Null response could be a valid end multipart collecting event for barrier response scenario.
index a821c2ceb20106f8602c613f09bd62af87ea113b..d48af6f5057a5ef2beff5dfd60a4e1f2a424496f 100644 (file)
@@ -7,7 +7,7 @@
  */
 package org.opendaylight.openflowplugin.api.openflow.lifecycle;
 
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.mdsal.singleton.common.api.ClusterSingletonService;
 import org.opendaylight.mdsal.singleton.common.api.ClusterSingletonServiceProvider;
 import org.opendaylight.openflowplugin.api.openflow.OFPContext;
@@ -25,7 +25,7 @@ public interface ContextChain extends ClusterSingletonService, AutoCloseable, Re
      * Add context to the chain, if reference already exist ignore it.
      * @param context child of OFPContext
      */
-    <T extends OFPContext> void addContext(@Nonnull T context);
+    <T extends OFPContext> void addContext(@NonNull T context);
 
     @Override
     void close();
@@ -51,7 +51,7 @@ public interface ContextChain extends ClusterSingletonService, AutoCloseable, Re
      * @return true if everything done fine
      * @see org.opendaylight.openflowplugin.api.openflow.mastership.MastershipChangeService
      */
-    boolean isMastered(@Nonnull ContextChainMastershipState mastershipState,
+    boolean isMastered(@NonNull ContextChainMastershipState mastershipState,
                        boolean inReconciliationFrameworkStep);
 
     /**
@@ -65,18 +65,18 @@ public interface ContextChain extends ClusterSingletonService, AutoCloseable, Re
      * @param connectionContext new connection to the device.
      * @return false if primary connection is broken
      */
-    boolean addAuxiliaryConnection(@Nonnull ConnectionContext connectionContext);
+    boolean addAuxiliaryConnection(@NonNull ConnectionContext connectionContext);
 
     /**
      * Check if connection is auxiliary and if yes then continue working.
      * @param connectionContext connection to the device
      * @return false if this is primary connection
      */
-    boolean auxiliaryConnectionDropped(@Nonnull ConnectionContext connectionContext);
+    boolean auxiliaryConnectionDropped(@NonNull ConnectionContext connectionContext);
 
     /**
      * This method registers device removed handler what will be executed when device should be removed.
      * @param deviceRemovedHandler device removed handler
      */
-    void registerDeviceRemovedHandler(@Nonnull DeviceRemovedHandler deviceRemovedHandler);
+    void registerDeviceRemovedHandler(@NonNull DeviceRemovedHandler deviceRemovedHandler);
 }
\ No newline at end of file
index b4d5e51cf9adaee15ab1fcbe1502017926e973b3..b2a6b0d8b030c8f80dc0e90c17caf3ca1e8a9062 100644 (file)
@@ -7,7 +7,7 @@
  */
 package org.opendaylight.openflowplugin.api.openflow.lifecycle;
 
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowplugin.api.openflow.device.DeviceInfo;
 
 /**
@@ -40,7 +40,7 @@ public interface ContextChainMastershipWatcher {
      * @param deviceInfo connected switch identification
      * @param mastershipState state
      */
-    void onMasterRoleAcquired(DeviceInfo deviceInfo, @Nonnull ContextChainMastershipState mastershipState);
+    void onMasterRoleAcquired(DeviceInfo deviceInfo, @NonNull ContextChainMastershipState mastershipState);
 
     /**
      * Change to SLAVE role on device was successful.
index e2a0e8c09382959f01358f5788762bddc198aae1..9b996d4dae6b1bb20426a8e767070617040de225 100644 (file)
@@ -8,7 +8,7 @@
 package org.opendaylight.openflowplugin.api.openflow.lifecycle;
 
 import com.google.common.util.concurrent.ListenableFuture;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowplugin.api.openflow.device.DeviceInfo;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.openflowplugin.rf.state.rev170713.ResultState;
 
@@ -30,13 +30,13 @@ public interface OwnershipChangeListener extends ReconciliationFrameworkRegistra
      * </ul>
      * @param deviceInfo connected switch identification
      */
-    void becomeMaster(@Nonnull DeviceInfo deviceInfo);
+    void becomeMaster(@NonNull DeviceInfo deviceInfo);
 
     /**
      * Should be called when device is disconnected or going to be slaved.
      * @param deviceInfo connected switch identification
      */
-    void becomeSlaveOrDisconnect(@Nonnull DeviceInfo deviceInfo);
+    void becomeSlaveOrDisconnect(@NonNull DeviceInfo deviceInfo);
 
     /**
      * Should be called when device is being mastered as in {@link #becomeMaster(DeviceInfo)}.
@@ -47,12 +47,12 @@ public interface OwnershipChangeListener extends ReconciliationFrameworkRegistra
      * @param deviceInfo connected switch identification
      * @return future to be able handle device after reconciliation
      */
-    ListenableFuture<ResultState> becomeMasterBeforeSubmittedDS(@Nonnull DeviceInfo deviceInfo);
+    ListenableFuture<ResultState> becomeMasterBeforeSubmittedDS(@NonNull DeviceInfo deviceInfo);
 
     /**
      * Set the device mastership checker.
      * @param masterChecker {@link MasterChecker}
      */
-    void setMasterChecker(@Nonnull MasterChecker masterChecker);
+    void setMasterChecker(@NonNull MasterChecker masterChecker);
 
 }
index 4509d315780bc31248476af44e666d38bbd36c3c..c2f248ef6753b86e7658dfecfbe35244d44854ee 100644 (file)
@@ -7,7 +7,7 @@
  */
 package org.opendaylight.openflowplugin.api.openflow.mastership;
 
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowplugin.api.openflow.device.DeviceInfo;
 import org.opendaylight.openflowplugin.api.openflow.lifecycle.OwnershipChangeListener;
 
@@ -30,13 +30,13 @@ public interface MastershipChangeService extends AutoCloseable {
      * {@link OwnershipChangeListener#becomeMaster(DeviceInfo)}
      * @param deviceInfo connected switch identification
      */
-    void onBecomeOwner(@Nonnull DeviceInfo deviceInfo);
+    void onBecomeOwner(@NonNull DeviceInfo deviceInfo);
 
     /**
      * Event when device disconnected or become slave. This event is evoked by
      * {@link OwnershipChangeListener#becomeSlaveOrDisconnect(DeviceInfo)}
      * @param deviceInfo connected switch identification
      */
-    void onLoseOwnership(@Nonnull DeviceInfo deviceInfo);
+    void onLoseOwnership(@NonNull DeviceInfo deviceInfo);
 
 }
\ No newline at end of file
index 5912a7ad35a8f0203b5f357a1f3e12aa4601fb18..5795e388c9f1b405ab27c9714374a437274ba7ae 100644 (file)
@@ -7,7 +7,7 @@
  */
 package org.opendaylight.openflowplugin.api.openflow.mastership;
 
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowplugin.api.openflow.lifecycle.OwnershipChangeListener;
 
 /**
@@ -24,8 +24,8 @@ public interface MastershipChangeServiceManager extends OwnershipChangeListener,
      * @return registration
      * @see ReconciliationFrameworkEvent
      */
-    @Nonnull
-    MastershipChangeRegistration register(@Nonnull MastershipChangeService service);
+    @NonNull
+    MastershipChangeRegistration register(@NonNull MastershipChangeService service);
 
     /**
      * Setter for reconciliation framework event listener. It can be registered only once.
@@ -35,7 +35,7 @@ public interface MastershipChangeServiceManager extends OwnershipChangeListener,
      * @throws MastershipChangeException if already reconciliation framework registered
      */
     ReconciliationFrameworkRegistration reconciliationFrameworkRegistration(
-            @Nonnull ReconciliationFrameworkEvent mastershipRFRegistration) throws MastershipChangeException;
+            @NonNull ReconciliationFrameworkEvent mastershipRFRegistration) throws MastershipChangeException;
 
     @Override
     void close();
index ea7aa2e31828895e41c63b80b6730b2214b5173f..44aa8187eea2c562a73359005bfff60457c2988c 100644 (file)
@@ -8,7 +8,7 @@
 package org.opendaylight.openflowplugin.api.openflow.mastership;
 
 import com.google.common.util.concurrent.ListenableFuture;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowplugin.api.openflow.device.DeviceInfo;
 import org.opendaylight.openflowplugin.api.openflow.lifecycle.OwnershipChangeListener;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.openflowplugin.rf.state.rev170713.ResultState;
@@ -36,7 +36,7 @@ public interface ReconciliationFrameworkEvent extends AutoCloseable {
      * @param deviceInfo connected switch identification
      * @return result state if the device can continue with connecting or should be disconnected
      */
-    ListenableFuture<ResultState> onDevicePrepared(@Nonnull DeviceInfo deviceInfo);
+    ListenableFuture<ResultState> onDevicePrepared(@NonNull DeviceInfo deviceInfo);
 
     /**
      * This event occurs after device is disconnected or being slaved.
@@ -46,7 +46,7 @@ public interface ReconciliationFrameworkEvent extends AutoCloseable {
      * @return future
      * @see MastershipChangeService
      */
-    ListenableFuture<Void> onDeviceDisconnected(@Nonnull DeviceInfo deviceInfo);
+    ListenableFuture<Void> onDeviceDisconnected(@NonNull DeviceInfo deviceInfo);
 
 
 }
index 706c359d6b8836702aba9c2602f51879fafa105a..b6f355f214fc46e9824140536018bec22dd79d96 100644 (file)
@@ -10,8 +10,8 @@ package org.opendaylight.openflowplugin.api.openflow.registry.flow;
 import com.google.common.util.concurrent.ListenableFuture;
 import java.util.List;
 import java.util.Optional;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.Nullable;
 import org.opendaylight.openflowplugin.api.openflow.registry.CommonDeviceRegistry;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.FlowCapableNode;
 
@@ -23,9 +23,9 @@ public interface DeviceFlowRegistry extends CommonDeviceRegistry<FlowRegistryKey
 
     ListenableFuture<List<Optional<FlowCapableNode>>> fill();
 
-    void storeDescriptor(@Nonnull FlowRegistryKey flowRegistryKey, @Nonnull FlowDescriptor flowDescriptor);
+    void storeDescriptor(@NonNull FlowRegistryKey flowRegistryKey, @NonNull FlowDescriptor flowDescriptor);
 
     @Nullable
-    FlowDescriptor retrieveDescriptor(@Nonnull FlowRegistryKey flowRegistryKey);
+    FlowDescriptor retrieveDescriptor(@NonNull FlowRegistryKey flowRegistryKey);
 
 }
index 4bf1505d549bb890ae8bbd46dd4266366b85f2ae..b0b31b09d7b4eedd2d72e0782c24df3d647e2509 100644 (file)
@@ -8,7 +8,7 @@
 
 package org.opendaylight.openflowplugin.api.openflow.role;
 
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowplugin.api.openflow.OFPManager;
 import org.opendaylight.openflowplugin.api.openflow.device.DeviceContext;
 
@@ -23,5 +23,5 @@ public interface RoleManager extends OFPManager {
      * @param deviceContext the device context
      * @return the role context
      */
-    RoleContext createContext(@Nonnull DeviceContext deviceContext);
+    RoleContext createContext(@NonNull DeviceContext deviceContext);
 }
\ No newline at end of file
index f96c956267731d5964984a3b0863a146092bdace..aa82dc43f21e6f8e8cb11a3bd5b9f0c5c75132a8 100644 (file)
@@ -8,7 +8,7 @@
 
 package org.opendaylight.openflowplugin.api.openflow.rpc;
 
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowplugin.api.openflow.OFPManager;
 import org.opendaylight.openflowplugin.api.openflow.device.DeviceContext;
 
@@ -17,6 +17,6 @@ import org.opendaylight.openflowplugin.api.openflow.device.DeviceContext;
  */
 public interface RpcManager extends OFPManager {
 
-    RpcContext createContext(@Nonnull DeviceContext deviceContext);
+    RpcContext createContext(@NonNull DeviceContext deviceContext);
 
 }
index b7df3472ed30df6f161acab00e6c0cbe7132a2dd..16e1e4d8c25e97c75b36b00562d9ee2f123d5afc 100644 (file)
@@ -8,7 +8,7 @@
 
 package org.opendaylight.openflowplugin.api.openflow.statistics;
 
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowplugin.api.openflow.OFPManager;
 import org.opendaylight.openflowplugin.api.openflow.device.DeviceContext;
 
@@ -16,6 +16,6 @@ import org.opendaylight.openflowplugin.api.openflow.device.DeviceContext;
  * Manages statistics contexts.
  */
 public interface StatisticsManager extends OFPManager {
-    StatisticsContext createContext(@Nonnull DeviceContext deviceContext,
+    StatisticsContext createContext(@NonNull DeviceContext deviceContext,
                                     boolean useReconciliationFramework);
 }
\ No newline at end of file
index 7e1e56b112fd6ddb7817a8750455e05d7cbe3d04..c8beb2423365ac310ee81408d1af48a2fe554adc 100644 (file)
         <groupId>org.opendaylight.mdsal</groupId>
         <artifactId>mdsal-binding-api</artifactId>
     </dependency>
-    <dependency>
-        <groupId>com.google.code.findbugs</groupId>
-        <artifactId>jsr305</artifactId>
-        <version>3.0.2</version>
-        <optional>true</optional>
-    </dependency>
 
     <dependency>
       <groupId>org.slf4j</groupId>
index 2d9930de1ff573056104db92a147031acea040f6..655d935584fad19be382a309db189b730896d9fa 100755 (executable)
@@ -17,8 +17,9 @@ import java.util.concurrent.CancellationException;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
-import javax.annotation.Nonnull;
-import javax.annotation.concurrent.GuardedBy;
+import org.checkerframework.checker.lock.qual.GuardedBy;
+import org.checkerframework.checker.lock.qual.Holding;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.mdsal.binding.api.DataBroker;
 import org.opendaylight.mdsal.binding.api.ReadWriteTransaction;
 import org.opendaylight.mdsal.binding.api.Transaction;
@@ -64,14 +65,14 @@ public class TransactionChainManager implements TransactionChainListener, AutoCl
     @GuardedBy("txLock")
     private TransactionChainManagerStatus transactionChainManagerStatus = TransactionChainManagerStatus.SLEEPING;
 
-    public TransactionChainManager(@Nonnull final DataBroker dataBroker,
-                                   @Nonnull final String deviceIdentifier) {
+    public TransactionChainManager(@NonNull final DataBroker dataBroker,
+                                   @NonNull final String deviceIdentifier) {
         this.dataBroker = dataBroker;
         this.nodeId = deviceIdentifier;
         this.lastSubmittedFuture = CommitInfo.emptyFluentFuture();
     }
 
-    @GuardedBy("txLock")
+    @Holding("txLock")
     private void createTxChain() {
         TransactionChain txChainFactoryTemp = transactionChain;
         transactionChain = dataBroker.createTransactionChain(TransactionChainManager.this);
@@ -133,7 +134,7 @@ public class TransactionChainManager implements TransactionChainListener, AutoCl
                     }
 
                     @Override
-                    public void onFailure(@Nonnull final Throwable throwable) {
+                    public void onFailure(@NonNull final Throwable throwable) {
                         closeTransactionChain();
                     }
                 }, MoreExecutors.directExecutor());
@@ -290,7 +291,7 @@ public class TransactionChainManager implements TransactionChainListener, AutoCl
         // NOOP
     }
 
-    @GuardedBy("txLock")
+    @Holding("txLock")
     private void ensureTransaction() {
         if (writeTx == null && TransactionChainManagerStatus.WORKING == transactionChainManagerStatus
                 && transactionChain != null) {
index 11b5e175f74b5159a778bc8bc97a28a940451570..c408eaf436327684c60af82b50afa134f215d300 100644 (file)
             <artifactId>javax.inject</artifactId>
             <optional>true</optional>
         </dependency>
-        <dependency>
-            <groupId>com.google.code.findbugs</groupId>
-            <artifactId>jsr305</artifactId>
-            <version>3.0.2</version>
-            <optional>true</optional>
-        </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-log4j12</artifactId>
index a1d0fdc0877403ad6a9db625b90a9719881aec93..981b2700883b625df9a365f5a598e9bd7ac939f1 100644 (file)
@@ -13,7 +13,7 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
-import javax.annotation.Nullable;
+import org.eclipse.jdt.annotation.Nullable;
 import org.opendaylight.openflowplugin.api.openflow.device.DeviceInfo;
 import org.opendaylight.openflowplugin.api.openflow.device.MessageTranslator;
 import org.opendaylight.openflowplugin.api.openflow.device.TranslatorLibrary;
index 9a3965fd9db5de2429197b0ec3e7cd37798aba4e..87334d00db5e381fe728e6bd1300e2e1fe7dcd31 100644 (file)
@@ -7,7 +7,7 @@
  */
 package org.opendaylight.openflowplugin.impl.common;
 
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowplugin.api.OFConstants;
 import org.opendaylight.openflowplugin.impl.util.MatchUtil;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.multipart.request.multipart.request.body.MultipartRequestDescBuilder;
@@ -85,7 +85,7 @@ public final class MultipartRequestInputFactory {
      */
     public static OfHeader makeMultipartRequest(final long xid,
                                                 final short version,
-                                                @Nonnull final MultipartType type,
+                                                @NonNull final MultipartType type,
                                                 final boolean canUseSingleLayer) {
         return canUseSingleLayer
                 ? new MultipartRequestBuilder()
@@ -130,7 +130,7 @@ public final class MultipartRequestInputFactory {
         }
     }
 
-    private static MultipartRequestBody makeDefaultMultiLayerBody(@Nonnull final MultipartType type,
+    private static MultipartRequestBody makeDefaultMultiLayerBody(@NonNull final MultipartType type,
                                                                   final short version) {
         switch (type) {
             case OFPMPDESC:
index 7cbaab90f5f27793f83abc9d9ed63f65dcccf322..328e474a8aec3006d4a195090fba701cfd34191a 100644 (file)
@@ -14,7 +14,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.function.Function;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowplugin.api.openflow.configuration.ConfigurationListener;
 import org.opendaylight.openflowplugin.api.openflow.configuration.ConfigurationProperty;
 import org.opendaylight.openflowplugin.api.openflow.configuration.ConfigurationService;
@@ -90,7 +90,7 @@ public class ConfigurationServiceFactoryImpl implements ConfigurationServiceFact
         }
 
         @Override
-        public void update(@Nonnull final Map<String, String> properties) {
+        public void update(@NonNull final Map<String, String> properties) {
             properties.forEach((propertyName, newValue) -> {
                 final String originalValue = propertyMap.get(propertyName);
 
@@ -116,15 +116,15 @@ public class ConfigurationServiceFactoryImpl implements ConfigurationServiceFact
             });
         }
 
-        @Nonnull
+        @NonNull
         @Override
-        public <T> T getProperty(@Nonnull final String key, @Nonnull final Function<String, T> transformer) {
+        public <T> T getProperty(@NonNull final String key, @NonNull final Function<String, T> transformer) {
             return transformer.apply(propertyMap.get(key));
         }
 
-        @Nonnull
+        @NonNull
         @Override
-        public AutoCloseable registerListener(@Nonnull final ConfigurationListener listener) {
+        public AutoCloseable registerListener(@NonNull final ConfigurationListener listener) {
             Verify.verify(!listeners.contains(listener));
             LOG.info("{} was registered as configuration listener to OpenFlowPlugin configuration service", listener);
             listeners.add(listener);
index c2189bb3d5520adb32d7a0b921c05e79b78b5761..37a94d220bb1ed85700c65e4083f11af85b967fa 100644 (file)
@@ -10,7 +10,7 @@ package org.opendaylight.openflowplugin.impl.connection;
 
 import com.google.common.util.concurrent.FutureCallback;
 import java.util.function.Function;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowjava.protocol.api.connection.OutboundQueue;
 import org.opendaylight.openflowplugin.api.openflow.connection.OutboundQueueProvider;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.BarrierInput;
@@ -28,9 +28,9 @@ public class OutboundQueueProviderImpl implements OutboundQueueProvider {
         this.ofVersion = ofVersion;
     }
 
-    @Nonnull
+    @NonNull
     @Override
-    public BarrierInput createBarrierRequest(@Nonnull final Long xid) {
+    public BarrierInput createBarrierRequest(@NonNull final Long xid) {
         final BarrierInputBuilder biBuilder = new BarrierInputBuilder();
         biBuilder.setVersion(ofVersion);
         biBuilder.setXid(xid);
index 77581731782de12750bb507a94ebbcb612bbf32b..d0b7ec80f9e448ee542bbfbbc54df55c4e3361a6 100644 (file)
@@ -15,7 +15,7 @@ import java.util.Objects;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowplugin.api.openflow.connection.ConnectionContext;
 import org.opendaylight.openflowplugin.api.openflow.device.Xid;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.EchoInputBuilder;
@@ -42,9 +42,9 @@ public class SystemNotificationsListenerImpl implements SystemNotificationsListe
     private final long echoReplyTimeout;
     private final ExecutorService executorService;
 
-    public SystemNotificationsListenerImpl(@Nonnull final ConnectionContext connectionContext,
+    public SystemNotificationsListenerImpl(@NonNull final ConnectionContext connectionContext,
                                            final long echoReplyTimeout,
-                                           @Nonnull final ExecutorService executorService) {
+                                           @NonNull final ExecutorService executorService) {
         this.executorService = executorService;
         this.connectionContext = Preconditions.checkNotNull(connectionContext);
         this.echoReplyTimeout = echoReplyTimeout;
index 73bd3222ae00fe8fd4e2952591f228ff7d185cee..cf05cb1d279ba20960d5a471d531b2c4ea6837e5 100644 (file)
@@ -24,8 +24,8 @@ import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 import java.util.concurrent.atomic.AtomicBoolean;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.Nullable;
 import org.opendaylight.mdsal.binding.api.DataBroker;
 import org.opendaylight.mdsal.binding.api.NotificationPublishService;
 import org.opendaylight.mdsal.binding.api.ReadTransaction;
@@ -161,10 +161,10 @@ public class DeviceContextImpl implements DeviceContext, ExtensionConverterProvi
     private final NotificationManager<String, Runnable> queuedNotificationManager;
     private final boolean isStatisticsPollingOn;
 
-    DeviceContextImpl(@Nonnull final ConnectionContext primaryConnectionContext,
-                      @Nonnull final DataBroker dataBroker,
-                      @Nonnull final MessageSpy messageSpy,
-                      @Nonnull final TranslatorLibrary translatorLibrary,
+    DeviceContextImpl(@NonNull final ConnectionContext primaryConnectionContext,
+                      @NonNull final DataBroker dataBroker,
+                      @NonNull final MessageSpy messageSpy,
+                      @NonNull final TranslatorLibrary translatorLibrary,
                       final ConvertorExecutor convertorExecutor,
                       final boolean skipTableFeatures,
                       final HashedWheelTimer hashedWheelTimer,
@@ -596,11 +596,11 @@ public class DeviceContextImpl implements DeviceContext, ExtensionConverterProvi
     }
 
     @Override
-    public void registerMastershipWatcher(@Nonnull final ContextChainMastershipWatcher newWatcher) {
+    public void registerMastershipWatcher(@NonNull final ContextChainMastershipWatcher newWatcher) {
         this.contextChainMastershipWatcher = newWatcher;
     }
 
-    @Nonnull
+    @NonNull
     @Override
     public ServiceGroupIdentifier getIdentifier() {
         return deviceInfo.getServiceIdentifier();
index 8bb849495356df6ad232edc14b737340a062151b..45f99f65f4836fa5d43da7f702095b0a2c1811fd 100644 (file)
@@ -15,7 +15,7 @@ import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.ScheduledThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.mdsal.binding.api.DataBroker;
 import org.opendaylight.mdsal.binding.api.NotificationPublishService;
 import org.opendaylight.mdsal.binding.api.WriteTransaction;
@@ -71,14 +71,14 @@ public class DeviceManagerImpl implements DeviceManager, ExtensionConverterProvi
     private ContextChainHolder contextChainHolder;
     private final QueuedNotificationManager<String, Runnable> queuedNotificationManager;
 
-    public DeviceManagerImpl(@Nonnull final OpenflowProviderConfig config,
-                             @Nonnull final DataBroker dataBroker,
-                             @Nonnull final MessageSpy messageSpy,
-                             @Nonnull final NotificationPublishService notificationPublishService,
-                             @Nonnull final HashedWheelTimer hashedWheelTimer,
-                             @Nonnull final ConvertorExecutor convertorExecutor,
-                             @Nonnull final DeviceInitializerProvider deviceInitializerProvider,
-                             @Nonnull final ExecutorService executorService) {
+    public DeviceManagerImpl(@NonNull final OpenflowProviderConfig config,
+                             @NonNull final DataBroker dataBroker,
+                             @NonNull final MessageSpy messageSpy,
+                             @NonNull final NotificationPublishService notificationPublishService,
+                             @NonNull final HashedWheelTimer hashedWheelTimer,
+                             @NonNull final ConvertorExecutor convertorExecutor,
+                             @NonNull final DeviceInitializerProvider deviceInitializerProvider,
+                             @NonNull final ExecutorService executorService) {
         this.config = config;
         this.dataBroker = dataBroker;
         this.deviceInitializerProvider = deviceInitializerProvider;
@@ -129,7 +129,7 @@ public class DeviceManagerImpl implements DeviceManager, ExtensionConverterProvi
     }
 
     @Override
-    public ListenableFuture<?> removeDeviceFromOperationalDS(@Nonnull final KeyedInstanceIdentifier<Node, NodeKey> ii) {
+    public ListenableFuture<?> removeDeviceFromOperationalDS(@NonNull final KeyedInstanceIdentifier<Node, NodeKey> ii) {
 
         final WriteTransaction delWtx = dataBroker.newWriteOnlyTransaction();
         delWtx.delete(LogicalDatastoreType.OPERATIONAL, ii);
@@ -138,7 +138,7 @@ public class DeviceManagerImpl implements DeviceManager, ExtensionConverterProvi
     }
 
     @Override
-    public DeviceContext createContext(@Nonnull final ConnectionContext connectionContext) {
+    public DeviceContext createContext(@NonNull final ConnectionContext connectionContext) {
 
         LOG.info("ConnectionEvent: Device connected to controller, Device:{}, NodeId:{}",
                 connectionContext.getConnectionAdapter().getRemoteAddress(),
@@ -217,7 +217,7 @@ public class DeviceManagerImpl implements DeviceManager, ExtensionConverterProvi
     }
 
     @Override
-    public void sendNodeRemovedNotification(@Nonnull final KeyedInstanceIdentifier<Node, NodeKey> instanceIdentifier) {
+    public void sendNodeRemovedNotification(@NonNull final KeyedInstanceIdentifier<Node, NodeKey> instanceIdentifier) {
         if (notificationCreateNodeSend.remove(instanceIdentifier)) {
             NodeRemovedBuilder builder = new NodeRemovedBuilder();
             builder.setNodeRef(new NodeRef(instanceIdentifier));
@@ -227,12 +227,12 @@ public class DeviceManagerImpl implements DeviceManager, ExtensionConverterProvi
     }
 
     @Override
-    public void setContextChainHolder(@Nonnull final ContextChainHolder contextChainHolder) {
+    public void setContextChainHolder(@NonNull final ContextChainHolder contextChainHolder) {
         this.contextChainHolder = contextChainHolder;
     }
 
     @Override
-    public void sendNodeAddedNotification(@Nonnull final KeyedInstanceIdentifier<Node, NodeKey> instanceIdentifier) {
+    public void sendNodeAddedNotification(@NonNull final KeyedInstanceIdentifier<Node, NodeKey> instanceIdentifier) {
         if (!notificationCreateNodeSend.contains(instanceIdentifier)) {
             notificationCreateNodeSend.add(instanceIdentifier);
             final NodeId id = instanceIdentifier.firstKeyOf(Node.class).getId();
index d202399d1acaca1594c911df41e35845212a9027..87dd935bf2f8b1713631aa81b109eab0314b1157 100644 (file)
@@ -9,7 +9,8 @@ package org.opendaylight.openflowplugin.impl.device;
 
 import com.google.common.base.Preconditions;
 import java.util.concurrent.atomic.AtomicInteger;
-import javax.annotation.concurrent.GuardedBy;
+import org.checkerframework.checker.lock.qual.GuardedBy;
+import org.checkerframework.checker.lock.qual.Holding;
 
 abstract class SimpleRatelimiter {
     private final AtomicInteger counter = new AtomicInteger();
@@ -69,7 +70,7 @@ abstract class SimpleRatelimiter {
         }
     }
 
-    @GuardedBy("counterLock")
+    @Holding("counterLock")
     private void resetLowWaterMark() {
         lowWatermarkEffective = lowWatermark;
     }
index df9c458c76cfea498b7377c649ce70cde6492cf5..06ff776070885cd5a97a0ce8acaadc82fac9a361 100644 (file)
@@ -11,8 +11,8 @@ import com.google.common.base.Preconditions;
 import com.google.common.util.concurrent.Futures;
 import java.util.Collections;
 import java.util.concurrent.Future;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.Nullable;
 import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
 import org.opendaylight.openflowplugin.api.ConnectionException;
 import org.opendaylight.openflowplugin.api.openflow.device.DeviceContext;
@@ -36,7 +36,7 @@ public abstract class AbstractDeviceInitializer {
      * @param convertorExecutor convertor executor
      */
     @SuppressWarnings("checkstyle:IllegalCatch")
-    public Future<Void> initialize(@Nonnull final DeviceContext deviceContext,
+    public Future<Void> initialize(@NonNull final DeviceContext deviceContext,
                                    final boolean switchFeaturesMandatory,
                                    final boolean skipTableFeatures,
                                    @Nullable final MultipartWriterProvider multipartWriterProvider,
@@ -64,7 +64,7 @@ public abstract class AbstractDeviceInitializer {
                 multipartWriterProvider, convertorExecutor);
     }
 
-    protected abstract Future<Void> initializeNodeInformation(@Nonnull DeviceContext deviceContext,
+    protected abstract Future<Void> initializeNodeInformation(@NonNull DeviceContext deviceContext,
                                                               boolean switchFeaturesMandatory,
                                                               boolean skipTableFeatures,
                                                               @Nullable MultipartWriterProvider multipartWriterProvider,
index 69b88f24a9bbcd55ffa40618f9e7032f4085a261..5a1d27313944c4058213a0eea3ac65e98c55d120 100644 (file)
@@ -13,8 +13,8 @@ import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.MoreExecutors;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.Nullable;
 import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
 import org.opendaylight.openflowplugin.api.openflow.connection.ConnectionContext;
 import org.opendaylight.openflowplugin.api.openflow.device.DeviceContext;
@@ -52,7 +52,7 @@ public class OF10DeviceInitializer extends AbstractDeviceInitializer {
     private static final Logger LOG = LoggerFactory.getLogger(OF10DeviceInitializer.class);
 
     @Override
-    protected ListenableFuture<Void> initializeNodeInformation(@Nonnull final DeviceContext deviceContext,
+    protected ListenableFuture<Void> initializeNodeInformation(@NonNull final DeviceContext deviceContext,
                                                      final boolean switchFeaturesMandatory,
                                                      final boolean skipTableFeatures,
                                                      @Nullable final MultipartWriterProvider multipartWriterProvider,
index 828d8d492247ded58e1dac4b4db62fb6264b1e55..356bede583b7d8b979bc72a9a3d8d79be362c90d 100644 (file)
@@ -17,8 +17,8 @@ import java.util.List;
 import java.util.Optional;
 import java.util.concurrent.Future;
 import java.util.stream.Collectors;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.Nullable;
 import org.opendaylight.openflowplugin.api.openflow.connection.ConnectionContext;
 import org.opendaylight.openflowplugin.api.openflow.device.DeviceContext;
 import org.opendaylight.openflowplugin.api.openflow.device.DeviceInfo;
@@ -44,7 +44,7 @@ public class OF13DeviceInitializer extends AbstractDeviceInitializer {
     private static final Logger LOG = LoggerFactory.getLogger(OF13DeviceInitializer.class);
 
     @Override
-    protected Future<Void> initializeNodeInformation(@Nonnull final DeviceContext deviceContext,
+    protected Future<Void> initializeNodeInformation(@NonNull final DeviceContext deviceContext,
                                                      final boolean switchFeaturesMandatory,
                                                      final boolean skipTableFeatures,
                                                      @Nullable final MultipartWriterProvider multipartWriterProvider,
index 2bd44ba07be9f374730962c538f84ad25a1b4476..ac100b5267e6b3a59a6c406615a247d97f6ae9e4 100644 (file)
@@ -10,8 +10,8 @@ package org.opendaylight.openflowplugin.impl.device.listener;
 import com.google.common.base.Preconditions;
 import java.util.ArrayList;
 import java.util.List;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.Nullable;
 import org.opendaylight.openflowplugin.api.openflow.device.RequestContext;
 import org.opendaylight.openflowplugin.api.openflow.device.handlers.DeviceReplyProcessor;
 import org.opendaylight.openflowplugin.api.openflow.device.handlers.MultiMsgCollector;
@@ -42,7 +42,7 @@ public class MultiMsgCollectorImpl<T extends OfHeader> implements MultiMsgCollec
     }
 
     @Override
-    public void addMultipartMsg(@Nonnull final T reply, final boolean reqMore,
+    public void addMultipartMsg(@NonNull final T reply, final boolean reqMore,
                                 @Nullable final EventIdentifier eventIdentifier) {
         Preconditions.checkNotNull(reply);
         Preconditions.checkNotNull(requestContext.getXid());
index 11e21ce53c4eee7ad99cea0279d8a1e7b49f6f2f..592660a6eebd8812508e80da4ec7663a056741a4 100644 (file)
@@ -24,7 +24,7 @@ import java.util.concurrent.ExecutorService;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 import java.util.stream.Collectors;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.mdsal.eos.binding.api.EntityOwnershipChange;
 import org.opendaylight.mdsal.eos.binding.api.EntityOwnershipListenerRegistration;
 import org.opendaylight.mdsal.eos.binding.api.EntityOwnershipService;
@@ -198,7 +198,7 @@ public class ContextChainHolderImpl implements ContextChainHolder, MasterChecker
     }
 
     @Override
-    public void onNotAbleToStartMastership(@Nonnull final DeviceInfo deviceInfo, @Nonnull final String reason,
+    public void onNotAbleToStartMastership(@NonNull final DeviceInfo deviceInfo, @NonNull final String reason,
                                            final boolean mandatory) {
         LOG.warn("Not able to set MASTER role on device {}, reason: {}", deviceInfo, reason);
 
@@ -214,8 +214,8 @@ public class ContextChainHolderImpl implements ContextChainHolder, MasterChecker
     }
 
     @Override
-    public void onMasterRoleAcquired(@Nonnull final DeviceInfo deviceInfo,
-                                     @Nonnull final ContextChainMastershipState mastershipState) {
+    public void onMasterRoleAcquired(@NonNull final DeviceInfo deviceInfo,
+                                     @NonNull final ContextChainMastershipState mastershipState) {
         Optional.ofNullable(contextChainMap.get(deviceInfo)).ifPresent(contextChain -> {
             if (ownershipChangeListener.isReconciliationFrameworkRegistered()
                     && !ContextChainMastershipState.INITIAL_SUBMIT.equals(mastershipState)) {
@@ -357,7 +357,7 @@ public class ContextChainHolderImpl implements ContextChainHolder, MasterChecker
         LOG.debug("Context chain removed for node {}", deviceInfo);
     }
 
-    private FutureCallback<ResultState> reconciliationFrameworkCallback(@Nonnull final DeviceInfo deviceInfo,
+    private FutureCallback<ResultState> reconciliationFrameworkCallback(@NonNull final DeviceInfo deviceInfo,
             final ContextChain contextChain, final ContextChainMastershipState mastershipState) {
         return new FutureCallback<>() {
             @Override
index acd5e548e6bc1e87e0f81c61000ed807c627b76e..b5c691047ba098df6bc7b22c14c035854c70ac74 100644 (file)
@@ -17,7 +17,7 @@ import java.util.concurrent.ExecutorService;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Collectors;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.mdsal.singleton.common.api.ClusterSingletonServiceProvider;
 import org.opendaylight.mdsal.singleton.common.api.ServiceGroupIdentifier;
 import org.opendaylight.openflowplugin.api.openflow.OFPContext;
@@ -53,9 +53,9 @@ public class ContextChainImpl implements ContextChain {
             new AtomicReference<>(ContextChainState.UNDEFINED);
     private AutoCloseable registration;
 
-    ContextChainImpl(@Nonnull final ContextChainMastershipWatcher contextChainMastershipWatcher,
-                     @Nonnull final ConnectionContext connectionContext,
-                     @Nonnull final ExecutorService executorService) {
+    ContextChainImpl(@NonNull final ContextChainMastershipWatcher contextChainMastershipWatcher,
+                     @NonNull final ConnectionContext connectionContext,
+                     @NonNull final ExecutorService executorService) {
         this.contextChainMastershipWatcher = contextChainMastershipWatcher;
         this.primaryConnection = connectionContext;
         this.deviceInfo = connectionContext.getDeviceInfo();
@@ -63,7 +63,7 @@ public class ContextChainImpl implements ContextChain {
     }
 
     @Override
-    public <T extends OFPContext> void addContext(@Nonnull final T context) {
+    public <T extends OFPContext> void addContext(@NonNull final T context) {
         contexts.add(new GuardedContextImpl(context));
     }
 
@@ -97,7 +97,7 @@ public class ContextChainImpl implements ContextChain {
         }, executorService);
     }
 
-    @Nonnull
+    @NonNull
     @Override
     public ServiceGroupIdentifier getIdentifier() {
         return deviceInfo.getServiceIdentifier();
@@ -159,7 +159,7 @@ public class ContextChainImpl implements ContextChain {
     }
 
     @Override
-    public boolean isMastered(@Nonnull final ContextChainMastershipState mastershipState,
+    public boolean isMastered(@NonNull final ContextChainMastershipState mastershipState,
                               final boolean inReconciliationFrameworkStep) {
         switch (mastershipState) {
             case INITIAL_SUBMIT:
@@ -220,19 +220,19 @@ public class ContextChainImpl implements ContextChain {
     }
 
     @Override
-    public boolean addAuxiliaryConnection(@Nonnull final ConnectionContext connectionContext) {
+    public boolean addAuxiliaryConnection(@NonNull final ConnectionContext connectionContext) {
         return connectionContext.getFeatures().getAuxiliaryId().toJava() != 0
                 && !ConnectionContext.CONNECTION_STATE.RIP.equals(primaryConnection.getConnectionState())
                 && auxiliaryConnections.add(connectionContext);
     }
 
     @Override
-    public boolean auxiliaryConnectionDropped(@Nonnull final ConnectionContext connectionContext) {
+    public boolean auxiliaryConnectionDropped(@NonNull final ConnectionContext connectionContext) {
         return auxiliaryConnections.remove(connectionContext);
     }
 
     @Override
-    public void registerDeviceRemovedHandler(@Nonnull final DeviceRemovedHandler deviceRemovedHandler) {
+    public void registerDeviceRemovedHandler(@NonNull final DeviceRemovedHandler deviceRemovedHandler) {
         deviceRemovedHandlers.add(deviceRemovedHandler);
     }
 
index 9c1ff0fc325bb1e56e73ae98482702a3e5c2cce2..2dc60069ab0a6c48ed4182060428746050b7dc67 100644 (file)
@@ -22,7 +22,7 @@ import com.google.common.util.concurrent.Monitor.Guard;
 import com.google.common.util.concurrent.MoreExecutors;
 import com.google.common.util.concurrent.Service;
 import java.util.function.Function;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.mdsal.singleton.common.api.ServiceGroupIdentifier;
 import org.opendaylight.openflowplugin.api.openflow.OFPContext;
 import org.opendaylight.openflowplugin.api.openflow.device.DeviceInfo;
@@ -127,7 +127,7 @@ public class GuardedContextImpl implements GuardedContext {
         return result;
     }
 
-    @Nonnull
+    @NonNull
     @Override
     public ServiceGroupIdentifier getIdentifier() {
         return delegate.getIdentifier();
@@ -144,7 +144,7 @@ public class GuardedContextImpl implements GuardedContext {
     }
 
     @Override
-    public void registerMastershipWatcher(@Nonnull final ContextChainMastershipWatcher contextChainMastershipWatcher) {
+    public void registerMastershipWatcher(@NonNull final ContextChainMastershipWatcher contextChainMastershipWatcher) {
         delegate.registerMastershipWatcher(contextChainMastershipWatcher);
     }
 
index 72f3dbfde1fcc9b123c182163ee86fd493cf3e71..dd6e81c367e5f8483d80df9139f8ae303e52515a 100644 (file)
@@ -13,9 +13,9 @@ import com.google.common.annotations.VisibleForTesting;
 import com.google.common.util.concurrent.ListenableFuture;
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
-import javax.annotation.Nonnull;
 import javax.inject.Singleton;
 import org.apache.aries.blueprint.annotation.service.Service;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowplugin.api.openflow.device.DeviceInfo;
 import org.opendaylight.openflowplugin.api.openflow.lifecycle.MasterChecker;
 import org.opendaylight.openflowplugin.api.openflow.mastership.MastershipChangeException;
@@ -38,9 +38,9 @@ public final class MastershipChangeServiceManagerImpl implements MastershipChang
     private ReconciliationFrameworkEvent rfService = null;
     private MasterChecker masterChecker;
 
-    @Nonnull
+    @NonNull
     @Override
-    public MastershipChangeRegistration register(@Nonnull MastershipChangeService service) {
+    public MastershipChangeRegistration register(@NonNull MastershipChangeService service) {
         final MastershipServiceDelegate registration =
                 new MastershipServiceDelegate(service, () -> serviceGroup.remove(service));
         serviceGroup.add(service);
@@ -52,7 +52,7 @@ public final class MastershipChangeServiceManagerImpl implements MastershipChang
 
     @Override
     public ReconciliationFrameworkRegistration reconciliationFrameworkRegistration(
-            @Nonnull ReconciliationFrameworkEvent reconciliationFrameworkEvent) throws MastershipChangeException {
+            @NonNull ReconciliationFrameworkEvent reconciliationFrameworkEvent) throws MastershipChangeException {
         if (rfService != null) {
             throw new MastershipChangeException("Reconciliation framework already registered.");
         } else {
@@ -67,12 +67,12 @@ public final class MastershipChangeServiceManagerImpl implements MastershipChang
     }
 
     @Override
-    public void becomeMaster(@Nonnull final DeviceInfo deviceInfo) {
+    public void becomeMaster(@NonNull final DeviceInfo deviceInfo) {
         serviceGroup.forEach(mastershipChangeService -> mastershipChangeService.onBecomeOwner(deviceInfo));
     }
 
     @Override
-    public void becomeSlaveOrDisconnect(@Nonnull final DeviceInfo deviceInfo) {
+    public void becomeSlaveOrDisconnect(@NonNull final DeviceInfo deviceInfo) {
         if (rfService != null) {
             ListenableFuture<Void> future = rfService.onDeviceDisconnected(deviceInfo);
             // TODO This null future check here should ideally not be required, but some tests currently rely on it
@@ -84,12 +84,12 @@ public final class MastershipChangeServiceManagerImpl implements MastershipChang
     }
 
     @Override
-    public ListenableFuture<ResultState> becomeMasterBeforeSubmittedDS(@Nonnull DeviceInfo deviceInfo) {
+    public ListenableFuture<ResultState> becomeMasterBeforeSubmittedDS(@NonNull DeviceInfo deviceInfo) {
         return rfService == null ? null : rfService.onDevicePrepared(deviceInfo);
     }
 
     @Override
-    public void setMasterChecker(@Nonnull final MasterChecker masterChecker) {
+    public void setMasterChecker(@NonNull final MasterChecker masterChecker) {
         this.masterChecker = masterChecker;
     }
 
index 0d6cd67e7fdeeedd91e4b9d135dd95a97741e61e..25e9fb728d7e56b610996abaf2168e51581a2010 100644 (file)
@@ -7,7 +7,7 @@
  */
 package org.opendaylight.openflowplugin.impl.mastership;
 
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowplugin.api.openflow.device.DeviceInfo;
 import org.opendaylight.openflowplugin.api.openflow.mastership.MastershipChangeRegistration;
 import org.opendaylight.openflowplugin.api.openflow.mastership.MastershipChangeService;
@@ -35,12 +35,12 @@ public class MastershipServiceDelegate implements MastershipChangeService, Maste
     }
 
     @Override
-    public void onBecomeOwner(@Nonnull final DeviceInfo deviceInfo) {
+    public void onBecomeOwner(@NonNull final DeviceInfo deviceInfo) {
         this.service.onBecomeOwner(deviceInfo);
     }
 
     @Override
-    public void onLoseOwnership(@Nonnull final DeviceInfo deviceInfo) {
+    public void onLoseOwnership(@NonNull final DeviceInfo deviceInfo) {
         this.service.onLoseOwnership(deviceInfo);
     }
 
index 36310df677e70d667080980cf11c8cd8ac35da6e..af3c7a834275e04ae50c38613b24393d98148b92 100644 (file)
@@ -8,7 +8,7 @@
 package org.opendaylight.openflowplugin.impl.mastership;
 
 import com.google.common.util.concurrent.ListenableFuture;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowplugin.api.openflow.device.DeviceInfo;
 import org.opendaylight.openflowplugin.api.openflow.mastership.ReconciliationFrameworkEvent;
 import org.opendaylight.openflowplugin.api.openflow.mastership.ReconciliationFrameworkRegistration;
@@ -39,12 +39,12 @@ public class ReconciliationFrameworkServiceDelegate implements
     }
 
     @Override
-    public ListenableFuture<ResultState> onDevicePrepared(@Nonnull DeviceInfo deviceInfo) {
+    public ListenableFuture<ResultState> onDevicePrepared(@NonNull DeviceInfo deviceInfo) {
         return this.service.onDevicePrepared(deviceInfo);
     }
 
     @Override
-    public ListenableFuture<Void> onDeviceDisconnected(@Nonnull DeviceInfo deviceInfo) {
+    public ListenableFuture<Void> onDeviceDisconnected(@NonNull DeviceInfo deviceInfo) {
         return this.service.onDeviceDisconnected(deviceInfo);
     }
 
index 6451f91abdec180078733e05810ca25986dc3f2f..e13e9a3985502c6b8f71c4c3843d964486042260 100644 (file)
@@ -8,7 +8,7 @@
 package org.opendaylight.openflowplugin.impl.protocol.deserialization.match;
 
 import io.netty.buffer.ByteBuf;
-import javax.annotation.Nullable;
+import org.eclipse.jdt.annotation.Nullable;
 import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants;
 import org.opendaylight.openflowjava.protocol.impl.deserialization.match.OxmDeserializerHelper;
 import org.opendaylight.openflowjava.util.ByteBufUtils;
index 144686130a152c67d493925e8b5bead371f629e5..a71a738ecc7272bb896c2153c80acee7dd8a0de4 100644 (file)
@@ -25,8 +25,7 @@ import java.util.Objects;
 import java.util.Optional;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Consumer;
-import javax.annotation.Nonnull;
-import javax.annotation.concurrent.ThreadSafe;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.mdsal.binding.api.DataBroker;
 import org.opendaylight.mdsal.binding.api.ReadTransaction;
 import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
@@ -45,7 +44,9 @@ import org.opendaylight.yangtools.yang.common.Uint8;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-@ThreadSafe
+/*
+ * this class is marked to be thread safe
+ */
 public class DeviceFlowRegistryImpl implements DeviceFlowRegistry {
     private static final Logger LOG = LoggerFactory.getLogger(DeviceFlowRegistryImpl.class);
     private static final String ALIEN_SYSTEM_FLOW_ID = "#UF$TABLE*";
@@ -134,7 +135,7 @@ public class DeviceFlowRegistryImpl implements DeviceFlowRegistry {
     }
 
     @Override
-    public FlowDescriptor retrieveDescriptor(@Nonnull final FlowRegistryKey flowRegistryKey) {
+    public FlowDescriptor retrieveDescriptor(@NonNull final FlowRegistryKey flowRegistryKey) {
         if (LOG.isTraceEnabled()) {
             LOG.trace("Retrieving flow descriptor for flow registry : {}", flowRegistryKey.toString());
         }
@@ -147,8 +148,8 @@ public class DeviceFlowRegistryImpl implements DeviceFlowRegistry {
     }
 
     @Override
-    public void storeDescriptor(@Nonnull final FlowRegistryKey flowRegistryKey,
-                                @Nonnull final FlowDescriptor flowDescriptor) {
+    public void storeDescriptor(@NonNull final FlowRegistryKey flowRegistryKey,
+                                @NonNull final FlowDescriptor flowDescriptor) {
         try {
             if (LOG.isTraceEnabled()) {
                 LOG.trace("Storing flowDescriptor with table ID : {} and flow ID : {} for flow hash : {}",
index c914c09a78156bd2e89f2f39cdf6fefb9287e898..e57a146ba08eaa7e4f4384704532a3461dfb19a9 100644 (file)
@@ -10,7 +10,7 @@ package org.opendaylight.openflowplugin.impl.registry.flow;
 import static java.util.Objects.requireNonNull;
 
 import com.google.common.base.Objects;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowplugin.api.openflow.registry.flow.FlowDescriptor;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.FlowId;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.tables.TableKey;
@@ -26,8 +26,8 @@ public final class FlowDescriptorFactory {
         // Hide implicit constructor
     }
 
-    @Nonnull
-    public static FlowDescriptor create(final Uint8 tableId, @Nonnull final FlowId flowId) {
+    @NonNull
+    public static FlowDescriptor create(final Uint8 tableId, @NonNull final FlowId flowId) {
         return new FlowDescriptorDto(new TableKey(tableId), requireNonNull(flowId));
     }
 
@@ -36,7 +36,7 @@ public final class FlowDescriptorFactory {
         private final FlowId flowId;
         private final TableKey tableKey;
 
-        private FlowDescriptorDto(@Nonnull final TableKey tableKey, @Nonnull final FlowId flowId) {
+        private FlowDescriptorDto(@NonNull final TableKey tableKey, @NonNull final FlowId flowId) {
             this.flowId = flowId;
             this.tableKey = tableKey;
         }
index c51cd61c8eefcc53ea726422f6bbd01d1c50d30e..05f18c2396c95af670f3237b4f8b6b566c8e49e9 100644 (file)
@@ -11,7 +11,7 @@ package org.opendaylight.openflowplugin.impl.registry.flow;
 import com.google.common.base.MoreObjects;
 import com.google.common.base.Preconditions;
 import java.util.Objects;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowplugin.api.OFConstants;
 import org.opendaylight.openflowplugin.api.openflow.registry.flow.FlowRegistryKey;
 import org.opendaylight.openflowplugin.impl.util.MatchNormalizationUtil;
@@ -29,8 +29,8 @@ public final class FlowRegistryKeyFactory {
         // Hide implicit constructor
     }
 
-    @Nonnull
-    public static FlowRegistryKey create(final short version, @Nonnull final Flow flow) {
+    @NonNull
+    public static FlowRegistryKey create(final short version, @NonNull final Flow flow) {
         //TODO: mandatory flow input values (or default values) should be specified via yang model
         final Uint8 tableId = Preconditions.checkNotNull(flow.getTableId(), "flow tableId must not be null");
         final Uint16 priority = MoreObjects.firstNonNull(flow.getPriority(), OFConstants.DEFAULT_FLOW_PRIORITY);
@@ -49,8 +49,8 @@ public final class FlowRegistryKeyFactory {
 
         private FlowRegistryKeyDto(final short tableId,
                                    final int priority,
-                                   @Nonnull final Uint64 cookie,
-                                   @Nonnull final Match match) {
+                                   @NonNull final Uint64 cookie,
+                                   @NonNull final Match match) {
             this.tableId = tableId;
             this.priority = priority;
             this.cookie = cookie;
index 1e4420749851e9804fbfae05763026d7e6b8784b..454b0b2d59fb2a95b47c3308eebb8cb575f45f00 100755 (executable)
@@ -13,11 +13,12 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.function.Consumer;
-import javax.annotation.concurrent.ThreadSafe;
 import org.opendaylight.openflowplugin.api.openflow.registry.group.DeviceGroupRegistry;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.GroupId;
 
-@ThreadSafe
+/*
+ * this class is marked to be thread safe
+ */
 public class DeviceGroupRegistryImpl implements DeviceGroupRegistry {
 
     private final List<GroupId> groupIds = Collections.synchronizedList(new ArrayList<>());
index d28c78f31aefabce5b878daf78937d68f559ddf6..63fb17b355244af5e69edbb98d748e1fecdb04a8 100755 (executable)
@@ -13,11 +13,12 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.function.Consumer;
-import javax.annotation.concurrent.ThreadSafe;
 import org.opendaylight.openflowplugin.api.openflow.registry.meter.DeviceMeterRegistry;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.types.rev130918.MeterId;
 
-@ThreadSafe
+/*
+ * this class is marked to be thread safe
+ */
 public class DeviceMeterRegistryImpl implements DeviceMeterRegistry {
 
     private final List<MeterId> meterIds = Collections.synchronizedList(new ArrayList<>());
index a09e82c4473d79c56c5196a86403bf393c7df5fe..63062ab2e1d5d68a8042ebc549d1754c19bf1bf1 100644 (file)
@@ -19,7 +19,7 @@ import java.util.concurrent.CancellationException;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.mdsal.singleton.common.api.ServiceGroupIdentifier;
 import org.opendaylight.openflowplugin.api.OFConstants;
 import org.opendaylight.openflowplugin.api.openflow.device.DeviceInfo;
@@ -57,8 +57,8 @@ public class RoleContextImpl implements RoleContext {
     private ContextChainMastershipWatcher contextChainMastershipWatcher;
     private SalRoleService roleService;
 
-    RoleContextImpl(@Nonnull final DeviceInfo deviceInfo,
-                    @Nonnull final HashedWheelTimer timer,
+    RoleContextImpl(@NonNull final DeviceInfo deviceInfo,
+                    @NonNull final HashedWheelTimer timer,
                     final long checkRoleMasterTimeout,
                     final OpenflowProviderConfig config,
                     final ExecutorService executorService) {
@@ -84,7 +84,7 @@ public class RoleContextImpl implements RoleContext {
     }
 
     @Override
-    public void registerMastershipWatcher(@Nonnull final ContextChainMastershipWatcher newWatcher) {
+    public void registerMastershipWatcher(@NonNull final ContextChainMastershipWatcher newWatcher) {
         this.contextChainMastershipWatcher = newWatcher;
     }
 
@@ -122,7 +122,7 @@ public class RoleContextImpl implements RoleContext {
         return ret;
     }
 
-    @Nonnull
+    @NonNull
     @Override
     public ServiceGroupIdentifier getIdentifier() {
         return deviceInfo.getServiceIdentifier();
index 2f2eba2edc32f741eff163ffb1c96dc6c1c09797..f5d309ff06b6c328f200526824464e85e459af6c 100644 (file)
@@ -12,7 +12,7 @@ import io.netty.util.HashedWheelTimer;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.ExecutorService;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowplugin.api.openflow.OFPContext;
 import org.opendaylight.openflowplugin.api.openflow.device.DeviceContext;
 import org.opendaylight.openflowplugin.api.openflow.device.DeviceInfo;
@@ -39,7 +39,7 @@ public class RoleManagerImpl implements RoleManager {
     }
 
     @Override
-    public RoleContext createContext(@Nonnull final DeviceContext deviceContext) {
+    public RoleContext createContext(@NonNull final DeviceContext deviceContext) {
         final DeviceInfo deviceInfo = deviceContext.getDeviceInfo();
         final RoleContextImpl roleContext = new RoleContextImpl(
                 deviceContext.getDeviceInfo(),
index d329bf8c9ae3a4249ce483dba869339f233961e5..19d4ef6e1ebdd2a067d40675ebfdf5ddb9391642 100644 (file)
@@ -18,7 +18,7 @@ import java.util.Map.Entry;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.Semaphore;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.mdsal.binding.api.NotificationPublishService;
 import org.opendaylight.mdsal.binding.api.RpcProviderService;
 import org.opendaylight.mdsal.singleton.common.api.ServiceGroupIdentifier;
@@ -59,12 +59,12 @@ class RpcContextImpl implements RpcContext {
     private final NotificationPublishService notificationPublishService;
     private ContextChainMastershipWatcher contextChainMastershipWatcher;
 
-    RpcContextImpl(@Nonnull final RpcProviderService rpcProviderRegistry,
+    RpcContextImpl(@NonNull final RpcProviderService rpcProviderRegistry,
                    final int maxRequests,
-                   @Nonnull final DeviceContext deviceContext,
-                   @Nonnull final ExtensionConverterProvider extensionConverterProvider,
-                   @Nonnull final ConvertorExecutor convertorExecutor,
-                   @Nonnull final NotificationPublishService notificationPublishService,
+                   @NonNull final DeviceContext deviceContext,
+                   @NonNull final ExtensionConverterProvider extensionConverterProvider,
+                   @NonNull final ConvertorExecutor convertorExecutor,
+                   @NonNull final NotificationPublishService notificationPublishService,
                    final boolean statisticsRpcEnabled) {
         this.deviceContext = deviceContext;
         this.deviceInfo = deviceContext.getDeviceInfo();
@@ -170,7 +170,7 @@ class RpcContextImpl implements RpcContext {
     }
 
     @Override
-    public void registerMastershipWatcher(@Nonnull final ContextChainMastershipWatcher newWatcher) {
+    public void registerMastershipWatcher(@NonNull final ContextChainMastershipWatcher newWatcher) {
         this.contextChainMastershipWatcher = newWatcher;
     }
 
@@ -197,7 +197,7 @@ class RpcContextImpl implements RpcContext {
         contextChainMastershipWatcher.onMasterRoleAcquired(deviceInfo, ContextChainMastershipState.RPC_REGISTRATION);
     }
 
-    @Nonnull
+    @NonNull
     @Override
     public ServiceGroupIdentifier getIdentifier() {
         return deviceInfo.getServiceIdentifier();
index 9736d4b8b42ba931be0bdc17a9333af9a09f0ae0..748cbce10b96d60809105728274fc4168934665c 100644 (file)
@@ -12,7 +12,7 @@ import com.google.common.collect.Iterators;
 import java.util.Iterator;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.mdsal.binding.api.NotificationPublishService;
 import org.opendaylight.mdsal.binding.api.RpcProviderService;
 import org.opendaylight.openflowplugin.api.openflow.device.DeviceContext;
@@ -66,7 +66,7 @@ public class RpcManagerImpl implements RpcManager {
     }
 
     @Override
-    public RpcContext createContext(final @Nonnull DeviceContext deviceContext) {
+    public RpcContext createContext(final @NonNull DeviceContext deviceContext) {
         final RpcContextImpl rpcContext = new RpcContextImpl(
                 rpcProviderRegistry,
                 config.getRpcRequestsQuota().getValue().toJava(),
index 187871ef8fa1222b343b701c110b77d58c5fca18..6e38acb771c4ff5b3724d856bdb6851be63b9455 100644 (file)
@@ -11,7 +11,7 @@ import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.ListenableFuture;
 import java.util.List;
 import java.util.function.Function;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowplugin.api.openflow.device.DeviceContext;
 import org.opendaylight.openflowplugin.api.openflow.device.RequestContext;
 import org.opendaylight.openflowplugin.api.openflow.device.RequestContextStack;
@@ -39,7 +39,7 @@ public abstract class AbstractMultipartService<I, T extends OfHeader> extends Ab
     }
 
     @Override
-    public final ListenableFuture<RpcResult<List<T>>> handleServiceCall(@Nonnull final I input) {
+    public final ListenableFuture<RpcResult<List<T>>> handleServiceCall(@NonNull final I input) {
         return canUseSingleLayerSerialization()
             ? super.handleServiceCall(input, ALTERNATE_IS_COMPLETE)
             : super.handleServiceCall(input);
index 1fdfa45edd3bd6a5dc54a8c6dd7c38850489dafe..e589fcb2ad7352ea31e56cc2e04271de700601a8 100644 (file)
@@ -9,8 +9,8 @@ package org.opendaylight.openflowplugin.impl.services;
 
 import com.google.common.base.Preconditions;
 import com.google.common.util.concurrent.FutureCallback;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.Nullable;
 import org.opendaylight.openflowjava.protocol.api.connection.DeviceRequestFailedException;
 import org.opendaylight.openflowplugin.api.openflow.device.RequestContext;
 import org.opendaylight.openflowplugin.api.openflow.statistics.ofpspecific.EventIdentifier;
@@ -45,7 +45,7 @@ public abstract class AbstractRequestCallback<T> implements FutureCallback<OfHea
         context.close();
     }
 
-    protected final void spyMessage(@Nonnull final StatisticsGroup group) {
+    protected final void spyMessage(@NonNull final StatisticsGroup group) {
         spy.spyMessage(requestType, Preconditions.checkNotNull(group));
     }
 
@@ -54,7 +54,7 @@ public abstract class AbstractRequestCallback<T> implements FutureCallback<OfHea
     }
 
     @Override
-    public final void onFailure(@Nonnull final Throwable throwable) {
+    public final void onFailure(@NonNull final Throwable throwable) {
         final RpcResultBuilder<T> builder;
         if (null != eventIdentifier) {
             EventsTimeCounter.markEnd(eventIdentifier);
index 68292c45553727747c007d7e8c1bcb9c4709cde5..7bd326fe50438958c3317660269391108f693192 100644 (file)
@@ -13,8 +13,8 @@ import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import java.util.function.Function;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.Nullable;
 import org.opendaylight.openflowjava.protocol.api.connection.OutboundQueue;
 import org.opendaylight.openflowplugin.api.openflow.device.DeviceContext;
 import org.opendaylight.openflowplugin.api.openflow.device.DeviceInfo;
@@ -105,11 +105,11 @@ public abstract class AbstractService<I, O> {
 
     protected abstract FutureCallback<OfHeader> createCallback(RequestContext<O> context, Class<?> requestType);
 
-    public ListenableFuture<RpcResult<O>> handleServiceCall(@Nonnull final I input) {
+    public ListenableFuture<RpcResult<O>> handleServiceCall(@NonNull final I input) {
         return handleServiceCall(input, null);
     }
 
-    public ListenableFuture<RpcResult<O>> handleServiceCall(@Nonnull final I input,
+    public ListenableFuture<RpcResult<O>> handleServiceCall(@NonNull final I input,
             @Nullable final Function<OfHeader, Boolean> isComplete) {
         Preconditions.checkNotNull(input);
 
index 7550a0b7f78b89cd4d8fb794d560be4234be7b1b..f97836db012f5fcdd0edcc6baa4becf176cebeb8 100644 (file)
@@ -11,8 +11,8 @@ import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.MoreExecutors;
 import java.util.function.Function;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.Nullable;
 import org.opendaylight.openflowplugin.api.openflow.device.DeviceContext;
 import org.opendaylight.openflowplugin.api.openflow.device.RequestContextStack;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.OfHeader;
@@ -30,7 +30,7 @@ public abstract class AbstractSilentErrorService<I, O extends DataObject>
     }
 
     @Override
-    public ListenableFuture<RpcResult<O>> handleServiceCall(@Nonnull I input,
+    public ListenableFuture<RpcResult<O>> handleServiceCall(@NonNull I input,
                                                             @Nullable final Function<OfHeader, Boolean> isComplete) {
         return Futures.catching(
             super.handleServiceCall(input, isComplete),
index 0fb57f9a11411c06ab542b97bb9d3f632eb73506..3a6d111f7fe454dc77a590d0a4c054d3d28f464b 100644 (file)
@@ -22,7 +22,7 @@ import java.util.Optional;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicReference;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.mdsal.binding.api.TransactionChainClosedException;
 import org.opendaylight.mdsal.singleton.common.api.ServiceGroupIdentifier;
 import org.opendaylight.openflowplugin.api.ConnectionException;
@@ -73,11 +73,11 @@ class StatisticsContextImpl<T extends OfHeader> implements StatisticsContext, De
     private StatisticsGatheringOnTheFlyService<T> statisticsGatheringOnTheFlyService;
     private ContextChainMastershipWatcher contextChainMastershipWatcher;
 
-    StatisticsContextImpl(@Nonnull final DeviceContext deviceContext,
-                          @Nonnull final ConvertorExecutor convertorExecutor,
-                          @Nonnull final MultipartWriterProvider statisticsWriterProvider,
-                          @Nonnull final ListeningExecutorService executorService,
-                          @Nonnull final OpenflowProviderConfig config,
+    StatisticsContextImpl(@NonNull final DeviceContext deviceContext,
+                          @NonNull final ConvertorExecutor convertorExecutor,
+                          @NonNull final MultipartWriterProvider statisticsWriterProvider,
+                          @NonNull final ListeningExecutorService executorService,
+                          @NonNull final OpenflowProviderConfig config,
                           final boolean isStatisticsPollingOn,
                           final boolean isUsingReconciliationFramework) {
         this.deviceContext = deviceContext;
@@ -103,14 +103,14 @@ class StatisticsContextImpl<T extends OfHeader> implements StatisticsContext, De
         return this.deviceInfo;
     }
 
-    @Nonnull
+    @NonNull
     @Override
     public ServiceGroupIdentifier getIdentifier() {
         return deviceInfo.getServiceIdentifier();
     }
 
     @Override
-    public void registerMastershipWatcher(@Nonnull final ContextChainMastershipWatcher newWatcher) {
+    public void registerMastershipWatcher(@NonNull final ContextChainMastershipWatcher newWatcher) {
         this.contextChainMastershipWatcher = newWatcher;
     }
 
index c3645b7f3d1b82671c76d45839b12695feeed4d1..ca63473aa0db7a40f0e98f926852ddf4be55efb8 100644 (file)
@@ -13,7 +13,7 @@ import com.google.common.util.concurrent.ListeningExecutorService;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.Semaphore;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.mdsal.binding.api.RpcProviderService;
 import org.opendaylight.openflowplugin.api.openflow.device.DeviceContext;
 import org.opendaylight.openflowplugin.api.openflow.device.DeviceInfo;
@@ -50,10 +50,10 @@ public class StatisticsManagerImpl implements StatisticsManager, StatisticsManag
     private final StatisticsWorkMode workMode = StatisticsWorkMode.COLLECTALL;
     private boolean isStatisticsFullyDisabled;
 
-    public StatisticsManagerImpl(@Nonnull final OpenflowProviderConfig config,
-                                 @Nonnull final RpcProviderService rpcProviderRegistry,
+    public StatisticsManagerImpl(@NonNull final OpenflowProviderConfig config,
+                                 @NonNull final RpcProviderService rpcProviderRegistry,
                                  final ConvertorExecutor convertorExecutor,
-                                 @Nonnull final ListeningExecutorService executorService) {
+                                 @NonNull final ListeningExecutorService executorService) {
         this.config = config;
         this.converterExecutor = convertorExecutor;
         this.controlServiceRegistration = Preconditions.checkNotNull(rpcProviderRegistry
@@ -100,7 +100,7 @@ public class StatisticsManagerImpl implements StatisticsManager, StatisticsManag
     }
 
     @Override
-    public StatisticsContext createContext(@Nonnull final DeviceContext deviceContext,
+    public StatisticsContext createContext(@NonNull final DeviceContext deviceContext,
                                            final boolean useReconciliationFramework) {
         final MultipartWriterProvider statisticsWriterProvider = MultipartWriterProviderFactory
                 .createDefaultProvider(deviceContext);
index c242c7496a604cc2704396b6901bf5c2392ae7e6..49c64bd144d45b1820e5ff5316167e1059397bcf 100644 (file)
@@ -18,7 +18,7 @@ import java.util.concurrent.CancellationException;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Supplier;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowplugin.api.ConnectionException;
 
 public class StatisticsPollingService extends AbstractScheduledService {
@@ -30,10 +30,10 @@ public class StatisticsPollingService extends AbstractScheduledService {
     private final Supplier<ListenableFuture<Boolean>> gatheringSupplier;
     private final SettableFuture<Void> future = SettableFuture.create();
 
-    StatisticsPollingService(@Nonnull final TimeCounter counter,
+    StatisticsPollingService(@NonNull final TimeCounter counter,
                              final long pollingInterval,
                              final long maximumTimerDelay,
-                             @Nonnull final Supplier<ListenableFuture<Boolean>> gatheringSupplier) {
+                             @NonNull final Supplier<ListenableFuture<Boolean>> gatheringSupplier) {
         this.counter = counter;
         this.pollingInterval = pollingInterval;
         this.maximumTimerDelay = maximumTimerDelay;
index 455b537f958be3973abd83170ded68afc8236ae1..f14fc41f48f2f1e386f6f6b6d6aedb4f809215ee 100644 (file)
@@ -16,7 +16,7 @@ import java.util.Map.Entry;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.atomic.AtomicLongFieldUpdater;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowplugin.api.openflow.statistics.ofpspecific.MessageIntelligenceAgency;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -56,7 +56,7 @@ public class MessageIntelligenceAgencyImpl implements MessageIntelligenceAgency,
             new ConcurrentHashMap<>();
 
     @Override
-    public void spyMessage(@Nonnull final Class<?> message, final StatisticsGroup statGroup) {
+    public void spyMessage(@NonNull final Class<?> message, final StatisticsGroup statGroup) {
         Preconditions.checkNotNull(message, "Message can't be null.");
         getCounters(message, statGroup).increment();
     }
index 4f83d238382334dc0dede63b4ae80b2259a4bef4..15681a1a6f9dc7bfdf3c3e5dd8551ebe8d9d5532 100644 (file)
@@ -10,7 +10,7 @@ package org.opendaylight.openflowplugin.impl.util;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.util.Locale;
-import javax.annotation.Nullable;
+import org.eclipse.jdt.annotation.Nullable;
 import org.opendaylight.openflowplugin.api.openflow.md.util.OpenflowVersion;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.common.IpConversionUtil;
 import org.opendaylight.openflowplugin.openflow.md.util.InventoryDataServiceUtil;
index 6fc9cc344243670ec1790982d46d4637f33fc2cc..44719b77b19c4ee8411edd4c02022d873fa324f9 100644 (file)
@@ -16,8 +16,8 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
-import javax.annotation.Nonnull;
 import org.apache.commons.lang3.tuple.Pair;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.FlowCapableNode;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.FlowId;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.tables.Table;
@@ -208,7 +208,7 @@ public final class FlowUtil {
         }
 
         public Function<List<RpcResult<O>>, RpcResult<List<BatchFailedFlowsOutput>>> invoke() {
-            return (@Nonnull final List<RpcResult<O>> innerInput) -> {
+            return (@NonNull final List<RpcResult<O>> innerInput) -> {
                 final int sizeOfFutures = innerInput.size();
                 final int sizeOfInputBatch = inputBatchFlows.size();
                 Preconditions.checkArgument(sizeOfFutures == sizeOfInputBatch,
index 6aa643104aa23c3731548eff890b1137955fd096..d2e6bae15f4c19f65c16515438d3bd363673b6c3 100644 (file)
@@ -25,7 +25,7 @@ import java.util.Set;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowplugin.api.OFConstants;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.flow.Match;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.flow.MatchBuilder;
@@ -70,8 +70,8 @@ public final class MatchNormalizationUtil {
      * @param version the OpenFlow version
      * @return normalized OpenFlow match
      */
-    @Nonnull
-    public static Match normalizeMatch(@Nonnull final Match match, final short version) {
+    @NonNull
+    public static Match normalizeMatch(@NonNull final Match match, final short version) {
         final MatchBuilder matchBuilder = new MatchBuilder(match);
 
         Optional.ofNullable(NORMALIZERS.get(version))
@@ -81,7 +81,7 @@ public final class MatchNormalizationUtil {
         return matchBuilder.build();
     }
 
-    @Nonnull
+    @NonNull
     private static Stream<Function<MatchBuilder, MatchBuilder>> createNormalizers(final short version) {
         return Stream.of(
             MatchNormalizationUtil::normalizeExtensionMatch,
@@ -96,14 +96,14 @@ public final class MatchNormalizationUtil {
             (match) -> normalizeInPhyPortMatch(match, version));
     }
 
-    @Nonnull
-    private static MatchBuilder normalizeExtensionMatch(@Nonnull final MatchBuilder match) {
+    @NonNull
+    private static MatchBuilder normalizeExtensionMatch(@NonNull final MatchBuilder match) {
         return new MatchBuilder(MatchUtil.transformMatch(match.build(), Match.class));
     }
 
-    @Nonnull
+    @NonNull
     @VisibleForTesting
-    static MatchBuilder normalizeInPortMatch(@Nonnull final MatchBuilder match, final short version) {
+    static MatchBuilder normalizeInPortMatch(@NonNull final MatchBuilder match, final short version) {
         return Optional
                 .ofNullable(match.getInPort())
                 .flatMap(inPort -> Optional.ofNullable(normalizeProtocolAgnosticPort(inPort, version)))
@@ -111,9 +111,9 @@ public final class MatchNormalizationUtil {
                 .orElse(match);
     }
 
-    @Nonnull
+    @NonNull
     @VisibleForTesting
-    static MatchBuilder normalizeInPhyPortMatch(@Nonnull final MatchBuilder match, final short version) {
+    static MatchBuilder normalizeInPhyPortMatch(@NonNull final MatchBuilder match, final short version) {
         return Optional
                 .ofNullable(match.getInPhyPort())
                 .flatMap(inPhyPort -> Optional.ofNullable(normalizeProtocolAgnosticPort(inPhyPort, version)))
@@ -121,9 +121,9 @@ public final class MatchNormalizationUtil {
                 .orElse(match);
     }
 
-    @Nonnull
+    @NonNull
     @VisibleForTesting
-    static MatchBuilder normalizeArpMatch(@Nonnull final MatchBuilder match) {
+    static MatchBuilder normalizeArpMatch(@NonNull final MatchBuilder match) {
         return Optional
                 .ofNullable(match.getLayer3Match())
                 .filter(ArpMatch.class::isInstance)
@@ -151,9 +151,9 @@ public final class MatchNormalizationUtil {
     }
 
 
-    @Nonnull
+    @NonNull
     @VisibleForTesting
-    static MatchBuilder normalizeTunnelIpv4Match(@Nonnull final MatchBuilder match) {
+    static MatchBuilder normalizeTunnelIpv4Match(@NonNull final MatchBuilder match) {
         return Optional
                 .ofNullable(match.getLayer3Match())
                 .filter(TunnelIpv4Match.class::isInstance)
@@ -165,9 +165,9 @@ public final class MatchNormalizationUtil {
                 .orElse(match);
     }
 
-    @Nonnull
+    @NonNull
     @VisibleForTesting
-    static MatchBuilder normalizeIpv4Match(@Nonnull final MatchBuilder match) {
+    static MatchBuilder normalizeIpv4Match(@NonNull final MatchBuilder match) {
         return Optional
                 .ofNullable(match.getLayer3Match())
                 .filter(Ipv4Match.class::isInstance)
@@ -179,9 +179,9 @@ public final class MatchNormalizationUtil {
                 .orElse(match);
     }
 
-    @Nonnull
+    @NonNull
     @VisibleForTesting
-    static MatchBuilder normalizeIpv4MatchArbitraryBitMask(@Nonnull final MatchBuilder match) {
+    static MatchBuilder normalizeIpv4MatchArbitraryBitMask(@NonNull final MatchBuilder match) {
         return Optional
                 .ofNullable(match.getLayer3Match())
                 .filter(Ipv4MatchArbitraryBitMask.class::isInstance)
@@ -198,9 +198,9 @@ public final class MatchNormalizationUtil {
     }
 
 
-    @Nonnull
+    @NonNull
     @VisibleForTesting
-    static MatchBuilder normalizeIpv6Match(@Nonnull final MatchBuilder match) {
+    static MatchBuilder normalizeIpv6Match(@NonNull final MatchBuilder match) {
         return Optional
                 .ofNullable(match.getLayer3Match())
                 .filter(Ipv6Match.class::isInstance)
@@ -216,9 +216,9 @@ public final class MatchNormalizationUtil {
     }
 
 
-    @Nonnull
+    @NonNull
     @VisibleForTesting
-    static MatchBuilder normalizeIpv6MatchArbitraryBitMask(@Nonnull final MatchBuilder match) {
+    static MatchBuilder normalizeIpv6MatchArbitraryBitMask(@NonNull final MatchBuilder match) {
         return Optional
                 .ofNullable(match.getLayer3Match())
                 .filter(Ipv6MatchArbitraryBitMask.class::isInstance)
@@ -234,9 +234,9 @@ public final class MatchNormalizationUtil {
                 .orElse(match);
     }
 
-    @Nonnull
+    @NonNull
     @VisibleForTesting
-    static MatchBuilder normalizeEthernetMatch(@Nonnull final MatchBuilder match) {
+    static MatchBuilder normalizeEthernetMatch(@NonNull final MatchBuilder match) {
         return Optional
                 .ofNullable(match.getEthernetMatch())
                 .map(eth -> match.setEthernetMatch(new EthernetMatchBuilder(eth)
index ebf04678eed6b2bd48cc298d8c6802782c997d86..47500a30b5a3c14240ee71d61a7b2292ee0052e2 100644 (file)
@@ -12,8 +12,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.function.Function;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.Nullable;
 import org.opendaylight.openflowplugin.openflow.md.core.extension.ExtensionResolvers;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.MacAddress;
@@ -142,7 +142,7 @@ public final class MatchUtil {
 
     @Nullable
     public static <T extends Match> T transformMatch(@Nullable final Match match,
-                                                     @Nonnull final Class<T> implementedInterface) {
+                                                     @NonNull final Class<T> implementedInterface) {
         if (match == null) {
             return null;
         }
index ced0513226c1f5f685cdd422b1cf58f18604d587..3f3f3600273b6ee0281a375b46e023e89a60de14 100644 (file)
@@ -9,7 +9,7 @@ package org.opendaylight.openflowplugin.impl.util;
 
 import com.google.common.base.Preconditions;
 import java.util.concurrent.atomic.AtomicLong;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.mdsal.binding.api.NotificationPublishService;
 import org.opendaylight.openflowplugin.api.openflow.device.DeviceContext;
 import org.opendaylight.openflowplugin.api.openflow.rpc.RpcContext;
@@ -86,8 +86,8 @@ public final class MdSalRegistrationUtils {
      *
      * @param convertorExecutor convertor executor
      */
-    public static void registerServices(@Nonnull final RpcContext rpcContext,
-                                        @Nonnull final DeviceContext deviceContext,
+    public static void registerServices(@NonNull final RpcContext rpcContext,
+                                        @NonNull final DeviceContext deviceContext,
                                         final ExtensionConverterProvider extensionConverterProvider,
                                         final ConvertorExecutor convertorExecutor) {
         // TODO: Use multipart writer provider from device context
index fae0666ba606aa9e47998f2fb0bab0125e498284..4d00092816ec222ab4435a73cbe0f53a540e3d11 100644 (file)
@@ -10,8 +10,8 @@ package org.opendaylight.openflowplugin.impl.util;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Preconditions;
 import java.util.List;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.Nullable;
 import org.opendaylight.openflowplugin.api.OFConstants;
 import org.opendaylight.openflowplugin.api.openflow.md.util.OpenflowVersion;
 import org.opendaylight.openflowplugin.openflow.md.util.InventoryDataServiceUtil;
@@ -42,7 +42,7 @@ public final class NodeConnectorRefToPortTranslator {
      * @return packet input converted to node connector reference
      */
     @Nullable
-    public static NodeConnectorRef toNodeConnectorRef(@Nonnull final PacketIn packetIn, final Uint64 dataPathId) {
+    public static NodeConnectorRef toNodeConnectorRef(@NonNull final PacketIn packetIn, final Uint64 dataPathId) {
         Preconditions.checkNotNull(packetIn);
 
         NodeConnectorRef ref = null;
@@ -65,7 +65,7 @@ public final class NodeConnectorRefToPortTranslator {
      */
     @SuppressWarnings("unchecked")
     @Nullable
-    public static Uint32 fromNodeConnectorRef(@Nonnull final NodeConnectorRef nodeConnectorRef, final short version) {
+    public static Uint32 fromNodeConnectorRef(@NonNull final NodeConnectorRef nodeConnectorRef, final short version) {
         Preconditions.checkNotNull(nodeConnectorRef);
 
         Uint32 port = null;
@@ -86,7 +86,7 @@ public final class NodeConnectorRefToPortTranslator {
 
     @VisibleForTesting
     @Nullable
-    static Uint32 getPortNoFromPacketIn(@Nonnull final PacketIn packetIn) {
+    static Uint32 getPortNoFromPacketIn(@NonNull final PacketIn packetIn) {
         Preconditions.checkNotNull(packetIn);
 
         Uint32 port = null;
index ce2f247d30e0d19c975aa9699d8adc07bc4c4e31..98449b95c31b67a79cc7e9f484fddea04a7367aa 100644 (file)
@@ -23,7 +23,7 @@ import java.util.List;
 import java.util.concurrent.ArrayBlockingQueue;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import javax.inject.Inject;
 import org.junit.After;
 import org.junit.Assert;
@@ -164,7 +164,7 @@ public class OFPluginFlowTest {
         }
 
         @Override
-        public void onDataTreeChanged(@Nonnull Collection<DataTreeModification<FlowCapableNode>> modifications) {
+        public void onDataTreeChanged(@NonNull Collection<DataTreeModification<FlowCapableNode>> modifications) {
 
             for (DataTreeModification modification : modifications) {
                 if (modification.getRootNode().getModificationType() == ModificationType.WRITE) {
index b271b019bc916c9b08975ee217cac034e9d60257..8507ed116ce6e8739971d103a5b1c2167205f936 100644 (file)
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.google.code.findbugs</groupId>
-            <artifactId>jsr305</artifactId>
-            <version>3.0.2</version>
-            <optional>true</optional>
-        </dependency>
 
         <dependency>
             <groupId>org.slf4j</groupId>
index ec75919aa9722508ca0684b61e638ff2581d9d18..e01b4024ef1107f49f132421b2a4f6d07ada28a0 100644 (file)
@@ -9,7 +9,7 @@
 package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.cases;
 
 import java.util.Optional;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowplugin.api.OFConstants;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.data.ActionResponseConvertorData;
@@ -25,7 +25,7 @@ public class OfToSalCopyTtlInCase extends ConvertorCase<CopyTtlInCase, Action, A
     }
 
     @Override
-    public Optional<Action> process(@Nonnull final CopyTtlInCase source, final ActionResponseConvertorData data,
+    public Optional<Action> process(@NonNull final CopyTtlInCase source, final ActionResponseConvertorData data,
             ConvertorExecutor convertorExecutor) {
         CopyTtlInBuilder copyTtlInaction = new CopyTtlInBuilder();
         return Optional.of(new CopyTtlInCaseBuilder().setCopyTtlIn(copyTtlInaction.build()).build());
index 833f252d2ff57931735f76e148ce935c169a94f5..9c6ae31e0809da7565a38fe31b6a4fbda6d4cbf9 100644 (file)
@@ -9,7 +9,7 @@
 package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.cases;
 
 import java.util.Optional;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowplugin.api.OFConstants;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.data.ActionResponseConvertorData;
@@ -25,7 +25,7 @@ public class OfToSalCopyTtlOutCase extends ConvertorCase<CopyTtlOutCase, Action,
     }
 
     @Override
-    public Optional<Action> process(@Nonnull final CopyTtlOutCase source, final ActionResponseConvertorData data,
+    public Optional<Action> process(@NonNull final CopyTtlOutCase source, final ActionResponseConvertorData data,
             ConvertorExecutor convertorExecutor) {
         CopyTtlOutBuilder copyTtlOutaction = new CopyTtlOutBuilder();
         return Optional.of(new CopyTtlOutCaseBuilder().setCopyTtlOut(copyTtlOutaction.build()).build());
index aaab8e9a998b3bc6358564866c81f0506885908a..baabe7e2418e29cdafa95e29664c910092176ae5 100644 (file)
@@ -9,7 +9,7 @@
 package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.cases;
 
 import java.util.Optional;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowplugin.api.OFConstants;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.data.ActionResponseConvertorData;
@@ -25,7 +25,7 @@ public class OfToSalDecMplsTtlCase extends ConvertorCase<DecMplsTtlCase, Action,
     }
 
     @Override
-    public Optional<Action> process(@Nonnull final DecMplsTtlCase source, final ActionResponseConvertorData data,
+    public Optional<Action> process(@NonNull final DecMplsTtlCase source, final ActionResponseConvertorData data,
             ConvertorExecutor convertorExecutor) {
         DecMplsTtlBuilder decMplsTtl = new DecMplsTtlBuilder();
         return Optional.of(new DecMplsTtlCaseBuilder().setDecMplsTtl(decMplsTtl.build()).build());
index 83c874f87acdf9d406f2f399cc1b6e66479f024d..927bdb0f2ef70489c1c87b789c31a175f326dba3 100644 (file)
@@ -9,7 +9,7 @@
 package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.cases;
 
 import java.util.Optional;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowplugin.api.OFConstants;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.data.ActionResponseConvertorData;
@@ -25,7 +25,7 @@ public class OfToSalDecNwTtlCase extends ConvertorCase<DecNwTtlCase, Action, Act
     }
 
     @Override
-    public Optional<Action> process(@Nonnull final DecNwTtlCase source, final ActionResponseConvertorData data,
+    public Optional<Action> process(@NonNull final DecNwTtlCase source, final ActionResponseConvertorData data,
             ConvertorExecutor convertorExecutor) {
         DecNwTtlBuilder decNwTtl = new DecNwTtlBuilder();
         return Optional.of(new DecNwTtlCaseBuilder().setDecNwTtl(decNwTtl.build()).build());
index 9429751d5c2997e639132f86368260df3a84a269..76c9e6b6d0e3804a210361d5149d8ede86875f56 100644 (file)
@@ -9,7 +9,7 @@
 package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.cases;
 
 import java.util.Optional;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowplugin.api.OFConstants;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.data.ActionResponseConvertorData;
@@ -26,7 +26,7 @@ public class OfToSalGroupCase extends ConvertorCase<GroupCase, Action, ActionRes
     }
 
     @Override
-    public Optional<Action> process(@Nonnull final GroupCase source, final ActionResponseConvertorData data,
+    public Optional<Action> process(@NonNull final GroupCase source, final ActionResponseConvertorData data,
             ConvertorExecutor convertorExecutor) {
         GroupAction groupActionFromOF = source.getGroupAction();
         GroupActionBuilder groupAction = new GroupActionBuilder();
index f40a4304b339631c5d1b5cec2ec523c33553b5b0..8df17a3bfa2014894eabcf1b5b8de0933b354b5b 100644 (file)
@@ -8,7 +8,7 @@
 package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.cases;
 
 import java.util.Optional;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowplugin.api.OFConstants;
 import org.opendaylight.openflowplugin.api.openflow.md.util.OpenflowVersion;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor;
@@ -34,7 +34,7 @@ public class OfToSalOutputActionCase extends ConvertorCase<OutputActionCase, Act
     }
 
     @Override
-    public Optional<Action> process(@Nonnull final OutputActionCase source, final ActionResponseConvertorData data,
+    public Optional<Action> process(@NonNull final OutputActionCase source, final ActionResponseConvertorData data,
             final ConvertorExecutor convertorExecutor) {
         final OpenflowVersion ofVersion = OpenflowVersion.get(data.getVersion());
 
index 69c7a5519d53960626a7d2d97ce386fc7f14277b..73fef85531e369ce42aaabbf18ba0c9c3e8be85a 100644 (file)
@@ -9,7 +9,7 @@
 package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.cases;
 
 import java.util.Optional;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowplugin.api.OFConstants;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.data.ActionResponseConvertorData;
@@ -26,7 +26,7 @@ public class OfToSalPopMplsCase extends ConvertorCase<PopMplsCase, Action, Actio
     }
 
     @Override
-    public Optional<Action> process(@Nonnull final PopMplsCase source, final ActionResponseConvertorData data,
+    public Optional<Action> process(@NonNull final PopMplsCase source, final ActionResponseConvertorData data,
             ConvertorExecutor convertorExecutor) {
         PopMplsAction popMplsActionFromOF = source.getPopMplsAction();
         PopMplsActionBuilder popMplsAction = new PopMplsActionBuilder();
index 706e9341ab740d5ae48faf017b5ddda33ec31a73..126d239fc9841085a6a7e5328f5a4225139662c5 100644 (file)
@@ -9,7 +9,7 @@
 package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.cases;
 
 import java.util.Optional;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowplugin.api.OFConstants;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.data.ActionResponseConvertorData;
@@ -25,7 +25,7 @@ public class OfToSalPopPbbCase extends ConvertorCase<PopPbbCase, Action, ActionR
     }
 
     @Override
-    public Optional<Action> process(@Nonnull final PopPbbCase source, final ActionResponseConvertorData data,
+    public Optional<Action> process(@NonNull final PopPbbCase source, final ActionResponseConvertorData data,
             ConvertorExecutor convertorExecutor) {
         PopPbbActionBuilder popPbb = new PopPbbActionBuilder();
         return Optional.of(new PopPbbActionCaseBuilder().setPopPbbAction(popPbb.build()).build());
index 21fe1984ebe87a0bba19381e5f2a687240daca53..1b69599a294e665b956c25a73920e501d22cd322 100644 (file)
@@ -9,7 +9,7 @@
 package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.cases;
 
 import java.util.Optional;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowplugin.api.OFConstants;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.data.ActionResponseConvertorData;
@@ -25,7 +25,7 @@ public class OfToSalPopVlanCase extends ConvertorCase<PopVlanCase, Action, Actio
     }
 
     @Override
-    public Optional<Action> process(@Nonnull final PopVlanCase source, final ActionResponseConvertorData data,
+    public Optional<Action> process(@NonNull final PopVlanCase source, final ActionResponseConvertorData data,
             ConvertorExecutor convertorExecutor) {
         PopVlanActionBuilder popVlan = new PopVlanActionBuilder();
         return Optional.of(new PopVlanActionCaseBuilder().setPopVlanAction(popVlan.build()).build());
index 39b31ecae5ad29c542e80a0ceb26338a311cde98..ae09b9fc83606cb7cf567a5b0fd29d2c5ed93bfd 100644 (file)
@@ -9,7 +9,7 @@
 package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.cases;
 
 import java.util.Optional;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowplugin.api.OFConstants;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.data.ActionResponseConvertorData;
@@ -26,7 +26,7 @@ public class OfToSalPushMplsCase extends ConvertorCase<PushMplsCase, Action, Act
     }
 
     @Override
-    public Optional<Action> process(@Nonnull final PushMplsCase source, final ActionResponseConvertorData data,
+    public Optional<Action> process(@NonNull final PushMplsCase source, final ActionResponseConvertorData data,
             ConvertorExecutor convertorExecutor) {
         PushMplsAction pushMplsActionFromOF = source.getPushMplsAction();
         PushMplsActionBuilder pushMplsAction = new PushMplsActionBuilder();
index 45b1d9f1a8e4187c890ed8c30368b9c9fc1eabf3..0009a0b0e7e54e801d4c9165e936ac1e170cfffa 100644 (file)
@@ -9,7 +9,7 @@
 package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.cases;
 
 import java.util.Optional;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowplugin.api.OFConstants;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.data.ActionResponseConvertorData;
@@ -26,7 +26,7 @@ public class OfToSalPushPbbCase extends ConvertorCase<PushPbbCase, Action, Actio
     }
 
     @Override
-    public Optional<Action> process(@Nonnull final PushPbbCase source, final ActionResponseConvertorData data,
+    public Optional<Action> process(@NonNull final PushPbbCase source, final ActionResponseConvertorData data,
             ConvertorExecutor convertorExecutor) {
         PushPbbAction pushPbbActionFromOf = source.getPushPbbAction();
         PushPbbActionBuilder pushPbbAction = new PushPbbActionBuilder();
index d161fe96f03b0b6c1fcc9d08263993cdc5e5616c..9dcc7bcc7d7f81ea0a36f97a7750d2f95af0f468 100644 (file)
@@ -9,7 +9,7 @@
 package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.cases;
 
 import java.util.Optional;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowplugin.api.OFConstants;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.data.ActionResponseConvertorData;
@@ -26,7 +26,7 @@ public class OfToSalPushVlanCase extends ConvertorCase<PushVlanCase, Action, Act
     }
 
     @Override
-    public Optional<Action> process(@Nonnull final PushVlanCase source, final ActionResponseConvertorData data,
+    public Optional<Action> process(@NonNull final PushVlanCase source, final ActionResponseConvertorData data,
             ConvertorExecutor convertorExecutor) {
         PushVlanAction pushVlanActionFromOF = source.getPushVlanAction();
         PushVlanActionBuilder pushVlanAction = new PushVlanActionBuilder();
index b0aaaedd453f9d8e826b78b3c1eb6eebd9b8de76..4fe535136d74d6dd956d2b5b78e865883a5daa86 100644 (file)
@@ -9,7 +9,7 @@
 package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.cases;
 
 import java.util.Optional;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowplugin.api.OFConstants;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.data.ActionResponseConvertorData;
@@ -25,7 +25,7 @@ public class OfToSalSetDlDstCase extends ConvertorCase<SetDlDstCase, Action, Act
     }
 
     @Override
-    public Optional<Action> process(@Nonnull final SetDlDstCase source, final ActionResponseConvertorData data,
+    public Optional<Action> process(@NonNull final SetDlDstCase source, final ActionResponseConvertorData data,
             ConvertorExecutor convertorExecutor) {
         return Optional.of(new SetDlDstActionCaseBuilder()
                 .setSetDlDstAction(new SetDlDstActionBuilder()
index 2c7643a2a0280ada0cc6e44090ea795624a83504..583b257e8ebd7e9a1ab52292d940458393db5bc8 100644 (file)
@@ -9,7 +9,7 @@
 package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.cases;
 
 import java.util.Optional;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowplugin.api.OFConstants;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.data.ActionResponseConvertorData;
@@ -25,7 +25,7 @@ public class OfToSalSetDlSrcCase extends ConvertorCase<SetDlSrcCase, Action, Act
     }
 
     @Override
-    public Optional<Action> process(@Nonnull final SetDlSrcCase source, final ActionResponseConvertorData data,
+    public Optional<Action> process(@NonNull final SetDlSrcCase source, final ActionResponseConvertorData data,
             ConvertorExecutor convertorExecutor) {
         return Optional.of(new SetDlSrcActionCaseBuilder()
                 .setSetDlSrcAction(new SetDlSrcActionBuilder()
index 2e97f78db6fa4ffaab1888758a660bfac859c398..16cc96f1284fd58f825b194c162f96ee4658d87f 100644 (file)
@@ -9,7 +9,7 @@
 package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.cases;
 
 import java.util.Optional;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowplugin.api.OFConstants;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.data.ActionResponseConvertorData;
@@ -28,7 +28,7 @@ public class OfToSalSetFieldCase extends ConvertorCase<SetFieldCase, Action, Act
     }
 
     @Override
-    public Optional<Action> process(@Nonnull final SetFieldCase source, final ActionResponseConvertorData data,
+    public Optional<Action> process(@NonNull final SetFieldCase source, final ActionResponseConvertorData data,
             ConvertorExecutor convertorExecutor) {
         final VersionDatapathIdConvertorData datapathIdConvertorData =
                 new VersionDatapathIdConvertorData(data.getVersion());
index 3b31516e9e23105c49abda9388f2694cb0453297..6c5826e4b7da1ff74732246c5ab4c732f7e1a0f2 100644 (file)
@@ -9,7 +9,7 @@
 package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.cases;
 
 import java.util.Optional;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowplugin.api.OFConstants;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.data.ActionResponseConvertorData;
@@ -26,7 +26,7 @@ public class OfToSalSetMplsTtlCase extends ConvertorCase<SetMplsTtlCase, Action,
     }
 
     @Override
-    public Optional<Action> process(@Nonnull final SetMplsTtlCase source, final ActionResponseConvertorData data,
+    public Optional<Action> process(@NonNull final SetMplsTtlCase source, final ActionResponseConvertorData data,
             ConvertorExecutor convertorExecutor) {
         SetMplsTtlAction setMplsTtlActionFromOF = source.getSetMplsTtlAction();
 
index 251c0d586a501f48376c7f2dc1bce251c14ad103..85df2ea2e743ea7c53c37953381e1dff701e0c55 100644 (file)
@@ -9,7 +9,7 @@
 package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.cases;
 
 import java.util.Optional;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowplugin.api.OFConstants;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.data.ActionResponseConvertorData;
@@ -27,7 +27,7 @@ public class OfToSalSetNwDstCase extends ConvertorCase<SetNwDstCase, Action, Act
     }
 
     @Override
-    public Optional<Action> process(@Nonnull final SetNwDstCase source, final ActionResponseConvertorData data,
+    public Optional<Action> process(@NonNull final SetNwDstCase source, final ActionResponseConvertorData data,
             ConvertorExecutor convertorExecutor) {
         return Optional.of(new SetNwDstActionCaseBuilder()
                 .setSetNwDstAction(new SetNwDstActionBuilder().setAddress(new Ipv4Builder()
index d08ba4078bfa45ff3cc479d9421894a8199ea894..fc496b1765d19d311c760811752a82214c1623c2 100644 (file)
@@ -9,7 +9,7 @@
 package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.cases;
 
 import java.util.Optional;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowplugin.api.OFConstants;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.data.ActionResponseConvertorData;
@@ -27,7 +27,7 @@ public class OfToSalSetNwSrcCase extends ConvertorCase<SetNwSrcCase, Action, Act
     }
 
     @Override
-    public Optional<Action> process(@Nonnull final SetNwSrcCase source, final ActionResponseConvertorData data,
+    public Optional<Action> process(@NonNull final SetNwSrcCase source, final ActionResponseConvertorData data,
             ConvertorExecutor convertorExecutor) {
         return Optional.of(new SetNwSrcActionCaseBuilder()
                 .setSetNwSrcAction(new SetNwSrcActionBuilder().setAddress(new Ipv4Builder()
index c84aa8933be147c1912f23ab087bf601368a56f3..8f853c56447022e77751900fba11b9157cedc1b3 100644 (file)
@@ -8,7 +8,7 @@
 package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.cases;
 
 import java.util.Optional;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowplugin.api.OFConstants;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.data.ActionResponseConvertorData;
@@ -24,7 +24,7 @@ public class OfToSalSetNwTosCase extends ConvertorCase<SetNwTosCase, Action, Act
     }
 
     @Override
-    public Optional<Action> process(@Nonnull final SetNwTosCase source, final ActionResponseConvertorData data,
+    public Optional<Action> process(@NonNull final SetNwTosCase source, final ActionResponseConvertorData data,
             final ConvertorExecutor convertorExecutor) {
         return Optional.of(new SetNwTosActionCaseBuilder()
                 .setSetNwTosAction(new SetNwTosActionBuilder()
index cf484639aa46ab8ddec5df2c7556b49ed39e2831..35ddf65a31d090061f8113dca7524867fbd897f5 100644 (file)
@@ -9,7 +9,7 @@
 package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.cases;
 
 import java.util.Optional;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowplugin.api.OFConstants;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.data.ActionResponseConvertorData;
@@ -26,7 +26,7 @@ public class OfToSalSetNwTtlCase extends ConvertorCase<SetNwTtlCase, Action, Act
     }
 
     @Override
-    public Optional<Action> process(@Nonnull final SetNwTtlCase source, final ActionResponseConvertorData data,
+    public Optional<Action> process(@NonNull final SetNwTtlCase source, final ActionResponseConvertorData data,
             ConvertorExecutor convertorExecutor) {
         SetNwTtlAction setNwTtlActionFromOf = source.getSetNwTtlAction();
         SetNwTtlActionBuilder setNwTtl = new SetNwTtlActionBuilder();
index dc7bc54e65fc20525ac3a6c438456764f7704270..08d09725b86b60ced4089e18ab3cb0b372335bc9 100644 (file)
@@ -9,7 +9,7 @@
 package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.cases;
 
 import java.util.Optional;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowplugin.api.OFConstants;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.data.ActionResponseConvertorData;
@@ -26,7 +26,7 @@ public class OfToSalSetQueueCase extends ConvertorCase<SetQueueCase, Action, Act
     }
 
     @Override
-    public Optional<Action> process(@Nonnull final SetQueueCase source, final ActionResponseConvertorData data,
+    public Optional<Action> process(@NonNull final SetQueueCase source, final ActionResponseConvertorData data,
             ConvertorExecutor convertorExecutor) {
         SetQueueAction queueActionFromOF = source.getSetQueueAction();
         SetQueueActionBuilder setQueueAction = new SetQueueActionBuilder();
index c5758a54b8a2d7ae5069fa78bec792c7ad2c30ec..49f0ca0b991c383a53c35f0205918f3d4965486a 100644 (file)
@@ -9,7 +9,7 @@
 package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.cases;
 
 import java.util.Optional;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowplugin.api.OFConstants;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.data.ActionResponseConvertorData;
@@ -26,7 +26,7 @@ public class OfToSalSetTpDstCase extends ConvertorCase<SetTpDstCase, Action, Act
     }
 
     @Override
-    public Optional<Action> process(@Nonnull final SetTpDstCase source, final ActionResponseConvertorData data,
+    public Optional<Action> process(@NonNull final SetTpDstCase source, final ActionResponseConvertorData data,
             ConvertorExecutor convertorExecutor) {
         return Optional.of(new SetTpDstActionCaseBuilder()
                 .setSetTpDstAction(new SetTpDstActionBuilder()
index 404ba62f52b3d719587feea6ae8cad8eaa579abc..5d9c1941a9c11a302442ce1014ed2ce33f75263c 100644 (file)
@@ -9,7 +9,7 @@
 package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.cases;
 
 import java.util.Optional;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowplugin.api.OFConstants;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.data.ActionResponseConvertorData;
@@ -26,7 +26,7 @@ public class OfToSalSetTpSrcCase extends ConvertorCase<SetTpSrcCase, Action, Act
     }
 
     @Override
-    public Optional<Action> process(@Nonnull final SetTpSrcCase source, final ActionResponseConvertorData data,
+    public Optional<Action> process(@NonNull final SetTpSrcCase source, final ActionResponseConvertorData data,
             ConvertorExecutor convertorExecutor) {
         return Optional.of(new SetTpSrcActionCaseBuilder()
                 .setSetTpSrcAction(new SetTpSrcActionBuilder()
index 324decbc242413437fec17d236d86b80406b7069..ef6798e261b216d48efcdbec5926fb15183c69a8 100644 (file)
@@ -9,7 +9,7 @@
 package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.cases;
 
 import java.util.Optional;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowplugin.api.OFConstants;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.data.ActionResponseConvertorData;
@@ -26,7 +26,7 @@ public class OfToSalSetVlanIdCase extends ConvertorCase<SetVlanVidCase, Action,
     }
 
     @Override
-    public Optional<Action> process(@Nonnull final SetVlanVidCase source, final ActionResponseConvertorData data,
+    public Optional<Action> process(@NonNull final SetVlanVidCase source, final ActionResponseConvertorData data,
             ConvertorExecutor convertorExecutor) {
         return Optional.of(new SetVlanIdActionCaseBuilder()
                 .setSetVlanIdAction(new SetVlanIdActionBuilder()
index 6d828d8f16924aea086409b269a01e310b3a5eb9..db04aac408ee4722842150b90cfd21bbf53811f5 100644 (file)
@@ -9,7 +9,7 @@
 package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.cases;
 
 import java.util.Optional;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowplugin.api.OFConstants;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.data.ActionResponseConvertorData;
@@ -26,7 +26,7 @@ public class OfToSalSetVlanPcpCase extends ConvertorCase<SetVlanPcpCase, Action,
     }
 
     @Override
-    public Optional<Action> process(@Nonnull final SetVlanPcpCase source, final ActionResponseConvertorData data,
+    public Optional<Action> process(@NonNull final SetVlanPcpCase source, final ActionResponseConvertorData data,
             ConvertorExecutor convertorExecutor) {
         return Optional.of(new SetVlanPcpActionCaseBuilder()
                 .setSetVlanPcpAction(new SetVlanPcpActionBuilder()
index b79658b821e19203eeddd99feddc1f27a33079a6..022b0fb432c6f2b90744f12887a63781ce8360fb 100644 (file)
@@ -9,7 +9,7 @@
 package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.cases;
 
 import java.util.Optional;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowplugin.api.OFConstants;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.data.ActionResponseConvertorData;
@@ -25,7 +25,7 @@ public class OfToSalStripVlanCase extends ConvertorCase<StripVlanCase, Action, A
     }
 
     @Override
-    public Optional<Action> process(@Nonnull final StripVlanCase source, final ActionResponseConvertorData data,
+    public Optional<Action> process(@NonNull final StripVlanCase source, final ActionResponseConvertorData data,
             ConvertorExecutor convertorExecutor) {
         PopVlanActionBuilder popVlan = new PopVlanActionBuilder();
         return Optional.of(new PopVlanActionCaseBuilder().setPopVlanAction(popVlan.build()).build());
index ee2bb6babe4d1b1d29a4b0d0a1a4f214c55aa006..cd35ae73399116e4b31fbf5d201461a013e31b53 100644 (file)
@@ -9,7 +9,7 @@
 package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.cases;
 
 import java.util.Optional;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowplugin.api.OFConstants;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.data.ActionConvertorData;
@@ -24,9 +24,9 @@ public class SalToOfCopyTtlInCase extends ConvertorCase<CopyTtlInCase, Action, A
         super(CopyTtlInCase.class, true, OFConstants.OFP_VERSION_1_0, OFConstants.OFP_VERSION_1_3);
     }
 
-    @Nonnull
+    @NonNull
     @Override
-    public Optional<Action> process(@Nonnull final CopyTtlInCase source, final ActionConvertorData data,
+    public Optional<Action> process(@NonNull final CopyTtlInCase source, final ActionConvertorData data,
             ConvertorExecutor convertorExecutor) {
         return Optional.of(new ActionBuilder()
                 .setActionChoice(new CopyTtlInCaseBuilder().build())
index fd1dd8db119fe61ad9efc59f96c6b5e1c669417b..3f9c6db0c928ada044a988a810741daa4f78c5ee 100644 (file)
@@ -9,7 +9,7 @@
 package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.cases;
 
 import java.util.Optional;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowplugin.api.OFConstants;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.data.ActionConvertorData;
@@ -24,9 +24,9 @@ public class SalToOfCopyTtlOutCase extends ConvertorCase<CopyTtlOutCase, Action,
         super(CopyTtlOutCase.class, true, OFConstants.OFP_VERSION_1_0, OFConstants.OFP_VERSION_1_3);
     }
 
-    @Nonnull
+    @NonNull
     @Override
-    public Optional<Action> process(@Nonnull final CopyTtlOutCase source, final ActionConvertorData data,
+    public Optional<Action> process(@NonNull final CopyTtlOutCase source, final ActionConvertorData data,
             ConvertorExecutor convertorExecutor) {
         return Optional.of(new ActionBuilder()
                 .setActionChoice(new CopyTtlOutCaseBuilder().build())
index fadf1f0a62d560633a7d37b0369b0a155423b573..7e65379aaab2234b4107f5dccc5e074dee2cce89 100644 (file)
@@ -9,7 +9,7 @@
 package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.cases;
 
 import java.util.Optional;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowplugin.api.OFConstants;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.data.ActionConvertorData;
@@ -24,9 +24,9 @@ public class SalToOfDecMplsTtlCase extends ConvertorCase<DecMplsTtlCase, Action,
         super(DecMplsTtlCase.class, true, OFConstants.OFP_VERSION_1_0, OFConstants.OFP_VERSION_1_3);
     }
 
-    @Nonnull
+    @NonNull
     @Override
-    public Optional<Action> process(@Nonnull final DecMplsTtlCase source, final ActionConvertorData data,
+    public Optional<Action> process(@NonNull final DecMplsTtlCase source, final ActionConvertorData data,
             ConvertorExecutor convertorExecutor) {
         return Optional.of(new ActionBuilder()
                 .setActionChoice(new DecMplsTtlCaseBuilder().build())
index 9cda25f6323346140af223220b9e1a379c08fb26..fbf275cd4b20e80c905684db91a5e4e73cc6ac46 100644 (file)
@@ -9,7 +9,7 @@
 package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.cases;
 
 import java.util.Optional;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowplugin.api.OFConstants;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.data.ActionConvertorData;
@@ -24,9 +24,9 @@ public class SalToOfDecNwTtlCase extends ConvertorCase<DecNwTtlCase, Action, Act
         super(DecNwTtlCase.class, true, OFConstants.OFP_VERSION_1_0, OFConstants.OFP_VERSION_1_3);
     }
 
-    @Nonnull
+    @NonNull
     @Override
-    public Optional<Action> process(@Nonnull final DecNwTtlCase source, final ActionConvertorData data,
+    public Optional<Action> process(@NonNull final DecNwTtlCase source, final ActionConvertorData data,
             ConvertorExecutor convertorExecutor) {
         return Optional.of(new ActionBuilder()
                 .setActionChoice(new DecNwTtlCaseBuilder().build())
index 2fa8365fa3f4488539bf959f92e307b7ddc64dea..4e729885c49ad197afa218c669aeda7cd474c1ce 100644 (file)
@@ -9,7 +9,7 @@
 package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.cases;
 
 import java.util.Optional;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowplugin.api.OFConstants;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.data.ActionConvertorData;
@@ -22,9 +22,9 @@ public class SalToOfDropActionCase extends ConvertorCase<DropActionCase, Action,
         super(DropActionCase.class, false, OFConstants.OFP_VERSION_1_0, OFConstants.OFP_VERSION_1_3);
     }
 
-    @Nonnull
+    @NonNull
     @Override
-    public Optional<Action> process(@Nonnull final DropActionCase source, final ActionConvertorData data,
+    public Optional<Action> process(@NonNull final DropActionCase source, final ActionConvertorData data,
             ConvertorExecutor convertorExecutor) {
         return Optional.empty();
     }
index 309c0605d3759600f32bd5fc9ced82b1c85addd1..10c7baee80998c7f3b86bc80ffc827f6a54014b4 100644 (file)
@@ -9,7 +9,7 @@
 package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.cases;
 
 import java.util.Optional;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowplugin.api.OFConstants;
 import org.opendaylight.openflowplugin.extension.api.ConverterExtensionKey;
 import org.opendaylight.openflowplugin.extension.api.ConvertorToOFJava;
@@ -32,9 +32,9 @@ public class SalToOfGeneralExtensionGroupingCase
         super(GeneralExtensionGrouping.class, true, OFConstants.OFP_VERSION_1_0, OFConstants.OFP_VERSION_1_3);
     }
 
-    @Nonnull
+    @NonNull
     @Override
-    public Optional<Action> process(@Nonnull final GeneralExtensionGrouping source, final ActionConvertorData data,
+    public Optional<Action> process(@NonNull final GeneralExtensionGrouping source, final ActionConvertorData data,
             ConvertorExecutor convertorExecutor) {
         final short version = data.getVersion();
 
index 12e237c4ddb7084ebee4c1efeb79d416fa1d2428..cf3351d42c26541d5cdd0070c3cf9456d8001956 100644 (file)
@@ -9,7 +9,7 @@
 package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.cases;
 
 import java.util.Optional;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowplugin.api.OFConstants;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.data.ActionConvertorData;
@@ -26,9 +26,9 @@ public class SalToOfGroupActionCase extends ConvertorCase<GroupActionCase, Actio
         super(GroupActionCase.class, true, OFConstants.OFP_VERSION_1_0, OFConstants.OFP_VERSION_1_3);
     }
 
-    @Nonnull
+    @NonNull
     @Override
-    public Optional<Action> process(@Nonnull final GroupActionCase source, final ActionConvertorData data,
+    public Optional<Action> process(@NonNull final GroupActionCase source, final ActionConvertorData data,
             ConvertorExecutor convertorExecutor) {
         GroupAction groupAction = source.getGroupAction();
         GroupActionBuilder groupActionBuilder = new GroupActionBuilder();
index e96928af88d36d7b4f32f518e3993dceee72a7f2..bcec44e5200db5a10ff1d79031db616d49fbf5b0 100644 (file)
@@ -9,7 +9,7 @@
 package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.cases;
 
 import java.util.Optional;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowplugin.api.OFConstants;
 import org.opendaylight.openflowplugin.api.openflow.md.util.OpenflowVersion;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor;
@@ -35,9 +35,9 @@ public class SalToOfOutputActionCase extends ConvertorCase<OutputActionCase, Act
         super(OutputActionCase.class, true, OFConstants.OFP_VERSION_1_0, OFConstants.OFP_VERSION_1_3);
     }
 
-    @Nonnull
+    @NonNull
     @Override
-    public Optional<Action> process(@Nonnull final OutputActionCase source, final ActionConvertorData data,
+    public Optional<Action> process(@NonNull final OutputActionCase source, final ActionConvertorData data,
             final ConvertorExecutor convertorExecutor) {
         final OutputAction outputAction = source.getOutputAction();
         final OutputActionBuilder outputBuilder = new OutputActionBuilder();
index 571079cb3d431c1d48c18016695330f4078597c7..76dcf9a6e8e536b842b3366fa120b483d850dd3d 100644 (file)
@@ -9,7 +9,7 @@
 package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.cases;
 
 import java.util.Optional;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowplugin.api.OFConstants;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.data.ActionConvertorData;
@@ -26,9 +26,9 @@ public class SalToOfPopMplsActionCase extends ConvertorCase<PopMplsActionCase, A
         super(PopMplsActionCase.class, true, OFConstants.OFP_VERSION_1_0, OFConstants.OFP_VERSION_1_3);
     }
 
-    @Nonnull
+    @NonNull
     @Override
-    public Optional<Action> process(@Nonnull final PopMplsActionCase source, final ActionConvertorData data,
+    public Optional<Action> process(@NonNull final PopMplsActionCase source, final ActionConvertorData data,
             ConvertorExecutor convertorExecutor) {
         PopMplsCaseBuilder popMplsCaseBuilder = new PopMplsCaseBuilder();
         PopMplsActionBuilder popMplsBuilder = new PopMplsActionBuilder();
index 08d3c963355b765412b2fa9aad4a0a17b12e4456..fc498a66d61fedfb67599c36ab71c160a2d8b9ea 100644 (file)
@@ -9,7 +9,7 @@
 package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.cases;
 
 import java.util.Optional;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowplugin.api.OFConstants;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.data.ActionConvertorData;
@@ -24,9 +24,9 @@ public class SalToOfPopPbbActionCase extends ConvertorCase<PopPbbActionCase, Act
         super(PopPbbActionCase.class, true, OFConstants.OFP_VERSION_1_0, OFConstants.OFP_VERSION_1_3);
     }
 
-    @Nonnull
+    @NonNull
     @Override
-    public Optional<Action> process(@Nonnull final PopPbbActionCase source, final ActionConvertorData data,
+    public Optional<Action> process(@NonNull final PopPbbActionCase source, final ActionConvertorData data,
             ConvertorExecutor convertorExecutor) {
         return Optional.of(new ActionBuilder()
                 .setActionChoice(new PopPbbCaseBuilder().build())
index 52fad526a0b840aa1567be5ca384c28d5b654520..c9b1ddde884d174412ff364a03a3e5e583a7c5fb 100644 (file)
@@ -9,7 +9,7 @@
 package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.cases;
 
 import java.util.Optional;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowplugin.api.OFConstants;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.data.ActionConvertorData;
@@ -24,9 +24,9 @@ public class SalToOfPopVlanActionCase extends ConvertorCase<PopVlanActionCase, A
         super(PopVlanActionCase.class, true, OFConstants.OFP_VERSION_1_3);
     }
 
-    @Nonnull
+    @NonNull
     @Override
-    public Optional<Action> process(@Nonnull final PopVlanActionCase source, final ActionConvertorData data,
+    public Optional<Action> process(@NonNull final PopVlanActionCase source, final ActionConvertorData data,
             ConvertorExecutor convertorExecutor) {
         return Optional.of(new ActionBuilder()
                 .setActionChoice(new PopVlanCaseBuilder().build())
index 1fe4d91d661a771a20b1b918c3466ce41456941b..dfce72f6562aa2426e2bade29ceffa9e75306d9b 100644 (file)
@@ -9,7 +9,7 @@
 package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.cases;
 
 import java.util.Optional;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowplugin.api.OFConstants;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.data.ActionConvertorData;
@@ -24,9 +24,9 @@ public class SalToOfPopVlanActionV10Case extends ConvertorCase<PopVlanActionCase
         super(PopVlanActionCase.class, true, OFConstants.OFP_VERSION_1_0);
     }
 
-    @Nonnull
+    @NonNull
     @Override
-    public Optional<Action> process(@Nonnull final PopVlanActionCase source, final ActionConvertorData data,
+    public Optional<Action> process(@NonNull final PopVlanActionCase source, final ActionConvertorData data,
             ConvertorExecutor convertorExecutor) {
         return Optional.of(new ActionBuilder()
                 .setActionChoice(new StripVlanCaseBuilder().build())
index 5d2a17d948a42901f341a17abd0ef9c495101f7d..708d0b077bfe924f91175da172d7aa96a2b4824b 100644 (file)
@@ -9,7 +9,7 @@
 package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.cases;
 
 import java.util.Optional;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowplugin.api.OFConstants;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.data.ActionConvertorData;
@@ -26,9 +26,9 @@ public class SalToOfPushMplsActionCase extends ConvertorCase<PushMplsActionCase,
         super(PushMplsActionCase.class, true, OFConstants.OFP_VERSION_1_0, OFConstants.OFP_VERSION_1_3);
     }
 
-    @Nonnull
+    @NonNull
     @Override
-    public Optional<Action> process(@Nonnull final PushMplsActionCase source, final ActionConvertorData data,
+    public Optional<Action> process(@NonNull final PushMplsActionCase source, final ActionConvertorData data,
             ConvertorExecutor convertorExecutor) {
         PushMplsCaseBuilder pushMplsCaseBuilder = new PushMplsCaseBuilder();
         PushMplsActionBuilder pushMplsBuilder = new PushMplsActionBuilder();
index 45b7072880e31a7236d93a064144b6dfadcdf1f6..c133b13a7a7f8e5b5820de1e1873abf5787be1ff 100644 (file)
@@ -9,7 +9,7 @@
 package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.cases;
 
 import java.util.Optional;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowplugin.api.OFConstants;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.data.ActionConvertorData;
@@ -26,9 +26,9 @@ public class SalToOfPushPbbActionCase extends ConvertorCase<PushPbbActionCase, A
         super(PushPbbActionCase.class, true, OFConstants.OFP_VERSION_1_0, OFConstants.OFP_VERSION_1_3);
     }
 
-    @Nonnull
+    @NonNull
     @Override
-    public Optional<Action> process(@Nonnull final PushPbbActionCase source, final ActionConvertorData data,
+    public Optional<Action> process(@NonNull final PushPbbActionCase source, final ActionConvertorData data,
             ConvertorExecutor convertorExecutor) {
         PushPbbCaseBuilder pushPbbCaseBuilder = new PushPbbCaseBuilder();
         PushPbbActionBuilder pushPbbBuilder = new PushPbbActionBuilder();
index df5a5d0239d3a81dbb1ab55a9ae238f5ec54b235..97c00a1b006969fdb82c4fb9373801669a3496e3 100644 (file)
@@ -9,7 +9,7 @@
 package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.cases;
 
 import java.util.Optional;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowplugin.api.OFConstants;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.data.ActionConvertorData;
@@ -27,9 +27,9 @@ public class SalToOfPushVlanActionCase extends ConvertorCase<PushVlanActionCase,
         super(PushVlanActionCase.class, true, OFConstants.OFP_VERSION_1_3);
     }
 
-    @Nonnull
+    @NonNull
     @Override
-    public Optional<Action> process(@Nonnull final PushVlanActionCase source, final ActionConvertorData data,
+    public Optional<Action> process(@NonNull final PushVlanActionCase source, final ActionConvertorData data,
             ConvertorExecutor convertorExecutor) {
         PushVlanAction pushVlanAction = source.getPushVlanAction();
 
index 414f57e7c5669e03474b1ccba25fea25fe429f33..1afdd50a3a587dc9902e57c5fd12b5e7600a4378 100644 (file)
@@ -11,7 +11,7 @@ package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.ca
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowplugin.api.OFConstants;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.data.ActionConvertorData;
@@ -34,9 +34,9 @@ public class SalToOfSetDlDstActionCase extends ConvertorCase<SetDlDstActionCase,
         super(SetDlDstActionCase.class, true, OFConstants.OFP_VERSION_1_3);
     }
 
-    @Nonnull
+    @NonNull
     @Override
-    public Optional<Action> process(@Nonnull final SetDlDstActionCase source, final ActionConvertorData data,
+    public Optional<Action> process(@NonNull final SetDlDstActionCase source, final ActionConvertorData data,
             ConvertorExecutor convertorExecutor) {
         SetDlDstAction setdldstaction = source.getSetDlDstAction();
 
index 6b9c5c3a4ca3968ebc43c4f81cf10baed1204a38..ccb16bb8c8fc60f45ba1ac1f066b8b348e9c089b 100644 (file)
@@ -9,7 +9,7 @@
 package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.cases;
 
 import java.util.Optional;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowplugin.api.OFConstants;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.data.ActionConvertorData;
@@ -26,9 +26,9 @@ public class SalToOfSetDlDstActionV10Case extends ConvertorCase<SetDlDstActionCa
         super(SetDlDstActionCase.class, true, OFConstants.OFP_VERSION_1_0);
     }
 
-    @Nonnull
+    @NonNull
     @Override
-    public Optional<Action> process(@Nonnull final SetDlDstActionCase source, final ActionConvertorData data,
+    public Optional<Action> process(@NonNull final SetDlDstActionCase source, final ActionConvertorData data,
             ConvertorExecutor convertorExecutor) {
         SetDlDstAction setdldstaction = source.getSetDlDstAction();
         SetDlDstCaseBuilder setDlDstCaseBuilder = new SetDlDstCaseBuilder();
index 018036b8eabc3888fb7ba557f4a414df09f8bf65..ee6f4de44e31269ecfc8bdfd0d6610de8bd755fa 100644 (file)
@@ -11,7 +11,7 @@ package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.ca
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowplugin.api.OFConstants;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.data.ActionConvertorData;
@@ -34,9 +34,9 @@ public class SalToOfSetDlSrcActionCase extends ConvertorCase<SetDlSrcActionCase,
         super(SetDlSrcActionCase.class, true, OFConstants.OFP_VERSION_1_3);
     }
 
-    @Nonnull
+    @NonNull
     @Override
-    public Optional<Action> process(@Nonnull final SetDlSrcActionCase source, final ActionConvertorData data,
+    public Optional<Action> process(@NonNull final SetDlSrcActionCase source, final ActionConvertorData data,
             ConvertorExecutor convertorExecutor) {
         SetDlSrcAction setdlsrcaction = source.getSetDlSrcAction();
 
index bf7401fc6009cd149c094bd6e29ad7f90b26e106..ed70b87e8c93dec95bddcdaac5cb6e53429c7ba6 100644 (file)
@@ -9,7 +9,7 @@
 package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.cases;
 
 import java.util.Optional;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowplugin.api.OFConstants;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.data.ActionConvertorData;
@@ -26,9 +26,9 @@ public class SalToOfSetDlSrcActionV10Case extends ConvertorCase<SetDlSrcActionCa
         super(SetDlSrcActionCase.class, true, OFConstants.OFP_VERSION_1_0);
     }
 
-    @Nonnull
+    @NonNull
     @Override
-    public Optional<Action> process(@Nonnull final SetDlSrcActionCase source, final ActionConvertorData data,
+    public Optional<Action> process(@NonNull final SetDlSrcActionCase source, final ActionConvertorData data,
             ConvertorExecutor convertorExecutor) {
         SetDlSrcAction setdlsrcaction = source.getSetDlSrcAction();
         SetDlSrcCaseBuilder setDlSrcCaseBuilder = new SetDlSrcCaseBuilder();
index 07066163216b1888c976671e3a9b07ea3be5de98..800970ce79787ae2e6ce19c2316c2bba783aa08b 100644 (file)
@@ -9,7 +9,7 @@
 package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.cases;
 
 import java.util.Optional;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowplugin.api.OFConstants;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.data.ActionConvertorData;
@@ -26,9 +26,9 @@ public class SalToOfSetFieldCase extends ConvertorCase<SetFieldCase, Action, Act
         super(SetFieldCase.class, true, OFConstants.OFP_VERSION_1_3);
     }
 
-    @Nonnull
+    @NonNull
     @Override
-    public Optional<Action> process(@Nonnull final SetFieldCase source, final ActionConvertorData data,
+    public Optional<Action> process(@NonNull final SetFieldCase source, final ActionConvertorData data,
             ConvertorExecutor convertorExecutor) {
         final short version = data.getVersion();
         final SetFieldActionBuilder setFieldBuilder = new SetFieldActionBuilder();
index d74ca2935912e35193dc3de64be3da0c9ebea325..1f19c5857dd478204da62180445b89cad225d919 100644 (file)
@@ -9,7 +9,7 @@
 package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.cases;
 
 import java.util.Optional;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowplugin.api.OFConstants;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.data.ActionConvertorData;
@@ -25,9 +25,9 @@ public class SalToOfSetFieldV10Case extends ConvertorCase<SetFieldCase, Action,
         super(SetFieldCase.class, true, OFConstants.OFP_VERSION_1_0);
     }
 
-    @Nonnull
+    @NonNull
     @Override
-    public Optional<Action> process(@Nonnull final SetFieldCase source, final ActionConvertorData data,
+    public Optional<Action> process(@NonNull final SetFieldCase source, final ActionConvertorData data,
             ConvertorExecutor convertorExecutor) {
         SetVlanVidCaseBuilder setVlanVidCaseBuilder = new SetVlanVidCaseBuilder();
 
index b856213d4a486677569411cb30de69958e984ceb..cea879526978f5bbfb306daf04d9e0c42510a5a1 100644 (file)
@@ -9,7 +9,7 @@
 package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.cases;
 
 import java.util.Optional;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowplugin.api.OFConstants;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.data.ActionConvertorData;
@@ -25,9 +25,9 @@ public class SalToOfSetMplsTtlActionCase extends ConvertorCase<SetMplsTtlActionC
         super(SetMplsTtlActionCase.class, true, OFConstants.OFP_VERSION_1_0, OFConstants.OFP_VERSION_1_3);
     }
 
-    @Nonnull
+    @NonNull
     @Override
-    public Optional<Action> process(@Nonnull final SetMplsTtlActionCase source, final ActionConvertorData data,
+    public Optional<Action> process(@NonNull final SetMplsTtlActionCase source, final ActionConvertorData data,
             ConvertorExecutor convertorExecutor) {
         SetMplsTtlActionBuilder setMplsTtlBuilder = new SetMplsTtlActionBuilder()
                 .setMplsTtl(source.getSetMplsTtlAction().getMplsTtl());
index ce89b0977b834d9159caa8e8fcd3c465161258a1..dea314069e554435118821d24de15947d810e16e 100644 (file)
@@ -12,7 +12,7 @@ import com.google.common.base.Splitter;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowplugin.api.OFConstants;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.data.ActionConvertorData;
@@ -45,9 +45,9 @@ public class SalToOfSetNwDstActionCase extends ConvertorCase<SetNwDstActionCase,
         super(SetNwDstActionCase.class, true, OFConstants.OFP_VERSION_1_3);
     }
 
-    @Nonnull
+    @NonNull
     @Override
-    public Optional<Action> process(@Nonnull final SetNwDstActionCase source, final ActionConvertorData data,
+    public Optional<Action> process(@NonNull final SetNwDstActionCase source, final ActionConvertorData data,
             ConvertorExecutor convertorExecutor) {
         final ActionBuilder builder = new ActionBuilder();
         final Address address = source.getSetNwDstAction().getAddress();
index 2c683150c08d7a8de467d434d224de2bb49fd236..c81b05630d005d4b9470625f2561c0fff8323149 100644 (file)
@@ -9,7 +9,7 @@
 package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.cases;
 
 import java.util.Optional;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowplugin.api.OFConstants;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.data.ActionConvertorData;
@@ -28,9 +28,9 @@ public class SalToOfSetNwDstActionV10Case extends ConvertorCase<SetNwDstActionCa
         super(SetNwDstActionCase.class, true, OFConstants.OFP_VERSION_1_0);
     }
 
-    @Nonnull
+    @NonNull
     @Override
-    public Optional<Action> process(@Nonnull final SetNwDstActionCase source, final ActionConvertorData data,
+    public Optional<Action> process(@NonNull final SetNwDstActionCase source, final ActionConvertorData data,
             ConvertorExecutor convertorExecutor) {
         final ActionBuilder builder = new ActionBuilder();
         final Address address = source.getSetNwDstAction().getAddress();
index 165b891bb6c9f1641f4e58525797af61ab3f2cfd..0b688131876580823e49772298925ffc822d9083 100644 (file)
@@ -12,7 +12,7 @@ import com.google.common.base.Splitter;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowplugin.api.OFConstants;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.data.ActionConvertorData;
@@ -45,9 +45,9 @@ public class SalToOfSetNwSrcActionCase extends ConvertorCase<SetNwSrcActionCase,
         super(SetNwSrcActionCase.class, true, OFConstants.OFP_VERSION_1_3);
     }
 
-    @Nonnull
+    @NonNull
     @Override
-    public Optional<Action> process(@Nonnull final SetNwSrcActionCase source, final ActionConvertorData data,
+    public Optional<Action> process(@NonNull final SetNwSrcActionCase source, final ActionConvertorData data,
             ConvertorExecutor convertorExecutor) {
         final ActionBuilder builder = new ActionBuilder();
         final Address address = source.getSetNwSrcAction().getAddress();
index 2a4a16e542542b21e44db696467ef7a2512e08af..ea372e421d0b8cc912ae57534d1784144c5c1c85 100644 (file)
@@ -9,7 +9,7 @@
 package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.cases;
 
 import java.util.Optional;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowplugin.api.OFConstants;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.data.ActionConvertorData;
@@ -28,9 +28,9 @@ public class SalToOfSetNwSrcActionV10Case extends ConvertorCase<SetNwSrcActionCa
         super(SetNwSrcActionCase.class, true, OFConstants.OFP_VERSION_1_0);
     }
 
-    @Nonnull
+    @NonNull
     @Override
-    public Optional<Action> process(@Nonnull final SetNwSrcActionCase source, final ActionConvertorData data,
+    public Optional<Action> process(@NonNull final SetNwSrcActionCase source, final ActionConvertorData data,
             ConvertorExecutor convertorExecutor) {
         final ActionBuilder builder = new ActionBuilder();
         final Address address = source.getSetNwSrcAction().getAddress();
index 0f43d4c303c046594fb78a0b09604d6b8b504769..6d363db8122992e2d3786e78eafdaa2d7ff45d5d 100644 (file)
@@ -11,7 +11,7 @@ package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.ca
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowplugin.api.OFConstants;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.data.ActionConvertorData;
@@ -32,9 +32,9 @@ public class SalToOfSetNwTosActionCase extends ConvertorCase<SetNwTosActionCase,
         super(SetNwTosActionCase.class, true, OFConstants.OFP_VERSION_1_3);
     }
 
-    @Nonnull
+    @NonNull
     @Override
-    public Optional<Action> process(@Nonnull final SetNwTosActionCase source, final ActionConvertorData data,
+    public Optional<Action> process(@NonNull final SetNwTosActionCase source, final ActionConvertorData data,
             ConvertorExecutor convertorExecutor) {
         SetNwTosAction setnwtosaction = source.getSetNwTosAction();
         SetFieldCaseBuilder setFieldCaseBuilder = new SetFieldCaseBuilder();
index 65431feed5176f361147160c85323718f270238f..3ae0042059d5035c468b0a5b02860369e1f4317e 100644 (file)
@@ -9,7 +9,7 @@
 package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.cases;
 
 import java.util.Optional;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowplugin.api.OFConstants;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.data.ActionConvertorData;
@@ -26,9 +26,9 @@ public class SalToOfSetNwTosActionV10Case extends ConvertorCase<SetNwTosActionCa
         super(SetNwTosActionCase.class, true, OFConstants.OFP_VERSION_1_0);
     }
 
-    @Nonnull
+    @NonNull
     @Override
-    public Optional<Action> process(@Nonnull final SetNwTosActionCase source, final ActionConvertorData data,
+    public Optional<Action> process(@NonNull final SetNwTosActionCase source, final ActionConvertorData data,
             ConvertorExecutor convertorExecutor) {
         SetNwTosAction setnwtosaction = source.getSetNwTosAction();
         SetNwTosActionBuilder setNwTosActionBuilder = new SetNwTosActionBuilder();
index f4b153486dc81c3331965247d56c3acd20a16535..f3bc2e3683292a4bbdae03265c4f004c6dc7596e 100644 (file)
@@ -9,7 +9,7 @@
 package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.cases;
 
 import java.util.Optional;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowplugin.api.OFConstants;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.data.ActionConvertorData;
@@ -25,9 +25,9 @@ public class SalToOfSetNwTtlActionCase extends ConvertorCase<SetNwTtlActionCase,
         super(SetNwTtlActionCase.class, true, OFConstants.OFP_VERSION_1_0, OFConstants.OFP_VERSION_1_3);
     }
 
-    @Nonnull
+    @NonNull
     @Override
-    public Optional<Action> process(@Nonnull final SetNwTtlActionCase source, final ActionConvertorData data,
+    public Optional<Action> process(@NonNull final SetNwTtlActionCase source, final ActionConvertorData data,
             ConvertorExecutor convertorExecutor) {
         SetNwTtlCaseBuilder nwTtlCaseBuilder = new SetNwTtlCaseBuilder();
         SetNwTtlActionBuilder nwTtlBuilder = new SetNwTtlActionBuilder();
index 9080b43cd2d39f563bd8b281ab30111bbd9f2a31..080005e81b81476b0b1e9430a1a88c7a9a796ba3 100644 (file)
@@ -9,7 +9,7 @@
 package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.cases;
 
 import java.util.Optional;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowplugin.api.OFConstants;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.data.ActionConvertorData;
@@ -26,9 +26,9 @@ public class SalToOfSetQueueActionCase extends ConvertorCase<SetQueueActionCase,
         super(SetQueueActionCase.class, true, OFConstants.OFP_VERSION_1_0, OFConstants.OFP_VERSION_1_3);
     }
 
-    @Nonnull
+    @NonNull
     @Override
-    public Optional<Action> process(@Nonnull final SetQueueActionCase source, final ActionConvertorData data,
+    public Optional<Action> process(@NonNull final SetQueueActionCase source, final ActionConvertorData data,
             ConvertorExecutor convertorExecutor) {
         SetQueueAction setQueueAction = source.getSetQueueAction();
         SetQueueCaseBuilder setQueueCaseBuilder = new SetQueueCaseBuilder();
index 6b1f26c1323f273cf6b0a24329825e0fb189d008..e6b11a0ba1bc7f989cc296f3c15da88912b48273 100644 (file)
@@ -11,7 +11,7 @@ package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.ca
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowplugin.api.OFConstants;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.data.ActionConvertorData;
@@ -48,9 +48,9 @@ public class SalToOfSetTpDstActionCase extends ConvertorCase<SetTpDstActionCase,
         super(SetTpDstActionCase.class, true, OFConstants.OFP_VERSION_1_3);
     }
 
-    @Nonnull
+    @NonNull
     @Override
-    public Optional<Action> process(@Nonnull final SetTpDstActionCase source, final ActionConvertorData data,
+    public Optional<Action> process(@NonNull final SetTpDstActionCase source, final ActionConvertorData data,
             final ConvertorExecutor convertorExecutor) {
         IPProtocols protocol = null;
 
index 70b80bfec39d293b13eb19b700096e2cc8bf4884..99836bad9571e69c7bc5ba5996f1123972dfd5fc 100644 (file)
@@ -9,7 +9,7 @@
 package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.cases;
 
 import java.util.Optional;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowplugin.api.OFConstants;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.data.ActionConvertorData;
@@ -27,9 +27,9 @@ public class SalToOfSetTpDstActionV10Case extends ConvertorCase<SetTpDstActionCa
         super(SetTpDstActionCase.class, true, OFConstants.OFP_VERSION_1_0);
     }
 
-    @Nonnull
+    @NonNull
     @Override
-    public Optional<Action> process(@Nonnull final SetTpDstActionCase source, final ActionConvertorData data,
+    public Optional<Action> process(@NonNull final SetTpDstActionCase source, final ActionConvertorData data,
             ConvertorExecutor convertorExecutor) {
         SetTpDstAction settpdstaction = source.getSetTpDstAction();
         SetTpDstCaseBuilder setTpDstCaseBuilder = new SetTpDstCaseBuilder();
index 67c9077815caace8f15007680bc07e3413053c81..9e35fbf013d8b584c18d12a8e61cc83eabbc6902 100644 (file)
@@ -11,7 +11,7 @@ package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.ca
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowplugin.api.OFConstants;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.data.ActionConvertorData;
@@ -48,9 +48,9 @@ public class SalToOfSetTpSrcActionCase extends ConvertorCase<SetTpSrcActionCase,
         super(SetTpSrcActionCase.class, true, OFConstants.OFP_VERSION_1_3);
     }
 
-    @Nonnull
+    @NonNull
     @Override
-    public Optional<Action> process(@Nonnull final SetTpSrcActionCase source, final ActionConvertorData data,
+    public Optional<Action> process(@NonNull final SetTpSrcActionCase source, final ActionConvertorData data,
             final ConvertorExecutor convertorExecutor) {
         IPProtocols protocol = null;
 
index 59b49311b28813231d0dd8a5a4b826213c41220a..ad8b79422a579bb5fff89491b82c603f6a619df9 100644 (file)
@@ -9,7 +9,7 @@
 package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.cases;
 
 import java.util.Optional;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowplugin.api.OFConstants;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.data.ActionConvertorData;
@@ -31,9 +31,9 @@ public class SalToOfSetTpSrcActionV10Case extends ConvertorCase<SetTpSrcActionCa
         super(SetTpSrcActionCase.class, true, OFConstants.OFP_VERSION_1_0);
     }
 
-    @Nonnull
+    @NonNull
     @Override
-    public Optional<Action> process(@Nonnull final SetTpSrcActionCase source, final ActionConvertorData data,
+    public Optional<Action> process(@NonNull final SetTpSrcActionCase source, final ActionConvertorData data,
             ConvertorExecutor convertorExecutor) {
         SetTpSrcAction settpsrcaction = source.getSetTpSrcAction();
         SetTpSrcCaseBuilder setTpSrcCaseBuilder = new SetTpSrcCaseBuilder();
index dffd3d89f4ecee6b9c8665066dfa8c6c0ae1b9eb..3bcee09635fb5a806144261d1a6ae0875afa4666 100644 (file)
@@ -11,7 +11,7 @@ package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.ca
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowplugin.api.OFConstants;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.data.ActionConvertorData;
@@ -34,9 +34,9 @@ public class SalToOfSetVlanIdActionCase extends ConvertorCase<SetVlanIdActionCas
         super(SetVlanIdActionCase.class, true, OFConstants.OFP_VERSION_1_3);
     }
 
-    @Nonnull
+    @NonNull
     @Override
-    public Optional<Action> process(@Nonnull final SetVlanIdActionCase source, final ActionConvertorData data,
+    public Optional<Action> process(@NonNull final SetVlanIdActionCase source, final ActionConvertorData data,
             ConvertorExecutor convertorExecutor) {
         MatchEntryBuilder matchBuilder = new MatchEntryBuilder();
         matchBuilder.setOxmClass(OpenflowBasicClass.class);
index 9e674e3de14a5166db1e8d93ea83e3bbbe0aa45d..45d206eb270ce5b56f1265e4efb85c03c01a73d8 100644 (file)
@@ -9,7 +9,7 @@
 package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.cases;
 
 import java.util.Optional;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowplugin.api.OFConstants;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.data.ActionConvertorData;
@@ -26,9 +26,9 @@ public class SalToOfSetVlanIdActionV10Case extends ConvertorCase<SetVlanIdAction
         super(SetVlanIdActionCase.class, true, OFConstants.OFP_VERSION_1_0);
     }
 
-    @Nonnull
+    @NonNull
     @Override
-    public Optional<Action> process(@Nonnull final SetVlanIdActionCase source, final ActionConvertorData data,
+    public Optional<Action> process(@NonNull final SetVlanIdActionCase source, final ActionConvertorData data,
             ConvertorExecutor convertorExecutor) {
         SetVlanIdAction setvlanidaction = source.getSetVlanIdAction();
         SetVlanVidActionBuilder vlanidActionBuilder = new SetVlanVidActionBuilder();
index 337b15961062b940854afd2926e9465f27538b8a..cefefcb0852320786c2f987bc97701d881e2e9a5 100644 (file)
@@ -11,7 +11,7 @@ package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.ca
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowplugin.api.OFConstants;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.data.ActionConvertorData;
@@ -30,9 +30,9 @@ public class SalToOfSetVlanPcpActionCase extends ConvertorCase<SetVlanPcpActionC
         super(SetVlanPcpActionCase.class, true, OFConstants.OFP_VERSION_1_3);
     }
 
-    @Nonnull
+    @NonNull
     @Override
-    public Optional<Action> process(@Nonnull final SetVlanPcpActionCase source, final ActionConvertorData data,
+    public Optional<Action> process(@NonNull final SetVlanPcpActionCase source, final ActionConvertorData data,
             ConvertorExecutor convertorExecutor) {
         SetVlanPcpAction setvlanpcpaction = source.getSetVlanPcpAction();
         SetFieldCaseBuilder setFieldCaseBuilder = new SetFieldCaseBuilder();
index 8f2fc39422a87bc0424928f021c3b378cdf86541..1d5410a53b2f43ec248c0983ad8d82a87f5bcc16 100644 (file)
@@ -9,7 +9,7 @@
 package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.cases;
 
 import java.util.Optional;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowplugin.api.OFConstants;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.data.ActionConvertorData;
@@ -26,9 +26,9 @@ public class SalToOfSetVlanPcpActionV10Case extends ConvertorCase<SetVlanPcpActi
         super(SetVlanPcpActionCase.class, true, OFConstants.OFP_VERSION_1_0);
     }
 
-    @Nonnull
+    @NonNull
     @Override
-    public Optional<Action> process(@Nonnull final SetVlanPcpActionCase source, final ActionConvertorData data,
+    public Optional<Action> process(@NonNull final SetVlanPcpActionCase source, final ActionConvertorData data,
             ConvertorExecutor convertorExecutor) {
         SetVlanPcpAction setvlanpcpaction = source.getSetVlanPcpAction();
         SetVlanPcpActionBuilder setVlanPcpActionBuilder = new SetVlanPcpActionBuilder();
index 664f5e4f1e17630c5b1e66fc190920327dda0277..29ff95c721a9f971e561287bba45e6451a783fb5 100644 (file)
@@ -11,7 +11,7 @@ package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.ca
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowplugin.api.OFConstants;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.data.ActionConvertorData;
@@ -33,9 +33,9 @@ public class SalToOfStripVlanActionCase extends ConvertorCase<StripVlanActionCas
         super(StripVlanActionCase.class, true, OFConstants.OFP_VERSION_1_3);
     }
 
-    @Nonnull
+    @NonNull
     @Override
-    public Optional<Action> process(@Nonnull final StripVlanActionCase source, final ActionConvertorData data,
+    public Optional<Action> process(@NonNull final StripVlanActionCase source, final ActionConvertorData data,
             ConvertorExecutor convertorExecutor) {
         MatchEntryBuilder matchBuilder = new MatchEntryBuilder();
         matchBuilder.setOxmClass(OpenflowBasicClass.class);
index b5da2bc823b29bb84f82685bf2255e92d1ba08bc..249be13797c34da5a25485e717c1a1e83b644e91 100644 (file)
@@ -9,7 +9,7 @@
 package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.cases;
 
 import java.util.Optional;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowplugin.api.OFConstants;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.data.ActionConvertorData;
@@ -24,9 +24,9 @@ public class SalToOfStripVlanActionV10Case extends ConvertorCase<StripVlanAction
         super(StripVlanActionCase.class, true, OFConstants.OFP_VERSION_1_0);
     }
 
-    @Nonnull
+    @NonNull
     @Override
-    public Optional<Action> process(@Nonnull final StripVlanActionCase source, final ActionConvertorData data,
+    public Optional<Action> process(@NonNull final StripVlanActionCase source, final ActionConvertorData data,
             ConvertorExecutor convertorExecutor) {
         return Optional.of(new ActionBuilder()
                 .setActionChoice(new StripVlanCaseBuilder().build())
index 7016a159565f8530de040cd5807d23efde043916..39bd8005f1391dad519cca49de978277e7648d51 100644 (file)
@@ -9,7 +9,7 @@
 package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.cases;
 
 import java.util.Optional;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowplugin.api.OFConstants;
 import org.opendaylight.openflowplugin.extension.api.ConvertorActionToOFJava;
 import org.opendaylight.openflowplugin.extension.api.TypeVersionKey;
@@ -32,9 +32,9 @@ public class SalToOfVendorCodecCase extends ConvertorCase<org.opendaylight.yang.
     }
 
     @SuppressWarnings("unchecked")
-    @Nonnull
+    @NonNull
     @Override
-    public Optional<Action> process(@Nonnull final org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112
+    public Optional<Action> process(final org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112
             .action.Action source, final ActionConvertorData data, ConvertorExecutor convertorExecutor) {
         final short version = data.getVersion();
         final TypeVersionKey<org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action> key =
index d8036d6e94b26cb4b01f479a19e33480ca99e8c2..7e2f9eba4b86affa1fa158229600746a6718901b 100644 (file)
@@ -12,7 +12,7 @@ import com.google.common.base.Preconditions;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor;
 
 /**
@@ -49,7 +49,7 @@ public abstract class ConvertorCase<F, T, D extends ConvertorData> {
      * @param convertorExecutor convertor executor
      * @return the optional
      */
-    public abstract Optional<T> process(@Nonnull F source, D data, ConvertorExecutor convertorExecutor);
+    public abstract Optional<T> process(@NonNull F source, D data, ConvertorExecutor convertorExecutor);
 
     /**
      * Should {@link org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.common.ConvertorProcessor}
@@ -70,7 +70,7 @@ public abstract class ConvertorCase<F, T, D extends ConvertorData> {
      * @param convertorExecutor convertor executor
      * @return the optional
      */
-    Optional<T> processRaw(@Nonnull final Object source, final D data, final ConvertorExecutor convertorExecutor) {
+    Optional<T> processRaw(@NonNull final Object source, final D data, final ConvertorExecutor convertorExecutor) {
         return process(getType().cast(source), data, convertorExecutor);
     }
 
index 6b86c3c1a6ef17b47ae7efce9464debacecb0a77..564f24122224f737a7b653ed97e45b6fa31ceff2 100644 (file)
@@ -23,7 +23,7 @@ import java.util.BitSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.regex.Pattern;
-import javax.annotation.Nullable;
+import org.eclipse.jdt.annotation.Nullable;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IetfInetUtil;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Prefix;
index ccb543957efcee825ba4d8f394d90cc7544b7bb0..29bc556a3c301a9e3998db3335d4bf936742cf70 100644 (file)
@@ -11,7 +11,6 @@ package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.flow.case
 import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
-import javax.annotation.Nonnull;
 import org.opendaylight.openflowplugin.api.OFConstants;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.data.ActionConvertorData;
@@ -31,7 +30,7 @@ public class ApplyActionsCase extends ConvertorCase<org.opendaylight.yang.gen.v1
     }
 
     @Override
-    public Optional<Instruction> process(final @Nonnull org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types
+    public Optional<Instruction> process(final org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types
             .rev131026.instruction.instruction.ApplyActionsCase source, final ActionConvertorData data,
             ConvertorExecutor convertorExecutor) {
         ApplyActions applyActions = source.getApplyActions();
index ffd81debe2198485b969b6ba80a3c1e08fecb297..caca0c8e496cad062883aef105b7391af9cf4d74 100644 (file)
@@ -9,7 +9,6 @@
 package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.flow.cases;
 
 import java.util.Optional;
-import javax.annotation.Nonnull;
 import org.opendaylight.openflowplugin.api.OFConstants;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.data.ActionConvertorData;
@@ -26,7 +25,7 @@ public class ClearActionsCase extends ConvertorCase<org.opendaylight.yang.gen.v1
     }
 
     @Override
-    public Optional<Instruction> process(final @Nonnull org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types
+    public Optional<Instruction> process(final org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types
             .rev131026.instruction.instruction.ClearActionsCase source, final ActionConvertorData data,
             ConvertorExecutor convertorExecutor) {
         ClearActionsCaseBuilder clearActionsCaseBuilder = new ClearActionsCaseBuilder();
index a84b2c4cb3b59a995c514da5f1f6d166b43116bb..a8e089a431e22376e9df71fb807bc8dfcf930cf2 100644 (file)
@@ -9,7 +9,6 @@
 package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.flow.cases;
 
 import java.util.Optional;
-import javax.annotation.Nonnull;
 import org.opendaylight.openflowplugin.api.OFConstants;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.data.ActionConvertorData;
@@ -28,7 +27,7 @@ public class GoToTableCase extends ConvertorCase<org.opendaylight.yang.gen.v1.ur
     }
 
     @Override
-    public Optional<Instruction> process(final @Nonnull org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types
+    public Optional<Instruction> process(final org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types
             .rev131026.instruction.instruction.GoToTableCase source, final ActionConvertorData data,
             ConvertorExecutor convertorExecutor) {
         GoToTable goToTable = source.getGoToTable();
index ae90e8a6dbe805e62870c137cbfc4f511a36ff8a..6156422be13b5390f1e12aaf6581468c0eb1d7f3 100644 (file)
@@ -8,7 +8,6 @@
 package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.flow.cases;
 
 import java.util.Optional;
-import javax.annotation.Nonnull;
 import org.opendaylight.openflowplugin.api.OFConstants;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.data.ActionConvertorData;
@@ -26,7 +25,7 @@ public class MeterCase extends ConvertorCase<org.opendaylight.yang.gen.v1.urn.op
     }
 
     @Override
-    public Optional<Instruction> process(final @Nonnull org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types
+    public Optional<Instruction> process(final org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types
             .rev131026.instruction.instruction.MeterCase source, final ActionConvertorData data,
             final ConvertorExecutor convertorExecutor) {
         return Optional.of(new InstructionBuilder().setInstructionChoice(new MeterCaseBuilder()
index 78da0a16d88c454b40def5b33e88e7699a94b3c9..e768233eb414584ddce7391b2de083f6c0fe87e7 100644 (file)
@@ -11,7 +11,6 @@ package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.flow.case
 import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
-import javax.annotation.Nonnull;
 import org.opendaylight.openflowplugin.api.OFConstants;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.data.ActionConvertorData;
@@ -31,7 +30,7 @@ public class WriteActionsCase extends ConvertorCase<org.opendaylight.yang.gen.v1
     }
 
     @Override
-    public Optional<Instruction> process(final @Nonnull org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types
+    public Optional<Instruction> process(final org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types
             .rev131026.instruction.instruction.WriteActionsCase source, final ActionConvertorData data,
             ConvertorExecutor convertorExecutor) {
         WriteActions writeActions = source.getWriteActions();
index 708b33a934c69c482e218107f4d6a9d0aad2313f..1c47da2d34271aefb01a2dab2c0070f5b1ab86e7 100644 (file)
@@ -8,7 +8,6 @@
 package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.flow.cases;
 
 import java.util.Optional;
-import javax.annotation.Nonnull;
 import org.opendaylight.openflowplugin.api.OFConstants;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.data.ActionConvertorData;
@@ -28,7 +27,7 @@ public class WriteMetadataCase extends ConvertorCase<org.opendaylight.yang.gen.v
     }
 
     @Override
-    public Optional<Instruction> process(final @Nonnull org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types
+    public Optional<Instruction> process(final org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types
             .rev131026.instruction.instruction.WriteMetadataCase source, final ActionConvertorData data,
             final ConvertorExecutor convertorExecutor) {
         WriteMetadata writeMetadata = source.getWriteMetadata();
index b705326fc64372330636cff3b72b44d9cb5b2bcc..f3282242e36ef60f7327e42d86dae3e0a0b527c5 100644 (file)
@@ -10,7 +10,7 @@ package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.match;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.util.Iterator;
-import javax.annotation.Nullable;
+import org.eclipse.jdt.annotation.Nullable;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Dscp;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.Ipv6ExthdrFlags;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.IpDscp;
index 39003dba26bb9004a3f3445ddc2f999db0fbf2d4..2fa12eb6861d51b48eb30fa02f0582bed210d5d7 100644 (file)
@@ -9,7 +9,7 @@
 package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.match.cases;
 
 import java.util.Optional;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowplugin.api.OFConstants;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.common.ConvertorCase;
@@ -25,7 +25,7 @@ public class OfToSalArpOpCase extends ConvertorCase<ArpOpCase, MatchBuilder, Mat
     }
 
     @Override
-    public Optional<MatchBuilder> process(@Nonnull ArpOpCase source, MatchResponseConvertorData data,
+    public Optional<MatchBuilder> process(@NonNull ArpOpCase source, MatchResponseConvertorData data,
             ConvertorExecutor convertorExecutor) {
         final MatchBuilder matchBuilder = data.getMatchBuilder();
         final ArpMatchBuilder arpMatchBuilder = data.getArpMatchBuilder();
index 920463257273748e9239634d9d865bd0b1bce33a..8715253d41851d7f02e3d85e5e2b5af674002cdf 100644 (file)
@@ -9,7 +9,7 @@
 package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.match.cases;
 
 import java.util.Optional;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowjava.util.ByteBufUtils;
 import org.opendaylight.openflowplugin.api.OFConstants;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor;
@@ -28,7 +28,7 @@ public class OfToSalArpShaCase extends ConvertorCase<ArpShaCase, MatchBuilder, M
     }
 
     @Override
-    public Optional<MatchBuilder> process(@Nonnull ArpShaCase source, MatchResponseConvertorData data,
+    public Optional<MatchBuilder> process(@NonNull ArpShaCase source, MatchResponseConvertorData data,
             ConvertorExecutor convertorExecutor) {
         final MatchBuilder matchBuilder = data.getMatchBuilder();
         final ArpMatchBuilder arpMatchBuilder = data.getArpMatchBuilder();
index 4b5e63ed86ec3c366b3bf1305c291bcb81b09b0a..da6f075c5f64779da81e9b09584a0ab94509f9ee 100644 (file)
@@ -9,7 +9,7 @@
 package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.match.cases;
 
 import java.util.Optional;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowplugin.api.OFConstants;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.common.ConvertorCase;
@@ -27,7 +27,7 @@ public class OfToSalArpSpaCase extends ConvertorCase<ArpSpaCase, MatchBuilder, M
     }
 
     @Override
-    public Optional<MatchBuilder> process(@Nonnull ArpSpaCase source, MatchResponseConvertorData data,
+    public Optional<MatchBuilder> process(@NonNull ArpSpaCase source, MatchResponseConvertorData data,
             ConvertorExecutor convertorExecutor) {
         final MatchBuilder matchBuilder = data.getMatchBuilder();
         final ArpMatchBuilder arpMatchBuilder = data.getArpMatchBuilder();
index 49c7bc01d3ef9489950108fd603c68add69e8de9..cecdf5b58c445f064318037837b62c9ee994b0bd 100644 (file)
@@ -9,7 +9,7 @@
 package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.match.cases;
 
 import java.util.Optional;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowjava.util.ByteBufUtils;
 import org.opendaylight.openflowplugin.api.OFConstants;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor;
@@ -28,7 +28,7 @@ public class OfToSalArpThaCase extends ConvertorCase<ArpThaCase, MatchBuilder, M
     }
 
     @Override
-    public Optional<MatchBuilder> process(@Nonnull ArpThaCase source, MatchResponseConvertorData data,
+    public Optional<MatchBuilder> process(@NonNull ArpThaCase source, MatchResponseConvertorData data,
             ConvertorExecutor convertorExecutor) {
         final MatchBuilder matchBuilder = data.getMatchBuilder();
         final ArpMatchBuilder arpMatchBuilder = data.getArpMatchBuilder();
index 6d330737d69ca7e4fa36576031c2c782353a50bd..9c8d3908d87733a0510800892d14a318f873d6f2 100644 (file)
@@ -9,7 +9,7 @@
 package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.match.cases;
 
 import java.util.Optional;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowplugin.api.OFConstants;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.common.ConvertorCase;
@@ -27,7 +27,7 @@ public class OfToSalArpTpaCase extends ConvertorCase<ArpTpaCase, MatchBuilder, M
     }
 
     @Override
-    public Optional<MatchBuilder> process(@Nonnull ArpTpaCase source, MatchResponseConvertorData data,
+    public Optional<MatchBuilder> process(@NonNull ArpTpaCase source, MatchResponseConvertorData data,
             ConvertorExecutor convertorExecutor) {
         final MatchBuilder matchBuilder = data.getMatchBuilder();
         final ArpMatchBuilder arpMatchBuilder = data.getArpMatchBuilder();
index 42fcece6364ae837511a6105508c6a1e7537dfbf..219d1ce681edeb414e9bed70c6eb5b753276e3dd 100644 (file)
@@ -11,7 +11,7 @@ package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.match.cas
 import static org.opendaylight.openflowjava.util.ByteBufUtils.macAddressToString;
 
 import java.util.Optional;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowplugin.api.OFConstants;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.common.ConvertorCase;
@@ -29,7 +29,7 @@ public class OfToSalEthDstCase extends ConvertorCase<EthDstCase, MatchBuilder, M
     }
 
     @Override
-    public Optional<MatchBuilder> process(@Nonnull EthDstCase source, MatchResponseConvertorData data,
+    public Optional<MatchBuilder> process(@NonNull EthDstCase source, MatchResponseConvertorData data,
             ConvertorExecutor convertorExecutor) {
         final MatchBuilder matchBuilder = data.getMatchBuilder();
         final EthernetMatchBuilder ethMatchBuilder = data.getEthernetMatchBuilder();
index 99a914cc3e6ab46750e3d594e137f137ee7a07d9..e204cb7f26d540e2233301538d77a06fdda48e11 100644 (file)
@@ -11,7 +11,7 @@ package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.match.cas
 import static org.opendaylight.openflowjava.util.ByteBufUtils.macAddressToString;
 
 import java.util.Optional;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowplugin.api.OFConstants;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.common.ConvertorCase;
@@ -29,7 +29,7 @@ public class OfToSalEthSrcCase extends ConvertorCase<EthSrcCase, MatchBuilder, M
     }
 
     @Override
-    public Optional<MatchBuilder> process(@Nonnull EthSrcCase source, MatchResponseConvertorData data,
+    public Optional<MatchBuilder> process(@NonNull EthSrcCase source, MatchResponseConvertorData data,
             ConvertorExecutor convertorExecutor) {
         final MatchBuilder matchBuilder = data.getMatchBuilder();
         final EthernetMatchBuilder ethMatchBuilder = data.getEthernetMatchBuilder();
index c2a9a94b578fe22b0eba14af26fc7c18e2f91a5c..8b64d4e85d945176a282a95d9c66007ffbfc862e 100644 (file)
@@ -8,7 +8,7 @@
 package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.match.cases;
 
 import java.util.Optional;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowplugin.api.OFConstants;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.common.ConvertorCase;
@@ -26,7 +26,7 @@ public class OfToSalEthTypeCase extends ConvertorCase<EthTypeCase, MatchBuilder,
     }
 
     @Override
-    public Optional<MatchBuilder> process(@Nonnull final EthTypeCase source, final MatchResponseConvertorData data,
+    public Optional<MatchBuilder> process(@NonNull final EthTypeCase source, final MatchResponseConvertorData data,
             final ConvertorExecutor convertorExecutor) {
         final MatchBuilder matchBuilder = data.getMatchBuilder();
         final EthType ethTypeCase = source.getEthType();
index 4cf16d443aac2ea9f27f7e07f20954363a4eaf77..d1534d0621d99bcc43e5a5e295408aeb8bbcaeef 100644 (file)
@@ -9,7 +9,7 @@
 package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.match.cases;
 
 import java.util.Optional;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowplugin.api.OFConstants;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.common.ConvertorCase;
@@ -28,7 +28,7 @@ public class OfToSalExperimenterIdCase extends ConvertorCase<ExperimenterIdCase,
     }
 
     @Override
-    public Optional<MatchBuilder> process(@Nonnull ExperimenterIdCase source, MatchResponseConvertorData data,
+    public Optional<MatchBuilder> process(@NonNull ExperimenterIdCase source, MatchResponseConvertorData data,
             ConvertorExecutor convertorExecutor) {
         final MatchBuilder matchBuilder = data.getMatchBuilder();
 
index 68b38a339b0a0b017eed6d49f37988f51acec16b..fa31c562db8b45f4349f0703431e6eba138b0d4a 100644 (file)
@@ -8,7 +8,7 @@
 package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.match.cases;
 
 import java.util.Optional;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowplugin.api.OFConstants;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.common.ConvertorCase;
@@ -25,7 +25,7 @@ public class OfToSalIcmpv4CodeCase extends ConvertorCase<Icmpv4CodeCase, MatchBu
     }
 
     @Override
-    public Optional<MatchBuilder> process(@Nonnull final Icmpv4CodeCase source, final MatchResponseConvertorData data,
+    public Optional<MatchBuilder> process(@NonNull final Icmpv4CodeCase source, final MatchResponseConvertorData data,
             final ConvertorExecutor convertorExecutor) {
         final MatchBuilder matchBuilder = data.getMatchBuilder();
         final Icmpv4MatchBuilder icmpv4MatchBuilder = data.getIcmpv4MatchBuilder();
index d50b61f4410b26d4de268aff9b4b290e116342fa..81f7d44fe04d8967d38ec3bbc09213470904d398 100644 (file)
@@ -8,7 +8,7 @@
 package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.match.cases;
 
 import java.util.Optional;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowplugin.api.OFConstants;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.common.ConvertorCase;
@@ -25,7 +25,7 @@ public class OfToSalIcmpv4TypeCase extends ConvertorCase<Icmpv4TypeCase, MatchBu
     }
 
     @Override
-    public Optional<MatchBuilder> process(@Nonnull final Icmpv4TypeCase source, final MatchResponseConvertorData data,
+    public Optional<MatchBuilder> process(@NonNull final Icmpv4TypeCase source, final MatchResponseConvertorData data,
             final ConvertorExecutor convertorExecutor) {
         final MatchBuilder matchBuilder = data.getMatchBuilder();
         final Icmpv4MatchBuilder icmpv4MatchBuilder = data.getIcmpv4MatchBuilder();
index 5d63beeb512e9a27f9219c00f18c6e1cfc05a0a6..0df5acea617a54f2fa974b8463d01b0645d1b452 100644 (file)
@@ -8,7 +8,7 @@
 package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.match.cases;
 
 import java.util.Optional;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowplugin.api.OFConstants;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.common.ConvertorCase;
@@ -25,7 +25,7 @@ public class OfToSalIcmpv6CodeCase extends ConvertorCase<Icmpv6CodeCase, MatchBu
     }
 
     @Override
-    public Optional<MatchBuilder> process(@Nonnull final Icmpv6CodeCase source, final MatchResponseConvertorData data,
+    public Optional<MatchBuilder> process(@NonNull final Icmpv6CodeCase source, final MatchResponseConvertorData data,
             final ConvertorExecutor convertorExecutor) {
         final MatchBuilder matchBuilder = data.getMatchBuilder();
         final Icmpv6MatchBuilder icmpv6MatchBuilder = data.getIcmpv6MatchBuilder();
index 3a4e302fb983054cd659a22eaf7c10859c1144a5..33e6c1520ee21d9ddb89bf540ce5b1721a0af879 100644 (file)
@@ -8,7 +8,7 @@
 package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.match.cases;
 
 import java.util.Optional;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowplugin.api.OFConstants;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.common.ConvertorCase;
@@ -25,7 +25,7 @@ public class OfToSalIcmpv6TypeCase extends ConvertorCase<Icmpv6TypeCase, MatchBu
     }
 
     @Override
-    public Optional<MatchBuilder> process(@Nonnull final Icmpv6TypeCase source, final MatchResponseConvertorData data,
+    public Optional<MatchBuilder> process(@NonNull final Icmpv6TypeCase source, final MatchResponseConvertorData data,
             final ConvertorExecutor convertorExecutor) {
         final MatchBuilder matchBuilder = data.getMatchBuilder();
         final Icmpv6MatchBuilder icmpv6MatchBuilder = data.getIcmpv6MatchBuilder();
index 074fa8245e91ce68418c55a336aecd781c8d5ab8..8bbd576ff56b8a8bb7060e7fb2037f3db9d72724 100644 (file)
@@ -8,7 +8,7 @@
 package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.match.cases;
 
 import java.util.Optional;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowplugin.api.OFConstants;
 import org.opendaylight.openflowplugin.api.openflow.md.util.OpenflowVersion;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor;
@@ -26,7 +26,7 @@ public class OfToSalInPhyPortCase extends ConvertorCase<InPhyPortCase, MatchBuil
     }
 
     @Override
-    public Optional<MatchBuilder> process(@Nonnull final InPhyPortCase source, final MatchResponseConvertorData data,
+    public Optional<MatchBuilder> process(@NonNull final InPhyPortCase source, final MatchResponseConvertorData data,
             final ConvertorExecutor convertorExecutor) {
         final MatchBuilder matchBuilder = data.getMatchBuilder();
         final OpenflowVersion ofVersion = OpenflowVersion.get(data.getVersion());
index 4dc3967115c89f9019c483b1805f224c5a71f547..739067f68fe584c0d8e8e0c71fafa99b6c62569f 100644 (file)
@@ -8,7 +8,7 @@
 package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.match.cases;
 
 import java.util.Optional;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowplugin.api.OFConstants;
 import org.opendaylight.openflowplugin.api.openflow.md.util.OpenflowVersion;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor;
@@ -26,7 +26,7 @@ public class OfToSalInPortCase extends ConvertorCase<InPortCase, MatchBuilder, M
     }
 
     @Override
-    public Optional<MatchBuilder> process(@Nonnull final InPortCase source, final MatchResponseConvertorData data,
+    public Optional<MatchBuilder> process(@NonNull final InPortCase source, final MatchResponseConvertorData data,
             final ConvertorExecutor convertorExecutor) {
         final MatchBuilder matchBuilder = data.getMatchBuilder();
         final OpenflowVersion ofVersion = OpenflowVersion.get(data.getVersion());
index 55a83b9875653fa54c016c42f12175f82f0ab802..f9fd0175dbddd36ba31fbfb27c30b4c8617c7339 100644 (file)
@@ -9,7 +9,7 @@
 package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.match.cases;
 
 import java.util.Optional;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowplugin.api.OFConstants;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.common.ConvertorCase;
@@ -26,7 +26,7 @@ public class OfToSalIpDscpCase extends ConvertorCase<IpDscpCase, MatchBuilder, M
     }
 
     @Override
-    public Optional<MatchBuilder> process(@Nonnull IpDscpCase source, MatchResponseConvertorData data,
+    public Optional<MatchBuilder> process(@NonNull IpDscpCase source, MatchResponseConvertorData data,
             ConvertorExecutor convertorExecutor) {
         final MatchBuilder matchBuilder = data.getMatchBuilder();
         final IpMatchBuilder ipMatchBuilder = data.getIpMatchBuilder();
index d369ef1b4093ce029ef1795bfed4c75aafe9a857..18525b89ab25fac44353cf5ca8a55b82aa412e1a 100644 (file)
@@ -9,7 +9,7 @@
 package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.match.cases;
 
 import java.util.Optional;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowplugin.api.OFConstants;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.common.ConvertorCase;
@@ -25,7 +25,7 @@ public class OfToSalIpEcnCase extends ConvertorCase<IpEcnCase, MatchBuilder, Mat
     }
 
     @Override
-    public Optional<MatchBuilder> process(@Nonnull IpEcnCase source, MatchResponseConvertorData data,
+    public Optional<MatchBuilder> process(@NonNull IpEcnCase source, MatchResponseConvertorData data,
             ConvertorExecutor convertorExecutor) {
         final MatchBuilder matchBuilder = data.getMatchBuilder();
         final IpMatchBuilder ipMatchBuilder = data.getIpMatchBuilder();
index a24e6e6aa6f91bc333995cf99e718db61ea0338a..73e169cf2058b7c5448f095a05de259be3cdda1a 100644 (file)
@@ -8,7 +8,7 @@
 package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.match.cases;
 
 import java.util.Optional;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowplugin.api.OFConstants;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.common.ConvertorCase;
@@ -25,7 +25,7 @@ public class OfToSalIpProtoCase extends ConvertorCase<IpProtoCase, MatchBuilder,
     }
 
     @Override
-    public Optional<MatchBuilder> process(@Nonnull final IpProtoCase source, final MatchResponseConvertorData data,
+    public Optional<MatchBuilder> process(@NonNull final IpProtoCase source, final MatchResponseConvertorData data,
             final ConvertorExecutor convertorExecutor) {
         final MatchBuilder matchBuilder = data.getMatchBuilder();
         final IpMatchBuilder ipMatchBuilder = data.getIpMatchBuilder();
index e8845d2e1a23867aecbcf9d67ba56fc9c7844789..9c91d5964f1f1506c0441e654706eea6c8389265 100644 (file)
@@ -9,7 +9,7 @@
 package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.match.cases;
 
 import java.util.Optional;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowplugin.api.OFConstants;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.common.ConvertorCase;
@@ -66,7 +66,7 @@ public class OfToSalIpv4DstCase extends ConvertorCase<Ipv4DstCase, MatchBuilder,
     }
 
     @Override
-    public Optional<MatchBuilder> process(@Nonnull final Ipv4DstCase source, final MatchResponseConvertorData data,
+    public Optional<MatchBuilder> process(@NonNull final Ipv4DstCase source, final MatchResponseConvertorData data,
             final ConvertorExecutor convertorExecutor) {
         final MatchBuilder matchBuilder = data.getMatchBuilder();
         final Ipv4MatchBuilder ipv4MatchBuilder = data.getIpv4MatchBuilder();
index 246605dbde578678f6f2686cd515f31b81158226..a7d937798506805b655b1a0ccb1eb6b5814f0013 100644 (file)
@@ -9,7 +9,7 @@
 package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.match.cases;
 
 import java.util.Optional;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowplugin.api.OFConstants;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.common.ConvertorCase;
@@ -66,7 +66,7 @@ public class OfToSalIpv4SrcCase extends ConvertorCase<Ipv4SrcCase, MatchBuilder,
     }
 
     @Override
-    public Optional<MatchBuilder> process(@Nonnull Ipv4SrcCase source, MatchResponseConvertorData data,
+    public Optional<MatchBuilder> process(@NonNull Ipv4SrcCase source, MatchResponseConvertorData data,
             ConvertorExecutor convertorExecutor) {
         final MatchBuilder matchBuilder = data.getMatchBuilder();
         final Ipv4MatchBuilder ipv4MatchBuilder = data.getIpv4MatchBuilder();
index eac66c0cb185a1e0412c383a701856b5f9c244e6..925b9daab7af6116c103871a980c58c588c80c63 100644 (file)
@@ -9,7 +9,7 @@
 package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.match.cases;
 
 import java.util.Optional;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowplugin.api.OFConstants;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.common.ConvertorCase;
@@ -30,7 +30,7 @@ public class OfToSalIpv6DstCase extends ConvertorCase<Ipv6DstCase, MatchBuilder,
     }
 
     @Override
-    public Optional<MatchBuilder> process(@Nonnull Ipv6DstCase source, MatchResponseConvertorData data,
+    public Optional<MatchBuilder> process(@NonNull Ipv6DstCase source, MatchResponseConvertorData data,
             ConvertorExecutor convertorExecutor) {
         final MatchBuilder matchBuilder = data.getMatchBuilder();
         final Ipv6MatchBuilder ipv6MatchBuilder = data.getIpv6MatchBuilder();
index e3f148929d4b0e9fe69eeb49a30ff7f5af7a8ed8..256d4cf9e70c115e0a56ddee0aa099d9cb2b4034 100644 (file)
@@ -9,7 +9,7 @@
 package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.match.cases;
 
 import java.util.Optional;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowplugin.api.OFConstants;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.common.ConvertorCase;
@@ -29,7 +29,7 @@ public class OfToSalIpv6ExthdrCase extends ConvertorCase<Ipv6ExthdrCase, MatchBu
     }
 
     @Override
-    public Optional<MatchBuilder> process(@Nonnull Ipv6ExthdrCase source, MatchResponseConvertorData data,
+    public Optional<MatchBuilder> process(@NonNull Ipv6ExthdrCase source, MatchResponseConvertorData data,
             ConvertorExecutor convertorExecutor) {
         final MatchBuilder matchBuilder = data.getMatchBuilder();
         final Ipv6MatchBuilder ipv6MatchBuilder = data.getIpv6MatchBuilder();
index aed67ffe9db182d4cc3e36270e317995c45e090f..066f21c3e61c4cb991c31f926d32f9f17e67c0f0 100644 (file)
@@ -9,7 +9,7 @@
 package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.match.cases;
 
 import java.util.Optional;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowplugin.api.OFConstants;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.common.ConvertorCase;
@@ -28,7 +28,7 @@ public class OfToSalIpv6FlabelCase extends ConvertorCase<Ipv6FlabelCase, MatchBu
     }
 
     @Override
-    public Optional<MatchBuilder> process(@Nonnull Ipv6FlabelCase source, MatchResponseConvertorData data,
+    public Optional<MatchBuilder> process(@NonNull Ipv6FlabelCase source, MatchResponseConvertorData data,
             ConvertorExecutor convertorExecutor) {
         final MatchBuilder matchBuilder = data.getMatchBuilder();
         final Ipv6MatchBuilder ipv6MatchBuilder = data.getIpv6MatchBuilder();
index cb47757a7c1dd98daa941f7da00b70957b84d14f..e8423980f6569baf3274fdec4b2d0010710e4875 100644 (file)
@@ -9,7 +9,7 @@
 package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.match.cases;
 
 import java.util.Optional;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowplugin.api.OFConstants;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.common.ConvertorCase;
@@ -25,7 +25,7 @@ public class OfToSalIpv6NdSllCase extends ConvertorCase<Ipv6NdSllCase, MatchBuil
     }
 
     @Override
-    public Optional<MatchBuilder> process(@Nonnull Ipv6NdSllCase source, MatchResponseConvertorData data,
+    public Optional<MatchBuilder> process(@NonNull Ipv6NdSllCase source, MatchResponseConvertorData data,
             ConvertorExecutor convertorExecutor) {
         final MatchBuilder matchBuilder = data.getMatchBuilder();
         final Ipv6MatchBuilder ipv6MatchBuilder = data.getIpv6MatchBuilder();
index a82710e76a7722511052f9740169313f031ed0a6..35263964c39c46a39c64d556acf6a1cd3df6f16d 100644 (file)
@@ -9,7 +9,7 @@
 package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.match.cases;
 
 import java.util.Optional;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowplugin.api.OFConstants;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.common.ConvertorCase;
@@ -25,7 +25,7 @@ public class OfToSalIpv6NdTargetCase extends ConvertorCase<Ipv6NdTargetCase, Mat
     }
 
     @Override
-    public Optional<MatchBuilder> process(@Nonnull Ipv6NdTargetCase source, MatchResponseConvertorData data,
+    public Optional<MatchBuilder> process(@NonNull Ipv6NdTargetCase source, MatchResponseConvertorData data,
             ConvertorExecutor convertorExecutor) {
         final MatchBuilder matchBuilder = data.getMatchBuilder();
         final Ipv6MatchBuilder ipv6MatchBuilder = data.getIpv6MatchBuilder();
index 505727bb4816d808fc90fd2e20786c4ff5ab31e7..68379b172e6b5cddb8b11cb4f170dec9cd6deba1 100644 (file)
@@ -9,7 +9,7 @@
 package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.match.cases;
 
 import java.util.Optional;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowplugin.api.OFConstants;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.common.ConvertorCase;
@@ -25,7 +25,7 @@ public class OfToSalIpv6NdTllCase extends ConvertorCase<Ipv6NdTllCase, MatchBuil
     }
 
     @Override
-    public Optional<MatchBuilder> process(@Nonnull Ipv6NdTllCase source, MatchResponseConvertorData data,
+    public Optional<MatchBuilder> process(@NonNull Ipv6NdTllCase source, MatchResponseConvertorData data,
             ConvertorExecutor convertorExecutor) {
         final MatchBuilder matchBuilder = data.getMatchBuilder();
         final Ipv6MatchBuilder ipv6MatchBuilder = data.getIpv6MatchBuilder();
index 6dffae09948b745c4981d441075da09d6f1c6b30..c021f0646f4dfd1f9e84f05d445b329f6a26cff6 100644 (file)
@@ -9,7 +9,7 @@
 package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.match.cases;
 
 import java.util.Optional;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowplugin.api.OFConstants;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.common.ConvertorCase;
@@ -30,7 +30,7 @@ public class OfToSalIpv6SrcCase extends ConvertorCase<Ipv6SrcCase, MatchBuilder,
     }
 
     @Override
-    public Optional<MatchBuilder> process(@Nonnull Ipv6SrcCase source, MatchResponseConvertorData data,
+    public Optional<MatchBuilder> process(@NonNull Ipv6SrcCase source, MatchResponseConvertorData data,
             ConvertorExecutor convertorExecutor) {
         final MatchBuilder matchBuilder = data.getMatchBuilder();
         final Ipv6MatchBuilder ipv6MatchBuilder = data.getIpv6MatchBuilder();
index 5b7a88c7f92a62e3423a6aa51143a35c498177ff..2f4727cfb51f437609c862865ccee2f549f401fc 100644 (file)
@@ -10,7 +10,7 @@ package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.match.cas
 
 import java.math.BigInteger;
 import java.util.Optional;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowplugin.api.OFConstants;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.common.ConvertorCase;
@@ -26,7 +26,7 @@ public class OfToSalMetadataCase extends ConvertorCase<MetadataCase, MatchBuilde
     }
 
     @Override
-    public Optional<MatchBuilder> process(@Nonnull MetadataCase source, MatchResponseConvertorData data,
+    public Optional<MatchBuilder> process(@NonNull MetadataCase source, MatchResponseConvertorData data,
             ConvertorExecutor convertorExecutor) {
         final MatchBuilder matchBuilder = data.getMatchBuilder();
         final MetadataBuilder metadataBuilder = new MetadataBuilder();
index 58dc37f42e8f92d599d330d9262b58b58cd11689..49b48be89f6631e7bd379241da8515a0b0a4e51e 100644 (file)
@@ -9,7 +9,7 @@
 package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.match.cases;
 
 import java.util.Optional;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowplugin.api.OFConstants;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.common.ConvertorCase;
@@ -25,7 +25,7 @@ public class OfToSalMplsBosCase extends ConvertorCase<MplsBosCase, MatchBuilder,
     }
 
     @Override
-    public Optional<MatchBuilder> process(@Nonnull MplsBosCase source, MatchResponseConvertorData data,
+    public Optional<MatchBuilder> process(@NonNull MplsBosCase source, MatchResponseConvertorData data,
             ConvertorExecutor convertorExecutor) {
         final MatchBuilder matchBuilder = data.getMatchBuilder();
         final ProtocolMatchFieldsBuilder protocolMatchFieldsBuilder = data.getProtocolMatchFieldsBuilder();
index 6d6ccf5d07415d55ffdec7b3b787cf9e13d70eb1..33e0d8f73523b4108484b002749a548b6dd61fc2 100644 (file)
@@ -9,7 +9,7 @@
 package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.match.cases;
 
 import java.util.Optional;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowplugin.api.OFConstants;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.common.ConvertorCase;
@@ -25,7 +25,7 @@ public class OfToSalMplsLabelCase extends ConvertorCase<MplsLabelCase, MatchBuil
     }
 
     @Override
-    public Optional<MatchBuilder> process(@Nonnull MplsLabelCase source, MatchResponseConvertorData data,
+    public Optional<MatchBuilder> process(@NonNull MplsLabelCase source, MatchResponseConvertorData data,
             ConvertorExecutor convertorExecutor) {
         final MatchBuilder matchBuilder = data.getMatchBuilder();
         final ProtocolMatchFieldsBuilder protocolMatchFieldsBuilder = data.getProtocolMatchFieldsBuilder();
index 2af8a7cefc32da9d0cc6ac5bd3ec885a88ea1c2e..2834bfd206d51912aa79133af980f888314ec062 100644 (file)
@@ -9,7 +9,7 @@
 package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.match.cases;
 
 import java.util.Optional;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowplugin.api.OFConstants;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.common.ConvertorCase;
@@ -25,7 +25,7 @@ public class OfToSalMplsTcCase extends ConvertorCase<MplsTcCase, MatchBuilder, M
     }
 
     @Override
-    public Optional<MatchBuilder> process(@Nonnull MplsTcCase source, MatchResponseConvertorData data,
+    public Optional<MatchBuilder> process(@NonNull MplsTcCase source, MatchResponseConvertorData data,
             ConvertorExecutor convertorExecutor) {
         final MatchBuilder matchBuilder = data.getMatchBuilder();
         final ProtocolMatchFieldsBuilder protocolMatchFieldsBuilder = data.getProtocolMatchFieldsBuilder();
index dafb0316349dc8271c297da95e8591571338e281..ceba3f680b8ab525448657fab4338894d1f17862 100644 (file)
@@ -8,7 +8,7 @@
 package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.match.cases;
 
 import java.util.Optional;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowplugin.api.OFConstants;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.common.ConvertorCase;
@@ -25,7 +25,7 @@ public class OfToSalPacketTypeCase extends ConvertorCase<PacketTypeCase, MatchBu
     }
 
     @Override
-    public Optional<MatchBuilder> process(@Nonnull final PacketTypeCase source,
+    public Optional<MatchBuilder> process(@NonNull final PacketTypeCase source,
                                           final MatchResponseConvertorData data,
                                           final ConvertorExecutor convertorExecutor) {
         final MatchBuilder matchBuilder = data.getMatchBuilder();
index 4022f6364306b7e3d41bfde880499cdea49c1750..711c0f056cafa4a02b2672f140fa21821eb5d7d8 100644 (file)
@@ -9,7 +9,7 @@
 package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.match.cases;
 
 import java.util.Optional;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowplugin.api.OFConstants;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.common.ConvertorCase;
@@ -27,7 +27,7 @@ public class OfToSalPbbIsidCase extends ConvertorCase<PbbIsidCase, MatchBuilder,
     }
 
     @Override
-    public Optional<MatchBuilder> process(@Nonnull PbbIsidCase source, MatchResponseConvertorData data,
+    public Optional<MatchBuilder> process(@NonNull PbbIsidCase source, MatchResponseConvertorData data,
             ConvertorExecutor convertorExecutor) {
         final MatchBuilder matchBuilder = data.getMatchBuilder();
         final ProtocolMatchFieldsBuilder protocolMatchFieldsBuilder = data.getProtocolMatchFieldsBuilder();
index e41e03ff7980037d459dcfa6ffa61322597d5814..03b3a1c9c43340b872ade452407bba1fef3e315a 100644 (file)
@@ -9,7 +9,7 @@
 package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.match.cases;
 
 import java.util.Optional;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowplugin.api.OFConstants;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.common.ConvertorCase;
@@ -26,7 +26,7 @@ public class OfToSalSctpDstCase extends ConvertorCase<SctpDstCase, MatchBuilder,
     }
 
     @Override
-    public Optional<MatchBuilder> process(@Nonnull SctpDstCase source, MatchResponseConvertorData data,
+    public Optional<MatchBuilder> process(@NonNull SctpDstCase source, MatchResponseConvertorData data,
             ConvertorExecutor convertorExecutor) {
         final MatchBuilder matchBuilder = data.getMatchBuilder();
         final SctpMatchBuilder sctpMatchBuilder = data.getSctpMatchBuilder();
index f896fb7dc5622962738eb66e5016c9f7d71e9357..531cebe6fd57bc1ed9f6db01c77051d0e14336c7 100644 (file)
@@ -9,7 +9,7 @@
 package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.match.cases;
 
 import java.util.Optional;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowplugin.api.OFConstants;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.common.ConvertorCase;
@@ -26,7 +26,7 @@ public class OfToSalSctpSrcCase extends ConvertorCase<SctpSrcCase, MatchBuilder,
     }
 
     @Override
-    public Optional<MatchBuilder> process(@Nonnull SctpSrcCase source, MatchResponseConvertorData data,
+    public Optional<MatchBuilder> process(@NonNull SctpSrcCase source, MatchResponseConvertorData data,
             ConvertorExecutor convertorExecutor) {
         final MatchBuilder matchBuilder = data.getMatchBuilder();
         final SctpMatchBuilder sctpMatchBuilder = data.getSctpMatchBuilder();
index e9e553ec3771882389eedd9a90c017e6691c8854..54ffbaa925797c22d6598c9398bae858f11384a7 100644 (file)
@@ -9,7 +9,7 @@
 package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.match.cases;
 
 import java.util.Optional;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowplugin.api.OFConstants;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.common.ConvertorCase;
@@ -26,7 +26,7 @@ public class OfToSalTcpDstCase extends ConvertorCase<TcpDstCase, MatchBuilder, M
     }
 
     @Override
-    public Optional<MatchBuilder> process(@Nonnull TcpDstCase source, MatchResponseConvertorData data,
+    public Optional<MatchBuilder> process(@NonNull TcpDstCase source, MatchResponseConvertorData data,
             ConvertorExecutor convertorExecutor) {
         final MatchBuilder matchBuilder = data.getMatchBuilder();
         final TcpMatchBuilder tcpMatchBuilder = data.getTcpMatchBuilder();
index e62f108c3c3bbbce8d1fad3cacabf41c57c49cc6..194194e5e5e2a619ae39ad98cd03fb531cc64ab8 100644 (file)
@@ -9,7 +9,7 @@
 package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.match.cases;
 
 import java.util.Optional;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowplugin.api.OFConstants;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.common.ConvertorCase;
@@ -25,7 +25,7 @@ public class OfToSalTcpSrcCase extends ConvertorCase<TcpSrcCase, MatchBuilder, M
     }
 
     @Override
-    public Optional<MatchBuilder> process(@Nonnull TcpSrcCase source, MatchResponseConvertorData data,
+    public Optional<MatchBuilder> process(@NonNull TcpSrcCase source, MatchResponseConvertorData data,
             ConvertorExecutor convertorExecutor) {
         final MatchBuilder matchBuilder = data.getMatchBuilder();
         final TcpMatchBuilder tcpMatchBuilder = data.getTcpMatchBuilder();
index b9a02a2370c1570775744a5406f2ad636517ea62..377d4e08dad38b2627e01909a39fe40a8cbbbb0a 100644 (file)
@@ -10,7 +10,7 @@ package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.match.cas
 
 import java.math.BigInteger;
 import java.util.Optional;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowplugin.api.OFConstants;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.common.ConvertorCase;
@@ -26,7 +26,7 @@ public class OfToSalTunnelIdCase extends ConvertorCase<TunnelIdCase, MatchBuilde
     }
 
     @Override
-    public Optional<MatchBuilder> process(@Nonnull TunnelIdCase source, MatchResponseConvertorData data,
+    public Optional<MatchBuilder> process(@NonNull TunnelIdCase source, MatchResponseConvertorData data,
             ConvertorExecutor convertorExecutor) {
         final MatchBuilder matchBuilder = data.getMatchBuilder();
 
index 8ae1e1886ba80c0518c65c3b06eac45bb936dc8d..67e25b9daf16f72382638c31b669013271a2e19d 100644 (file)
@@ -10,7 +10,7 @@ package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.match.cas
 
 import java.nio.ByteBuffer;
 import java.util.Optional;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowplugin.api.OFConstants;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.common.ConvertorCase;
@@ -30,7 +30,7 @@ public class OfToSalTunnelIpv4DstCase extends ConvertorCase<Ipv4DstCase, MatchBu
     }
 
     @Override
-    public Optional<MatchBuilder> process(@Nonnull Ipv4DstCase source, MatchResponseConvertorData data,
+    public Optional<MatchBuilder> process(@NonNull Ipv4DstCase source, MatchResponseConvertorData data,
             ConvertorExecutor convertorExecutor) {
         final MatchBuilder matchBuilder = data.getMatchBuilder();
         final Ipv4MatchBuilder ipv4MatchBuilder = data.getIpv4MatchBuilder();
index 7a092aa195d7c0417b9b8e1d04e702e081c25792..7d50179d24c5162f0f15029eb0b30aed8e443347 100644 (file)
@@ -10,7 +10,7 @@ package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.match.cas
 
 import java.nio.ByteBuffer;
 import java.util.Optional;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowplugin.api.OFConstants;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.common.ConvertorCase;
@@ -30,7 +30,7 @@ public class OfToSalTunnelIpv4SrcCase extends ConvertorCase<Ipv4SrcCase, MatchBu
     }
 
     @Override
-    public Optional<MatchBuilder> process(@Nonnull Ipv4SrcCase source, MatchResponseConvertorData data,
+    public Optional<MatchBuilder> process(@NonNull Ipv4SrcCase source, MatchResponseConvertorData data,
             ConvertorExecutor convertorExecutor) {
         final MatchBuilder matchBuilder = data.getMatchBuilder();
         final Ipv4MatchBuilder ipv4MatchBuilder = data.getIpv4MatchBuilder();
index 970d8bbee630503bb45365530d1525deb6346dc6..d8dea5748ea5a4744d3871f70278144dc8f9b16f 100644 (file)
@@ -9,7 +9,7 @@
 package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.match.cases;
 
 import java.util.Optional;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowplugin.api.OFConstants;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.common.ConvertorCase;
@@ -25,7 +25,7 @@ public class OfToSalUdpDstCase extends ConvertorCase<UdpDstCase, MatchBuilder, M
     }
 
     @Override
-    public Optional<MatchBuilder> process(@Nonnull UdpDstCase source, MatchResponseConvertorData data,
+    public Optional<MatchBuilder> process(@NonNull UdpDstCase source, MatchResponseConvertorData data,
             ConvertorExecutor convertorExecutor) {
         final MatchBuilder matchBuilder = data.getMatchBuilder();
         final UdpMatchBuilder udpMatchBuilder = data.getUdpMatchBuilder();
index 6ee348c9bb5960a2d22a933f9f85d602ba5bf911..a154fb898b49e922b01afea1ae0b80eb9d188225 100644 (file)
@@ -9,7 +9,7 @@
 package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.match.cases;
 
 import java.util.Optional;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowplugin.api.OFConstants;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.common.ConvertorCase;
@@ -25,7 +25,7 @@ public class OfToSalUdpSrcCase extends ConvertorCase<UdpSrcCase, MatchBuilder, M
     }
 
     @Override
-    public Optional<MatchBuilder> process(@Nonnull UdpSrcCase source, MatchResponseConvertorData data,
+    public Optional<MatchBuilder> process(@NonNull UdpSrcCase source, MatchResponseConvertorData data,
             ConvertorExecutor convertorExecutor) {
         final MatchBuilder matchBuilder = data.getMatchBuilder();
         final UdpMatchBuilder udpMatchBuilder = data.getUdpMatchBuilder();
index 574a99c50203299c80fb9eff13da5b758ed7f4e7..9514329d0075ac9bfe0605bfdae5031f37e038ff 100644 (file)
@@ -9,7 +9,7 @@
 package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.match.cases;
 
 import java.util.Optional;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowplugin.api.OFConstants;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.common.ConvertorCase;
@@ -25,7 +25,7 @@ public class OfToSalVlanPcpCase extends ConvertorCase<VlanPcpCase, MatchBuilder,
     }
 
     @Override
-    public Optional<MatchBuilder> process(@Nonnull VlanPcpCase source, MatchResponseConvertorData data,
+    public Optional<MatchBuilder> process(@NonNull VlanPcpCase source, MatchResponseConvertorData data,
             ConvertorExecutor convertorExecutor) {
         final MatchBuilder matchBuilder = data.getMatchBuilder();
         final VlanMatchBuilder vlanMatchBuilder = data.getVlanMatchBuilder();
index 144ac4467a53a2b8c8c92610ba9e37352e1e7e0b..2cf35fdd4140da7af80e1fbdd631858aade7b104 100644 (file)
@@ -9,7 +9,7 @@
 package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.match.cases;
 
 import java.util.Optional;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowplugin.api.OFConstants;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.common.ConvertorCase;
@@ -27,7 +27,7 @@ public class OfToSalVlanVidCase extends ConvertorCase<VlanVidCase, MatchBuilder,
     }
 
     @Override
-    public Optional<MatchBuilder> process(@Nonnull VlanVidCase source, MatchResponseConvertorData data,
+    public Optional<MatchBuilder> process(@NonNull VlanVidCase source, MatchResponseConvertorData data,
             ConvertorExecutor convertorExecutor) {
         final MatchBuilder matchBuilder = data.getMatchBuilder();
         final VlanMatchBuilder vlanMatchBuilder = data.getVlanMatchBuilder();
index b17425b3a1860c91a8b27fa5471be4b7181a99cd..c7f45fe6b119ba3e81614a3980761be8a9a356a1 100644 (file)
@@ -12,7 +12,7 @@ import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Optional;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowjava.util.ByteBufUtils;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.common.ConvertorCase;
@@ -49,7 +49,7 @@ public class SalToOfArpMatchCase extends ConvertorCase<ArpMatch, List<MatchEntry
     }
 
     @Override
-    public Optional<List<MatchEntry>> process(@Nonnull ArpMatch source, VersionConvertorData data,
+    public Optional<List<MatchEntry>> process(@NonNull ArpMatch source, VersionConvertorData data,
             ConvertorExecutor convertorExecutor) {
         List<MatchEntry> result = new ArrayList<>();
 
index dbca089e8b08445e629a55daa773469cd4000cb9..53328edae1e7399d7ca0287f5a244c0abdd6ef27 100644 (file)
@@ -11,7 +11,7 @@ package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.match.cas
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.common.ConvertorCase;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.common.IpConversionUtil;
@@ -35,7 +35,7 @@ public class SalToOfIpv4MatchArbitraryBitMaskCase extends ConvertorCase<Ipv4Matc
     }
 
     @Override
-    public Optional<List<MatchEntry>> process(@Nonnull Ipv4MatchArbitraryBitMask source, VersionConvertorData data,
+    public Optional<List<MatchEntry>> process(@NonNull Ipv4MatchArbitraryBitMask source, VersionConvertorData data,
             ConvertorExecutor convertorExecutor) {
         List<MatchEntry> result = new ArrayList<>();
 
index d68d88454d51279857dc7240d8556a137b0bc88c..3fddd2419d2e8345cf21c642272c1ffffba3e5b6 100644 (file)
@@ -12,7 +12,7 @@ import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Optional;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.common.ConvertorCase;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.common.IpConversionUtil;
@@ -37,7 +37,7 @@ public class SalToOfIpv4MatchCase extends ConvertorCase<Ipv4Match, List<MatchEnt
     }
 
     @Override
-    public Optional<List<MatchEntry>> process(@Nonnull Ipv4Match source, VersionConvertorData data,
+    public Optional<List<MatchEntry>> process(@NonNull Ipv4Match source, VersionConvertorData data,
             ConvertorExecutor convertorExecutor) {
         List<MatchEntry> result = new ArrayList<>();
 
index 48a7f1e5d3517bb5912755e0bddab7d1ebcdcbb8..3d08e136fab9b01bdf2e7026078525732a721c82 100644 (file)
@@ -11,7 +11,7 @@ package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.match.cas
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.common.ConvertorCase;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.common.IpConversionUtil;
@@ -35,7 +35,7 @@ public class SalToOfIpv6MatchArbitraryBitMaskCase extends ConvertorCase<Ipv6Matc
     }
 
     @Override
-    public Optional<List<MatchEntry>> process(@Nonnull Ipv6MatchArbitraryBitMask source, VersionConvertorData data,
+    public Optional<List<MatchEntry>> process(@NonNull Ipv6MatchArbitraryBitMask source, VersionConvertorData data,
             ConvertorExecutor convertorExecutor) {
         List<MatchEntry> result = new ArrayList<>();
 
index e95283065ddd8e880cd9f845aebff69b75694918..46afa0c772c582d0f9745fbb50d622b03d2c121b 100644 (file)
@@ -11,7 +11,7 @@ package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.match.cas
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.common.ConvertorCase;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.common.IpConversionUtil;
@@ -52,7 +52,7 @@ public class SalToOfIpv6MatchCase extends ConvertorCase<Ipv6Match, List<MatchEnt
     }
 
     @Override
-    public Optional<List<MatchEntry>> process(@Nonnull final Ipv6Match source, final VersionConvertorData data,
+    public Optional<List<MatchEntry>> process(@NonNull final Ipv6Match source, final VersionConvertorData data,
             final ConvertorExecutor convertorExecutor) {
         List<MatchEntry> result = new ArrayList<>();
 
index 5d89bd93597c51d524bfd9017b0470a7b00e7bdd..a3cb4c1690c2be1f2d60b2de099c7ad8ddbb42d6 100644 (file)
@@ -11,7 +11,7 @@ package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.match.cas
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.common.ConvertorCase;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.data.VersionConvertorData;
@@ -32,7 +32,7 @@ public class SalToOfSctpMatchCase extends ConvertorCase<SctpMatch, List<MatchEnt
     }
 
     @Override
-    public Optional<List<MatchEntry>> process(@Nonnull SctpMatch source, VersionConvertorData data,
+    public Optional<List<MatchEntry>> process(@NonNull SctpMatch source, VersionConvertorData data,
             ConvertorExecutor convertorExecutor) {
         List<MatchEntry> result = new ArrayList<>();
 
index e2113ddf92217d13d0edd43815083acc9d3ab758..b74bb769dc09c6b0132e621dd31331aa91a29f05 100644 (file)
@@ -11,7 +11,7 @@ package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.match.cas
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.common.ConvertorCase;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.data.VersionConvertorData;
@@ -32,7 +32,7 @@ public class SalToOfTcpMatchCase extends ConvertorCase<TcpMatch, List<MatchEntry
     }
 
     @Override
-    public Optional<List<MatchEntry>> process(@Nonnull TcpMatch source, VersionConvertorData data,
+    public Optional<List<MatchEntry>> process(@NonNull TcpMatch source, VersionConvertorData data,
             ConvertorExecutor convertorExecutor) {
         List<MatchEntry> result = new ArrayList<>();
 
index 6b4a85381d194e6eb51bcb89d96e49ee8b78c073..18dbb9499202d5adf5447e0df644b1e92d9dc4cf 100644 (file)
@@ -12,7 +12,7 @@ import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Optional;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.common.ConvertorCase;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.common.IpConversionUtil;
@@ -37,7 +37,7 @@ public class SalToOfTunnelIpv4MatchCase extends ConvertorCase<TunnelIpv4Match, L
     }
 
     @Override
-    public Optional<List<MatchEntry>> process(@Nonnull TunnelIpv4Match source, VersionConvertorData data,
+    public Optional<List<MatchEntry>> process(@NonNull TunnelIpv4Match source, VersionConvertorData data,
             ConvertorExecutor convertorExecutor) {
         List<MatchEntry> result = new ArrayList<>();
 
index cb57ccc1740e15b33ce046ef89a028b0ba95f705..ec5cd9bd3dce995f0eaef7752d439db4fa00b856 100644 (file)
@@ -11,7 +11,7 @@ package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.match.cas
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.common.ConvertorCase;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.data.VersionConvertorData;
@@ -32,7 +32,7 @@ public class SalToOfUdpMatchCase extends ConvertorCase<UdpMatch, List<MatchEntry
     }
 
     @Override
-    public Optional<List<MatchEntry>> process(@Nonnull UdpMatch source, VersionConvertorData data,
+    public Optional<List<MatchEntry>> process(@NonNull UdpMatch source, VersionConvertorData data,
             ConvertorExecutor convertorExecutor) {
         List<MatchEntry> result = new ArrayList<>();
 
index d03d52ab8984c99942ff75185d93c2c1cc7307f4..3ae218095730ee2421de912f7e4a6c7220e36c4c 100644 (file)
@@ -13,7 +13,7 @@ import com.google.common.primitives.Longs;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.math.BigInteger;
 import java.util.Arrays;
-import javax.annotation.Nullable;
+import org.eclipse.jdt.annotation.Nullable;
 import org.opendaylight.yangtools.yang.common.Uint16;
 import org.opendaylight.yangtools.yang.common.Uint32;
 import org.opendaylight.yangtools.yang.common.Uint64;
index 01dc7a34bd5da66c8e66d20a8e78d6eee91478ca..0c01587455f772792501f09a9d8de2fd3deef97c 100644 (file)
@@ -11,8 +11,8 @@ import com.google.common.base.Splitter;
 import com.google.common.base.Strings;
 import java.math.BigInteger;
 import java.util.List;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.Nullable;
 import org.opendaylight.openflowplugin.api.OFConstants;
 import org.opendaylight.openflowplugin.api.openflow.md.util.OpenflowVersion;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeConnectorId;
@@ -91,7 +91,7 @@ public abstract class InventoryDataServiceUtil {
     }
 
     @Nullable
-    public static Uint32 portNumberfromNodeConnectorId(final OpenflowVersion ofVersion, @Nonnull final String ncId) {
+    public static Uint32 portNumberfromNodeConnectorId(final OpenflowVersion ofVersion, @NonNull final String ncId) {
         String portNoString = portNoStringfromNodeConnectorID(ncId);
         return OpenflowPortsUtil.getPortFromLogicalName(ofVersion, portNoString);
     }
index 665b3ef4f365c4f8653e815c9b115d00be9e0c32..b72534b374eeeec54ab6a2a12770638c9bdde8f6 100644 (file)
@@ -10,7 +10,7 @@ package org.opendaylight.openflowplugin.openflow.md.util;
 import com.google.common.collect.ImmutableBiMap;
 import com.google.common.collect.Maps;
 import java.util.Objects;
-import javax.annotation.Nullable;
+import org.eclipse.jdt.annotation.Nullable;
 import org.opendaylight.openflowjava.protocol.api.util.BinContent;
 import org.opendaylight.openflowplugin.api.OFConstants;
 import org.opendaylight.openflowplugin.api.openflow.md.util.OpenflowVersion;
index 747ae7e07ba6c2dbd7f6d4b9f65e5cfc4f84c4a0..6c7d619e766fbca89e080e8a06712c516f3cd762 100644 (file)
             <artifactId>javax.annotation-api</artifactId>
             <optional>true</optional>
         </dependency>
-        <dependency>
-            <groupId>com.google.code.findbugs</groupId>
-            <artifactId>jsr305</artifactId>
-            <version>3.0.2</version>
-            <optional>true</optional>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.openflowplugin.model</groupId>
             <artifactId>model-flow-base</artifactId>
index 4f6ffe53c813b4f788ddbe88edcceb12d020fc8e..efbca47ebea7dd6b6d5b0d81d9f51ffe6bde53e7 100644 (file)
@@ -16,8 +16,8 @@ import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicLong;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.Nullable;
 import org.opendaylight.infrautils.utils.concurrent.LoggingFutures;
 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.inventory.rev130819.FlowId;
@@ -69,8 +69,8 @@ public class LearningSwitchHandlerSimpleImpl implements LearningSwitchHandler, P
     private Map<MacAddress, NodeConnectorRef> mac2portMapping;
     private final Set<String> coveredMacPaths = new HashSet<>();
 
-    public LearningSwitchHandlerSimpleImpl(@Nonnull FlowCommitWrapper dataStoreAccessor,
-            @Nonnull PacketProcessingService packetProcessingService,
+    public LearningSwitchHandlerSimpleImpl(@NonNull FlowCommitWrapper dataStoreAccessor,
+            @NonNull PacketProcessingService packetProcessingService,
             @Nullable DataTreeChangeListenerRegistrationHolder registrationPublisher) {
         this.dataStoreAccessor = Objects.requireNonNull(dataStoreAccessor);
         this.packetProcessingService = Objects.requireNonNull(packetProcessingService);
index a539b54bc17768f875499bc7b6b2702f07e6892b..32b72cf7d4fd88ff5ec7f68cf766c15f149c19d8 100644 (file)
@@ -8,7 +8,7 @@
 package org.opendaylight.openflowplugin.learningswitch;
 
 import java.util.Collection;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.mdsal.binding.api.DataObjectModification.ModificationType;
 import org.opendaylight.mdsal.binding.api.DataTreeChangeListener;
 import org.opendaylight.mdsal.binding.api.DataTreeModification;
@@ -25,7 +25,7 @@ public class WakeupOnNode implements DataTreeChangeListener<Table> {
     private LearningSwitchHandler learningSwitchHandler;
 
     @Override
-    public void onDataTreeChanged(@Nonnull Collection<DataTreeModification<Table>> modifications) {
+    public void onDataTreeChanged(@NonNull Collection<DataTreeModification<Table>> modifications) {
         Uint8 requiredTableId = Uint8.ZERO;
         // TODO add flow
 
index 39a92c490fbcba4be9e66ae51030cb2dcd29ea5a..d9825e6a9a8eeecaa5b96f3285c3eab7346174a7 100644 (file)
@@ -8,7 +8,7 @@
 package org.opendaylight.openflowplugin.learningswitch.multi;
 
 import java.util.Objects;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowplugin.learningswitch.FlowCommitWrapper;
 import org.opendaylight.openflowplugin.learningswitch.InstanceIdentifierUtils;
 import org.opendaylight.openflowplugin.learningswitch.LearningSwitchHandler;
@@ -27,9 +27,9 @@ public class MultipleLearningSwitchHandlerFacadeImpl implements LearningSwitchHa
     private final PacketProcessingService packetProcessingService;
     private final PacketInDispatcherImpl packetInDispatcher;
 
-    public MultipleLearningSwitchHandlerFacadeImpl(@Nonnull FlowCommitWrapper dataStoreAccessor,
-            @Nonnull PacketProcessingService packetProcessingService,
-            @Nonnull PacketInDispatcherImpl packetInDispatcher) {
+    public MultipleLearningSwitchHandlerFacadeImpl(@NonNull FlowCommitWrapper dataStoreAccessor,
+            @NonNull PacketProcessingService packetProcessingService,
+            @NonNull PacketInDispatcherImpl packetInDispatcher) {
         this.dataStoreAccessor = Objects.requireNonNull(dataStoreAccessor);
         this.packetProcessingService = Objects.requireNonNull(packetProcessingService);
         this.packetInDispatcher = Objects.requireNonNull(packetInDispatcher);