RESTEasy Spring Boot starter integration

Allowing ResteasyDeployment to use previously set dispatcher Also adding an extra constructor to SynchronousDispatcher with pre-set ResourceMethodRegistry object This is necessary for RESTEasy Spring Boot starter See https://issues.jboss.org/browse/RESTEASY-1305 See https://github.com/paypal/resteasy-spring-boot
fabiocarvalho777 · Feb 23, 2016 · 18f5a2c · 18f5a2c
1 parent 53e39f1
commit 18f5a2c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/jaxrs/resteasy-jaxrs/src/main/java/org/jboss/resteasy/core/SynchronousDispatcher.java b/jaxrs/resteasy-jaxrs/src/main/java/org/jboss/resteasy/core/SynchronousDispatcher.java
@@ -66,6 +66,12 @@ public SynchronousDispatcher(ResteasyProviderFactory providerFactory)
       defaultContextObjects.put(InternalDispatcher.class, InternalDispatcher.getInstance());
    }
 
+   public SynchronousDispatcher(ResteasyProviderFactory providerFactory, ResourceMethodRegistry registry) {
+      this(providerFactory);
+      this.registry = registry;
+      defaultContextObjects.put(Registry.class, registry);
+   }
+
    public ResteasyProviderFactory getProviderFactory()
    {
       return providerFactory;

diff --git a/jaxrs/resteasy-jaxrs/src/main/java/org/jboss/resteasy/spi/ResteasyDeployment.java b/jaxrs/resteasy-jaxrs/src/main/java/org/jboss/resteasy/spi/ResteasyDeployment.java
@@ -118,9 +118,11 @@ public void start()
       }
       else
       {
-         SynchronousDispatcher dis = new SynchronousDispatcher(providerFactory);
-         dis.getUnwrappedExceptions().addAll(unwrappedExceptions);
-         dispatcher = dis;
+         if(dispatcher == null) {
+            SynchronousDispatcher dis = new SynchronousDispatcher(providerFactory);
+            dis.getUnwrappedExceptions().addAll(unwrappedExceptions);
+            dispatcher = dis;
+         }
       }
       registry = dispatcher.getRegistry();
       if (widerRequestMatching)