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 4acaf26 REST refactoring.
4acaf26 is described below
commit 4acaf26c5cd59e7936d3b928bd10c5b41ec33aef
Author: JamesBognar <[email protected]>
AuthorDate: Mon Jan 11 16:41:43 2021 -0500
REST refactoring.
---
.../src/main/java/org/apache/juneau/rest/RestContext.java | 5 +----
.../java/org/apache/juneau/rest/RestContextBuilder.java | 15 +++++----------
.../src/main/java/org/apache/juneau/rest/RestServlet.java | 4 +---
3 files changed, 7 insertions(+), 17 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 6e3169e..aa8971c 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
@@ -3246,7 +3246,7 @@ public class RestContext extends BeanContext {
/**
* 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>.
@@ -3273,8 +3273,6 @@ public class RestContext extends BeanContext {
HttpException _initException = null;
try {
- ServletContext servletContext = builder.servletContext;
-
this.builder = builder;
resource = builder.resource;
parentContext = builder.parentContext;
@@ -3636,7 +3634,6 @@ public class RestContext extends BeanContext {
childBuilder.init(r);
if (r instanceof RestServlet)
((RestServlet)r).innerInit(childBuilder);
- childBuilder.servletContext(servletContext);
RestContext rc2 = childBuilder.build();
if (r instanceof RestServlet)
((RestServlet)r).setContext(rc2);
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 824af05..567b087 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
@@ -140,6 +140,7 @@ public class RestContextBuilder extends BeanContextBuilder
implements ServletCon
beanFactory = createBeanFactory(parentContext,
resource);
beanFactory.addBean(RestContextBuilder.class, this);
beanFactory.addBean(ServletConfig.class,
servletConfig.orElse(this));
+ beanFactory.addBean(ServletContext.class,
servletConfig.orElse(this).getServletContext());
varResolverBuilder = new VarResolverBuilder()
.defaultVars()
@@ -279,12 +280,6 @@ public class RestContextBuilder extends BeanContextBuilder
implements ServletCon
return this;
}
- RestContextBuilder servletContext(ServletContext servletContext) {
- this.servletContext = servletContext;
- beanFactory.addBean(ServletContext.class, servletContext);
- return this;
- }
-
/**
* Adds the specified {@link Var} classes to this config.
*
@@ -2559,21 +2554,21 @@ public class RestContextBuilder extends
BeanContextBuilder implements ServletCon
@Override /* ServletConfig */
public String getInitParameter(String name) {
- return inner.getInitParameter(name);
+ return inner == null ? null : inner.getInitParameter(name);
}
@Override /* ServletConfig */
public Enumeration<String> getInitParameterNames() {
- return inner.getInitParameterNames();
+ return inner == null ? new Vector<String>().elements() :
inner.getInitParameterNames();
}
@Override /* ServletConfig */
public ServletContext getServletContext() {
- return inner.getServletContext();
+ return inner == null ? null : inner.getServletContext();
}
@Override /* ServletConfig */
public String getServletName() {
- return inner.getServletName();
+ return inner == null ? null : inner.getServletName();
}
}
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 9b7d352..ff4d28f 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,9 +54,7 @@ public abstract class RestServlet extends HttpServlet {
if (context.get() != null)
return;
super.init(servletConfig);
- RestContextBuilder builder = RestContext.create(null,
servletConfig, this.getClass(), this).init(this);
- builder.servletContext(this.getServletContext());
- context.set(builder.build());
+ context.set(RestContext.create(null, servletConfig,
this.getClass(), this).init(this).build());
context.get().postInit();
context.get().postInitChildFirst();
} catch (ServletException e) {
