Fix issues related to checkstyle enforcement on openflow-impl module

[openflowplugin.git] / openflowplugin-impl / src / main / java / org / opendaylight / openflowplugin / impl / statistics / ofpspecific / SessionStatistics.java

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 70892d92b7b3246deba1a650ecc4938032d33ede..29d500d396c7d3d7513e06235bf592fdf3d28fcc 100644 (file)
--- 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
@@ -14,7 +14,10 @@ import java.util.List;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicLongFieldUpdater;
 
-public class SessionStatistics {
+public final class SessionStatistics {
+
+    private SessionStatistics() {
+    }
 
     private static final Map<String, Map<ConnectionStatus, EventCounter>> SESSION_EVENTS = new HashMap<>();
 
@@ -26,21 +29,11 @@ public class SessionStatistics {
 
     private static EventCounter getConnectionEvent(final Map<ConnectionStatus, EventCounter> sessionsConnectionEvents,
                                                    final ConnectionStatus connectionStatus) {
-        EventCounter eventCounter = sessionsConnectionEvents.get(connectionStatus);
-        if (null == eventCounter) {
-            eventCounter = new EventCounter();
-            sessionsConnectionEvents.put(connectionStatus, eventCounter);
-        }
-        return eventCounter;
+        return sessionsConnectionEvents.computeIfAbsent(connectionStatus, k -> new EventCounter());
     }
 
     private static Map<ConnectionStatus, EventCounter> getConnectionEvents(final String sessionId) {
-        Map<ConnectionStatus, EventCounter> sessionConnectionEvents = SESSION_EVENTS.get(sessionId);
-        if (null == sessionConnectionEvents) {
-            sessionConnectionEvents = new HashMap<>();
-            SESSION_EVENTS.put(sessionId, sessionConnectionEvents);
-        }
-        return sessionConnectionEvents;
+        return SESSION_EVENTS.computeIfAbsent(sessionId, k -> new HashMap<>());
     }
 
 
@@ -59,7 +52,7 @@ public class SessionStatistics {
     }
 
     public enum ConnectionStatus {
-        CONNECTION_CREATED, CONNECTION_DISCONNECTED_BY_DEVICE, CONNECTION_DISCONNECTED_BY_OFP;
+        CONNECTION_CREATED, CONNECTION_DISCONNECTED_BY_DEVICE, CONNECTION_DISCONNECTED_BY_OFP
     }
 
     private static final class EventCounter {