Tweak the InstantiatorService interface and use it to instantiate the XA TransactionManager

Author: chrisdennis

ehcache-core/src/main/java/org/ehcache/core/spi/service/InstantiatorService.java

@@ -19,5 +19,5 @@
 
 public interface InstantiatorService extends Service {
 
-  <T> T instantiate(Class<T> clazz, Object[] arguments);
+  <T> T instantiate(Class<T> clazz, Object ... arguments) throws IllegalArgumentException;
 }

ehcache-impl/src/main/java/org/ehcache/impl/internal/classes/DefaultInstantiatorService.java

@@ -33,7 +33,7 @@ public void stop() {
   }
 
   @Override
-  public <T> T instantiate(Class<T> clazz, Object[] arguments) {
+  public <T> T instantiate(Class<T> clazz, Object ... arguments) {
     try {
       return ConstructorUtils.invokeConstructor(clazz, arguments);
     } catch (ReflectiveOperationException e) {

ehcache-transactions/src/jakarta/java/org/ehcache/transactions/xa/txmgr/provider/LookupTransactionManagerProvider.java

@@ -17,7 +17,9 @@
 package org.ehcache.transactions.xa.txmgr.provider;
 
 import jakarta.transaction.TransactionManager;
+import org.ehcache.core.spi.service.InstantiatorService;
 import org.ehcache.spi.service.Service;
+import org.ehcache.spi.service.ServiceDependencies;
 import org.ehcache.spi.service.ServiceProvider;
 import org.ehcache.transactions.xa.txmgr.TransactionManagerWrapper;
 
@@ -37,10 +39,11 @@
  * Note that in this scheme, the lookup instance is not expected to cache the {@code TransactionManagerWrapper}
  * unless it can be considered a singleton.
  */
+@ServiceDependencies(InstantiatorService.class)
 public class LookupTransactionManagerProvider implements TransactionManagerProvider<TransactionManager> {
 
-  private final TransactionManagerLookup<TransactionManager> lookup;
-  private volatile TransactionManagerWrapper<TransactionManager> transactionManagerWrapper;
+  private final LookupTransactionManagerProviderConfiguration config;
+  private TransactionManagerWrapper<TransactionManager> transactionManagerWrapper;
 
   /**
    * Creates a new instance with the provided configuration.
@@ -53,11 +56,7 @@ public LookupTransactionManagerProvider(LookupTransactionManagerProviderConfigur
     if (config == null) {
       throw new NullPointerException("LookupTransactionManagerProviderConfiguration cannot be null");
     }
-    try {
-      lookup = config.getTransactionManagerLookup().newInstance();
-    } catch (InstantiationException | IllegalAccessException e) {
-      throw new IllegalArgumentException("Could not instantiate lookup class", e);
-    }
+    this.config = config;
   }
 
   /**
@@ -73,7 +72,8 @@ public TransactionManagerWrapper<TransactionManager> getTransactionManagerWrappe
    */
   @Override
   public void start(ServiceProvider<Service> serviceProvider) {
-    this.transactionManagerWrapper = lookup.lookupTransactionManagerWrapper();
+    InstantiatorService instantiatorService = serviceProvider.getService(InstantiatorService.class);
+    this.transactionManagerWrapper = instantiatorService.instantiate(config.getTransactionManagerLookup()).lookupTransactionManagerWrapper();
   }
 
   /**

ehcache-transactions/src/main/java/org/ehcache/transactions/xa/txmgr/provider/LookupTransactionManagerProvider.java

@@ -16,7 +16,9 @@
 
 package org.ehcache.transactions.xa.txmgr.provider;
 
+import org.ehcache.core.spi.service.InstantiatorService;
 import org.ehcache.spi.service.Service;
+import org.ehcache.spi.service.ServiceDependencies;
 import org.ehcache.spi.service.ServiceProvider;
 import org.ehcache.transactions.xa.txmgr.TransactionManagerWrapper;
 
@@ -38,10 +40,11 @@
  * Note that in this scheme, the lookup instance is not expected to cache the {@code TransactionManagerWrapper}
  * unless it can be considered a singleton.
  */
+@ServiceDependencies(InstantiatorService.class)
 public class LookupTransactionManagerProvider implements TransactionManagerProvider<TransactionManager> {
 
-  private final TransactionManagerLookup<TransactionManager> lookup;
-  private volatile TransactionManagerWrapper<TransactionManager> transactionManagerWrapper;
+  private final LookupTransactionManagerProviderConfiguration config;
+  private TransactionManagerWrapper<TransactionManager> transactionManagerWrapper;
 
   /**
    * Creates a new instance with the provided configuration.
@@ -54,11 +57,7 @@ public LookupTransactionManagerProvider(LookupTransactionManagerProviderConfigur
     if (config == null) {
       throw new NullPointerException("LookupTransactionManagerProviderConfiguration cannot be null");
     }
-    try {
-      lookup = config.getTransactionManagerLookup().newInstance();
-    } catch (InstantiationException | IllegalAccessException e) {
-      throw new IllegalArgumentException("Could not instantiate lookup class", e);
-    }
+    this.config = config;
   }
 
   /**
@@ -74,7 +73,8 @@ public TransactionManagerWrapper<TransactionManager> getTransactionManagerWrappe
    */
   @Override
   public void start(ServiceProvider<Service> serviceProvider) {
-    this.transactionManagerWrapper = lookup.lookupTransactionManagerWrapper();
+    InstantiatorService instantiatorService = serviceProvider.getService(InstantiatorService.class);
+    this.transactionManagerWrapper = instantiatorService.instantiate(config.getTransactionManagerLookup()).lookupTransactionManagerWrapper();
   }
 
   /**