// Copyright 2019 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
package com.yahoo.vespa.config.server.rpc.security;

import com.google.inject.Inject;
import com.google.inject.Provider;
import com.yahoo.cloud.config.ConfigserverConfig;
import com.yahoo.config.provision.security.NodeIdentifier;
import com.yahoo.security.tls.TransportSecurityUtils;
import com.yahoo.vespa.config.server.host.HostRegistries;
import com.yahoo.vespa.config.server.rpc.RequestHandlerProvider;

/**
 * A provider for {@link RpcAuthorizer}. The instance provided is dependent on the configuration of the configserver.
 *
 * @author bjorncs
 */
public class DefaultRpcAuthorizerProvider implements Provider<RpcAuthorizer> {

    private final RpcAuthorizer rpcAuthorizer;

    @Inject
    public DefaultRpcAuthorizerProvider(ConfigserverConfig config,
                                        NodeIdentifier nodeIdentifier,
                                        HostRegistries hostRegistries,
                                        RequestHandlerProvider handlerProvider) {
        this.rpcAuthorizer =
                TransportSecurityUtils.isTransportSecurityEnabled() && config.multitenant()
                        ? new MultiTenantRpcAuthorizer(nodeIdentifier, hostRegistries, handlerProvider)
                        : new NoopRpcAuthorizer();
    }

    @Override
    public RpcAuthorizer get() {
        return rpcAuthorizer;
    }
}

@@ -196,43 +196,8 @@
 ct;%0A
-import com.google.inject.Provider;%0A
 impo
@@ -301,16 +301,71 @@
 tifier;%0A
+import com.yahoo.container.di.componentgraph.Provider;%0A
 import c
@@ -1478,11 +1478,59 @@
 r;%0A    %7D
+%0A%0A    @Override%0A    public void deconstruct() %7B%7D
 %0A%7D%0A

Use correct Provider interface for global components