switch srm/impl from binding to quality parent

because the YANG models are in srm/api, the impl doesn't need binding.
The (infrautils) quality parent enforces checkstyle, findbugs and
error-prone.

This change also deals with the impacts of these enforced additional
quality controls in the existing code.

Change-Id: Iab2113138e4f80ebf60985e6ab8aee76c58ad525
Signed-off-by: Michael Vorburger <vorburger@redhat.com>

diff --git a/srm/impl/pom.xml b/srm/impl/pom.xml
index 01d010964638504ad93a489b731abfa29920cb44..ae19ad33ba0f9cf3d4938735299645e75aec98bb 100644 (file)
--- a/srm/impl/pom.xml
+++ b/srm/impl/pom.xml
@@ -12,9 +12,9 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
 
   <parent>
     <groupId>org.opendaylight.serviceutils</groupId>
-    <artifactId>binding-parent</artifactId>
+    <artifactId>quality-parent</artifactId>
     <version>0.2.0-SNAPSHOT</version>
-    <relativePath>../../commons/binding-parent</relativePath>
+    <relativePath>../../commons/quality-parent</relativePath>
   </parent>
 
   <groupId>org.opendaylight.serviceutils</groupId>

diff --git a/srm/impl/src/main/java/org/opendaylight/serviceutils/srm/impl/ServiceRecoveryManager.java b/srm/impl/src/main/java/org/opendaylight/serviceutils/srm/impl/ServiceRecoveryManager.java
index 08cdb7281ab587ff8e99a04b120f48ce8caf36ef..5a09144403ca4b73e7731487a8ecac3dccc53927 100644 (file)
--- a/srm/impl/src/main/java/org/opendaylight/serviceutils/srm/impl/ServiceRecoveryManager.java
+++ b/srm/impl/src/main/java/org/opendaylight/serviceutils/srm/impl/ServiceRecoveryManager.java
@@ -23,7 +23,7 @@ public final class ServiceRecoveryManager {
         this.serviceRecoveryRegistry = serviceRecoveryRegistry;
     }
 
-    private String getServiceRegistryKey(Class<? extends EntityNameBase> entityName) {
+    private static String getServiceRegistryKey(Class<? extends EntityNameBase> entityName) {
         return entityName.toString();
     }
 

diff --git a/srm/impl/src/main/java/org/opendaylight/serviceutils/srm/impl/ServiceRecoveryRegistryImpl.java b/srm/impl/src/main/java/org/opendaylight/serviceutils/srm/impl/ServiceRecoveryRegistryImpl.java
index 6fc654eb9eaae5f38d5eb6327ad371300fd68c0c..e809449400d6424c908d4c398f41e27a5d6af085 100644 (file)
--- a/srm/impl/src/main/java/org/opendaylight/serviceutils/srm/impl/ServiceRecoveryRegistryImpl.java
+++ b/srm/impl/src/main/java/org/opendaylight/serviceutils/srm/impl/ServiceRecoveryRegistryImpl.java
@@ -39,14 +39,14 @@ public class ServiceRecoveryRegistryImpl implements ServiceRecoveryRegistry {
     }
 
     @Override
-    public synchronized void addRecoverableListener(String serviceName, final RecoverableListener recoverableListener) {
+    public synchronized void addRecoverableListener(String serviceName, RecoverableListener recoverableListener) {
         recoverableListenersMap
                 .computeIfAbsent(serviceName, k -> new ConcurrentLinkedQueue<>())
                 .add(recoverableListener);
     }
 
     @Override
-    public void removeRecoverableListener(String serviceName, final RecoverableListener recoverableListener) {
+    public void removeRecoverableListener(String serviceName, RecoverableListener recoverableListener) {
         if (recoverableListenersMap.get(serviceName) != null) {
             recoverableListenersMap.get(serviceName).remove(recoverableListener);
         }
@@ -60,4 +60,4 @@ public class ServiceRecoveryRegistryImpl implements ServiceRecoveryRegistry {
     ServiceRecoveryInterface getRegisteredServiceRecoveryHandler(String entityName) {
         return serviceRecoveryRegistry.get(entityName);
     }
-}
\ No newline at end of file
+}

diff --git a/srm/impl/src/main/java/org/opendaylight/serviceutils/srm/impl/SrmRpcProvider.java b/srm/impl/src/main/java/org/opendaylight/serviceutils/srm/impl/SrmRpcProvider.java
index fa538c7bb24c3a367df9d6513391d10169bd7862..2871f54087d5d24b0aa2419c8e28fbc1eeeb7d13 100644 (file)
--- a/srm/impl/src/main/java/org/opendaylight/serviceutils/srm/impl/SrmRpcProvider.java
+++ b/srm/impl/src/main/java/org/opendaylight/serviceutils/srm/impl/SrmRpcProvider.java
@@ -32,7 +32,7 @@ public class SrmRpcProvider implements SrmRpcsService {
     private final DataBroker dataBroker;
 
     @Inject
-    public SrmRpcProvider(final DataBroker dataBroker) {
+    public SrmRpcProvider(DataBroker dataBroker) {
         this.dataBroker = dataBroker;
     }