commit 227943db2341df0832406e84791514f60e6df668
author Thomas Vachuska <tom@opennetworking.org> Mon Mar 19 09:37:28 2018 -0700
committer Thomas Vachuska <tom@opennetworking.org> Mon Mar 19 09:37:28 2018 -0700
tree ff3a54fa7e05ba283b1623e7c827786395b1b998
parent fa615493306a05f2889cc8c3a5c3425bb8fb3191

Cosmetic fixes to FlowRuleManager.

Change-Id: I473a205f22d284502e0b66d894c859fb7a34b813

core/net/src/main/java/org/onosproject/net/flow/impl/FlowRuleManager.java

diff --git a/core/net/src/main/java/org/onosproject/net/flow/impl/FlowRuleManager.java b/core/net/src/main/java/org/onosproject/net/flow/impl/FlowRuleManager.java
index ffcfe0b..5047841 100644
--- a/core/net/src/main/java/org/onosproject/net/flow/impl/FlowRuleManager.java
+++ b/core/net/src/main/java/org/onosproject/net/flow/impl/FlowRuleManager.java
@@ -89,8 +89,6 @@
 import static org.onosproject.security.AppPermission.Type.FLOWRULE_WRITE;
 import static org.slf4j.LoggerFactory.getLogger;
 
-
-
 /**
  * Provides implementation of the flow NB & SB APIs.
  */
@@ -101,10 +99,10 @@
                                                  FlowRuleProvider, FlowRuleProviderService>
         implements FlowRuleService, FlowRuleProviderRegistry {
 
-    public static final String DEVICE_ID_NULL = "Device ID cannot be null";
     private final Logger log = getLogger(getClass());
 
-    public static final String FLOW_RULE_NULL = "FlowRule cannot be null";
+    private static final String DEVICE_ID_NULL = "Device ID cannot be null";
+    private static final String FLOW_RULE_NULL = "FlowRule cannot be null";
     private static final boolean ALLOW_EXTRANEOUS_RULES = false;
 
     @Property(name = "allowExtraneousRules", boolValue = ALLOW_EXTRANEOUS_RULES,
@@ -236,7 +234,7 @@
     @Override
     public int getFlowRuleCount(DeviceId deviceId) {
         checkPermission(FLOWRULE_READ);
-        checkNotNull(deviceId, "Device ID cannot be null");
+        checkNotNull(deviceId, DEVICE_ID_NULL);
         return store.getFlowRuleCount(deviceId);
     }