[juneau] branch master updated: REST refactoring.

[jamesbognar]

This is an automated email from the ASF dual-hosted git repository.

jamesbognar pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/juneau.git


The following commit(s) were added to refs/heads/master by this push:
     new 41318a0  REST refactoring.
41318a0 is described below

commit 41318a0c84909037a9ba79f9e44b6da428e4ecf8
Author: JamesBognar <james.bog...@salesforce.com>
AuthorDate: Mon Jan 11 12:39:42 2021 -0500

    REST refactoring.
---
 .../src/main/java/org/apache/juneau/rest/RestContext.java  | 14 +++++++-------
 .../java/org/apache/juneau/rest/RestContextBuilder.java    |  2 +-
 .../src/main/java/org/apache/juneau/rest/RestServlet.java  |  3 +--
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git 
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java
 
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java
index 42aac79..6e3169e 100644
--- 
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java
+++ 
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java
@@ -3241,20 +3241,20 @@ public class RestContext extends BeanContext {
         * @throws ServletException Something bad happened.
         */
        public static RestContextBuilder create(Object resource) throws 
ServletException {
-               return new RestContextBuilder(resource.getClass(), 
Optional.empty(), Optional.empty(), Optional.of(resource)).init(resource);
+               return new RestContextBuilder(Optional.empty(), 
Optional.empty(), resource.getClass(), Optional.of(resource)).init(resource);
        }
 
        /**
         * Constructor.
-        *
+        * 
+        * @param parentContext The parent context, or <jk>null</jk> if there 
is no parent context.
         * @param servletConfig The servlet config passed into the servlet by 
the servlet container.
         * @param resourceClass The class annotated with <ja>@Rest</ja>.
-        * @param parentContext The parent context, or <jk>null</jk> if there 
is no parent context.
         * @return A new builder object.
         * @throws ServletException Something bad happened.
         */
-       static RestContextBuilder create(ServletConfig servletConfig, Class<?> 
resourceClass, RestContext parentContext) throws ServletException {
-               return new RestContextBuilder(resourceClass, 
Optional.ofNullable(servletConfig), Optional.ofNullable(parentContext), 
Optional.empty());
+       static RestContextBuilder create(RestContext parentContext, 
ServletConfig servletConfig, Class<?> resourceClass, Object resource) throws 
ServletException {
+               return new 
RestContextBuilder(Optional.ofNullable(parentContext), 
Optional.ofNullable(servletConfig), resourceClass, 
Optional.ofNullable(resource));
        }
 
        /**
@@ -3626,11 +3626,11 @@ public class RestContext extends BeanContext {
 
                                if (o instanceof Class) {
                                        Class<?> oc = (Class<?>)o;
-                                       childBuilder = 
RestContext.create(builder.inner, oc, this);
+                                       childBuilder = RestContext.create(this, 
builder.inner, oc, null);
                                        r = new BeanFactory(beanFactory, 
resource).addBean(RestContextBuilder.class, childBuilder).createBean(oc);
                                } else {
                                        r = o;
-                                       childBuilder = 
RestContext.create(builder.inner, o.getClass(), this);
+                                       childBuilder = RestContext.create(this, 
builder.inner, o.getClass(), o);
                                }
 
                                childBuilder.init(r);
diff --git 
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContextBuilder.java
 
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContextBuilder.java
index 4fbe9a0..824af05 100644
--- 
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContextBuilder.java
+++ 
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContextBuilder.java
@@ -109,7 +109,7 @@ public class RestContextBuilder extends BeanContextBuilder 
implements ServletCon
        Config config;
        VarResolverBuilder varResolverBuilder;
 
-       RestContextBuilder(Class<?> resourceClass, Optional<ServletConfig> 
servletConfig, Optional<RestContext> parentContext, Optional<Object> resource) 
throws ServletException {
+       RestContextBuilder(Optional<RestContext> parentContext, 
Optional<ServletConfig> servletConfig, Class<?> resourceClass, Optional<Object> 
resource) throws ServletException {
                try {
 
                        this.resourceClass = resourceClass;
diff --git 
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestServlet.java
 
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestServlet.java
index 470d2c3..9b7d352 100644
--- 
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestServlet.java
+++ 
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestServlet.java
@@ -54,8 +54,7 @@ public abstract class RestServlet extends HttpServlet {
                        if (context.get() != null)
                                return;
                        super.init(servletConfig);
-                       RestContextBuilder builder = 
RestContext.create(servletConfig, this.getClass(), null);
-                       builder.init(this);
+                       RestContextBuilder builder = RestContext.create(null, 
servletConfig, this.getClass(), this).init(this);
                        builder.servletContext(this.getServletContext());
                        context.set(builder.build());
                        context.get().postInit();