From d30ee7cb9b182e166b6d88de8027cf51d946af35 Mon Sep 17 00:00:00 2001 From: Tomas Slusny Date: Tue, 2 Aug 2016 13:11:11 +0200 Subject: [PATCH] SONAR TD - Remove unused fields, fix naming - Added private constructor to EventsTimeCounter - Removed unused fields - Fixed naming of constants Change-Id: I4321e2b75af71abb3473eef5e5cc6b92e36c76c4 Signed-off-by: Tomas Slusny --- .../ofpspecific/EventsTimeCounter.java | 16 ++++++++++------ .../ofpspecific/SessionStatistics.java | 14 +++++++------- .../services/AllFlowsInTableService.java | 3 --- .../OpendaylightFlowStatisticsServiceImpl.java | 4 ---- .../translator/PacketReceivedTranslator.java | 2 -- .../openflowplugin/impl/util/BarrierUtil.java | 4 ---- 6 files changed, 17 insertions(+), 26 deletions(-) diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/ofpspecific/EventsTimeCounter.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/ofpspecific/EventsTimeCounter.java index 9deaddbddb..357c0ab694 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/ofpspecific/EventsTimeCounter.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/ofpspecific/EventsTimeCounter.java @@ -20,7 +20,11 @@ import org.opendaylight.openflowplugin.api.openflow.statistics.ofpspecific.Event */ public final class EventsTimeCounter { - private static Map> devicesEvents = new HashMap<>(); + private static final Map> DEVICES_EVENTS = new HashMap<>(); + + private EventsTimeCounter() { + // Hiding implicit constructor + } public static void markStart(final EventIdentifier eventIdentifier) { Map deviceEvents = getOrCreateCountersForDevice(eventIdentifier.getDeviceId()); @@ -44,10 +48,10 @@ public final class EventsTimeCounter { } private static Map getOrCreateCountersForDevice(final String deviceId) { - Map lookup = devicesEvents.get(deviceId); + Map lookup = DEVICES_EVENTS.get(deviceId); if (null == lookup) { - lookup = new HashMap(); - devicesEvents.put(deviceId, lookup); + lookup = new HashMap<>(); + DEVICES_EVENTS.put(deviceId, lookup); } return lookup; @@ -55,7 +59,7 @@ public final class EventsTimeCounter { public static List provideTimes() { List dump = new ArrayList<>(); - for (Map.Entry> deviceEntry : devicesEvents.entrySet()) { + for (Map.Entry> deviceEntry : DEVICES_EVENTS.entrySet()) { Map eventsMap = deviceEntry.getValue(); dump.add("================================================"); dump.add(String.format("DEVICE : %s", deviceEntry.getKey())); @@ -76,7 +80,7 @@ public final class EventsTimeCounter { } public static void resetAllCounters() { - devicesEvents = new HashMap<>(); + DEVICES_EVENTS.clear(); } diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/ofpspecific/SessionStatistics.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/ofpspecific/SessionStatistics.java index b243ec4802..7ae6d0c957 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/ofpspecific/SessionStatistics.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/ofpspecific/SessionStatistics.java @@ -19,7 +19,7 @@ import java.util.concurrent.atomic.AtomicLongFieldUpdater; */ public class SessionStatistics { - private static final Map> sessionEvents = new HashMap<>(); + private static final Map> SESSION_EVENTS = new HashMap<>(); public static void countEvent(final String sessionId, final ConnectionStatus connectionStatus) { Map sessionsConnectionEvents = getConnectionEvents(sessionId); @@ -38,10 +38,10 @@ public class SessionStatistics { } private static Map getConnectionEvents(final String sessionId) { - Map sessionConnectionEvents = sessionEvents.get(sessionId); + Map sessionConnectionEvents = SESSION_EVENTS.get(sessionId); if (null == sessionConnectionEvents) { sessionConnectionEvents = new HashMap<>(); - sessionEvents.put(sessionId, sessionConnectionEvents); + SESSION_EVENTS.put(sessionId, sessionConnectionEvents); } return sessionConnectionEvents; } @@ -49,7 +49,7 @@ public class SessionStatistics { public static List provideStatistics() { List dump = new ArrayList<>(); - for (Map.Entry> sessionEntries : sessionEvents.entrySet()) { + for (Map.Entry> sessionEntries : SESSION_EVENTS.entrySet()) { Map sessionEvents = sessionEntries.getValue(); dump.add(String.format("SESSION : %s", sessionEntries.getKey())); for (Map.Entry sessionEvent : sessionEvents.entrySet()) { @@ -65,7 +65,7 @@ public class SessionStatistics { } private static final class EventCounter { - private final AtomicLongFieldUpdater UPDATER = AtomicLongFieldUpdater.newUpdater(EventCounter.class, "count"); + private final AtomicLongFieldUpdater updater = AtomicLongFieldUpdater.newUpdater(EventCounter.class, "count"); private volatile long count; public long getCount() { @@ -73,12 +73,12 @@ public class SessionStatistics { } public void increment() { - count = UPDATER.incrementAndGet(this); + count = updater.incrementAndGet(this); } } public static void resetAllCounters() { - sessionEvents.clear(); + SESSION_EVENTS.clear(); } } diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/services/AllFlowsInTableService.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/services/AllFlowsInTableService.java index d7a4af5da3..2f1783bee6 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/services/AllFlowsInTableService.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/services/AllFlowsInTableService.java @@ -7,7 +7,6 @@ */ package org.opendaylight.openflowplugin.impl.statistics.services; -import com.google.common.base.Function; import java.util.List; import java.util.concurrent.atomic.AtomicLong; import org.opendaylight.openflowplugin.api.OFConstants; @@ -30,13 +29,11 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.OfHeader; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.request.multipart.request.body.MultipartRequestFlowCaseBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.request.multipart.request.body.multipart.request.flow._case.MultipartRequestFlowBuilder; -import org.opendaylight.yangtools.yang.common.RpcResult; public class AllFlowsInTableService extends AbstractCompatibleStatService { private final ConvertorExecutor convertorExecutor; - private Function>, FlowsStatisticsUpdate> transformer; public AllFlowsInTableService(final RequestContextStack requestContextStack, final DeviceContext deviceContext, AtomicLong compatibilityXidSeed, ConvertorExecutor convertorExecutor) { super(requestContextStack, deviceContext, compatibilityXidSeed); diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/services/OpendaylightFlowStatisticsServiceImpl.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/services/OpendaylightFlowStatisticsServiceImpl.java index 3ab8c8b21a..4d9a2b3ce1 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/services/OpendaylightFlowStatisticsServiceImpl.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/services/OpendaylightFlowStatisticsServiceImpl.java @@ -37,16 +37,12 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.reply.multipart.reply.body.MultipartReplyAggregateCase; import org.opendaylight.yangtools.yang.common.RpcResult; import org.opendaylight.yangtools.yang.common.RpcResultBuilder; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * @author joe */ public class OpendaylightFlowStatisticsServiceImpl implements OpendaylightFlowStatisticsService, Delegator { - private static final Logger LOG = LoggerFactory.getLogger(OpendaylightFlowStatisticsServiceImpl.class); - private final Function>, RpcResult> matchingConvertor = new Function>, RpcResult>() { @Override 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 f37474da37..a3423ac69a 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 @@ -46,8 +46,6 @@ public class PacketReceivedTranslator implements MessageTranslator