Enhance function service implementations to use Exception* functional…

… interfaces from wildfly-common.
wildfly · Apr 24, 2017 · 75728fd · 75728fd
1 parent a76a4ed
commit 75728fd
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 8 deletions.
diff --git a/clustering/service/pom.xml b/clustering/service/pom.xml
@@ -46,6 +46,10 @@
             <groupId>org.jboss.threads</groupId>
             <artifactId>jboss-threads</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.wildfly.common</groupId>
+            <artifactId>wildfly-common</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.jboss.logging</groupId>
             <artifactId>jboss-logging</artifactId>

diff --git a/clustering/service/src/main/java/org/wildfly/clustering/service/FunctionalValueService.java b/clustering/service/src/main/java/org/wildfly/clustering/service/FunctionalValueService.java
@@ -30,6 +30,7 @@
 import org.jboss.msc.service.StartContext;
 import org.jboss.msc.service.StartException;
 import org.jboss.msc.service.StopContext;
+import org.wildfly.common.function.ExceptionFunction;
 
 /**
  * Generic {@link Service} whose value is created and destroyed by contextual functions.
@@ -39,7 +40,7 @@ public class FunctionalValueService<T, V> implements Service<V> {
     private static final Logger LOGGER = Logger.getLogger(FunctionalValueService.class);
 
     private final Function<T, V> mapper;
-    private final Function<StartContext, T> factory;
+    private final ExceptionFunction<StartContext, T, StartException> factory;
     private final BiConsumer<StopContext, T> destroyer;
 
     private volatile T value;
@@ -50,7 +51,7 @@ public class FunctionalValueService<T, V> implements Service<V> {
      * @param factory a function that creates a value
      * @param destroyer a consumer that destroys the value created by the factory function
      */
-    public FunctionalValueService(Function<T, V> mapper, Function<StartContext, T> factory, BiConsumer<StopContext, T> destroyer) {
+    public FunctionalValueService(Function<T, V> mapper, ExceptionFunction<StartContext, T, StartException> factory, BiConsumer<StopContext, T> destroyer) {
         this.mapper = mapper;
         this.factory = factory;
         this.destroyer = destroyer;
@@ -65,7 +66,7 @@ public V getValue() {
     public void start(StartContext context) throws StartException {
         try {
             this.value = this.factory.apply(context);
-        } catch (Throwable e) {
+        } catch (RuntimeException | Error e) {
             throw new StartException(e);
         }
     }
@@ -75,7 +76,7 @@ public void stop(StopContext context) {
         if (this.destroyer != null) {
             try {
                 this.destroyer.accept(context, this.value);
-            } catch (Throwable e) {
+            } catch (RuntimeException | Error e) {
                 LOGGER.warn(e.getLocalizedMessage(), e);
             } finally {
                 this.value = null;

diff --git a/clustering/service/src/main/java/org/wildfly/clustering/service/FunctionalVoidService.java b/clustering/service/src/main/java/org/wildfly/clustering/service/FunctionalVoidService.java
@@ -29,6 +29,7 @@
 import org.jboss.msc.service.StartContext;
 import org.jboss.msc.service.StartException;
 import org.jboss.msc.service.StopContext;
+import org.wildfly.common.function.ExceptionConsumer;
 
 /**
  * Generic {@link Service} that provides no value.
@@ -37,15 +38,15 @@
 public class FunctionalVoidService implements Service<Void> {
     private static final Logger LOGGER = Logger.getLogger(FunctionalVoidService.class);
 
-    private final Consumer<StartContext> starter;
+    private final ExceptionConsumer<StartContext, StartException> starter;
     private final Consumer<StopContext> stopper;
 
     /**
      * Create a new functional service.
      * @param starter
      * @param stopper
      */
-    public FunctionalVoidService(Consumer<StartContext> starter, Consumer<StopContext> stopper) {
+    public FunctionalVoidService(ExceptionConsumer<StartContext, StartException> starter, Consumer<StopContext> stopper) {
         this.starter = starter;
         this.stopper = stopper;
     }
@@ -55,7 +56,7 @@ public void start(StartContext context) throws StartException {
         if (this.starter != null) {
             try {
                 this.starter.accept(context);
-            } catch (Throwable e) {
+            } catch (RuntimeException | Error e) {
                 throw new StartException(e);
             }
         }
@@ -66,7 +67,7 @@ public void stop(StopContext context) {
         if (this.stopper != null) {
             try {
                 this.stopper.accept(context);
-            } catch (Throwable e) {
+            } catch (RuntimeException | Error e) {
                 LOGGER.warn(e.getLocalizedMessage(), e);
             }
         }

diff --git a/.../main/resources/modules/system/layers/base/org/wildfly/clustering/service/main/module.xml b/.../main/resources/modules/system/layers/base/org/wildfly/clustering/service/main/module.xml
@@ -37,6 +37,7 @@
         <module name="org.jboss.modules"/>
         <module name="org.jboss.msc"/>
         <module name="org.jboss.threads"/>
+        <module name="org.wildfly.common"/>
         <module name="org.wildfly.security.elytron-private"/>
     </dependencies>
 </module>