Fix (and suppress) some static code analysis warnings in blueprint

[controller.git] / opendaylight / blueprint / src / main / java / org / opendaylight / controller / blueprint / ext / SpecificReferenceListMetadata.java

diff --git a/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/SpecificReferenceListMetadata.java b/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/SpecificReferenceListMetadata.java
index 02086410f66b80f19bb36a35ecddc227d2d639f8..9a0bd29a09d6ba552e0778a82381a72cbbfcd46b 100644 (file)
--- a/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/SpecificReferenceListMetadata.java
+++ b/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/SpecificReferenceListMetadata.java
@@ -103,7 +103,7 @@ class SpecificReferenceListMetadata extends AbstractDependentComponentFactoryMet
             }
         };
 
-        setDependendencyDesc(interfaceName + " services with types " + expectedServiceTypes);
+        setDependencyDesc(interfaceName + " services with types " + expectedServiceTypes);
 
         serviceTracker = new ServiceTracker<>(container().getBundleContext(), interfaceName, serviceListener);
         serviceTracker.open();
@@ -141,7 +141,7 @@ class SpecificReferenceListMetadata extends AbstractDependentComponentFactoryMet
 
     private Object serviceAdded(ServiceReference<Object> reference) {
         Object service = container().getBundleContext().getService(reference);
-        Object serviceType = reference.getProperty(OpendaylightNamespaceHandler.TYPE_ATTR);
+        String serviceType = (String) reference.getProperty(OpendaylightNamespaceHandler.TYPE_ATTR);
 
         LOG.debug("{}: Service type {} added from bundle {}", logName(), serviceType,
                 reference.getBundle().getSymbolicName());
@@ -166,7 +166,7 @@ class SpecificReferenceListMetadata extends AbstractDependentComponentFactoryMet
         if (isSatisfied()) {
             restartContainer();
         } else {
-            retrievedServiceTypes.add(serviceType.toString());
+            retrievedServiceTypes.add(serviceType);
             retrievedServices.add(service);
 
             if (retrievedServiceTypes.equals(expectedServiceTypes)) {
@@ -175,7 +175,7 @@ class SpecificReferenceListMetadata extends AbstractDependentComponentFactoryMet
             } else {
                 Set<String> remaining = new HashSet<>(expectedServiceTypes);
                 remaining.removeAll(retrievedServiceTypes);
-                setDependendencyDesc(interfaceName + " services with types " + remaining);
+                setDependencyDesc(interfaceName + " services with types " + remaining);
             }
         }