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 d276596 Context API refactoring.
d276596 is described below
commit d276596cb8cadbfe7b5944421d27604d4f7704cf
Author: JamesBognar <[email protected]>
AuthorDate: Fri Sep 10 19:53:08 2021 -0400
Context API refactoring.
---
.../java/org/apache/juneau/rest/RestContext.java | 22 +-
.../org/apache/juneau/rest/RestContextBuilder.java | 332 +--------------------
.../java/org/apache/juneau/rest/RestRequest.java | 5 +-
.../java/org/apache/juneau/rest/RestResponse.java | 3 +-
4 files changed, 26 insertions(+), 336 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 9074218..316d9a5 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
@@ -76,7 +76,7 @@ import org.apache.juneau.utils.*;
* </ul>
*/
@ConfigurableContext(nocache=true)
-public class RestContext extends BeanContext {
+public class RestContext extends Context {
/**
* Represents a null value for the {@link Rest#contextClass()}
annotation.
@@ -217,7 +217,7 @@ public class RestContext extends BeanContext {
* @throws Exception If any initialization problems were encountered.
*/
public RestContext(RestContextBuilder builder) throws Exception {
- super(builder.getContextProperties());
+ super(builder);
startTime = Instant.now();
@@ -3583,6 +3583,24 @@ public class RestContext extends BeanContext {
);
}
+ @Override
+ public ContextBuilder copy() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public Session createSession(SessionArgs args) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public SessionArgs createDefaultSessionArgs() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
//-----------------------------------------------------------------------------------------------------------------
// Helpers.
//-----------------------------------------------------------------------------------------------------------------
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 98eeabb..8cb6bba 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
@@ -96,7 +96,7 @@ import org.apache.juneau.utils.*;
* </ul>
*/
@FluentSetters(ignore={"set"})
-public class RestContextBuilder extends BeanContextBuilder implements
ServletConfig {
+public class RestContextBuilder extends ContextBuilder implements
ServletConfig {
final ServletConfig inner;
final Class<?> resourceClass;
@@ -3069,18 +3069,6 @@ public class RestContextBuilder extends
BeanContextBuilder implements ServletCon
}
@Override /* GENERATED - ContextBuilder */
- public RestContextBuilder locale(Locale value) {
- super.locale(value);
- return this;
- }
-
- @Override /* GENERATED - ContextBuilder */
- public RestContextBuilder mediaType(MediaType value) {
- super.mediaType(value);
- return this;
- }
-
- @Override /* GENERATED - ContextBuilder */
public RestContextBuilder prependTo(String name, Object value) {
super.prependTo(name, value);
return this;
@@ -3105,12 +3093,6 @@ public class RestContextBuilder extends
BeanContextBuilder implements ServletCon
}
@Override /* GENERATED - ContextBuilder */
- public RestContextBuilder timeZone(TimeZone value) {
- super.timeZone(value);
- return this;
- }
-
- @Override /* GENERATED - ContextBuilder */
public RestContextBuilder unset(String name) {
super.unset(name);
return this;
@@ -3122,318 +3104,6 @@ public class RestContextBuilder extends
BeanContextBuilder implements ServletCon
return this;
}
- @Override /* GENERATED - BeanContextBuilder */
- public RestContextBuilder beanClassVisibility(Visibility value) {
- super.beanClassVisibility(value);
- return this;
- }
-
- @Override /* GENERATED - BeanContextBuilder */
- public RestContextBuilder beanConstructorVisibility(Visibility value) {
- super.beanConstructorVisibility(value);
- return this;
- }
-
- @Override /* GENERATED - BeanContextBuilder */
- public RestContextBuilder beanFieldVisibility(Visibility value) {
- super.beanFieldVisibility(value);
- return this;
- }
-
- @Override /* GENERATED - BeanContextBuilder */
- public RestContextBuilder beanInterceptor(Class<?> on, Class<? extends
org.apache.juneau.transform.BeanInterceptor<?>> value) {
- super.beanInterceptor(on, value);
- return this;
- }
-
- @Override /* GENERATED - BeanContextBuilder */
- public RestContextBuilder beanMapPutReturnsOldValue() {
- super.beanMapPutReturnsOldValue();
- return this;
- }
-
- @Override /* GENERATED - BeanContextBuilder */
- public RestContextBuilder beanMethodVisibility(Visibility value) {
- super.beanMethodVisibility(value);
- return this;
- }
-
- @Override /* GENERATED - BeanContextBuilder */
- public RestContextBuilder beanProperties(Map<String,Object> values) {
- super.beanProperties(values);
- return this;
- }
-
- @Override /* GENERATED - BeanContextBuilder */
- public RestContextBuilder beanProperties(Class<?> beanClass, String
properties) {
- super.beanProperties(beanClass, properties);
- return this;
- }
-
- @Override /* GENERATED - BeanContextBuilder */
- public RestContextBuilder beanProperties(String beanClassName, String
properties) {
- super.beanProperties(beanClassName, properties);
- return this;
- }
-
- @Override /* GENERATED - BeanContextBuilder */
- public RestContextBuilder beanPropertiesExcludes(Map<String,Object>
values) {
- super.beanPropertiesExcludes(values);
- return this;
- }
-
- @Override /* GENERATED - BeanContextBuilder */
- public RestContextBuilder beanPropertiesExcludes(Class<?> beanClass,
String properties) {
- super.beanPropertiesExcludes(beanClass, properties);
- return this;
- }
-
- @Override /* GENERATED - BeanContextBuilder */
- public RestContextBuilder beanPropertiesExcludes(String beanClassName,
String properties) {
- super.beanPropertiesExcludes(beanClassName, properties);
- return this;
- }
-
- @Override /* GENERATED - BeanContextBuilder */
- public RestContextBuilder beanPropertiesReadOnly(Map<String,Object>
values) {
- super.beanPropertiesReadOnly(values);
- return this;
- }
-
- @Override /* GENERATED - BeanContextBuilder */
- public RestContextBuilder beanPropertiesReadOnly(Class<?> beanClass,
String properties) {
- super.beanPropertiesReadOnly(beanClass, properties);
- return this;
- }
-
- @Override /* GENERATED - BeanContextBuilder */
- public RestContextBuilder beanPropertiesReadOnly(String beanClassName,
String properties) {
- super.beanPropertiesReadOnly(beanClassName, properties);
- return this;
- }
-
- @Override /* GENERATED - BeanContextBuilder */
- public RestContextBuilder beanPropertiesWriteOnly(Map<String,Object>
values) {
- super.beanPropertiesWriteOnly(values);
- return this;
- }
-
- @Override /* GENERATED - BeanContextBuilder */
- public RestContextBuilder beanPropertiesWriteOnly(Class<?> beanClass,
String properties) {
- super.beanPropertiesWriteOnly(beanClass, properties);
- return this;
- }
-
- @Override /* GENERATED - BeanContextBuilder */
- public RestContextBuilder beanPropertiesWriteOnly(String beanClassName,
String properties) {
- super.beanPropertiesWriteOnly(beanClassName, properties);
- return this;
- }
-
- @Override /* GENERATED - BeanContextBuilder */
- public RestContextBuilder beansRequireDefaultConstructor() {
- super.beansRequireDefaultConstructor();
- return this;
- }
-
- @Override /* GENERATED - BeanContextBuilder */
- public RestContextBuilder beansRequireSerializable() {
- super.beansRequireSerializable();
- return this;
- }
-
- @Override /* GENERATED - BeanContextBuilder */
- public RestContextBuilder beansRequireSettersForGetters() {
- super.beansRequireSettersForGetters();
- return this;
- }
-
- @Override /* GENERATED - BeanContextBuilder */
- public RestContextBuilder dictionary(Object...values) {
- super.dictionary(values);
- return this;
- }
-
- @Override /* GENERATED - BeanContextBuilder */
- public RestContextBuilder dictionaryOn(Class<?> on,
java.lang.Class<?>...values) {
- super.dictionaryOn(on, values);
- return this;
- }
-
- @Override /* GENERATED - BeanContextBuilder */
- public RestContextBuilder disableBeansRequireSomeProperties() {
- super.disableBeansRequireSomeProperties();
- return this;
- }
-
- @Override /* GENERATED - BeanContextBuilder */
- public RestContextBuilder disableIgnoreMissingSetters() {
- super.disableIgnoreMissingSetters();
- return this;
- }
-
- @Override /* GENERATED - BeanContextBuilder */
- public RestContextBuilder disableIgnoreTransientFields() {
- super.disableIgnoreTransientFields();
- return this;
- }
-
- @Override /* GENERATED - BeanContextBuilder */
- public RestContextBuilder disableIgnoreUnknownNullBeanProperties() {
- super.disableIgnoreUnknownNullBeanProperties();
- return this;
- }
-
- @Override /* GENERATED - BeanContextBuilder */
- public RestContextBuilder disableInterfaceProxies() {
- super.disableInterfaceProxies();
- return this;
- }
-
- @Override /* GENERATED - BeanContextBuilder */
- public <T> RestContextBuilder example(Class<T> pojoClass, T o) {
- super.example(pojoClass, o);
- return this;
- }
-
- @Override /* GENERATED - BeanContextBuilder */
- public <T> RestContextBuilder example(Class<T> pojoClass, String json) {
- super.example(pojoClass, json);
- return this;
- }
-
- @Override /* GENERATED - BeanContextBuilder */
- public RestContextBuilder findFluentSetters() {
- super.findFluentSetters();
- return this;
- }
-
- @Override /* GENERATED - BeanContextBuilder */
- public RestContextBuilder findFluentSetters(Class<?> on) {
- super.findFluentSetters(on);
- return this;
- }
-
- @Override /* GENERATED - BeanContextBuilder */
- public RestContextBuilder ignoreInvocationExceptionsOnGetters() {
- super.ignoreInvocationExceptionsOnGetters();
- return this;
- }
-
- @Override /* GENERATED - BeanContextBuilder */
- public RestContextBuilder ignoreInvocationExceptionsOnSetters() {
- super.ignoreInvocationExceptionsOnSetters();
- return this;
- }
-
- @Override /* GENERATED - BeanContextBuilder */
- public RestContextBuilder ignoreUnknownBeanProperties() {
- super.ignoreUnknownBeanProperties();
- return this;
- }
-
- @Override /* GENERATED - BeanContextBuilder */
- public RestContextBuilder implClass(Class<?> interfaceClass, Class<?>
implClass) {
- super.implClass(interfaceClass, implClass);
- return this;
- }
-
- @Override /* GENERATED - BeanContextBuilder */
- public RestContextBuilder implClasses(Map<Class<?>,Class<?>> values) {
- super.implClasses(values);
- return this;
- }
-
- @Override /* GENERATED - BeanContextBuilder */
- public RestContextBuilder interfaceClass(Class<?> on, Class<?> value) {
- super.interfaceClass(on, value);
- return this;
- }
-
- @Override /* GENERATED - BeanContextBuilder */
- public RestContextBuilder interfaces(java.lang.Class<?>...value) {
- super.interfaces(value);
- return this;
- }
-
- @Override /* GENERATED - BeanContextBuilder */
- public RestContextBuilder notBeanClasses(Object...values) {
- super.notBeanClasses(values);
- return this;
- }
-
- @Override /* GENERATED - BeanContextBuilder */
- public RestContextBuilder notBeanPackages(Object...values) {
- super.notBeanPackages(values);
- return this;
- }
-
- @Override /* GENERATED - BeanContextBuilder */
- public RestContextBuilder propertyNamer(Class<? extends
org.apache.juneau.PropertyNamer> value) {
- super.propertyNamer(value);
- return this;
- }
-
- @Override /* GENERATED - BeanContextBuilder */
- public RestContextBuilder propertyNamer(Class<?> on, Class<? extends
org.apache.juneau.PropertyNamer> value) {
- super.propertyNamer(on, value);
- return this;
- }
-
- @Override /* GENERATED - BeanContextBuilder */
- public RestContextBuilder sortProperties() {
- super.sortProperties();
- return this;
- }
-
- @Override /* GENERATED - BeanContextBuilder */
- public RestContextBuilder sortProperties(java.lang.Class<?>...on) {
- super.sortProperties(on);
- return this;
- }
-
- @Override /* GENERATED - BeanContextBuilder */
- public RestContextBuilder stopClass(Class<?> on, Class<?> value) {
- super.stopClass(on, value);
- return this;
- }
-
- @Override /* GENERATED - BeanContextBuilder */
- public RestContextBuilder swaps(Object...values) {
- super.swaps(values);
- return this;
- }
-
- @Override /* GENERATED - BeanContextBuilder */
- public RestContextBuilder typeName(Class<?> on, String value) {
- super.typeName(on, value);
- return this;
- }
-
- @Override /* GENERATED - BeanContextBuilder */
- public RestContextBuilder typePropertyName(String value) {
- super.typePropertyName(value);
- return this;
- }
-
- @Override /* GENERATED - BeanContextBuilder */
- public RestContextBuilder typePropertyName(Class<?> on, String value) {
- super.typePropertyName(on, value);
- return this;
- }
-
- @Override /* GENERATED - BeanContextBuilder */
- public RestContextBuilder useEnumNames() {
- super.useEnumNames();
- return this;
- }
-
- @Override /* GENERATED - BeanContextBuilder */
- public RestContextBuilder useJavaBeanIntrospector() {
- super.useJavaBeanIntrospector();
- return this;
- }
-
// </FluentSetters>
//----------------------------------------------------------------------------------------------------
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestRequest.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestRequest.java
index 4768354..ed3238a 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestRequest.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestRequest.java
@@ -1913,7 +1913,8 @@ public final class RestRequest {
public <T> T getRequest(final RequestBeanMeta rbm) {
try {
Class<T> c =
(Class<T>)rbm.getClassMeta().getInnerClass();
- final BeanMeta<T> bm = getBeanSession().getBeanMeta(c);
+ final BeanSession bs = getBeanSession();
+ final BeanMeta<T> bm = bs.getBeanMeta(c);
return (T)Proxy.newProxyInstance(
c.getClassLoader(),
new Class[] { c },
@@ -1925,7 +1926,7 @@ public final class RestRequest {
HttpPartParserSession
pp = pm.getParser(getPartParserSession());
HttpPartSchema schema =
pm.getSchema();
String name =
pm.getPartName();
- ClassMeta<?> type =
getContext().getClassMeta(method.getGenericReturnType());
+ ClassMeta<?> type =
bs.getClassMeta(method.getGenericReturnType());
HttpPartType pt =
pm.getPartType();
if (pt ==
HttpPartType.BODY)
return
getBody().schema(schema).asType(type);
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestResponse.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestResponse.java
index c391e88..ac4c0f6 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestResponse.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestResponse.java
@@ -25,6 +25,7 @@ import javax.servlet.*;
import javax.servlet.http.*;
import org.apache.http.*;
+import org.apache.juneau.*;
import org.apache.juneau.collections.*;
import org.apache.juneau.encoders.*;
import org.apache.juneau.httppart.*;
@@ -93,7 +94,7 @@ public final class RestResponse {
String passThroughHeaders =
request.getHeader("x-response-headers").orElse(null);
if (passThroughHeaders != null) {
HttpPartParser p = context.getPartParser();
- OMap m =
p.createPartSession(request.getParserSessionArgs()).parse(HEADER, null,
passThroughHeaders, context.getClassMeta(OMap.class));
+ OMap m =
p.createPartSession(request.getParserSessionArgs()).parse(HEADER, null,
passThroughHeaders, BeanContext.DEFAULT.getClassMeta(OMap.class));
for (Map.Entry<String,Object> e : m.entrySet())
addHeader(e.getKey(),
resolveUris(e.getValue()));
}
