From c2c3c27ad44909d5a6b8601a43c9ce381042277f Mon Sep 17 00:00:00 2001 From: Alissa Bonas Date: Mon, 16 Sep 2013 20:04:44 +0300 Subject: [PATCH] Reorder public/private modifiers as per JLS. (fixes sonar warnings) Signed-off-by: Alissa Bonas Change-Id: I9a8d36a812443aa2e33a01bd30ab9e54758e693a Signed-off-by: Alissa Bonas --- .../internal/ClusterManagerCommon.java | 2 +- .../clustering/stub/internal/ClusterManagerCommon.java | 2 +- .../controller/forwardingrulesmanager/FlowEntryInstall.java | 4 ++-- .../implementation/data/FlowEntryDistributionOrder.java | 6 +++--- .../src/main/java/org/openflow/protocol/OFType.java | 6 +++--- 5 files changed, 10 insertions(+), 10 deletions(-) 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 fabf3e9f1d..90299e5ac9 100644 --- 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 035b0d3433..975f97c8e5 100644 --- 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 ee2113db82..1318c97ce2 100644 --- 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 5220428199..672a290a24 100644 --- 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 92a2e866f0..603f4ccb9e 100644 --- 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]; } -- 2.36.6