From a46f9d5f295e94a777e844245231fc1fd24e0581 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Sat, 6 Jun 2015 03:11:13 +0200 Subject: [PATCH] BUG-3363: code optimization and cleanup - Fix eclipse warnings Unused imports, missing serialVersionUID, unneeded cast. Formatting changes courtesy autosave cleanup actions. Change-Id: If85ef69d426b129170d5b55d0bd6893a901d50cc Signed-off-by: Robert Varga (cherry picked from commit d25cd407fd8f5d038349db4bb2407d023afe3150) --- .../registry/flow/FlowRegistryException.java | 1 + .../connection/ConnectionManagerImpl.java | 3 +-- .../ShowSessionStatsCommandProvider.java | 2 -- .../registry/flow/FlowRegistryKeyFactory.java | 24 +++++++++++++------ .../impl/translator/PortUpdateTranslator.java | 1 - .../openflow/device/RpcManagerImplTest.java | 1 - 6 files changed, 19 insertions(+), 13 deletions(-) diff --git a/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/registry/flow/FlowRegistryException.java b/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/registry/flow/FlowRegistryException.java index a298726987..dfacba9a0f 100644 --- a/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/registry/flow/FlowRegistryException.java +++ b/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/registry/flow/FlowRegistryException.java @@ -13,6 +13,7 @@ package org.opendaylight.openflowplugin.api.openflow.registry.flow; */ @Deprecated public class FlowRegistryException extends Exception { + private static final long serialVersionUID = 7514092745206029217L; public FlowRegistryException(final String message) { super(message); 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 8cca35254a..70f23afdb4 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 @@ -24,7 +24,6 @@ import org.opendaylight.openflowplugin.impl.connection.listener.ConnectionReadyL import org.opendaylight.openflowplugin.impl.connection.listener.HandshakeListenerImpl; import org.opendaylight.openflowplugin.impl.connection.listener.OpenflowProtocolListenerInitialImpl; import org.opendaylight.openflowplugin.impl.connection.listener.SystemNotificationsListenerImpl; -import org.opendaylight.openflowplugin.impl.statistics.ofpspecific.SessionStatistics; import org.opendaylight.openflowplugin.openflow.md.core.ErrorHandlerSimpleImpl; import org.opendaylight.openflowplugin.openflow.md.core.HandshakeManagerImpl; import org.opendaylight.openflowplugin.openflow.md.core.ThreadPoolLoggingExecutor; @@ -40,7 +39,7 @@ public class ConnectionManagerImpl implements ConnectionManager { private static final Logger LOG = LoggerFactory.getLogger(ConnectionManagerImpl.class); private static final int HELLO_LIMIT = 20; - private boolean bitmapNegotiationEnabled = true; + private final boolean bitmapNegotiationEnabled = true; private DeviceConnectedHandler deviceConnectedHandler; @Override diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/karaf/ShowSessionStatsCommandProvider.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/karaf/ShowSessionStatsCommandProvider.java index c7733dca3f..732957cc6d 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/karaf/ShowSessionStatsCommandProvider.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/karaf/ShowSessionStatsCommandProvider.java @@ -12,8 +12,6 @@ import java.io.PrintStream; import java.util.List; import org.apache.karaf.shell.commands.Command; import org.apache.karaf.shell.console.OsgiCommandSupport; -import org.opendaylight.openflowplugin.api.openflow.statistics.ofpspecific.MessageIntelligenceAgency; -import org.opendaylight.openflowplugin.impl.OpenFlowPluginProviderImpl; import org.opendaylight.openflowplugin.impl.statistics.ofpspecific.SessionStatistics; /** diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/registry/flow/FlowRegistryKeyFactory.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/registry/flow/FlowRegistryKeyFactory.java index 08f128e5b5..08f8d85e45 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/registry/flow/FlowRegistryKeyFactory.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/registry/flow/FlowRegistryKeyFactory.java @@ -25,7 +25,7 @@ public class FlowRegistryKeyFactory { public FlowRegistryKeyFactory() { } - public static FlowRegistryKey create(Flow flow) { + public static FlowRegistryKey create(final Flow flow) { return new FlowRegistryKeyDto(flow); } @@ -45,21 +45,31 @@ public class FlowRegistryKeyFactory { @Override public boolean equals(final Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } final FlowRegistryKeyDto that = (FlowRegistryKeyDto) o; - if (priority != that.priority) return false; - if (tableId != that.tableId) return false; - if (!match.equals(that.match)) return false; + if (priority != that.priority) { + return false; + } + if (tableId != that.tableId) { + return false; + } + if (!match.equals(that.match)) { + return false; + } return true; } @Override public int hashCode() { - int result = (int) tableId; + int result = tableId; result = 31 * result + priority; result = 31 * result + match.hashCode(); return result; diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/translator/PortUpdateTranslator.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/translator/PortUpdateTranslator.java index 2f8494c8b7..847fc003d9 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/translator/PortUpdateTranslator.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/translator/PortUpdateTranslator.java @@ -14,7 +14,6 @@ import org.opendaylight.openflowplugin.api.openflow.device.MessageTranslator; import org.opendaylight.openflowplugin.openflow.md.util.PortTranslatorUtil; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.FlowCapableNodeConnector; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.FlowCapableNodeConnectorBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.Queue; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.port.rev130925.PortNumberUni; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.PortGrouping; 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 562f7de5a9..82d5c55fba 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 @@ -21,7 +21,6 @@ import org.mockito.Mock; import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.ProviderContext; import org.opendaylight.openflowjava.protocol.api.connection.ConnectionAdapter; import org.opendaylight.openflowplugin.api.openflow.connection.ConnectionContext; -import org.opendaylight.openflowplugin.api.openflow.rpc.RpcContext; import org.opendaylight.openflowplugin.api.openflow.statistics.ofpspecific.MessageSpy; import org.opendaylight.openflowplugin.impl.rpc.RpcContextImpl; import org.opendaylight.openflowplugin.impl.rpc.RpcManagerImpl; -- 2.36.6