Directly inject CredentialAuth dependency

[netconf.git] / netconf / aaa-authn-odl-plugin / src / main / java / org / opendaylight / aaa / odl / CredentialServiceAuthProvider.java

diff --git a/netconf/aaa-authn-odl-plugin/src/main/java/org/opendaylight/aaa/odl/CredentialServiceAuthProvider.java b/netconf/aaa-authn-odl-plugin/src/main/java/org/opendaylight/aaa/odl/CredentialServiceAuthProvider.java
index 3d86ee1751adfd5037c8c369a42124e4a3f0f442..30a2149456d252d61dc181a95aeda667b6243eb9 100644 (file)
--- a/netconf/aaa-authn-odl-plugin/src/main/java/org/opendaylight/aaa/odl/CredentialServiceAuthProvider.java
+++ b/netconf/aaa-authn-odl-plugin/src/main/java/org/opendaylight/aaa/odl/CredentialServiceAuthProvider.java
@@ -12,10 +12,6 @@ import org.opendaylight.aaa.api.Claim;
 import org.opendaylight.aaa.api.CredentialAuth;
 import org.opendaylight.aaa.api.PasswordCredentials;
 import org.opendaylight.netconf.auth.AuthProvider;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceReference;
-import org.osgi.util.tracker.ServiceTracker;
-import org.osgi.util.tracker.ServiceTrackerCustomizer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -23,59 +19,27 @@ import org.slf4j.LoggerFactory;
 /**
  * AuthProvider implementation delegating to AAA CredentialAuth<PasswordCredentials> instance.
  */
-public final class CredentialServiceAuthProvider implements AuthProvider, AutoCloseable {
+public final class CredentialServiceAuthProvider implements AuthProvider {
     private static final Logger LOG = LoggerFactory.getLogger(CredentialServiceAuthProvider.class);
 
     // FIXME CredentialAuth is generic and it causes warnings during compilation
     // Maybe there should be a PasswordCredentialAuth implements CredentialAuth<PasswordCredentials>
-    private volatile CredentialAuth<PasswordCredentials> nullableCredService;
-    private final ServiceTracker<CredentialAuth, CredentialAuth> listenerTracker;
+    private final CredentialAuth<PasswordCredentials> credService;
 
-    public CredentialServiceAuthProvider(final BundleContext bundleContext) {
-
-        final ServiceTrackerCustomizer<CredentialAuth, CredentialAuth> customizer =
-                new ServiceTrackerCustomizer<CredentialAuth, CredentialAuth>() {
-            @Override
-            public CredentialAuth addingService(final ServiceReference<CredentialAuth> reference) {
-                LOG.trace("Credential service {} added", reference);
-                nullableCredService = bundleContext.getService(reference);
-                return nullableCredService;
-            }
-
-            @Override
-            public void modifiedService(final ServiceReference<CredentialAuth> reference,
-                                        final CredentialAuth service) {
-                LOG.trace("Replacing modified Credential service {}", reference);
-                nullableCredService = service;
-            }
-
-            @Override
-            public void removedService(final ServiceReference<CredentialAuth> reference, final CredentialAuth service) {
-                LOG.trace("Removing Credential service {}. "
-                        + "This AuthProvider will fail to authenticate every time", reference);
-                synchronized (CredentialServiceAuthProvider.this) {
-                    nullableCredService = null;
-                }
-            }
-        };
-        listenerTracker = new ServiceTracker<>(bundleContext, CredentialAuth.class, customizer);
-        listenerTracker.open();
+    public CredentialServiceAuthProvider(final CredentialAuth<PasswordCredentials> credService) {
+        this.credService = credService;
     }
 
     /**
      * Authenticate user. This implementation tracks CredentialAuth&lt;PasswordCredentials&gt;
-     * and delegates the decision to it. If the service is not available, IllegalStateException is thrown.
+     * and delegates the decision to it.
      */
     @Override
-    public synchronized boolean authenticated(final String username, final String password) {
-        if (nullableCredService == null) {
-            LOG.warn("Cannot authenticate user '{}', Credential service is missing", username);
-            throw new IllegalStateException("Credential service is not available");
-        }
+    public boolean authenticated(final String username, final String password) {
 
         Claim claim;
         try {
-            claim = nullableCredService.authenticate(new PasswordCredentialsWrapper(username, password));
+            claim = credService.authenticate(new PasswordCredentialsWrapper(username, password));
         } catch (AuthenticationException e) {
             LOG.debug("Authentication failed for user '{}' : {}", username, e);
             return false;
@@ -85,15 +49,6 @@ public final class CredentialServiceAuthProvider implements AuthProvider, AutoCl
         return true;
     }
 
-    /**
-     * Invoked by blueprint.
-     */
-    @Override
-    public void close() {
-        listenerTracker.close();
-        nullableCredService = null;
-    }
-
     private static final class PasswordCredentialsWrapper implements PasswordCredentials {
         private final String username;
         private final String password;