Fix usage of deprecated MSC & wildfly-clustering-common/service API i…

…n wildfly-clustering-web-spi
wildfly · Jun 8, 2018 · 97e0730 · 97e0730
1 parent aa2b6ae
commit 97e0730
Show file tree

Hide file tree

Showing 25 changed files with 189 additions and 198 deletions.
diff --git a/...nfinispanRouteLocatorBuilderProvider.java → ...teLocatorServiceConfiguratorProvider.java b/...nfinispanRouteLocatorBuilderProvider.java → ...teLocatorServiceConfiguratorProvider.java
@@ -33,37 +33,37 @@
 import org.infinispan.configuration.cache.ClusteringConfigurationBuilder;
 import org.infinispan.configuration.cache.ConfigurationBuilder;
 import org.infinispan.eviction.EvictionStrategy;
-import org.jboss.as.clustering.controller.CapabilityServiceBuilder;
+import org.jboss.as.clustering.controller.CapabilityServiceConfigurator;
 import org.jboss.msc.service.ServiceName;
 import org.kohsuke.MetaInfServices;
 import org.wildfly.clustering.infinispan.spi.InfinispanCacheRequirement;
 import org.wildfly.clustering.infinispan.spi.service.CacheBuilder;
 import org.wildfly.clustering.infinispan.spi.service.TemplateConfigurationBuilder;
-import org.wildfly.clustering.service.ValueDependency;
+import org.wildfly.clustering.service.SupplierDependency;
 import org.wildfly.clustering.spi.CacheBuilderProvider;
 import org.wildfly.clustering.spi.ClusteringCacheRequirement;
 import org.wildfly.clustering.spi.DistributedCacheBuilderProvider;
 import org.wildfly.clustering.spi.ServiceNameRegistry;
 import org.wildfly.clustering.web.session.RouteLocator;
-import org.wildfly.clustering.web.session.RouteLocatorBuilderProvider;
+import org.wildfly.clustering.web.session.RouteLocatorServiceConfiguratorProvider;
 
 /**
  * Provides a builder for a {@link RouteLocator} service.
  * @author Paul Ferraro
  */
