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 a871392 Context API refactoring.
a871392 is described below
commit a87139228bcedc3e576fe7f52b6c56a8ec974ff3
Author: JamesBognar <[email protected]>
AuthorDate: Sun Aug 29 18:26:52 2021 -0400
Context API refactoring.
---
.../java/org/apache/juneau/rest/RestContext.java | 29 ++--------------------
.../org/apache/juneau/rest/annotation/Rest.java | 3 ++-
.../juneau/rest/annotation/RestAnnotation.java | 2 +-
3 files changed, 5 insertions(+), 29 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 afe71e7..cf37bb5 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
@@ -149,29 +149,6 @@ public class RestContext extends BeanContext {
public static final String REST_beanStore = PREFIX + ".beanStore.o";
/**
- * Configuration property: Debug enablement bean.
- *
- * <h5 class='section'>Property:</h5>
- * <ul class='spaced-list'>
- * <li><b>ID:</b> {@link
org.apache.juneau.rest.RestContext#REST_debugEnablement REST_debugEnablement}
- * <li><b>Name:</b> <js>"RestContext.debug.s"</js>
- * <li><b>Data type:</b> {@link
org.apache.juneau.rest.DebugEnablement}
- * <li><b>Default:</b> {@link
org.apache.juneau.rest.BasicDebugEnablement}
- * <li><b>Session property:</b> <jk>false</jk>
- * <li><b>Annotations:</b>
- * <ul>
- * <li class='ja'>{@link
org.apache.juneau.rest.annotation.Rest#debugEnablement()}
- * </ul>
- * <li><b>Methods:</b>
- * <ul>
- * <li class='jm'>{@link
org.apache.juneau.rest.RestContextBuilder#debugEnablement(Class)}
- * <li class='jm'>{@link
org.apache.juneau.rest.RestContextBuilder#debugEnablement(DebugEnablement)}
- * </ul>
- * </ul>
- */
- public static final String REST_debugEnablement = PREFIX +
".debugEnablement.o";
-
- /**
* Configuration property: Debug mode on specified classes/methods.
*
* <h5 class='section'>Property:</h5>
@@ -3095,13 +3072,11 @@ public class RestContext extends BeanContext {
protected DebugEnablement createDebugEnablement(Object resource,
RestContextBuilder builder, BeanStore beanStore) throws Exception {
DebugEnablement x = null;
- ContextProperties properties = builder.getContextProperties();
-
if (resource instanceof DebugEnablement)
x = (DebugEnablement)resource;
if (x == null)
- x = properties.getIfType(REST_debugEnablement,
DebugEnablement.class).orElse(null);
+ x = builder.debugEnablement;
if (x == null)
x =
beanStore.getBean(DebugEnablement.class).orElse(null);
@@ -3137,7 +3112,7 @@ public class RestContext extends BeanContext {
protected DebugEnablementBuilder createDebugEnablementBuilder(Object
resource, RestContextBuilder builder, BeanStore beanStore) throws Exception {
ContextProperties properties = builder.getContextProperties();
- Class<? extends DebugEnablement> c =
properties.getIfClass(REST_debugEnablement, DebugEnablement.class).orElse(null);
+ Class<? extends DebugEnablement> c =
builder.debugEnablementClass;
DebugEnablementBuilder x = DebugEnablement
.create()
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/Rest.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/Rest.java
index de9d4cc..3fce6a7 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/Rest.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/Rest.java
@@ -337,7 +337,8 @@ public @interface Rest {
* TODO
*
* <ul class='seealso'>
- * <li class='jf'>{@link RestContext#REST_debugEnablement}
+ * <li class='jm'>{@link RestContextBuilder#debugEnablement(Class)}
+ * <li class='jm'>{@link
RestContextBuilder#debugEnablement(DebugEnablement)}
* </ul>
*/
Class<? extends DebugEnablement> debugEnablement() default
DebugEnablement.Null.class;
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestAnnotation.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestAnnotation.java
index d4ec651..a8f3574 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestAnnotation.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestAnnotation.java
@@ -1069,7 +1069,7 @@ public class RestAnnotation {
value(a.restOpContextClass()).ifPresent(x ->
b.restOpContextClass(x));
value(a.restChildrenClass()).ifPresent(x ->
b.restChildrenClass(x));
value(a.restOperationsClass()).ifPresent(x ->
b.restOperationsClass(x));
- b.setIf(a.debugEnablement() !=
DebugEnablement.Null.class, REST_debugEnablement, a.debugEnablement());
+ value(a.debugEnablement()).ifPresent(x ->
b.debugEnablement(x));
value(a.disableBodyParam()).map(Boolean::parseBoolean).ifPresent(x ->
b.disableBodyParam(x));
value(a.allowedHeaderParams()).ifPresent(x ->
b.allowedHeaderParams(x));
value(a.allowedMethodHeaders()).ifPresent(x ->
b.allowedMethodHeaders(x));
