From 812ba2457c5a2699b62ae3c62db60a2b23cdcf09 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Fri, 15 May 2015 22:53:25 +0200 Subject: [PATCH] Fix various small warnings All of these are reported by eclipse: needlessly raw types, missing serialversionUUID, methods which can be made static. Change-Id: I5b71c35ee37167ead77f7baa2e5d6e5c23f99834 Signed-off-by: Robert Varga --- .../api/ConnectionException.java | 6 +++- .../api/openflow/device/DeviceContext.java | 1 - .../RequestQuotaExceededException.java | 1 + .../OpenflowMessageListenerFacade.java | 1 - .../api/openflow/rpc/RpcContext.java | 1 - .../statistics/StatisticsContext.java | 1 - .../statistics/StatisticsManager.java | 1 - .../impl/OpenFlowPluginProviderImpl.java | 6 ++-- .../connection/ConnectionManagerImpl.java | 13 ++++---- .../ThrottledNotificationsOffererImpl.java | 8 ++--- .../impl/device/DeviceContextImpl.java | 7 ++-- .../impl/device/DeviceManagerImpl.java | 3 +- .../impl/device/TransactionChainManager.java | 8 ++--- .../listener/MultiMsgCollectorImpl.java | 8 ++--- .../group/DeviceGroupRegistryImpl.java | 4 +-- .../meter/DeviceMeterRegistryImpl.java | 4 +-- ...SinglePurposeMultipartReplyTranslator.java | 17 +++++----- .../statistics/StatisticsContextImpl.java | 5 ++- .../statistics/StatisticsGatheringUtils.java | 33 +++++++++---------- .../statistics/StatisticsManagerImpl.java | 8 ++--- .../MessageIntelligenceAgencyImpl.java | 24 +++++++------- .../AggregatedFlowStatisticsTranslator.java | 7 +--- .../translator/PacketReceivedTranslator.java | 6 ++-- .../impl/translator/TranslatorKeyFactory.java | 2 +- .../openflow/device/RpcManagerImplTest.java | 3 +- .../NodeConnectorTranslatorUtilTest.java | 13 ++++---- .../registry/flow/FlowHashFactoryTest.java | 5 ++- 27 files changed, 92 insertions(+), 104 deletions(-) diff --git a/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/ConnectionException.java b/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/ConnectionException.java index f20ddf3002..7de361215d 100644 --- a/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/ConnectionException.java +++ b/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/ConnectionException.java @@ -11,9 +11,13 @@ package org.opendaylight.openflowplugin.api; * Created by Martin Bobak mbobak@cisco.com on 7/8/14. */ public class ConnectionException extends Exception { + private static final long serialVersionUID = 1L; - public ConnectionException(String message){ + public ConnectionException(final String message) { super(message); } + public ConnectionException(final String message, final Throwable cause) { + super(message, cause); + } } diff --git a/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/device/DeviceContext.java b/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/device/DeviceContext.java index d2d860f169..3d9f3bd917 100644 --- a/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/device/DeviceContext.java +++ b/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/device/DeviceContext.java @@ -22,7 +22,6 @@ import org.opendaylight.openflowplugin.api.openflow.device.handlers.DeviceReplyP import org.opendaylight.openflowplugin.api.openflow.device.handlers.MessageHandler; import org.opendaylight.openflowplugin.api.openflow.device.handlers.MultiMsgCollector; import org.opendaylight.openflowplugin.api.openflow.device.handlers.OutstandingMessageExtractor; -import org.opendaylight.openflowplugin.api.openflow.device.listener.OpenflowMessageListenerFacade; import org.opendaylight.openflowplugin.api.openflow.registry.flow.DeviceFlowRegistry; import org.opendaylight.openflowplugin.api.openflow.registry.group.DeviceGroupRegistry; import org.opendaylight.openflowplugin.api.openflow.registry.meter.DeviceMeterRegistry; diff --git a/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/device/exception/RequestQuotaExceededException.java b/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/device/exception/RequestQuotaExceededException.java index cae8a85150..21465187de 100644 --- a/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/device/exception/RequestQuotaExceededException.java +++ b/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/device/exception/RequestQuotaExceededException.java @@ -12,4 +12,5 @@ package org.opendaylight.openflowplugin.api.openflow.device.exception; * Created by Martin Bobak <mbobak@cisco.com> on 25.2.2015. */ public class RequestQuotaExceededException extends Exception { + private static final long serialVersionUID = 1L; } diff --git a/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/device/listener/OpenflowMessageListenerFacade.java b/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/device/listener/OpenflowMessageListenerFacade.java index 9d521e9fab..8699e27160 100644 --- a/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/device/listener/OpenflowMessageListenerFacade.java +++ b/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/device/listener/OpenflowMessageListenerFacade.java @@ -8,7 +8,6 @@ package org.opendaylight.openflowplugin.api.openflow.device.listener; -import org.opendaylight.openflowplugin.api.openflow.device.handlers.MultiMsgCollector; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.OpenflowProtocolListener; /** diff --git a/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/rpc/RpcContext.java b/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/rpc/RpcContext.java index 60bb67e1fd..94ce2b2909 100644 --- a/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/rpc/RpcContext.java +++ b/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/rpc/RpcContext.java @@ -7,7 +7,6 @@ */ package org.opendaylight.openflowplugin.api.openflow.rpc; -import org.opendaylight.openflowplugin.api.openflow.device.DeviceContext; import org.opendaylight.openflowplugin.api.openflow.device.RequestContextStack; import org.opendaylight.openflowplugin.api.openflow.device.handlers.DeviceDisconnectedHandler; import org.opendaylight.yangtools.yang.binding.RpcService; diff --git a/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/statistics/StatisticsContext.java b/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/statistics/StatisticsContext.java index 62a51acad3..e45c0771c5 100644 --- a/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/statistics/StatisticsContext.java +++ b/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/statistics/StatisticsContext.java @@ -10,7 +10,6 @@ package org.opendaylight.openflowplugin.api.openflow.statistics; import com.google.common.util.concurrent.ListenableFuture; import org.opendaylight.openflowplugin.api.openflow.device.RequestContextStack; -import org.opendaylight.openflowplugin.api.openflow.device.handlers.MultiMsgCollector; /** * Created by Martin Bobak <mbobak@cisco.com> on 27.2.2015. diff --git a/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/statistics/StatisticsManager.java b/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/statistics/StatisticsManager.java index 7b59eb0d79..8c529f1c9e 100644 --- a/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/statistics/StatisticsManager.java +++ b/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/statistics/StatisticsManager.java @@ -9,7 +9,6 @@ package org.opendaylight.openflowplugin.api.openflow.statistics; import org.opendaylight.openflowplugin.api.openflow.device.handlers.DeviceContextClosedHandler; -import org.opendaylight.openflowplugin.api.openflow.device.handlers.DeviceDisconnectedHandler; import org.opendaylight.openflowplugin.api.openflow.device.handlers.DeviceInitializationPhaseHandler; import org.opendaylight.openflowplugin.api.openflow.device.handlers.DeviceInitializator; diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/OpenFlowPluginProviderImpl.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/OpenFlowPluginProviderImpl.java index 1c8f30af76..0195380626 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/OpenFlowPluginProviderImpl.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/OpenFlowPluginProviderImpl.java @@ -70,7 +70,7 @@ public class OpenFlowPluginProviderImpl implements OpenFlowPluginProvider, OpenF private DataBroker dataBroker; private OfpRole role; private Collection switchConnectionProviders; - private Long rpcRequestsQuota; + private final Long rpcRequestsQuota; public OpenFlowPluginProviderImpl(final Long rpcRequestsQuota) { this.rpcRequestsQuota = rpcRequestsQuota; @@ -151,11 +151,11 @@ public class OpenFlowPluginProviderImpl implements OpenFlowPluginProvider, OpenF TranslatorLibraryUtil.setBasicTranslatorLibrary(deviceManager); deviceManager.initialize(); - + startSwitchConnections(); } - private void registerMXBean(final MessageIntelligenceAgency messageIntelligenceAgency) { + private static void registerMXBean(final MessageIntelligenceAgency messageIntelligenceAgency) { MBeanServer mbs = ManagementFactory.getPlatformMBeanServer(); try { String pathToMxBean = String.format("%s:type=%s", diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/connection/ConnectionManagerImpl.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/connection/ConnectionManagerImpl.java index ea2e556bc0..d49bfe6b2d 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/connection/ConnectionManagerImpl.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/connection/ConnectionManagerImpl.java @@ -12,7 +12,6 @@ import java.util.concurrent.ArrayBlockingQueue; import java.util.concurrent.TimeUnit; import org.opendaylight.openflowjava.protocol.api.connection.ConnectionAdapter; import org.opendaylight.openflowjava.protocol.api.connection.ConnectionReadyListener; -import org.opendaylight.openflowjava.protocol.api.connection.OutboundQueueHandler; import org.opendaylight.openflowplugin.api.openflow.connection.ConnectionContext; import org.opendaylight.openflowplugin.api.openflow.connection.ConnectionManager; import org.opendaylight.openflowplugin.api.openflow.connection.HandshakeContext; @@ -83,7 +82,7 @@ public class ConnectionManagerImpl implements ConnectionManager { * @return */ private static ThreadPoolLoggingExecutor createHandshakePool( - final String connectionIdentifier, int handshakeThreadLimit) { + final String connectionIdentifier, final int handshakeThreadLimit) { return new ThreadPoolLoggingExecutor(handshakeThreadLimit, handshakeThreadLimit, 0L, TimeUnit.MILLISECONDS, new ArrayBlockingQueue(HELLO_LIMIT), "OFHandshake-" + connectionIdentifier); @@ -95,7 +94,7 @@ public class ConnectionManagerImpl implements ConnectionManager { * @return */ private HandshakeManager createHandshakeManager(final ConnectionAdapter connectionAdapter, - HandshakeListener handshakeListener) { + final HandshakeListener handshakeListener) { HandshakeManagerImpl handshakeManager = new HandshakeManagerImpl(connectionAdapter, ConnectionConductor.versionOrder.get(0), ConnectionConductor.versionOrder); @@ -116,23 +115,23 @@ public class ConnectionManagerImpl implements ConnectionManager { /** * @param bitmapNegotiationEnabled the bitmapNegotiationEnabled to set */ - public void setBitmapNegotiationEnabled(boolean bitmapNegotiationEnabled) { + public void setBitmapNegotiationEnabled(final boolean bitmapNegotiationEnabled) { this.bitmapNegotiationEnabled = bitmapNegotiationEnabled; } @Override - public boolean accept(InetAddress switchAddress) { + public boolean accept(final InetAddress switchAddress) { // TODO add connection accept logic based on address return true; } @Override - public void setDeviceConnectedHandler(DeviceConnectedHandler deviceConnectedHandler) { + public void setDeviceConnectedHandler(final DeviceConnectedHandler deviceConnectedHandler) { this.deviceConnectedHandler = deviceConnectedHandler; } @Override - public void setMessageHandler(MessageHandler arg0) { + public void setMessageHandler(final MessageHandler arg0) { // TODO Auto-generated method stub } diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/connection/ThrottledNotificationsOffererImpl.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/connection/ThrottledNotificationsOffererImpl.java index bf68d7107c..ee586fdbc2 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/connection/ThrottledNotificationsOffererImpl.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/connection/ThrottledNotificationsOffererImpl.java @@ -33,7 +33,7 @@ public class ThrottledNotificationsOffererImpl implement private final Map, SettableFuture> throttledQueues = new ConcurrentHashMap<>(); private final ThreadPoolLoggingExecutor throttleWorkerPool; private final NotificationPublishService notificationPublishService; - private final MessageSpy messageIntelligenceAgency; + private final MessageSpy> messageIntelligenceAgency; private boolean finishing = false; private CountDownLatch sleeperLatch = new CountDownLatch(0); @@ -41,7 +41,7 @@ public class ThrottledNotificationsOffererImpl implement * @param notificationPublishService * @param messageIntelligenceAgency */ - public ThrottledNotificationsOffererImpl(NotificationPublishService notificationPublishService, MessageSpy messageIntelligenceAgency) { + public ThrottledNotificationsOffererImpl(final NotificationPublishService notificationPublishService, final MessageSpy> messageIntelligenceAgency) { this.notificationPublishService = notificationPublishService; this.messageIntelligenceAgency = messageIntelligenceAgency; throttleWorkerPool = new ThreadPoolLoggingExecutor( @@ -51,7 +51,7 @@ public class ThrottledNotificationsOffererImpl implement } @Override - public ListenableFuture applyThrottlingOnConnection(Queue notificationsQueue) { + public ListenableFuture applyThrottlingOnConnection(final Queue notificationsQueue) { SettableFuture throttleWatching = SettableFuture.create(); throttledQueues.put(notificationsQueue, throttleWatching); synchronized (throttledQueues) { @@ -106,7 +106,7 @@ public class ThrottledNotificationsOffererImpl implement } @Override - public boolean isThrottlingEffective(Queue notificationsQueue) { + public boolean isThrottlingEffective(final Queue notificationsQueue) { return throttledQueues.containsKey(notificationsQueue); } diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/device/DeviceContextImpl.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/device/DeviceContextImpl.java index 319306a9c1..fb4b7dc12a 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/device/DeviceContextImpl.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/device/DeviceContextImpl.java @@ -38,7 +38,6 @@ import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; import org.opendaylight.openflowjava.protocol.api.connection.ConnectionAdapter; import org.opendaylight.openflowjava.protocol.api.connection.OutboundQueue; import org.opendaylight.openflowplugin.api.openflow.connection.ConnectionContext; -import org.opendaylight.openflowplugin.api.openflow.connection.OutboundQueueProvider; import org.opendaylight.openflowplugin.api.openflow.connection.ThrottledNotificationsOfferer; import org.opendaylight.openflowplugin.api.openflow.device.DeviceContext; import org.opendaylight.openflowplugin.api.openflow.device.DeviceState; @@ -114,12 +113,12 @@ public class DeviceContextImpl implements DeviceContext { private final DeviceMeterRegistry deviceMeterRegistry; private Timeout barrierTaskTimeout; private NotificationService notificationService; - private final MessageSpy messageSpy; + private final MessageSpy> messageSpy; private DeviceDisconnectedHandler deviceDisconnectedHandler; private final Collection closeHandlers = new HashSet<>(); private NotificationPublishService notificationPublishService; private final ThrottledNotificationsOfferer throttledConnectionsHolder; - private BlockingQueue bumperQueue; + private final BlockingQueue bumperQueue; private final OutboundQueue outboundQueueProvider; @Override @@ -180,7 +179,7 @@ public class DeviceContextImpl implements DeviceContext { auxiliaryConnectionContexts.put(connectionDistinguisher, connectionContext); } - private SwitchConnectionDistinguisher createConnectionDistinguisher(final ConnectionContext connectionContext) { + private static SwitchConnectionDistinguisher createConnectionDistinguisher(final ConnectionContext connectionContext) { return new SwitchConnectionCookieOFImpl(connectionContext.getFeatures().getAuxiliaryId()); } diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/device/DeviceManagerImpl.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/device/DeviceManagerImpl.java index 37c8412308..0560e945d5 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/device/DeviceManagerImpl.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/device/DeviceManagerImpl.java @@ -242,7 +242,7 @@ public class DeviceManagerImpl implements DeviceManager, AutoCloseable { }); } - private void chainTableTrunkWriteOF10(final DeviceContext deviceContext, final ListenableFuture>>> deviceFeaturesFuture) { + private static void chainTableTrunkWriteOF10(final DeviceContext deviceContext, final ListenableFuture>>> deviceFeaturesFuture) { Futures.addCallback(deviceFeaturesFuture, new FutureCallback>>>() { @Override public void onSuccess(final List>> results) { @@ -264,7 +264,6 @@ public class DeviceManagerImpl implements DeviceManager, AutoCloseable { }); } - private ListenableFuture>> processReplyDesc(final DeviceContext deviceContext, final DeviceState deviceState) { diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/device/TransactionChainManager.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/device/TransactionChainManager.java index 4570bf56a1..34326d87a1 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/device/TransactionChainManager.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/device/TransactionChainManager.java @@ -119,7 +119,7 @@ class TransactionChainManager implements TransactionChainListener { } } - void submitScheduledTransaction(Timeout timeout) { + void submitScheduledTransaction(final Timeout timeout) { if (timeout.isCancelled()) { // zombie timer executed return; @@ -157,17 +157,17 @@ class TransactionChainManager implements TransactionChainListener { } } - private void hookTimeExpenseCounter(CheckedFuture submitResult, final String name) { + private static void hookTimeExpenseCounter(final CheckedFuture submitResult, final String name) { final long submitFiredTime = System.currentTimeMillis(); LOG.debug("submit of {} fired", name); Futures.addCallback(submitResult, new FutureCallback() { @Override - public void onSuccess(Void result) { + public void onSuccess(final Void result) { LOG.debug("submit of {} finished in {} ms", name, System.currentTimeMillis() - submitFiredTime); } @Override - public void onFailure(Throwable t) { + public void onFailure(final Throwable t) { LOG.warn("transaction submit failed: {}", t.getMessage()); } }); diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/device/listener/MultiMsgCollectorImpl.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/device/listener/MultiMsgCollectorImpl.java index 421f8793c8..b0d2b122f9 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/device/listener/MultiMsgCollectorImpl.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/device/listener/MultiMsgCollectorImpl.java @@ -54,7 +54,7 @@ public class MultiMsgCollectorImpl implements MultiMsgCollector { cache = initCacheBuilder(timeout).build(); } - private RemovalListener getRemovalListener() { + private static RemovalListener getRemovalListener() { return new RemovalListener() { @Override public void onRemoval(final RemovalNotification notification) { @@ -67,7 +67,7 @@ public class MultiMsgCollectorImpl implements MultiMsgCollector { }; } - private CacheBuilder initCacheBuilder(final int timeout) { + private static CacheBuilder initCacheBuilder(final int timeout) { return CacheBuilder.newBuilder() .expireAfterAccess(timeout, TimeUnit.SECONDS) .removalListener(getRemovalListener()) @@ -109,7 +109,7 @@ public class MultiMsgCollectorImpl implements MultiMsgCollector { } @Override - public void setDeviceReplyProcessor(DeviceReplyProcessor deviceReplyProcessor) { + public void setDeviceReplyProcessor(final DeviceReplyProcessor deviceReplyProcessor) { this.deviceReplyProcessor = deviceReplyProcessor; } @@ -127,7 +127,7 @@ public class MultiMsgCollectorImpl implements MultiMsgCollector { replyCollection.add(reply); } - void publishCollection(long xid) { + void publishCollection(final long xid) { deviceReplyProcessor.processReply(new Xid(xid), replyCollection); } diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/registry/group/DeviceGroupRegistryImpl.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/registry/group/DeviceGroupRegistryImpl.java index 2d3f49b25e..001ccaaad7 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/registry/group/DeviceGroupRegistryImpl.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/registry/group/DeviceGroupRegistryImpl.java @@ -18,8 +18,8 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.Group */ public class DeviceGroupRegistryImpl implements DeviceGroupRegistry { - private final List groupIdList = new ArrayList(); - private final List marks = new ArrayList(); + private final List groupIdList = new ArrayList<>(); + private final List marks = new ArrayList<>(); @Override public void store(final GroupId groupId) { diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/registry/meter/DeviceMeterRegistryImpl.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/registry/meter/DeviceMeterRegistryImpl.java index 628179b29e..4d15fe3b86 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/registry/meter/DeviceMeterRegistryImpl.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/registry/meter/DeviceMeterRegistryImpl.java @@ -18,8 +18,8 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.types.rev130918.Meter */ public class DeviceMeterRegistryImpl implements DeviceMeterRegistry { - private final List meterIds = new ArrayList(); - private final List marks = new ArrayList(); + private final List meterIds = new ArrayList<>(); + private final List marks = new ArrayList<>(); @Override public void store(final MeterId meterId) { diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/SinglePurposeMultipartReplyTranslator.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/SinglePurposeMultipartReplyTranslator.java index 327f559560..9bf4757ced 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/SinglePurposeMultipartReplyTranslator.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/SinglePurposeMultipartReplyTranslator.java @@ -112,7 +112,7 @@ public class SinglePurposeMultipartReplyTranslator { private static MeterStatsResponseConvertor meterStatsConvertor = new MeterStatsResponseConvertor(); - public List translate(DeviceContext deviceContext, OfHeader msg) { + public List translate(final DeviceContext deviceContext, final OfHeader msg) { List listDataObject = new CopyOnWriteArrayList(); @@ -121,7 +121,7 @@ public class SinglePurposeMultipartReplyTranslator { final FeaturesReply features = deviceContext.getPrimaryConnectionContext().getFeatures(); if (msg instanceof MultipartReplyMessage) { MultipartReplyMessage mpReply = (MultipartReplyMessage) msg; - NodeId node = this.nodeIdFromDatapathId(features.getDatapathId()); + NodeId node = SinglePurposeMultipartReplyTranslator.nodeIdFromDatapathId(features.getDatapathId()); switch (mpReply.getType()) { case OFPMPFLOW: { FlowsStatisticsUpdateBuilder message = new FlowsStatisticsUpdateBuilder(); @@ -182,10 +182,12 @@ public class SinglePurposeMultipartReplyTranslator { statsBuilder.setPackets(packetsBuilder.build()); DurationBuilder durationBuilder = new DurationBuilder(); - if (portStats.getDurationSec() != null) + if (portStats.getDurationSec() != null) { durationBuilder.setSecond(new Counter32(portStats.getDurationSec())); - if (portStats.getDurationNsec() != null) + } + if (portStats.getDurationNsec() != null) { durationBuilder.setNanosecond(new Counter32(portStats.getDurationNsec())); + } statsBuilder.setDuration(durationBuilder.build()); statsBuilder.setCollisionCount(portStats.getCollisions()); statsBuilder.setKey(new NodeConnectorStatisticsAndPortNumberMapKey(statsBuilder.getNodeConnectorId())); @@ -426,15 +428,14 @@ public class SinglePurposeMultipartReplyTranslator { return listDataObject; } - private NodeId nodeIdFromDatapathId(BigInteger datapathId) { + private static NodeId nodeIdFromDatapathId(final BigInteger datapathId) { String current = datapathId.toString(); return new NodeId("openflow:" + current); } - private TransactionId generateTransactionId(Long xid) { + private static TransactionId generateTransactionId(final Long xid) { BigInteger bigIntXid = BigInteger.valueOf(xid); return new TransactionId(bigIntXid); - } /* @@ -446,7 +447,7 @@ public class SinglePurposeMultipartReplyTranslator { * @param actionsSupported * @return */ - private List getGroupActionsSupportBitmap(List actionsSupported) { + private static List getGroupActionsSupportBitmap(final List actionsSupported) { List supportActionByGroups = new ArrayList(); for (org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.ActionType supportedActions : actionsSupported) { long supportActionBitmap = 0; diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/StatisticsContextImpl.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/StatisticsContextImpl.java index 79d9f70d44..7be9e11d1f 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/StatisticsContextImpl.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/StatisticsContextImpl.java @@ -12,7 +12,6 @@ import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.SettableFuture; -import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; import java.util.HashSet; @@ -37,7 +36,7 @@ public class StatisticsContextImpl implements StatisticsContext { private static final Logger LOG = LoggerFactory.getLogger(StatisticsContextImpl.class); public static final String CONNECTION_CLOSED = "Connection closed."; - private final Collection requestContexts = new HashSet<>(); + private final Collection> requestContexts = new HashSet<>(); private final DeviceContext deviceContext; @@ -52,7 +51,7 @@ public class StatisticsContextImpl implements StatisticsContext { @Override public ListenableFuture gatherDynamicData() { - final SettableFuture settableResultingFuture = SettableFuture.create(); + final SettableFuture settableResultingFuture = SettableFuture.create(); ListenableFuture resultingFuture = settableResultingFuture; diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/StatisticsGatheringUtils.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/StatisticsGatheringUtils.java index f83e9f5753..db67901af3 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/StatisticsGatheringUtils.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/StatisticsGatheringUtils.java @@ -8,23 +8,21 @@ package org.opendaylight.openflowplugin.impl.statistics; -import java.util.concurrent.ExecutionException; +import com.google.common.base.Function; import com.google.common.base.Optional; -import com.google.common.util.concurrent.CheckedFuture; -import org.opendaylight.controller.md.sal.common.api.data.ReadFailedException; -import org.opendaylight.controller.md.sal.binding.api.ReadTransaction; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.tables.TableBuilder; import com.google.common.collect.Iterables; -import java.util.Collections; -import com.google.common.base.Function; +import com.google.common.util.concurrent.CheckedFuture; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.JdkFutureAdapters; import com.google.common.util.concurrent.ListenableFuture; +import java.util.Collections; import java.util.List; +import java.util.concurrent.ExecutionException; import javax.annotation.Nullable; +import org.opendaylight.controller.md.sal.binding.api.ReadTransaction; import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; +import org.opendaylight.controller.md.sal.common.api.data.ReadFailedException; import org.opendaylight.openflowplugin.api.openflow.device.DeviceContext; -import org.opendaylight.openflowplugin.api.openflow.registry.flow.FlowDescriptor; import org.opendaylight.openflowplugin.api.openflow.registry.flow.FlowHash; import org.opendaylight.openflowplugin.impl.registry.flow.FlowHashFactory; import org.opendaylight.openflowplugin.impl.statistics.services.dedicated.StatisticsGatheringService; @@ -35,6 +33,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.me import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.meters.MeterBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.meters.MeterKey; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.tables.Table; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.tables.TableBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.tables.TableKey; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.tables.table.Flow; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.tables.table.FlowBuilder; @@ -178,7 +177,7 @@ public final class StatisticsGatheringUtils { for (MeterConfigStats meterConfigStats : meterConfigStatsUpdated.getMeterConfigStats()) { final MeterId meterId = meterConfigStats.getMeterId(); final InstanceIdentifier meterInstanceIdentifier = fNodeIdent.child(Meter.class, new MeterKey(meterId)); - + final MeterBuilder meterBuilder = new MeterBuilder(meterConfigStats); meterBuilder.setKey(new MeterKey(meterId)); meterBuilder.addAugmentation(NodeMeterStatistics.class, new NodeMeterStatisticsBuilder().build()); @@ -198,7 +197,7 @@ public final class StatisticsGatheringUtils { final FlowBuilder flowBuilder = new FlowBuilder(flowStat); short tableId = flowStat.getTableId(); final Short version = deviceContext.getPrimaryConnectionContext().getFeatures().getVersion(); - + final FlowHash flowHash = FlowHashFactory.create(flowBuilder.build(), version); final FlowId flowId = deviceContext.getDeviceFlowRegistry().storeIfNecessary(flowHash, tableId); @@ -262,7 +261,7 @@ public final class StatisticsGatheringUtils { private static void processFlowTableStatistics(final Iterable data, final DeviceContext deviceContext) { for(final FlowTableStatisticsUpdate flowTableStatisticsUpdate : data) { final InstanceIdentifier fNodeIdent = getFlowCapableNodeInstanceIdentifier(flowTableStatisticsUpdate.getId()); - + for (final FlowTableAndStatisticsMap tableStat : flowTableStatisticsUpdate.getFlowTableAndStatisticsMap()) { final InstanceIdentifier tStatIdent = fNodeIdent.child(Table.class, new TableKey(tableStat.getTableId().getValue())) .augmentation(FlowTableStatisticsData.class).child(FlowTableStatistics.class); @@ -319,16 +318,16 @@ public final class StatisticsGatheringUtils { for ( GroupDescStatsUpdated groupDescStatsUpdated : data) { NodeId nodeId = groupDescStatsUpdated.getId(); final InstanceIdentifier fNodeIdent = getFlowCapableNodeInstanceIdentifier(nodeId); - + for (GroupDescStats groupDescStats : groupDescStatsUpdated.getGroupDescStats()) { final GroupId groupId = groupDescStats.getGroupId(); - + final GroupBuilder groupBuilder = new GroupBuilder(groupDescStats); groupBuilder.setKey(new GroupKey(groupId)); groupBuilder.addAugmentation(NodeGroupStatistics.class, new NodeGroupStatisticsBuilder().build()); - + final InstanceIdentifier groupIdent = fNodeIdent.child(Group.class, new GroupKey(groupId)); - + deviceContext.getDeviceGroupRegistry().store(groupId); deviceContext.writeToTransaction(LogicalDatastoreType.OPERATIONAL, groupIdent, groupBuilder.build()); } @@ -349,11 +348,11 @@ public final class StatisticsGatheringUtils { deleteAllKnownGroups(deviceContext, fNodeIdent); for (GroupStatisticsUpdated groupStatistics : data) { for (final GroupStats groupStats : groupStatistics.getGroupStats()) { - + final InstanceIdentifier groupIdent = fNodeIdent.child(Group.class, new GroupKey(groupStats.getGroupId())); final InstanceIdentifier nGroupStatIdent = groupIdent .augmentation(NodeGroupStatistics.class); - + final InstanceIdentifier gsIdent = nGroupStatIdent.child(GroupStatistics.class); final GroupStatistics stats = new GroupStatisticsBuilder(groupStats).build(); deviceContext.writeToTransaction(LogicalDatastoreType.OPERATIONAL, gsIdent, stats); diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/StatisticsManagerImpl.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/StatisticsManagerImpl.java index 439b7a7c83..ea0daf2f3c 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/StatisticsManagerImpl.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/StatisticsManagerImpl.java @@ -34,7 +34,7 @@ public class StatisticsManagerImpl implements StatisticsManager { private HashedWheelTimer hashedWheelTimer; - private ConcurrentHashMap contexts = new ConcurrentHashMap(); + private final ConcurrentHashMap contexts = new ConcurrentHashMap<>(); private final TimeCounter timeCounter = new TimeCounter(); @@ -87,10 +87,10 @@ public class StatisticsManagerImpl implements StatisticsManager { try { timeCounter.markStart(); for (final StatisticsContext statisticsContext : contexts.values()) { - ListenableFuture deviceStatisticsCollectionFuture = statisticsContext.gatherDynamicData(); - Futures.addCallback(deviceStatisticsCollectionFuture, new FutureCallback() { + ListenableFuture deviceStatisticsCollectionFuture = statisticsContext.gatherDynamicData(); + Futures.addCallback(deviceStatisticsCollectionFuture, new FutureCallback() { @Override - public void onSuccess(final Object o) { + public void onSuccess(final Boolean o) { timeCounter.addTimeMark(); } diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/ofpspecific/MessageIntelligenceAgencyImpl.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/ofpspecific/MessageIntelligenceAgencyImpl.java index 858f554091..ffd422f66f 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/ofpspecific/MessageIntelligenceAgencyImpl.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/ofpspecific/MessageIntelligenceAgencyImpl.java @@ -24,7 +24,7 @@ import org.slf4j.LoggerFactory; * Class counts message of {@link org.opendaylight.openflowplugin.api.openflow.statistics.ofpspecific.MessageSpy.STATISTIC_GROUP} type * and provides info as debug log. */ -public class MessageIntelligenceAgencyImpl implements MessageIntelligenceAgency, MessageIntelligenceAgencyMXBean { +public class MessageIntelligenceAgencyImpl implements MessageIntelligenceAgency>, MessageIntelligenceAgencyMXBean { private static final Logger LOG = LoggerFactory.getLogger(MessageIntelligenceAgencyImpl.class); @@ -48,10 +48,10 @@ public class MessageIntelligenceAgencyImpl implements MessageIntelligenceAgency< } } - private final ConcurrentMap> inputStats = new ConcurrentHashMap<>(); + private final ConcurrentMap, MessageCounters>> inputStats = new ConcurrentHashMap<>(); @Override - public void spyMessage(final Class message, final STATISTIC_GROUP statGroup) { + public void spyMessage(final Class message, final STATISTIC_GROUP statGroup) { getCounters(message, statGroup).increment(); } @@ -60,13 +60,13 @@ public class MessageIntelligenceAgencyImpl implements MessageIntelligenceAgency< * @param statGroup TODO * @return */ - private MessageCounters getCounters(final Class message, final STATISTIC_GROUP statGroup) { - ConcurrentMap groupData = getOrCreateGroupData(statGroup); + private MessageCounters getCounters(final Class message, final STATISTIC_GROUP statGroup) { + ConcurrentMap, MessageCounters> groupData = getOrCreateGroupData(statGroup); MessageCounters counters = getOrCreateCountersPair(message, groupData); return counters; } - private static MessageCounters getOrCreateCountersPair(final Class msgType, final ConcurrentMap groupData) { + private static MessageCounters getOrCreateCountersPair(final Class msgType, final ConcurrentMap, MessageCounters> groupData) { final MessageCounters lookup = groupData.get(msgType); if (lookup != null) { return lookup; @@ -78,14 +78,14 @@ public class MessageIntelligenceAgencyImpl implements MessageIntelligenceAgency< } - private ConcurrentMap getOrCreateGroupData(final STATISTIC_GROUP statGroup) { - final ConcurrentMap lookup = inputStats.get(statGroup); + private ConcurrentMap, MessageCounters> getOrCreateGroupData(final STATISTIC_GROUP statGroup) { + final ConcurrentMap, MessageCounters> lookup = inputStats.get(statGroup); if (lookup != null) { return lookup; } - final ConcurrentMap newmap = new ConcurrentHashMap<>(); - final ConcurrentMap check = inputStats.putIfAbsent(statGroup, newmap); + final ConcurrentMap, MessageCounters> newmap = new ConcurrentHashMap<>(); + final ConcurrentMap, MessageCounters> check = inputStats.putIfAbsent(statGroup, newmap); return check == null ? newmap : check; } @@ -105,9 +105,9 @@ public class MessageIntelligenceAgencyImpl implements MessageIntelligenceAgency< List dump = new ArrayList<>(); for (STATISTIC_GROUP statGroup : STATISTIC_GROUP.values()) { - Map groupData = inputStats.get(statGroup); + Map, MessageCounters> groupData = inputStats.get(statGroup); if (groupData != null) { - for (Entry statEntry : groupData.entrySet()) { + for (Entry, MessageCounters> statEntry : groupData.entrySet()) { long amountPerInterval = statEntry.getValue().accumulate(); long cumulativeAmount = statEntry.getValue().getCumulative(); dump.add(String.format("%s: MSG[%s] -> +%d | %d", diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/translator/AggregatedFlowStatisticsTranslator.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/translator/AggregatedFlowStatisticsTranslator.java index de8e3a26ca..93cdb5497f 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/translator/AggregatedFlowStatisticsTranslator.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/translator/AggregatedFlowStatisticsTranslator.java @@ -4,23 +4,18 @@ import org.opendaylight.openflowplugin.api.openflow.device.DeviceContext; import org.opendaylight.openflowplugin.api.openflow.device.MessageTranslator; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev100924.Counter32; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev100924.Counter64; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.statistics.rev130819.AggregateFlowStatisticsUpdate; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.statistics.rev130819.AggregateFlowStatisticsUpdateBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.statistics.rev130819.get.aggregate.flow.statistics.from.flow.table._for.given.match.output.AggregatedFlowStatistics; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.statistics.rev130819.get.aggregate.flow.statistics.from.flow.table._for.given.match.output.AggregatedFlowStatisticsBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.transaction.rev150304.TransactionId; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.MultipartReply; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.reply.multipart.reply.body.MultipartReplyAggregateCase; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.reply.multipart.reply.body.multipart.reply.aggregate._case.MultipartReplyAggregate; -import java.math.BigInteger; - /** * Created by tkubas on 4/27/15. */ public class AggregatedFlowStatisticsTranslator implements MessageTranslator { @Override - public AggregatedFlowStatistics translate(MultipartReply input, DeviceContext deviceContext, Object connectionDistinguisher) { + public AggregatedFlowStatistics translate(final MultipartReply input, final DeviceContext deviceContext, final Object connectionDistinguisher) { AggregatedFlowStatisticsBuilder aggregatedFlowStatisticsBuilder = new AggregatedFlowStatisticsBuilder(); MultipartReplyAggregateCase caseBody = (MultipartReplyAggregateCase)input.getMultipartReplyBody(); diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/translator/PacketReceivedTranslator.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/translator/PacketReceivedTranslator.java index c91d526de8..6e5bceecaf 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/translator/PacketReceivedTranslator.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/translator/PacketReceivedTranslator.java @@ -33,7 +33,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.packet.service.rev130709.pa */ public class PacketReceivedTranslator implements MessageTranslator { @Override - public PacketReceived translate(PacketInMessage input, DeviceContext deviceContext, Object connectionDistinguisher) { + public PacketReceived translate(final PacketInMessage input, final DeviceContext deviceContext, final Object connectionDistinguisher) { PacketReceivedBuilder packetReceivedBuilder = new PacketReceivedBuilder(); BigInteger datapathId = deviceContext.getPrimaryConnectionContext().getFeatures().getDatapathId(); @@ -73,7 +73,7 @@ public class PacketReceivedTranslator implements MessageTranslator entries) { + private static Long getPortNumberFromMatch(final List entries) { Long port = null; for (MatchEntry entry : entries) { if (InPortCase.class.equals(entry.getMatchEntryValue().getImplementedInterface())) { diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/translator/TranslatorKeyFactory.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/translator/TranslatorKeyFactory.java index 4769149fdb..1ed582472f 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/translator/TranslatorKeyFactory.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/translator/TranslatorKeyFactory.java @@ -21,7 +21,7 @@ public class TranslatorKeyFactory { this.version = version; } - public TranslatorKey createTranslatorKey(Class messageClass) { + public TranslatorKey createTranslatorKey(final Class messageClass) { return new TranslatorKey(version, messageClass.getName().toString()); } } diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/api/openflow/device/RpcManagerImplTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/api/openflow/device/RpcManagerImplTest.java index 4b0e367939..3cd4f4fb0d 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/api/openflow/device/RpcManagerImplTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/api/openflow/device/RpcManagerImplTest.java @@ -11,7 +11,6 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; - import java.math.BigInteger; import java.util.concurrent.ExecutionException; import java.util.concurrent.Future; @@ -108,7 +107,7 @@ public class RpcManagerImplTest { /** * @return */ - private AddFlowInput prepareTestingAddFlow() { + private static AddFlowInput prepareTestingAddFlow() { final AddFlowInputBuilder builder = new AddFlowInputBuilder(); builder.setFlowName("dummy flow"); builder.setHardTimeout(10000); diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/common/NodeConnectorTranslatorUtilTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/common/NodeConnectorTranslatorUtilTest.java index 65bea069a4..141740688c 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/common/NodeConnectorTranslatorUtilTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/common/NodeConnectorTranslatorUtilTest.java @@ -11,7 +11,6 @@ package org.opendaylight.openflowplugin.impl.common; import static org.junit.Assert.assertEquals; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; - import java.math.BigInteger; import java.util.Arrays; import java.util.List; @@ -194,7 +193,7 @@ public class NodeConnectorTranslatorUtilTest { return phyport; } - private PortStateV10 getPortStateV10() { + private static PortStateV10 getPortStateV10() { final PortStateV10 portState = new PortStateV10(Boolean.TRUE, Boolean.TRUE, Boolean.TRUE, Boolean.TRUE, Boolean.TRUE, Boolean.TRUE, Boolean.TRUE, Boolean.TRUE); return portState; } @@ -214,7 +213,7 @@ public class NodeConnectorTranslatorUtilTest { pfV10Bls[7], pfV10Bls[8], pfV10Bls[9], pfV10Bls[10], pfV10Bls[11]); } - private MacAddress getMacAddress() { + private static MacAddress getMacAddress() { return new MacAddress(MAC_ADDRESS); } @@ -226,19 +225,19 @@ public class NodeConnectorTranslatorUtilTest { return new PortConfig(portCfgBools[0], portCfgBools[1], portCfgBools[2], portCfgBools[3]); } - private void assertEqualsStateV10(final PortStateV10 psV10, final org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.port.rev130925.PortState state) { + private static void assertEqualsStateV10(final PortStateV10 psV10, final org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.port.rev130925.PortState state) { assertEquals(psV10.isBlocked(), state.isBlocked()); assertEquals(psV10.isLinkDown(), state.isLinkDown()); assertEquals(psV10.isLive(), state.isLive()); } - private void assertEqualsState(final PortState ps, final org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.port.rev130925.PortState state) { + private static void assertEqualsState(final PortState ps, final org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.port.rev130925.PortState state) { assertEquals(ps.isBlocked(), state.isBlocked()); assertEquals(ps.isLinkDown(), state.isLinkDown()); assertEquals(ps.isLive(), state.isLive()); } - private void assertEqualsPortFeaturesV10(final PortFeaturesV10 apfV10, final org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.port.rev130925.PortFeatures npf) { + private static void assertEqualsPortFeaturesV10(final PortFeaturesV10 apfV10, final org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.port.rev130925.PortFeatures npf) { assertEquals(apfV10.is_100mbFd(), npf.isHundredMbFd()); assertEquals(apfV10.is_100mbHd(), npf.isHundredMbHd()); @@ -256,7 +255,7 @@ public class NodeConnectorTranslatorUtilTest { assertEquals(apfV10.isPauseAsym(), npf.isPauseAsym()); } - private void assertEqualsPortFeatures(final PortFeatures apf, final org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.port.rev130925.PortFeatures npf) { + private static void assertEqualsPortFeatures(final PortFeatures apf, final org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.port.rev130925.PortFeatures npf) { assertEquals(apf.is_100gbFd(), npf.isHundredGbFd()); assertEquals(apf.is_100mbFd(), npf.isHundredMbFd()); assertEquals(apf.is_100mbHd(), npf.isHundredMbHd()); diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/registry/flow/FlowHashFactoryTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/registry/flow/FlowHashFactoryTest.java index 5e402dfc03..ec9ddae4e6 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/registry/flow/FlowHashFactoryTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/registry/flow/FlowHashFactoryTest.java @@ -10,7 +10,6 @@ package org.opendaylight.openflowplugin.impl.registry.flow; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotEquals; - import java.math.BigInteger; import java.util.ArrayList; import java.util.HashSet; @@ -56,7 +55,7 @@ public class FlowHashFactoryTest { @Before public void setup() { - List flowAndStatisticsMapListList = new ArrayList(); + List flowAndStatisticsMapListList = new ArrayList<>(); for (int i = 1; i < 4; i++) { FlowAndStatisticsMapListBuilder flowAndStatisticsMapListBuilder = new FlowAndStatisticsMapListBuilder(); flowAndStatisticsMapListBuilder.setPriority(i); @@ -90,7 +89,7 @@ public class FlowHashFactoryTest { public void testEquals() throws Exception { FlowsStatisticsUpdate flowStats = FLOWS_STATISTICS_UPDATE_BUILDER.build(); - HashSet flowHashs = new HashSet(); + HashSet flowHashs = new HashSet<>(); for (FlowAndStatisticsMapList item : flowStats.getFlowAndStatisticsMapList()) { flowHashs.add(FlowHashFactory.create(item, OFConstants.OFP_VERSION_1_3)); flowHashs.add(FlowHashFactory.create(item, OFConstants.OFP_VERSION_1_3)); -- 2.36.6