From: Robert Varga <robert.varga@pantheon.tech>
Date: Mon, 23 Aug 2021 13:09:44 +0000 (+0200)
Subject: Fix raw type warnings
X-Git-Tag: v0.14.2~3
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=207c6ab4197bac79997a3985aa59b026bfee7901;p=aaa.git

Fix raw type warnings

Component{Factory,Instance} are generic with OSGi R7, fix a few raw type
warnings.

Change-Id: I6a923e164a99d0e1959d217401116e0bf381b930
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---

diff --git a/aaa-password-service/impl/src/main/java/org/opendaylight/aaa/impl/password/service/OSGiPasswordServiceConfigBootstrap.java b/aaa-password-service/impl/src/main/java/org/opendaylight/aaa/impl/password/service/OSGiPasswordServiceConfigBootstrap.java
index 8cb741bb1..e98caab2e 100644
--- a/aaa-password-service/impl/src/main/java/org/opendaylight/aaa/impl/password/service/OSGiPasswordServiceConfigBootstrap.java
+++ b/aaa-password-service/impl/src/main/java/org/opendaylight/aaa/impl/password/service/OSGiPasswordServiceConfigBootstrap.java
@@ -39,10 +39,10 @@ public final class OSGiPasswordServiceConfigBootstrap
     DataBroker dataBroker = null;
 
     @Reference(target = "(component.factory=" + OSGiPasswordServiceConfig.FACTORY_NAME + ")")
-    ComponentFactory configFactory = null;
+    ComponentFactory<OSGiPasswordServiceConfig> configFactory = null;
 
     private ListenerRegistration<?> registration;
-    private ComponentInstance instance;
+    private ComponentInstance<?> instance;
 
     @Activate
     synchronized void activate() {
@@ -77,7 +77,7 @@ public final class OSGiPasswordServiceConfigBootstrap
     @Holding("this")
     private void updateInstance(final PasswordServiceConfig config) {
         if (registration != null) {
-            final ComponentInstance newInstance = configFactory.newInstance(
+            final ComponentInstance<?> newInstance = configFactory.newInstance(
                 OSGiPasswordServiceConfig.props(config != null ? config : new PasswordServiceConfigBuilder().build()));
             if (instance != null) {
                 instance.dispose();