Reorder public/private modifiers as per JLS. (fixes sonar warnings)

Signed-off-by: Alissa Bonas <abonas@redhat.com>
Change-Id: I9a8d36a812443aa2e33a01bd30ab9e54758e693a
Signed-off-by: Alissa Bonas <abonas@redhat.com>

diff --git a/opendaylight/clustering/services_implementation/src/main/java/org/opendaylight/controller/clustering/services_implementation/internal/ClusterManagerCommon.java b/opendaylight/clustering/services_implementation/src/main/java/org/opendaylight/controller/clustering/services_implementation/internal/ClusterManagerCommon.java
index fabf3e9f1d704413346d97b98c561e8d2adc8a16..90299e5ac960dcbd34c63df4cd8418c5b57ddf5f 100644 (file)
--- a/opendaylight/clustering/services_implementation/src/main/java/org/opendaylight/controller/clustering/services_implementation/internal/ClusterManagerCommon.java
+++ b/opendaylight/clustering/services_implementation/src/main/java/org/opendaylight/controller/clustering/services_implementation/internal/ClusterManagerCommon.java
@@ -39,7 +39,7 @@ import org.opendaylight.controller.clustering.services.ListenRoleChangeAddExcept
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-abstract public class ClusterManagerCommon implements IClusterServicesCommon {
+public abstract class ClusterManagerCommon implements IClusterServicesCommon {
     protected String containerName = null;
     private IClusterServices clusterService = null;
     protected static final Logger logger = LoggerFactory

diff --git a/opendaylight/clustering/stub/src/main/java/org/opendaylight/controller/clustering/stub/internal/ClusterManagerCommon.java b/opendaylight/clustering/stub/src/main/java/org/opendaylight/controller/clustering/stub/internal/ClusterManagerCommon.java
index 035b0d3433e413b928e4ce753f9bea1d034e0218..975f97c8e5104a75ef56080ca5d59717098cb38c 100644 (file)
--- a/opendaylight/clustering/stub/src/main/java/org/opendaylight/controller/clustering/stub/internal/ClusterManagerCommon.java
+++ b/opendaylight/clustering/stub/src/main/java/org/opendaylight/controller/clustering/stub/internal/ClusterManagerCommon.java
@@ -45,7 +45,7 @@ import org.apache.felix.dm.Component;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-abstract public class ClusterManagerCommon implements IClusterServicesCommon {
+public abstract class ClusterManagerCommon implements IClusterServicesCommon {
     protected String containerName = "";
     protected static final Logger logger = LoggerFactory
             .getLogger(ClusterManagerCommon.class);

diff --git a/opendaylight/forwardingrulesmanager/api/src/main/java/org/opendaylight/controller/forwardingrulesmanager/FlowEntryInstall.java b/opendaylight/forwardingrulesmanager/api/src/main/java/org/opendaylight/controller/forwardingrulesmanager/FlowEntryInstall.java
index ee2113db8287066f7337a147ade4e7d9048bf2ea..1318c97ce22e40016fb113a4d1c46d524eba7c1b 100644 (file)
--- a/opendaylight/forwardingrulesmanager/api/src/main/java/org/opendaylight/controller/forwardingrulesmanager/FlowEntryInstall.java
+++ b/opendaylight/forwardingrulesmanager/api/src/main/java/org/opendaylight/controller/forwardingrulesmanager/FlowEntryInstall.java
@@ -28,8 +28,8 @@ public class FlowEntryInstall implements Serializable {
     private final FlowEntry original;
     private final ContainerFlow cFlow;
     private final FlowEntry install;
-    transient private long requestId; // async request id
-    transient private boolean deletePending;
+    private transient long requestId; // async request id
+    private transient boolean deletePending;
 
     public FlowEntryInstall(FlowEntry original, ContainerFlow cFlow) {
         this.original = original;

diff --git a/opendaylight/forwardingrulesmanager/implementation/src/main/java/org/opendaylight/controller/forwardingrulesmanager/implementation/data/FlowEntryDistributionOrder.java b/opendaylight/forwardingrulesmanager/implementation/src/main/java/org/opendaylight/controller/forwardingrulesmanager/implementation/data/FlowEntryDistributionOrder.java
index 5220428199c41920b50d2fcbc676e98ea52f3959..672a290a2427f6bb1676ab31f3b72e21ffaa922e 100644 (file)
--- a/opendaylight/forwardingrulesmanager/implementation/src/main/java/org/opendaylight/controller/forwardingrulesmanager/implementation/data/FlowEntryDistributionOrder.java
+++ b/opendaylight/forwardingrulesmanager/implementation/src/main/java/org/opendaylight/controller/forwardingrulesmanager/implementation/data/FlowEntryDistributionOrder.java
@@ -27,9 +27,9 @@ public final class FlowEntryDistributionOrder implements Serializable {
      * Serialization UID
      */
     private static final long serialVersionUID = 416280377113255147L;
-    final private FlowEntryInstall entry;
-    final private UpdateType upType;
-    final private InetAddress requestorController;
+    private final FlowEntryInstall entry;
+    private final UpdateType upType;
+    private final InetAddress requestorController;
 
     /**
      * @return the entry

diff --git a/third-party/openflowj/src/main/java/org/openflow/protocol/OFType.java b/third-party/openflowj/src/main/java/org/openflow/protocol/OFType.java
index 92a2e866f02840f57c2f70dcf4f8b383eb6dccd9..603f4ccb9e529f20251148e3db452d755eb6e3c3 100644 (file)
--- a/third-party/openflowj/src/main/java/org/openflow/protocol/OFType.java
+++ b/third-party/openflowj/src/main/java/org/openflow/protocol/OFType.java
@@ -158,7 +158,7 @@ public enum OFType {
      * @param i OpenFlow wire protocol type
      * @param t type
      */
-    static public void addMapping(byte i, OFType t) {
+    public static void addMapping(byte i, OFType t) {
         if (mapping == null)
             mapping = new OFType[32];
         OFType.mapping[i] = t;
@@ -169,7 +169,7 @@ public enum OFType {
      *
      * @param i OpenFlow wire protocol type
      */
-    static public void removeMapping(byte i) {
+    public static void removeMapping(byte i) {
         OFType.mapping[i] = null;
     }
 
@@ -181,7 +181,7 @@ public enum OFType {
      * @return OFType enum type
      */
 
-    static public OFType valueOf(Byte i) {
+    public static OFType valueOf(Byte i) {
         return OFType.mapping[i];
     }