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 80ba9b8 Context API refactoring.
80ba9b8 is described below
commit 80ba9b80ac52329b5a15e54cf5f5ee4799198d9e
Author: JamesBognar <[email protected]>
AuthorDate: Sun Aug 29 18:18:41 2021 -0400
Context API refactoring.
---
.../java/org/apache/juneau/rest/RestContext.java | 44 +---------------------
.../org/apache/juneau/rest/RestContextBuilder.java | 10 +++--
.../org/apache/juneau/rest/annotation/Rest.java | 2 +-
.../juneau/rest/annotation/RestAnnotation.java | 2 +-
.../apache/juneau/rest/annotation/RestDelete.java | 3 +-
.../org/apache/juneau/rest/annotation/RestGet.java | 3 +-
.../org/apache/juneau/rest/annotation/RestOp.java | 3 +-
.../apache/juneau/rest/annotation/RestPost.java | 3 +-
.../org/apache/juneau/rest/annotation/RestPut.java | 3 +-
.../juneau/rest/logging/BasicRestLogger.java | 4 +-
.../org/apache/juneau/rest/logging/RestLogger.java | 2 +-
11 files changed, 23 insertions(+), 56 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 e7201fd..afe71e7 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,42 +149,6 @@ public class RestContext extends BeanContext {
public static final String REST_beanStore = PREFIX + ".beanStore.o";
/**
- * Configuration property: Debug mode.
- *
- * <h5 class='section'>Property:</h5>
- * <ul class='spaced-list'>
- * <li><b>ID:</b> {@link
org.apache.juneau.rest.RestContext#REST_debug REST_debug}
- * <li><b>Name:</b> <js>"RestContext.debug.s"</js>
- * <li><b>Data type:</b> {@link org.apache.juneau.Enablement}
- * <li><b>System property:</b> <c>RestContext.debug</c>
- * <li><b>Environment variable:</b> <c>RESTCONTEXT_DEBUG</c>
- * <li><b>Default:</b>
- * <li><b>Session property:</b> <jk>false</jk>
- * <li><b>Annotations:</b>
- * <ul>
- * <li class='ja'>{@link
org.apache.juneau.rest.annotation.Rest#debug()}
- * </ul>
- * <li><b>Methods:</b>
- * <ul>
- * <li class='jm'>{@link
org.apache.juneau.rest.RestContextBuilder#debug()}
- * </ul>
- * </ul>
- *
- * <h5 class='section'>Description:</h5>
- * <p>
- * Enables the following:
- * <ul class='spaced-list'>
- * <li>
- * HTTP request/response bodies are cached in memory for
logging purposes.
- * <li>
- * Request/response messages are automatically logged
always or per request.
- * <li>
- * The default can be overwritten by {@link
RestContextBuilder#debugDefault(Enablement)}.
- * </ul>
- */
- public static final String REST_debug = PREFIX + ".debug.s";
-
- /**
* Configuration property: Debug enablement bean.
*
* <h5 class='section'>Property:</h5>
@@ -204,12 +168,6 @@ public class RestContext extends BeanContext {
* <li class='jm'>{@link
org.apache.juneau.rest.RestContextBuilder#debugEnablement(DebugEnablement)}
* </ul>
* </ul>
- *
- * <h5 class='section'>Description:</h5>
- * <p>
- * The default value for the {@link #REST_debug} setting.
- * <p>
- * This setting is inherited from parent contexts.
*/
public static final String REST_debugEnablement = PREFIX +
".debugEnablement.o";
@@ -3194,7 +3152,7 @@ public class RestContext extends BeanContext {
.withDefault(x)
.run();
- Enablement defaultDebug = properties.getInstance(REST_debug,
Enablement.class).orElse(null);
+ Enablement defaultDebug = builder.debug;
if (defaultDebug == null)
defaultDebug = builder.debugDefault;
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 f283aea..cc45041 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
@@ -138,7 +138,7 @@ public class RestContextBuilder extends BeanContextBuilder
implements ServletCon
RestLogger callLogger;
Class<? extends RestLogger> callLoggerClass;
- Enablement debugDefault;
+ Enablement debugDefault, debug;
@SuppressWarnings("unchecked")
ResponseProcessorList.Builder responseProcessors =
ResponseProcessorList.create().append(
@@ -1038,7 +1038,7 @@ public class RestContextBuilder extends
BeanContextBuilder implements ServletCon
}
/**
- * <i><l>RestContext</l> configuration property: </i> Debug mode.
+ * Debug mode.
*
* <p>
* Enables the following:
@@ -1049,12 +1049,16 @@ public class RestContextBuilder extends
BeanContextBuilder implements ServletCon
* Request/response messages are automatically logged
always or per request.
* </ul>
*
+ * <p>
+ * The default can be overwritten by {@link
RestContextBuilder#debugDefault(Enablement)}.
+ *
* @param value The new value for this setting.
* @return This object (for method chaining).
*/
@FluentSetter
public RestContextBuilder debug(Enablement value) {
- return set(REST_debug, value);
+ debug = value;
+ return this;
}
/**
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 c28bf28..de9d4cc 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
@@ -326,7 +326,7 @@ public @interface Rest {
* </ul>
*
* <ul class='seealso'>
- * <li class='jf'>{@link RestContext#REST_debug}
+ * <li class='jm'>{@link RestContextBuilder#debug(Enablement)}
* </ul>
*/
String debug() default "";
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 a7650fb..d4ec651 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
@@ -1075,7 +1075,7 @@ public class RestAnnotation {
value(a.allowedMethodHeaders()).ifPresent(x ->
b.allowedMethodHeaders(x));
value(a.allowedMethodParams()).ifPresent(x ->
b.allowedMethodParams(x));
b.setIfNotEmpty(REST_renderResponseStackTraces,
bool(a.renderResponseStackTraces()));
- b.setIfNotEmpty(REST_debug, string(a.debug()));
+
value(a.debug()).map(Enablement::fromString).ifPresent(x -> b.debug(x));
b.setIfNotEmpty(REST_debugOn, string(a.debugOn()));
}
}
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestDelete.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestDelete.java
index a2781e2..7abb5f1 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestDelete.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestDelete.java
@@ -18,6 +18,7 @@ import static java.lang.annotation.RetentionPolicy.*;
import java.lang.annotation.*;
import java.nio.charset.*;
+import org.apache.juneau.*;
import org.apache.juneau.annotation.*;
import org.apache.juneau.rest.*;
import org.apache.juneau.dto.swagger.*;
@@ -137,7 +138,7 @@ public @interface RestDelete {
* </ul>
*
* <ul class='seealso'>
- * <li class='jf'>{@link RestContext#REST_debug}
+ * <li class='jm'>{@link RestContextBuilder#debug(Enablement)}
* </ul>
*/
String debug() default "";
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestGet.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestGet.java
index 2c79a1d..ffa3f2a 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestGet.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestGet.java
@@ -18,6 +18,7 @@ import static java.lang.annotation.RetentionPolicy.*;
import java.lang.annotation.*;
import java.nio.charset.*;
+import org.apache.juneau.*;
import org.apache.juneau.annotation.*;
import org.apache.juneau.rest.*;
import org.apache.juneau.dto.swagger.*;
@@ -152,7 +153,7 @@ public @interface RestGet {
* </ul>
*
* <ul class='seealso'>
- * <li class='jf'>{@link RestContext#REST_debug}
+ * <li class='jm'>{@link RestContextBuilder#debug(Enablement)}
* </ul>
*/
String debug() default "";
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestOp.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestOp.java
index e9c92f2..9d04e3d 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestOp.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestOp.java
@@ -18,6 +18,7 @@ import static java.lang.annotation.RetentionPolicy.*;
import java.lang.annotation.*;
import java.nio.charset.*;
+import org.apache.juneau.*;
import org.apache.juneau.annotation.*;
import org.apache.juneau.rest.*;
import org.apache.juneau.http.header.*;
@@ -168,7 +169,7 @@ public @interface RestOp {
* </ul>
*
* <ul class='seealso'>
- * <li class='jf'>{@link RestContext#REST_debug}
+ * <li class='jm'>{@link RestContextBuilder#debug(Enablement)}
* </ul>
*/
String debug() default "";
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPost.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPost.java
index a787b90..8a2d8ea 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPost.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPost.java
@@ -18,6 +18,7 @@ import static java.lang.annotation.RetentionPolicy.*;
import java.lang.annotation.*;
import java.nio.charset.*;
+import org.apache.juneau.*;
import org.apache.juneau.annotation.*;
import org.apache.juneau.rest.*;
import org.apache.juneau.dto.swagger.*;
@@ -170,7 +171,7 @@ public @interface RestPost {
* </ul>
*
* <ul class='seealso'>
- * <li class='jf'>{@link RestContext#REST_debug}
+ * <li class='jm'>{@link RestContextBuilder#debug(Enablement)}
* </ul>
*/
String debug() default "";
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPut.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPut.java
index 156a447..ee284df 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPut.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPut.java
@@ -18,6 +18,7 @@ import static java.lang.annotation.RetentionPolicy.*;
import java.lang.annotation.*;
import java.nio.charset.*;
+import org.apache.juneau.*;
import org.apache.juneau.annotation.*;
import org.apache.juneau.rest.*;
import org.apache.juneau.dto.swagger.*;
@@ -170,7 +171,7 @@ public @interface RestPut {
* </ul>
*
* <ul class='seealso'>
- * <li class='jf'>{@link RestContext#REST_debug}
+ * <li class='jm'>{@link RestContextBuilder#debug(Enablement)}
* </ul>
*/
String debug() default "";
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/logging/BasicRestLogger.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/logging/BasicRestLogger.java
index d4ed768..997b73d 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/logging/BasicRestLogger.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/logging/BasicRestLogger.java
@@ -86,7 +86,7 @@ import org.apache.juneau.rest.util.*;
* <li class='jm'>{@link RestContextBuilder#callLogger(RestLogger)}
* <li class='jm'>{@link RestContextBuilder#callLoggerDefault(Class)}
* <li class='jm'>{@link RestContextBuilder#callLoggerDefault(RestLogger)}
- * <li class='jf'>{@link RestContext#REST_debug}
+ * <li class='jm'>{@link RestContextBuilder#debug(Enablement)}
* <li class='jf'>{@link RestContext#REST_debugOn}
* <li class='ja'>{@link Rest#debug}
* <li class='ja'>{@link RestOp#debug}
@@ -273,7 +273,7 @@ public class BasicRestLogger implements RestLogger {
*
* @param req The HTTP request being logged.
* @return <jk>true</jk> if debug is enabled on this request.
- * @see RestContext#REST_debug
+ * @see RestContextBuilder#debug(Enablement)
* @see RestContext#REST_debugOn
* @see Rest#debug()
* @see RestOp#debug()
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/logging/RestLogger.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/logging/RestLogger.java
index f3fb5d8..b280fcd 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/logging/RestLogger.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/logging/RestLogger.java
@@ -41,7 +41,7 @@ import org.apache.juneau.rest.annotation.*;
* <li class='jm'>{@link RestContextBuilder#callLogger(RestLogger)}
* <li class='jm'>{@link RestContextBuilder#callLoggerDefault(Class)}
* <li class='jm'>{@link RestContextBuilder#callLoggerDefault(RestLogger)}
- * <li class='jf'>{@link RestContext#REST_debug}
+ * <li class='jm'>{@link RestContextBuilder#debug(Enablement)}
* <li class='jf'>{@link RestContext#REST_debugOn}
* <li class='ja'>{@link Rest#debug}
* <li class='ja'>{@link RestOp#debug}
