Do not access static methods through object instances

Stops eclipse from complaining.

Change-Id: I153b651068cceb8263f2f4a8ea65b8de45a1ba50
Signed-off-by: Robert Varga <rovarga@cisco.com>

diff --git a/opendaylight/config/config-util/src/test/java/org/opendaylight/controller/config/util/ConfigRegistryClientsTest.java b/opendaylight/config/config-util/src/test/java/org/opendaylight/controller/config/util/ConfigRegistryClientsTest.java
index 4c99c7770a4e3701719e9577fb5ccca7991c5924..13043458c0d097d0f6e936343480e77b63ad47be 100644 (file)
--- a/opendaylight/config/config-util/src/test/java/org/opendaylight/controller/config/util/ConfigRegistryClientsTest.java
+++ b/opendaylight/config/config-util/src/test/java/org/opendaylight/controller/config/util/ConfigRegistryClientsTest.java
@@ -47,7 +47,7 @@ public class ConfigRegistryClientsTest {
     @Test
     public void testLookupRuntimeBeans() throws Exception {
         Set<ObjectName> jmxLookup = lookupRuntimeBeans(jmxRegistryClient);
     @Test
     public void testLookupRuntimeBeans() throws Exception {
         Set<ObjectName> jmxLookup = lookupRuntimeBeans(jmxRegistryClient);

-        assertEquals(Sets.newHashSet(testingRegistry.run2, testingRegistry.run1, testingRegistry.run3), jmxLookup);
+        assertEquals(Sets.newHashSet(TestingConfigRegistry.run2, TestingConfigRegistry.run1, TestingConfigRegistry.run3), jmxLookup);

     }
 
     private Set<ObjectName> lookupRuntimeBeans(ConfigRegistryClient client)
     }
 
     private Set<ObjectName> lookupRuntimeBeans(ConfigRegistryClient client)


@@ -67,13 +67,13 @@ public class ConfigRegistryClientsTest {
                 jmxRegistryClient, TestingConfigRegistry.moduleName1,
                 TestingConfigRegistry.instName1);
         assertEquals(1, jmxLookup.size());
                 jmxRegistryClient, TestingConfigRegistry.moduleName1,
                 TestingConfigRegistry.instName1);
         assertEquals(1, jmxLookup.size());

-        assertEquals(Sets.newHashSet(testingRegistry.run2), jmxLookup);
+        assertEquals(Sets.newHashSet(TestingConfigRegistry.run2), jmxLookup);

 
         jmxLookup = clientLookupRuntimeBeansWithModuleAndInstance(
                 jmxRegistryClient, TestingConfigRegistry.moduleName2,
                 TestingConfigRegistry.instName2);
         assertEquals(1, jmxLookup.size());
 
         jmxLookup = clientLookupRuntimeBeansWithModuleAndInstance(
                 jmxRegistryClient, TestingConfigRegistry.moduleName2,
                 TestingConfigRegistry.instName2);
         assertEquals(1, jmxLookup.size());