-@MetaInfServices(RouteLocatorBuilderProvider.class)
-public class InfinispanRouteLocatorBuilderProvider implements RouteLocatorBuilderProvider, Consumer<ConfigurationBuilder> {
+@MetaInfServices(RouteLocatorServiceConfiguratorProvider.class)
+public class InfinispanRouteLocatorServiceConfiguratorProvider implements RouteLocatorServiceConfiguratorProvider, Consumer<ConfigurationBuilder> {
 
     @Override
-    public CapabilityServiceBuilder<RouteLocator> getRouteLocatorBuilder(String serverName, String deploymentName) {
+    public CapabilityServiceConfigurator getRouteLocatorServiceConfigurator(String serverName, String deploymentName) {
         return new InfinispanRouteLocatorBuilder(serverName, deploymentName);
     }
 
     @Override
-    public Collection<CapabilityServiceBuilder<?>> getRouteLocatorConfigurationBuilders(String serverName, ValueDependency<String> routeDependency) {
+    public Collection<CapabilityServiceConfigurator> getRouteLocatorConfigurationServiceConfigurators(String serverName, SupplierDependency<String> routeDependency) {
         String containerName = InfinispanSessionManagerFactoryBuilder.DEFAULT_CACHE_CONTAINER;
 
-        List<CapabilityServiceBuilder<?>> builders = new LinkedList<>();
+        List<CapabilityServiceConfigurator> builders = new LinkedList<>();
 
         builders.add(new RouteRegistryEntryProviderBuilder(serverName, routeDependency));
         builders.add(new TemplateConfigurationBuilder(ServiceName.parse(InfinispanCacheRequirement.CONFIGURATION.resolve(containerName, serverName)), containerName, serverName, null, this));

diff --git a/...SessionManagerFactoryBuilderProvider.java → ...erFactoryServiceConfiguratorProvider.java b/...SessionManagerFactoryBuilderProvider.java → ...erFactoryServiceConfiguratorProvider.java
@@ -21,23 +21,21 @@
  */
 package org.wildfly.clustering.web.infinispan.session;
 
-import org.jboss.as.clustering.controller.CapabilityServiceBuilder;
+import org.jboss.as.clustering.controller.CapabilityServiceConfigurator;
 import org.kohsuke.MetaInfServices;
-import org.wildfly.clustering.ee.infinispan.TransactionBatch;
 import org.wildfly.clustering.marshalling.spi.Marshallability;
 import org.wildfly.clustering.web.session.SessionManagerFactoryConfiguration;
-import org.wildfly.clustering.web.session.SessionManagerFactory;
-import org.wildfly.clustering.web.session.SessionManagerFactoryBuilderProvider;
+import org.wildfly.clustering.web.session.SessionManagerFactoryServiceConfiguratorProvider;
 
 /**
  * Service building strategy the Infinispan session manager factory.
  * @author Paul Ferraro
  */
-@MetaInfServices(SessionManagerFactoryBuilderProvider.class)
-public class InfinispanSessionManagerFactoryBuilderProvider implements SessionManagerFactoryBuilderProvider<TransactionBatch> {
+@MetaInfServices(SessionManagerFactoryServiceConfiguratorProvider.class)
+public class InfinispanSessionManagerFactoryServiceConfiguratorProvider implements SessionManagerFactoryServiceConfiguratorProvider {
 
     @Override
-    public <C extends Marshallability, L> CapabilityServiceBuilder<SessionManagerFactory<L, TransactionBatch>> getBuilder(SessionManagerFactoryConfiguration<C, L> config) {
+    public <C extends Marshallability, L> CapabilityServiceConfigurator getServiceConfigurator(SessionManagerFactoryConfiguration<C, L> config) {
         return new InfinispanSessionManagerFactoryBuilder<>(config);
     }
 }
diff --git a/...java/org/wildfly/clustering/web/infinispan/session/RouteRegistryEntryProviderBuilder.java b/...java/org/wildfly/clustering/web/infinispan/session/RouteRegistryEntryProviderBuilder.java
@@ -31,8 +31,8 @@
 import org.jboss.msc.service.ServiceController;
 import org.jboss.msc.service.ServiceName;
 import org.jboss.msc.service.ServiceTarget;
-import org.wildfly.clustering.service.MappedValueService;
-import org.wildfly.clustering.service.ValueDependency;
+import org.wildfly.clustering.service.SuppliedValueService;
+import org.wildfly.clustering.service.SupplierDependency;
 import org.wildfly.clustering.spi.ClusteringCacheRequirement;
 
 /**
@@ -42,9 +42,9 @@
 public class RouteRegistryEntryProviderBuilder implements CapabilityServiceBuilder<Map.Entry<String, Void>>, Function<String, Map.Entry<String, Void>> {
 
     private final String serverName;
-    private final ValueDependency<String> route;
+    private final SupplierDependency<String> route;
 
-    public RouteRegistryEntryProviderBuilder(String serverName, ValueDependency<String> route) {
+    public RouteRegistryEntryProviderBuilder(String serverName, SupplierDependency<String> route) {
         this.serverName = serverName;
         this.route = route;
     }
@@ -61,6 +61,6 @@ public ServiceName getServiceName() {
 
     @Override
     public ServiceBuilder<Map.Entry<String, Void>> build(ServiceTarget target) {
-        return this.route.register(target.addService(this.getServiceName(), new MappedValueService<>(this, this.route))).setInitialMode(ServiceController.Mode.ON_DEMAND);
+        return this.route.register(target.addService(this.getServiceName(), new SuppliedValueService<>(this, this.route, route -> {}))).setInitialMode(ServiceController.Mode.ON_DEMAND);
     }
 }
diff --git a/...spanSSOManagerFactoryBuilderProvider.java → ...erFactoryServiceConfiguratorProvider.java b/...spanSSOManagerFactoryBuilderProvider.java → ...erFactoryServiceConfiguratorProvider.java
@@ -21,17 +21,15 @@
  */
 package org.wildfly.clustering.web.infinispan.sso;
 
-import org.jboss.as.clustering.controller.CapabilityServiceBuilder;
+import org.jboss.as.clustering.controller.CapabilityServiceConfigurator;
 import org.kohsuke.MetaInfServices;
-import org.wildfly.clustering.ee.infinispan.TransactionBatch;
-import org.wildfly.clustering.web.sso.SSOManagerFactory;
-import org.wildfly.clustering.web.sso.SSOManagerFactoryBuilderProvider;
+import org.wildfly.clustering.web.sso.SSOManagerFactoryServiceConfiguratorProvider;
 
-@MetaInfServices(SSOManagerFactoryBuilderProvider.class)
-public class InfinispanSSOManagerFactoryBuilderProvider implements SSOManagerFactoryBuilderProvider<TransactionBatch> {
+@MetaInfServices(SSOManagerFactoryServiceConfiguratorProvider.class)
+public class InfinispanSSOManagerFactoryServiceConfiguratorProvider implements SSOManagerFactoryServiceConfiguratorProvider {
 
     @Override
-    public <A, D, S> CapabilityServiceBuilder<SSOManagerFactory<A, D, S, TransactionBatch>> getBuilder(String name) {
+    public CapabilityServiceConfigurator getServiceConfigurator(String name) {
         return new InfinispanSSOManagerFactoryBuilder<>(name);
     }
 }
diff --git a/...infinispan/src/test/java/org/wildfly/clustering/web/infinispan/ServiceLoaderTestCase.java b/...infinispan/src/test/java/org/wildfly/clustering/web/infinispan/ServiceLoaderTestCase.java
@@ -31,9 +31,9 @@
 import org.wildfly.clustering.spi.CacheAliasBuilderProvider;
 import org.wildfly.clustering.spi.DistributedCacheBuilderProvider;
 import org.wildfly.clustering.spi.LocalCacheBuilderProvider;
-import org.wildfly.clustering.web.session.RouteLocatorBuilderProvider;
-import org.wildfly.clustering.web.session.SessionManagerFactoryBuilderProvider;
-import org.wildfly.clustering.web.sso.SSOManagerFactoryBuilderProvider;
+import org.wildfly.clustering.web.session.RouteLocatorServiceConfiguratorProvider;
+import org.wildfly.clustering.web.session.SessionManagerFactoryServiceConfiguratorProvider;
+import org.wildfly.clustering.web.sso.SSOManagerFactoryServiceConfiguratorProvider;
 
 /**
  * Validates loading of services.
@@ -51,9 +51,9 @@ private static <T> void load(Class<T> targetClass) {
     @Test
     public void load() {
         load(Externalizer.class);
-        load(RouteLocatorBuilderProvider.class);
-        load(SessionManagerFactoryBuilderProvider.class);
-        load(SSOManagerFactoryBuilderProvider.class);
+        load(RouteLocatorServiceConfiguratorProvider.class);
+        load(SessionManagerFactoryServiceConfiguratorProvider.class);
+        load(SSOManagerFactoryServiceConfiguratorProvider.class);
         load(DistributedCacheBuilderProvider.class);
         load(LocalCacheBuilderProvider.class);
         load(CacheAliasBuilderProvider.class);

diff --git a/.../session/RouteLocatorBuilderProvider.java → ...teLocatorServiceConfiguratorProvider.java b/.../session/RouteLocatorBuilderProvider.java → ...teLocatorServiceConfiguratorProvider.java
@@ -23,25 +23,25 @@
 
 import java.util.Collection;
 
-import org.jboss.as.clustering.controller.CapabilityServiceBuilder;
-import org.wildfly.clustering.service.ValueDependency;
+import org.jboss.as.clustering.controller.CapabilityServiceConfigurator;
+import org.wildfly.clustering.service.SupplierDependency;
 
 /**
  * Builds a {@link RouteLocator} service.
  * @author Paul Ferraro
  */
-public interface RouteLocatorBuilderProvider {
+public interface RouteLocatorServiceConfiguratorProvider {
     /**
      * Builds a {@link RouteLocator} service.
      * @param deploymentName the name of the web deployment
      * @return a service builder
      */
-    CapabilityServiceBuilder<RouteLocator> getRouteLocatorBuilder(String serverName, String deploymentName);
+    CapabilityServiceConfigurator getRouteLocatorServiceConfigurator(String serverName, String deploymentName);
 
     /**
      * Builds the server dependencies to be made available to every deployment.
      * @param route the injected route source
      * @return a service builder
      */
-    Collection<CapabilityServiceBuilder<?>> getRouteLocatorConfigurationBuilders(String serverName, ValueDependency<String> routeDependencyProvider);
+    Collection<CapabilityServiceConfigurator> getRouteLocatorConfigurationServiceConfigurators(String serverName, SupplierDependency<String> routeDependencyProvider);
 }
diff --git a/...SessionManagerFactoryBuilderProvider.java → ...erFactoryServiceConfiguratorProvider.java b/...SessionManagerFactoryBuilderProvider.java → ...erFactoryServiceConfiguratorProvider.java
@@ -21,14 +21,13 @@
  */
 package org.wildfly.clustering.web.session;
 
-import org.jboss.as.clustering.controller.CapabilityServiceBuilder;
-import org.wildfly.clustering.ee.Batch;
+import org.jboss.as.clustering.controller.CapabilityServiceConfigurator;
 import org.wildfly.clustering.marshalling.spi.Marshallability;
 
 /**
  * Interface for building a session manager factory.
  * @author Paul Ferraro
  */
-public interface SessionManagerFactoryBuilderProvider<B extends Batch> {
-    <C extends Marshallability, L> CapabilityServiceBuilder<SessionManagerFactory<L, B>> getBuilder(SessionManagerFactoryConfiguration<C, L> configuration);
+public interface SessionManagerFactoryServiceConfiguratorProvider {
+    <C extends Marshallability, L> CapabilityServiceConfigurator getServiceConfigurator(SessionManagerFactoryConfiguration<C, L> configuration);
 }
diff --git a/...sso/SSOManagerFactoryBuilderProvider.java → ...erFactoryServiceConfiguratorProvider.java b/...sso/SSOManagerFactoryBuilderProvider.java → ...erFactoryServiceConfiguratorProvider.java
@@ -21,9 +21,8 @@
  */
 package org.wildfly.clustering.web.sso;
 
-import org.jboss.as.clustering.controller.CapabilityServiceBuilder;
-import org.wildfly.clustering.ee.Batch;
+import org.jboss.as.clustering.controller.CapabilityServiceConfigurator;
 
-public interface SSOManagerFactoryBuilderProvider<B extends Batch> {
-    <A, D, S> CapabilityServiceBuilder<SSOManagerFactory<A, D, S, B>> getBuilder(String name);
+public interface SSOManagerFactoryServiceConfiguratorProvider {
+    CapabilityServiceConfigurator getServiceConfigurator(String name);
 }
diff --git a/...g/wildfly/clustering/web/undertow/session/DistributableSessionIdentifierCodecBuilder.java b/...g/wildfly/clustering/web/undertow/session/DistributableSessionIdentifierCodecBuilder.java
@@ -24,6 +24,7 @@
 import java.util.function.Function;
 
 import org.jboss.as.clustering.controller.CapabilityServiceBuilder;
+import org.jboss.as.clustering.controller.CapabilityServiceConfigurator;
 import org.jboss.as.controller.capability.CapabilityServiceSupport;
 import org.jboss.as.web.session.RoutingSupport;
 import org.jboss.as.web.session.SessionIdentifierCodec;
@@ -37,7 +38,7 @@
 import org.wildfly.clustering.service.Builder;
 import org.wildfly.clustering.service.MappedValueService;
 import org.wildfly.clustering.web.session.RouteLocator;
-import org.wildfly.clustering.web.session.RouteLocatorBuilderProvider;
+import org.wildfly.clustering.web.session.RouteLocatorServiceConfiguratorProvider;
 
 /**
  * Builds a distributable {@link SessionIdentifierCodec} service.
@@ -46,12 +47,12 @@
 public class DistributableSessionIdentifierCodecBuilder implements CapabilityServiceBuilder<SessionIdentifierCodec>, Function<RouteLocator, SessionIdentifierCodec> {
 
     private final ServiceName name;
-    private final CapabilityServiceBuilder<RouteLocator> locatorBuilder;
+    private final CapabilityServiceConfigurator configurator;
     private final RoutingSupport routing = new SimpleRoutingSupport();
 
-    public DistributableSessionIdentifierCodecBuilder(ServiceName name, String serverName, String deploymentName, RouteLocatorBuilderProvider provider) {
+    public DistributableSessionIdentifierCodecBuilder(ServiceName name, String serverName, String deploymentName, RouteLocatorServiceConfiguratorProvider provider) {
         this.name = name;
-        this.locatorBuilder = provider.getRouteLocatorBuilder(serverName, deploymentName);
+        this.configurator = provider.getRouteLocatorServiceConfigurator(serverName, deploymentName);
     }
 
     @Override
@@ -66,17 +67,17 @@ public ServiceName getServiceName() {
 
     @Override
     public Builder<SessionIdentifierCodec> configure(CapabilityServiceSupport support) {
-        this.locatorBuilder.configure(support);
+        this.configurator.configure(support);
         return this;
     }
 
     @Override
     public ServiceBuilder<SessionIdentifierCodec> build(ServiceTarget target) {
-        this.locatorBuilder.build(target).setInitialMode(ServiceController.Mode.ON_DEMAND).install();
+        this.configurator.build(target).setInitialMode(ServiceController.Mode.ON_DEMAND).install();
         InjectedValue<RouteLocator> locatorValue = new InjectedValue<>();
         Service<SessionIdentifierCodec> service = new MappedValueService<>(this, locatorValue);
         return target.addService(this.name, service)
-                .addDependency(this.locatorBuilder.getServiceName(), RouteLocator.class, locatorValue)
+                .addDependency(this.configurator.getServiceName(), RouteLocator.class, locatorValue)
                 .setInitialMode(ServiceController.Mode.ON_DEMAND)
                 ;
     }

diff --git a/...essionIdentifierCodecBuilderProvider.java → ...fierCodecServiceConfiguratorProvider.java b/...essionIdentifierCodecBuilderProvider.java → ...fierCodecServiceConfiguratorProvider.java
@@ -26,43 +26,42 @@
 import java.util.LinkedList;
 import java.util.ServiceLoader;
 
-import org.jboss.as.clustering.controller.CapabilityServiceBuilder;
-import org.jboss.as.web.session.SessionIdentifierCodec;
+import org.jboss.as.clustering.controller.CapabilityServiceConfigurator;
 import org.jboss.msc.service.ServiceName;
 import org.kohsuke.MetaInfServices;
-import org.wildfly.clustering.service.InjectedValueDependency;
-import org.wildfly.clustering.service.ValueDependency;
-import org.wildfly.clustering.web.session.RouteLocatorBuilderProvider;
+import org.wildfly.clustering.service.ServiceSupplierDependency;
+import org.wildfly.clustering.service.SupplierDependency;
+import org.wildfly.clustering.web.session.RouteLocatorServiceConfiguratorProvider;
 import org.wildfly.extension.undertow.session.SimpleSessionIdentifierCodecBuilder;
 
 /**
  * @author Paul Ferraro
  */
-@MetaInfServices(org.wildfly.extension.undertow.session.DistributableSessionIdentifierCodecBuilderProvider.class)
-public class DistributableSessionIdentifierCodecBuilderProvider implements org.wildfly.extension.undertow.session.DistributableSessionIdentifierCodecBuilderProvider {
+@MetaInfServices(org.wildfly.extension.undertow.session.DistributableSessionIdentifierCodecServiceConfiguratorProvider.class)
+public class DistributableSessionIdentifierCodecServiceConfiguratorProvider implements org.wildfly.extension.undertow.session.DistributableSessionIdentifierCodecServiceConfiguratorProvider {
 
-    private static final RouteLocatorBuilderProvider PROVIDER = loadProvider();
+    private static final RouteLocatorServiceConfiguratorProvider PROVIDER = loadProvider();
 
-    private static RouteLocatorBuilderProvider loadProvider() {
-        for (RouteLocatorBuilderProvider provider : ServiceLoader.load(RouteLocatorBuilderProvider.class, RouteLocatorBuilderProvider.class.getClassLoader())) {
+    private static RouteLocatorServiceConfiguratorProvider loadProvider() {
+        for (RouteLocatorServiceConfiguratorProvider provider : ServiceLoader.load(RouteLocatorServiceConfiguratorProvider.class, RouteLocatorServiceConfiguratorProvider.class.getClassLoader())) {
             return provider;
         }
         return null;
     }
 
     @Override
-    public CapabilityServiceBuilder<SessionIdentifierCodec> getDeploymentBuilder(ServiceName name, String serverName, String deploymentName) {
+    public CapabilityServiceConfigurator getDeploymentServiceConfigurator(ServiceName name, String serverName, String deploymentName) {
         return (PROVIDER != null) ? new DistributableSessionIdentifierCodecBuilder(name, serverName, deploymentName, PROVIDER) : new SimpleSessionIdentifierCodecBuilder(name, serverName);
     }
 
     @Override
-    public Collection<CapabilityServiceBuilder<?>> getServerBuilders(String serverName) {
-        Collection<CapabilityServiceBuilder<?>> builders = new LinkedList<>();
-        CapabilityServiceBuilder<String> routeBuilder = new RouteBuilder(serverName);
+    public Collection<CapabilityServiceConfigurator> getServerServiceConfigurators(String serverName) {
+        Collection<CapabilityServiceConfigurator> builders = new LinkedList<>();
+        CapabilityServiceConfigurator routeBuilder = new RouteBuilder(serverName);
         builders.add(routeBuilder);
-        ValueDependency<String> routeDependency = new InjectedValueDependency<>(routeBuilder, String.class);
+        SupplierDependency<String> routeDependency = new ServiceSupplierDependency<>(routeBuilder.getServiceName());
         if (PROVIDER != null) {
-            builders.addAll(PROVIDER.getRouteLocatorConfigurationBuilders(serverName, routeDependency));
+            builders.addAll(PROVIDER.getRouteLocatorConfigurationServiceConfigurators(serverName, routeDependency));
         }
         return builders;
     }