[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 894209e  REST refactoring.
894209e is described below

commit 894209e52999d882846bac2413a1b6337b80c485
Author: JamesBognar <james.bog...@salesforce.com>
AuthorDate: Mon Jan 11 12:17:09 2021 -0500

    REST refactoring.
---
 .../src/main/java/org/apache/juneau/rest/mock/MockRestClient.java     | 4 +++-
 .../src/main/java/org/apache/juneau/rest/RestServlet.java             | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git 
a/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock/MockRestClient.java
 
b/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock/MockRestClient.java
index 43f650b..6543dfe 100644
--- 
a/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock/MockRestClient.java
+++ 
b/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock/MockRestClient.java
@@ -283,8 +283,10 @@ public class MockRestClient extends RestClient implements 
HttpClientConnection {
                                RestContext rc = rcb.build();
                                if (o instanceof RestServlet) {
                                        RestServlet rs = (RestServlet)o;
-                                       if (! rs.isInitialized())
+                                       if (! rs.isInitialized()) {
                                                rs.setContext(rc);
+                                               rc.postInit();
+                                       }
                                        rc = rs.getContext();
                                } else {
                                        rc.postInit();
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 0e0d281..0b8df53 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
@@ -57,7 +57,8 @@ public abstract class RestServlet extends HttpServlet {
                        builder.init(this);
                        super.init(servletConfig);
                        builder.servletContext(this.getServletContext());
-                       setContext(builder.build());
+                       context.set(builder.build());
+                       context.get().postInit();
                        context.get().postInitChildFirst();
                } catch (ServletException e) {
                        initException.set(e);
@@ -95,7 +96,6 @@ public abstract class RestServlet extends HttpServlet {
         */
        public synchronized void setContext(RestContext context) throws 
ServletException {
                this.context.set(context);
-               context.postInit();
        }
 
        /**