-        assertEquals(Sets.newHashSet(testingRegistry.run3), jmxLookup);
+        assertEquals(Sets.newHashSet(TestingConfigRegistry.run3), jmxLookup);

 
         jmxLookup = clientLookupRuntimeBeansWithModuleAndInstance(
                 jmxRegistryClient, TestingConfigRegistry.moduleName1,
 
         jmxLookup = clientLookupRuntimeBeansWithModuleAndInstance(
                 jmxRegistryClient, TestingConfigRegistry.moduleName1,

diff --git a/opendaylight/netconf/netconf-ssh/src/main/java/org/opendaylight/controller/netconf/ssh/authentication/AuthProvider.java b/opendaylight/netconf/netconf-ssh/src/main/java/org/opendaylight/controller/netconf/ssh/authentication/AuthProvider.java
index d904ad7f269a344600aa04bd2279b9590a0f91d7..3d5318073d8c0e7cc203fd80fa63b6a05ea71e3e 100644 (file)
--- a/opendaylight/netconf/netconf-ssh/src/main/java/org/opendaylight/controller/netconf/ssh/authentication/AuthProvider.java
+++ b/opendaylight/netconf/netconf-ssh/src/main/java/org/opendaylight/controller/netconf/ssh/authentication/AuthProvider.java
@@ -30,14 +30,14 @@ public class AuthProvider implements AuthProviderInterface {
 
     public AuthProvider(IUserManager ium,InputStream privateKeyFileInputStream) throws Exception {
 
 
     public AuthProvider(IUserManager ium,InputStream privateKeyFileInputStream) throws Exception {
 

-        this.um = ium;
-        if (this.um  == null){
+        AuthProvider.um = ium;
+        if (AuthProvider.um  == null){

             throw new Exception("No usermanager service available.");
         }
 
         List<String> roles = new ArrayList<String>(1);
         roles.add(UserLevel.SYSTEMADMIN.toString());
             throw new Exception("No usermanager service available.");
         }
 
         List<String> roles = new ArrayList<String>(1);
         roles.add(UserLevel.SYSTEMADMIN.toString());

-        this.um.addLocalUser(new UserConfig(DEFAULT_USER, DEFAULT_PASSWORD, roles));
+        AuthProvider.um.addLocalUser(new UserConfig(DEFAULT_USER, DEFAULT_PASSWORD, roles));

 
         try {
             PEM = IOUtils.toString(privateKeyFileInputStream);
 
         try {
             PEM = IOUtils.toString(privateKeyFileInputStream);


@@ -48,10 +48,10 @@ public class AuthProvider implements AuthProviderInterface {
     }
     @Override
     public boolean authenticated(String username, String password)  throws Exception {
     }
     @Override
     public boolean authenticated(String username, String password)  throws Exception {

-        if (this.um  == null){
+        if (AuthProvider.um  == null){

             throw new Exception("No usermanager service available.");
         }
             throw new Exception("No usermanager service available.");
         }

-        AuthResultEnum authResult = this.um.authenticate(username,password);
+        AuthResultEnum authResult = AuthProvider.um.authenticate(username,password);

         if (authResult.equals(AuthResultEnum.AUTH_ACCEPT) || authResult.equals(AuthResultEnum.AUTH_ACCEPT_LOC)){
             return true;
         }
         if (authResult.equals(AuthResultEnum.AUTH_ACCEPT) || authResult.equals(AuthResultEnum.AUTH_ACCEPT_LOC)){
             return true;
         }


@@ -69,12 +69,12 @@ public class AuthProvider implements AuthProviderInterface {
 
     @Override
     public void removeUserManagerService() {
 
     @Override
     public void removeUserManagerService() {

-        this.um = null;
+        AuthProvider.um = null;

     }
 
     @Override
     public void addUserManagerService(IUserManager userManagerService) {
     }
 
     @Override
     public void addUserManagerService(IUserManager userManagerService) {

-        this.um = userManagerService;
+        AuthProvider.um = userManagerService;

     }
 
 
     }
 
 

diff --git a/opendaylight/netconf/netconf-ssh/src/test/java/org/opendaylight/controller/netconf/StubUserManager.java b/opendaylight/netconf/netconf-ssh/src/test/java/org/opendaylight/controller/netconf/StubUserManager.java
index 4a3a650ecd9436505e566b2085d4881603f665cf..6628310c970212a0d4f5fa4079ad8356225ed35e 100644 (file)
--- a/opendaylight/netconf/netconf-ssh/src/test/java/org/opendaylight/controller/netconf/StubUserManager.java
+++ b/opendaylight/netconf/netconf-ssh/src/test/java/org/opendaylight/controller/netconf/StubUserManager.java
@@ -30,8 +30,8 @@ public class StubUserManager implements IUserManager{
     private static String password;
 
     public StubUserManager(String user, String password){
     private static String password;
 
     public StubUserManager(String user, String password){

-        this.user = user;
-        this.password = password;
+        StubUserManager.user = user;
+        StubUserManager.password = password;

     }
     @Override
     public List<String> getUserRoles(String userName) {
     }
     @Override
     public List<String> getUserRoles(String userName) {


@@ -40,7 +40,7 @@ public class StubUserManager implements IUserManager{
 
     @Override
     public AuthResultEnum authenticate(String username, String password) {
 
     @Override
     public AuthResultEnum authenticate(String username, String password) {

-        if (this.user.equals(username) && this.password.equals(password)){
+        if (StubUserManager.user.equals(username) && StubUserManager.password.equals(password)){

             return AuthResultEnum.AUTH_ACCEPT_LOC;
         }
         return AuthResultEnum.AUTH_REJECT_LOC;
             return AuthResultEnum.AUTH_ACCEPT_LOC;
         }
         return AuthResultEnum.AUTH_REJECT_LOC;

diff --git a/opendaylight/statisticsmanager/implementation/src/main/java/org/opendaylight/controller/statisticsmanager/internal/StatisticsManager.java b/opendaylight/statisticsmanager/implementation/src/main/java/org/opendaylight/controller/statisticsmanager/internal/StatisticsManager.java
index 5cd47f2f20a48cbf75774055267d0f2f90f6b751..2376b8752f1e5d675277024cb98cdc4c25a77b0c 100644 (file)
--- a/opendaylight/statisticsmanager/implementation/src/main/java/org/opendaylight/controller/statisticsmanager/internal/StatisticsManager.java
+++ b/opendaylight/statisticsmanager/implementation/src/main/java/org/opendaylight/controller/statisticsmanager/internal/StatisticsManager.java
@@ -314,9 +314,9 @@ public class StatisticsManager implements IStatisticsManager, IReadServiceListen
             try {
                 boolean retStatus;
                 if(oldLatch != null) {
             try {
                 boolean retStatus;
                 if(oldLatch != null) {

-                    retStatus = oldLatch.await(this.latchTimeout, TimeUnit.SECONDS);
+                    retStatus = oldLatch.await(StatisticsManager.latchTimeout, TimeUnit.SECONDS);

                 } else {
                 } else {

-                    retStatus = newLatch.await(this.latchTimeout, TimeUnit.SECONDS);
+                    retStatus = newLatch.await(StatisticsManager.latchTimeout, TimeUnit.SECONDS);

                 }
                 // log the return code as it will give us, if
                 // the latch timed out.
                 }
                 // log the return code as it will give us, if
                 // the latch timed out.