SONAR suggestion - Synchronize initialization of static fields
Change-Id: I2ddf8220bda49f235ddfc5713174c11a147df354
diff --git a/apps/acl/src/main/java/org/onosproject/acl/AclRule.java b/apps/acl/src/main/java/org/onosproject/acl/AclRule.java
index a5cc297..ff01aa4 100644
--- a/apps/acl/src/main/java/org/onosproject/acl/AclRule.java
+++ b/apps/acl/src/main/java/org/onosproject/acl/AclRule.java
@@ -43,7 +43,7 @@
private final short dstTpPort;
private final Action action;
- private static IdGenerator idGenerator;
+ protected static IdGenerator idGenerator;
/**
* Enum type for ACL rule's action.
diff --git a/apps/acl/src/test/java/org/onosproject/acl/AclWebResourceTest.java b/apps/acl/src/test/java/org/onosproject/acl/AclWebResourceTest.java
index 13c8201..897e8b4 100644
--- a/apps/acl/src/test/java/org/onosproject/acl/AclWebResourceTest.java
+++ b/apps/acl/src/test/java/org/onosproject/acl/AclWebResourceTest.java
@@ -67,8 +67,7 @@
.add(AclStore.class, mockAclStore);
BaseResource.setServiceDirectory(testDirectory);
- IdGenerator idGenerator = new MockIdGenerator();
- AclRule.bindIdGenerator(idGenerator);
+ AclRule.idGenerator = new MockIdGenerator();
}
@After
diff --git a/apps/gluon/src/main/java/org/onosproject/gluon/rsc/GluonServer.java b/apps/gluon/src/main/java/org/onosproject/gluon/rsc/GluonServer.java
index f4f400e..031ba69 100644
--- a/apps/gluon/src/main/java/org/onosproject/gluon/rsc/GluonServer.java
+++ b/apps/gluon/src/main/java/org/onosproject/gluon/rsc/GluonServer.java
@@ -86,10 +86,10 @@
public class GluonServer {
- private static String protonKeyUri;
- private static String serverUri;
+ private String protonKeyUri;
+ private String serverUri;
- private static CloseableHttpAsyncClient httpClient;
+ private CloseableHttpAsyncClient httpClient;
//store gluon server supported subkeys
private List<String> subKeys = new LinkedList<>();
diff --git a/apps/vpls/src/main/java/org/onosproject/vpls/cli/VplsCommand.java b/apps/vpls/src/main/java/org/onosproject/vpls/cli/VplsCommand.java
index 35caa97..72489b1 100644
--- a/apps/vpls/src/main/java/org/onosproject/vpls/cli/VplsCommand.java
+++ b/apps/vpls/src/main/java/org/onosproject/vpls/cli/VplsCommand.java
@@ -101,8 +101,8 @@
COLOR_ERROR + "Interface " + BOLD + "%s" + RESET + COLOR_ERROR +
" cannot be removed from VPLS " + BOLD + "%s" + RESET + ".";
- protected static Vpls vpls;
- protected static InterfaceService interfaceService;
+ protected Vpls vpls;
+ protected InterfaceService interfaceService;
@Argument(index = 0, name = "command", description = "Command name (add-if|" +
"create|delete|list|rem-if|set-encap|show)",
@@ -377,7 +377,7 @@
* @return true if the interface is already associated to a VPLS; false
* otherwise
*/
- private static boolean isIfaceAssociated(Interface iface) {
+ private boolean isIfaceAssociated(Interface iface) {
return vpls.getAllVpls()
.stream()
.map(VplsData::interfaces)
diff --git a/apps/vpls/src/main/java/org/onosproject/vpls/cli/completer/VplsOptArgCompleter.java b/apps/vpls/src/main/java/org/onosproject/vpls/cli/completer/VplsOptArgCompleter.java
index 0624005..4b5ec46 100644
--- a/apps/vpls/src/main/java/org/onosproject/vpls/cli/completer/VplsOptArgCompleter.java
+++ b/apps/vpls/src/main/java/org/onosproject/vpls/cli/completer/VplsOptArgCompleter.java
@@ -38,8 +38,8 @@
* VPLS optional argument completer.
*/
public class VplsOptArgCompleter extends AbstractChoicesCompleter {
- protected static Vpls vpls;
- protected static InterfaceService interfaceService;
+ protected Vpls vpls;
+ protected InterfaceService interfaceService;
@Override
public List<String> choices() {