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 c2d63808f Improvements to REST config interfaces.
c2d63808f is described below
commit c2d63808f6a055788341ff1ff6ebaf7a5996efbf
Author: JamesBognar <[email protected]>
AuthorDate: Mon Jul 4 08:35:54 2022 -0400
Improvements to REST config interfaces.
---
juneau-doc/src/main/javadoc/overview.html | 20 +++----
.../rest/test/client/ThirdPartyProxyResource.java | 4 +-
.../apache/juneau/rest/mock/MockRestClient.java | 4 +-
.../java/org/apache/juneau/rest/RestContext.java | 10 ++--
.../java/org/apache/juneau/rest/RestOpContext.java | 2 +-
.../java/org/apache/juneau/rest/RestOpSession.java | 2 +-
.../java/org/apache/juneau/rest/RestRequest.java | 2 +-
.../java/org/apache/juneau/rest/RestResponse.java | 2 +-
.../java/org/apache/juneau/rest/RestSession.java | 2 +-
.../org/apache/juneau/rest/annotation/Rest.java | 2 +-
.../juneau/rest/annotation/RestAnnotation.java | 2 +-
.../apache/juneau/rest/arg/RestContextArgs.java | 2 +-
.../apache/juneau/rest/config/DefaultConfig.java | 4 +-
.../BasicDisabledCallLogger.java} | 6 +--
.../BasicTestCallLogger.java} | 14 ++---
.../BasicTestCaptureCallLogger.java} | 22 ++++----
.../CallLogger.java} | 31 +++++------
.../CallLoggerRule.java} | 38 ++++++-------
.../CallLoggingDetail.java} | 10 ++--
.../rest/{logging => logger}/RestLogger.java | 62 +++++++++++-----------
.../rest/{logging => logger}/package-info.java | 2 +-
.../juneau/http/remote/RrpcInterfaceTest.java | 4 +-
.../rest/annotation/RestAnnotation_Test.java | 4 +-
.../juneau/rest/annotation/Rest_Debug_Test.java | 4 +-
.../rest/client/RestClient_Headers_Test.java | 4 +-
25 files changed, 130 insertions(+), 129 deletions(-)
diff --git a/juneau-doc/src/main/javadoc/overview.html
b/juneau-doc/src/main/javadoc/overview.html
index 1cc6c4771..4c4b17b36 100644
--- a/juneau-doc/src/main/javadoc/overview.html
+++ b/juneau-doc/src/main/javadoc/overview.html
@@ -17136,7 +17136,7 @@
<li class='jc'>{@link
org.apache.juneau.rest.RestChildren}
<li class='jc'>{@link
org.apache.juneau.rest.RestContext}
<li class='jc'>{@link
org.apache.juneau.rest.stats.RestContextStats}
- <li class='jic'>{@link
org.apache.juneau.rest.logging.RestLogger}
+ <li class='jic'>{@link
org.apache.juneau.rest.logger.RestLogger}
<li class='jc'>{@link
org.apache.juneau.rest.RestOpContext}
<li class='jc'>{@link
org.apache.juneau.rest.RestOperations}
<li class='jc'>{@link
org.apache.juneau.serializer.SerializerSet}
@@ -21297,7 +21297,7 @@
<li>
HTTP request/response bodies are cached in memory for
logging purposes.
<li>
- HTTP requests/responses are logged to the registered
{@link org.apache.juneau.rest.logging.RestLogger}.
+ HTTP requests/responses are logged to the registered
{@link org.apache.juneau.rest.logger.RestLogger}.
</ul>
<p>
The possible annotation values are:
@@ -21358,11 +21358,11 @@
HTTP calls can be logged with the following levels of
granularity:
</p>
<ul class='javatree'>
- <li class='je'>{@link
org.apache.juneau.rest.logging.RestLoggingDetail}
+ <li class='je'>{@link
org.apache.juneau.rest.logger.CallLoggingDetail}
<ul class='javatreec'>
- <li class='jf'>{@link
org.apache.juneau.rest.logging.RestLoggingDetail#STATUS_LINE STATUS_LINE}
- <li class='jf'>{@link
org.apache.juneau.rest.logging.RestLoggingDetail#HEADER HEADER}
- <li class='jf'>{@link
org.apache.juneau.rest.logging.RestLoggingDetail#ENTITY ENTITY}
+ <li class='jf'>{@link
org.apache.juneau.rest.logger.CallLoggingDetail#STATUS_LINE STATUS_LINE}
+ <li class='jf'>{@link
org.apache.juneau.rest.logger.CallLoggingDetail#HEADER HEADER}
+ <li class='jf'>{@link
org.apache.juneau.rest.logger.CallLoggingDetail#ENTITY ENTITY}
</ul>
</li>
</ul>
@@ -21414,8 +21414,8 @@
=== END
===================================================================
</p>
<p>
- The interface responsible for generating the log entries is
{@link org.apache.juneau.rest.logging.RestLogger}
- and the default is {@link
org.apache.juneau.rest.logging.BasicRestLogger} which produces the output
above. It
+ The interface responsible for generating the log entries is
{@link org.apache.juneau.rest.logger.RestLogger}
+ and the default is {@link
org.apache.juneau.rest.logger.CallLogger} which produces the output above. It
can be changed through any of the following:
</p>
<ul class='javatree'>
@@ -21482,10 +21482,10 @@
</li>
</ul>
<ul class='notes'>
- <li class='note'>The {@link
org.apache.juneau.rest.logging.BasicTestRestLogger} class is useful for testing
and
+ <li class='note'>The {@link
org.apache.juneau.rest.logger.BasicTestCallLogger} class is useful for testing
and
allows you to suppress logging when testing error
conditions by passing in a <c>noTrace=true</c> query parameter
or <c>No-Trace: true</c> header on requests.
- <li class='note'>{@link
org.apache.juneau.rest.debug.DebugEnablement}, {@link
org.apache.juneau.rest.logging.RestLogger}, and
+ <li class='note'>{@link
org.apache.juneau.rest.debug.DebugEnablement}, {@link
org.apache.juneau.rest.logger.RestLogger}, and
{@link org.apache.juneau.rest.stats.ThrownStore} can
all be defined globally as Spring beans in a Spring Boot environment.
</ul>
</div>
diff --git
a/juneau-microservice/juneau-microservice-ftest/src/test/java/org/apache/juneau/rest/test/client/ThirdPartyProxyResource.java
b/juneau-microservice/juneau-microservice-ftest/src/test/java/org/apache/juneau/rest/test/client/ThirdPartyProxyResource.java
index ff3c74690..9c1b66ffb 100644
---
a/juneau-microservice/juneau-microservice-ftest/src/test/java/org/apache/juneau/rest/test/client/ThirdPartyProxyResource.java
+++
b/juneau-microservice/juneau-microservice-ftest/src/test/java/org/apache/juneau/rest/test/client/ThirdPartyProxyResource.java
@@ -27,7 +27,7 @@ import org.apache.juneau.http.annotation.*;
import org.apache.juneau.rest.*;
import org.apache.juneau.rest.annotation.*;
import org.apache.juneau.rest.config.*;
-import org.apache.juneau.rest.logging.*;
+import org.apache.juneau.rest.logger.*;
import org.apache.juneau.rest.servlet.*;
import org.apache.juneau.serializer.annotation.*;
import org.apache.juneau.testutils.pojos.*;
@@ -37,7 +37,7 @@ import org.apache.juneau.testutils.pojos.*;
*/
@Rest(
path="/testThirdPartyProxy",
- callLogger=BasicDisabledRestLogger.class
+ callLogger=BasicDisabledCallLogger.class
)
@SerializerConfig(addRootType="true",addBeanTypes="true")
@SuppressWarnings({"serial"})
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 2ba6e09fb..bf9c24c61 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
@@ -59,8 +59,8 @@ import org.apache.juneau.rest.annotation.*;
import org.apache.juneau.rest.client.*;
import org.apache.juneau.rest.client.RestRequest;
import org.apache.juneau.rest.client.RestResponse;
+import org.apache.juneau.rest.logger.*;
import org.apache.juneau.http.header.ContentType;
-import org.apache.juneau.rest.logging.*;
import org.apache.juneau.serializer.*;
import org.apache.juneau.uon.*;
import org.apache.juneau.utils.*;
@@ -1870,7 +1870,7 @@ public class MockRestClient extends RestClient implements
HttpClientConnection {
Object o = isClass ?
((Class<?>)restBean).newInstance() : restBean;
RestContext rc = RestContext
.create(o.getClass(), null, null)
-
.defaultClasses(BasicTestRestLogger.class)
+
.defaultClasses(BasicTestCallLogger.class)
.debugDefault(CONDITIONAL)
.init(()->o)
.build()
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 f91bf2328..f96314c79 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
@@ -21,12 +21,12 @@ import static org.apache.juneau.internal.CollectionUtils.*;
import static org.apache.juneau.internal.IOUtils.*;
import static org.apache.juneau.internal.StringUtils.*;
import static org.apache.juneau.rest.HttpRuntimeException.*;
-import static org.apache.juneau.rest.logging.RestLoggingDetail.*;
import static org.apache.juneau.rest.processor.ResponseProcessor.*;
import static java.util.Collections.*;
import static java.util.logging.Level.*;
import static java.util.Optional.*;
import static org.apache.juneau.rest.annotation.RestOpAnnotation.*;
+import static org.apache.juneau.rest.logger.CallLoggingDetail.*;
import java.io.*;
import java.lang.annotation.*;
@@ -65,7 +65,7 @@ import org.apache.juneau.rest.annotation.*;
import org.apache.juneau.rest.arg.*;
import org.apache.juneau.rest.debug.*;
import org.apache.juneau.rest.httppart.*;
-import org.apache.juneau.rest.logging.*;
+import org.apache.juneau.rest.logger.*;
import org.apache.juneau.rest.processor.*;
import org.apache.juneau.rest.rrpc.*;
import org.apache.juneau.rest.servlet.*;
@@ -1911,13 +1911,13 @@ public class RestContext extends Context {
RestLogger
.create(beanStore)
.normalRules( // Rules when debugging
is not enabled.
-
RestLoggerRule.create(beanStore) // Log 500+ errors with status-line and
header information.
+
CallLoggerRule.create(beanStore) // Log 500+ errors with status-line and
header information.
.statusFilter(a -> a >=
500)
.level(SEVERE)
.requestDetail(HEADER)
.responseDetail(HEADER)
.build(),
-
RestLoggerRule.create(beanStore) // Log 400-500 errors with just status-line
information.
+
CallLoggerRule.create(beanStore) // Log 400-500 errors with just status-line
information.
.statusFilter(a -> a >=
400)
.level(WARNING)
.requestDetail(STATUS_LINE)
@@ -1925,7 +1925,7 @@ public class RestContext extends Context {
.build()
)
.debugRules( // Rules when debugging
is enabled.
-
RestLoggerRule.create(beanStore) // Log everything with full details.
+
CallLoggerRule.create(beanStore) // Log everything with full details.
.level(SEVERE)
.requestDetail(ENTITY)
.responseDetail(ENTITY)
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOpContext.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOpContext.java
index 4583277d8..d6db9ba64 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOpContext.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOpContext.java
@@ -56,8 +56,8 @@ import org.apache.juneau.rest.converter.*;
import org.apache.juneau.rest.debug.*;
import org.apache.juneau.rest.guard.*;
import org.apache.juneau.rest.httppart.*;
+import org.apache.juneau.rest.logger.*;
import org.apache.juneau.http.response.*;
-import org.apache.juneau.rest.logging.*;
import org.apache.juneau.rest.matcher.*;
import org.apache.juneau.rest.swagger.*;
import org.apache.juneau.rest.util.*;
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOpSession.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOpSession.java
index 4e54a4cca..b84c5ab8f 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOpSession.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOpSession.java
@@ -20,7 +20,7 @@ import org.apache.juneau.cp.*;
import org.apache.juneau.http.response.*;
import org.apache.juneau.rest.converter.*;
import org.apache.juneau.rest.guard.*;
-import org.apache.juneau.rest.logging.*;
+import org.apache.juneau.rest.logger.*;
/**
* A session for a single HTTP request.
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 868db1595..2348b0f2a 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
@@ -72,12 +72,12 @@ import org.apache.juneau.rest.assertions.*;
import org.apache.juneau.rest.beans.*;
import org.apache.juneau.rest.guard.*;
import org.apache.juneau.rest.httppart.*;
+import org.apache.juneau.rest.logger.*;
import org.apache.juneau.http.header.*;
import org.apache.juneau.http.header.BasicHeader;
import org.apache.juneau.http.header.Date;
import org.apache.juneau.http.response.*;
import org.apache.juneau.http.response.BasicHttpException;
-import org.apache.juneau.rest.logging.*;
import org.apache.juneau.rest.staticfile.*;
import org.apache.juneau.rest.swagger.*;
import org.apache.juneau.rest.util.*;
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 91f621419..2f8b6f746 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
@@ -35,7 +35,7 @@ import org.apache.juneau.oapi.*;
import org.apache.juneau.http.header.*;
import org.apache.juneau.http.response.*;
import org.apache.juneau.rest.httppart.*;
-import org.apache.juneau.rest.logging.*;
+import org.apache.juneau.rest.logger.*;
import org.apache.juneau.rest.util.*;
import org.apache.juneau.serializer.*;
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestSession.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestSession.java
index ce0e97879..05f7dabd5 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestSession.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestSession.java
@@ -24,7 +24,7 @@ import org.apache.juneau.*;
import org.apache.juneau.cp.*;
import org.apache.juneau.http.response.*;
import org.apache.juneau.rest.annotation.*;
-import org.apache.juneau.rest.logging.*;
+import org.apache.juneau.rest.logger.*;
import org.apache.juneau.rest.util.*;
/**
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 d2613cdce..df60d2c7b 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
@@ -34,7 +34,7 @@ import org.apache.juneau.rest.converter.*;
import org.apache.juneau.rest.debug.*;
import org.apache.juneau.rest.guard.*;
import org.apache.juneau.rest.httppart.*;
-import org.apache.juneau.rest.logging.*;
+import org.apache.juneau.rest.logger.*;
import org.apache.juneau.rest.processor.*;
import org.apache.juneau.rest.servlet.*;
import org.apache.juneau.rest.staticfile.*;
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 13d292a78..54fd38218 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
@@ -29,7 +29,7 @@ import org.apache.juneau.rest.converter.*;
import org.apache.juneau.rest.debug.*;
import org.apache.juneau.rest.guard.*;
import org.apache.juneau.rest.httppart.*;
-import org.apache.juneau.rest.logging.*;
+import org.apache.juneau.rest.logger.*;
import org.apache.juneau.rest.processor.*;
import org.apache.juneau.rest.staticfile.*;
import org.apache.juneau.rest.swagger.*;
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/RestContextArgs.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/RestContextArgs.java
index 83540e853..5a594874f 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/RestContextArgs.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/RestContextArgs.java
@@ -22,7 +22,7 @@ import org.apache.juneau.reflect.*;
import org.apache.juneau.rest.*;
import org.apache.juneau.rest.annotation.*;
import org.apache.juneau.rest.debug.*;
-import org.apache.juneau.rest.logging.*;
+import org.apache.juneau.rest.logger.*;
import org.apache.juneau.rest.staticfile.*;
import org.apache.juneau.rest.stats.*;
import org.apache.juneau.utils.*;
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/config/DefaultConfig.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/config/DefaultConfig.java
index 2604531d8..93b0c5151 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/config/DefaultConfig.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/config/DefaultConfig.java
@@ -19,7 +19,7 @@ import org.apache.juneau.rest.*;
import org.apache.juneau.rest.annotation.*;
import org.apache.juneau.rest.arg.*;
import org.apache.juneau.rest.debug.*;
-import org.apache.juneau.rest.logging.*;
+import org.apache.juneau.rest.logger.*;
import org.apache.juneau.rest.processor.*;
import org.apache.juneau.rest.staticfile.*;
import org.apache.juneau.rest.swagger.*;
@@ -34,7 +34,7 @@ import org.apache.juneau.oapi.*;
allowedMethodHeaders="$S{j.allowedMethodHeaders,$E{J_ALLOWED_METHOD_HEADERS,}}",
allowedMethodParams="$S{j.allowedMethodParams,$E{J_ALLOWED_METHOD_PARAMS,HEAD,OPTIONS}}",
beanStore=BeanStore.class,
- callLogger=BasicRestLogger.class,
+ callLogger=CallLogger.class,
clientVersionHeader="$S{j.clientVersionHeader,$E{J_CLIENT_VERSION_HEADER,Client-Version}}",
config="$S{j.configFile,$E{J_CONFIG_FILE,SYSTEM_DEFAULT}}",
consumes={},
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/logging/BasicDisabledRestLogger.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/logger/BasicDisabledCallLogger.java
similarity index 92%
rename from
juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/logging/BasicDisabledRestLogger.java
rename to
juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/logger/BasicDisabledCallLogger.java
index 25c4b04f0..22e35946e 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/logging/BasicDisabledRestLogger.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/logger/BasicDisabledCallLogger.java
@@ -10,7 +10,7 @@
// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
express or implied. See the License for the *
// * specific language governing permissions and limitations under the
License. *
//
***************************************************************************************************************************
-package org.apache.juneau.rest.logging;
+package org.apache.juneau.rest.logger;
import org.apache.juneau.rest.*;
@@ -22,14 +22,14 @@ import org.apache.juneau.rest.*;
* <li class='extlink'>{@source}
* </ul>
*/
-public class BasicDisabledRestLogger extends BasicRestLogger {
+public class BasicDisabledCallLogger extends CallLogger {
/**
* Constructor.
*
* @param context The context of the resource object.
*/
- public BasicDisabledRestLogger(RestContext context) {
+ public BasicDisabledCallLogger(RestContext context) {
super(RestLogger.create(context.getBeanStore()).disabled());
}
}
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/logging/BasicTestRestLogger.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/logger/BasicTestCallLogger.java
similarity index 91%
rename from
juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/logging/BasicTestRestLogger.java
rename to
juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/logger/BasicTestCallLogger.java
index c8dc4b3cf..23c55d54d 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/logging/BasicTestRestLogger.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/logger/BasicTestCallLogger.java
@@ -10,12 +10,12 @@
// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
express or implied. See the License for the *
// * specific language governing permissions and limitations under the
License. *
//
***************************************************************************************************************************
-package org.apache.juneau.rest.logging;
+package org.apache.juneau.rest.logger;
import static org.apache.juneau.internal.StringUtils.*;
+import static org.apache.juneau.rest.logger.CallLoggingDetail.*;
import static org.apache.juneau.Enablement.*;
import static java.util.logging.Level.*;
-import static org.apache.juneau.rest.logging.RestLoggingDetail.*;
import javax.servlet.http.*;
@@ -49,14 +49,14 @@ import org.apache.juneau.rest.*;
* <li class='extlink'>{@source}
* </ul>
*/
-public class BasicTestRestLogger extends BasicRestLogger {
+public class BasicTestCallLogger extends CallLogger {
/**
* Constructor.
*
* @param context The context of the resource object.
*/
- public BasicTestRestLogger(RestContext context) {
+ public BasicTestCallLogger(RestContext context) {
super(builder().logger(context.getLogger()).thrownStore(context.getThrownStore()));
}
@@ -64,7 +64,7 @@ public class BasicTestRestLogger extends BasicRestLogger {
BeanStore bs = BeanStore.INSTANCE;
return RestLogger.create(bs)
.normalRules( // Rules when debugging is not enabled.
- RestLoggerRule.create(bs) // Log 500+ errors
with status-line and header information.
+ CallLoggerRule.create(bs) // Log 500+ errors
with status-line and header information.
.statusFilter(x -> x >= 400)
.level(SEVERE)
.requestDetail(HEADER)
@@ -73,7 +73,7 @@ public class BasicTestRestLogger extends BasicRestLogger {
.enabledPredicate(x -> ! isNoTrace(x))
// Only log if it's not a no-trace request.
.logStackTrace()
.build(),
- RestLoggerRule.create(bs) // Log 400-500
errors with just status-line information.
+ CallLoggerRule.create(bs) // Log 400-500
errors with just status-line information.
.statusFilter(x -> x >= 400)
.level(WARNING)
.requestDetail(STATUS_LINE)
@@ -84,7 +84,7 @@ public class BasicTestRestLogger extends BasicRestLogger {
.build()
)
.debugRules( // Rules when debugging is enabled.
- RestLoggerRule.create(bs) // Log everything
with full details.
+ CallLoggerRule.create(bs) // Log everything
with full details.
.level(SEVERE)
.requestDetail(ENTITY)
.responseDetail(ENTITY)
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/logging/BasicTestCaptureRestLogger.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/logger/BasicTestCaptureCallLogger.java
similarity index 91%
rename from
juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/logging/BasicTestCaptureRestLogger.java
rename to
juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/logger/BasicTestCaptureCallLogger.java
index a319fceda..92aa7cf15 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/logging/BasicTestCaptureRestLogger.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/logger/BasicTestCaptureCallLogger.java
@@ -10,10 +10,10 @@
// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
express or implied. See the License for the *
// * specific language governing permissions and limitations under the
License. *
//
***************************************************************************************************************************
-package org.apache.juneau.rest.logging;
+package org.apache.juneau.rest.logger;
import static java.util.logging.Level.*;
-import static org.apache.juneau.rest.logging.RestLoggingDetail.*;
+import static org.apache.juneau.rest.logger.CallLoggingDetail.*;
import java.util.concurrent.atomic.*;
import java.util.logging.*;
@@ -39,7 +39,7 @@ import org.apache.juneau.cp.*;
*
* <jk>private static final</jk> CaptureLogger <jsf>LOGGER</jsf> =
<jk>new</jk> CaptureLogger();
*
- * <jk>public static class</jk> CaptureLogger <jk>extends</jk>
BasicTestCaptureRestLogger {
+ * <jk>public static class</jk> CaptureLogger <jk>extends</jk>
BasicTestCaptureCallLogger {
* <jc>// How our REST class will get the logger.</jc>
* <jk>public static</jk> CaptureLogger
<jsm>getInstance</jsm>() {
* <jk>return</jk> <jsf>LOGGER</jsf>;
@@ -71,7 +71,7 @@ import org.apache.juneau.cp.*;
* <li class='extlink'>{@source}
* </ul>
*/
-public class BasicTestCaptureRestLogger extends BasicRestLogger {
+public class BasicTestCaptureCallLogger extends CallLogger {
private AtomicReference<LogRecord> lastRecord = new AtomicReference<>();
@@ -80,16 +80,16 @@ public class BasicTestCaptureRestLogger extends
BasicRestLogger {
*
* @param builder The settings to use for this logger.
*/
- public BasicTestCaptureRestLogger(RestLogger.Builder builder) {
+ public BasicTestCaptureCallLogger(RestLogger.Builder builder) {
super(builder);
}
/**
* Constructor using default settings.
* <p>
- * Uses the same settings as {@link BasicRestLogger}.
+ * Uses the same settings as {@link CallLogger}.
*/
- public BasicTestCaptureRestLogger() {
+ public BasicTestCaptureCallLogger() {
super(builder());
}
@@ -97,13 +97,13 @@ public class BasicTestCaptureRestLogger extends
BasicRestLogger {
BeanStore bs = BeanStore.INSTANCE;
return RestLogger.create(bs)
.normalRules( // Rules when debugging is not enabled.
- RestLoggerRule.create(bs) // Log 500+ errors
with status-line and header information.
+ CallLoggerRule.create(bs) // Log 500+ errors
with status-line and header information.
.statusFilter(x -> x >= 500)
.level(SEVERE)
.requestDetail(HEADER)
.responseDetail(HEADER)
.build(),
- RestLoggerRule.create(bs) // Log 400-500
errors with just status-line information.
+ CallLoggerRule.create(bs) // Log 400-500
errors with just status-line information.
.statusFilter(x -> x >= 400)
.level(WARNING)
.requestDetail(STATUS_LINE)
@@ -111,7 +111,7 @@ public class BasicTestCaptureRestLogger extends
BasicRestLogger {
.build()
)
.debugRules( // Rules when debugging is enabled.
- RestLoggerRule.create(bs) // Log everything
with full details.
+ CallLoggerRule.create(bs) // Log everything
with full details.
.level(SEVERE)
.requestDetail(ENTITY)
.responseDetail(ENTITY)
@@ -200,7 +200,7 @@ public class BasicTestCaptureRestLogger extends
BasicRestLogger {
*
* @return This object.
*/
- public BasicTestCaptureRestLogger reset() {
+ public BasicTestCaptureCallLogger reset() {
this.lastRecord.set(null);
return this;
}
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/logger/CallLogger.java
similarity index 93%
rename from
juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/logging/BasicRestLogger.java
rename to
juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/logger/CallLogger.java
index ce9faa53e..4d6fb7c2e 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/logger/CallLogger.java
@@ -10,12 +10,13 @@
// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
express or implied. See the License for the *
// * specific language governing permissions and limitations under the
License. *
//
***************************************************************************************************************************
-package org.apache.juneau.rest.logging;
+package org.apache.juneau.rest.logger;
import static org.apache.juneau.collections.JsonMap.*;
import static org.apache.juneau.internal.ObjectUtils.*;
import static org.apache.juneau.internal.StringUtils.*;
-import static org.apache.juneau.rest.logging.RestLoggingDetail.*;
+import static org.apache.juneau.rest.logger.CallLoggingDetail.*;
+
import java.util.*;
import java.util.function.*;
import java.util.logging.*;
@@ -86,28 +87,28 @@ import org.apache.juneau.rest.util.*;
* <li class='extlink'>{@source}
* </ul>
*/
-public class BasicRestLogger implements RestLogger {
+public class CallLogger implements RestLogger {
- private static final RestLoggerRule DEFAULT_RULE =
RestLoggerRule.create(BeanStore.INSTANCE).build();
+ private static final CallLoggerRule DEFAULT_RULE =
CallLoggerRule.create(BeanStore.INSTANCE).build();
private final Logger logger;
private final ThrownStore thrownStore;
- private final RestLoggerRule[] normalRules, debugRules;
+ private final CallLoggerRule[] normalRules, debugRules;
private final Enablement enabled;
private final Predicate<HttpServletRequest> enabledTest;
private final Level level;
- private final RestLoggingDetail requestDetail, responseDetail;
+ private final CallLoggingDetail requestDetail, responseDetail;
/**
* Constructor.
*
* @param builder The builder object.
*/
- public BasicRestLogger(RestLogger.Builder builder) {
+ public CallLogger(RestLogger.Builder builder) {
this.logger = builder.logger;
this.thrownStore = builder.thrownStore;
- this.normalRules = builder.normalRules.toArray(new
RestLoggerRule[builder.normalRules.size()]);
- this.debugRules = builder.debugRules.toArray(new
RestLoggerRule[builder.debugRules.size()]);
+ this.normalRules = builder.normalRules.toArray(new
CallLoggerRule[builder.normalRules.size()]);
+ this.debugRules = builder.debugRules.toArray(new
CallLoggerRule[builder.debugRules.size()]);
this.enabled = builder.enabled;
this.enabledTest = builder.enabledTest;
this.requestDetail = builder.requestDetail;
@@ -124,7 +125,7 @@ public class BasicRestLogger implements RestLogger {
@Override /* RestLogger */
public void log(HttpServletRequest req, HttpServletResponse res) {
- RestLoggerRule rule = getRule(req, res);
+ CallLoggerRule rule = getRule(req, res);
if (! isEnabled(rule, req))
return;
@@ -137,8 +138,8 @@ public class BasicRestLogger implements RestLogger {
Throwable e = castOrNull(req.getAttribute("Exception"),
Throwable.class);
Long execTime = castOrNull(req.getAttribute("ExecTime"),
Long.class);
- RestLoggingDetail reqd = firstNonNull(rule.getRequestDetail(),
requestDetail);
- RestLoggingDetail resd = firstNonNull(rule.getResponseDetail(),
responseDetail);
+ CallLoggingDetail reqd = firstNonNull(rule.getRequestDetail(),
requestDetail);
+ CallLoggingDetail resd = firstNonNull(rule.getResponseDetail(),
responseDetail);
String method = req.getMethod();
int status = res.getStatus();
@@ -248,8 +249,8 @@ public class BasicRestLogger implements RestLogger {
* @param res The servlet response.
* @return The applicable logging rule, or the default rule if not
found. Never <jk>null</jk>.
*/
- protected RestLoggerRule getRule(HttpServletRequest req,
HttpServletResponse res) {
- for (RestLoggerRule r : isDebug(req) ? debugRules : normalRules)
+ protected CallLoggerRule getRule(HttpServletRequest req,
HttpServletResponse res) {
+ for (CallLoggerRule r : isDebug(req) ? debugRules : normalRules)
if (r.matches(req, res))
return r;
return DEFAULT_RULE;
@@ -289,7 +290,7 @@ public class BasicRestLogger implements RestLogger {
* @param req The HTTP request.
* @return <jk>true</jk> if logging is enabled for this request.
*/
- protected boolean isEnabled(RestLoggerRule rule, HttpServletRequest
req) {
+ protected boolean isEnabled(CallLoggerRule rule, HttpServletRequest
req) {
Enablement enabled = firstNonNull(rule.getEnabled(),
this.enabled);
Predicate<HttpServletRequest> enabledTest =
firstNonNull(rule.getEnabledTest(), this.enabledTest);
return enabled.isEnabled(enabledTest.test(req));
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/logging/RestLoggerRule.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/logger/CallLoggerRule.java
similarity index 93%
rename from
juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/logging/RestLoggerRule.java
rename to
juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/logger/CallLoggerRule.java
index deca2f07d..b4a5336d2 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/logging/RestLoggerRule.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/logger/CallLoggerRule.java
@@ -10,7 +10,7 @@
// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
express or implied. See the License for the *
// * specific language governing permissions and limitations under the
License. *
//
***************************************************************************************************************************
-package org.apache.juneau.rest.logging;
+package org.apache.juneau.rest.logger;
import static org.apache.juneau.collections.JsonMap.*;
@@ -31,7 +31,7 @@ import org.apache.juneau.internal.*;
* <li class='extlink'>{@source}
* </ul>
*/
-public class RestLoggerRule {
+public class CallLoggerRule {
//-----------------------------------------------------------------------------------------------------------------
// Static
@@ -55,7 +55,7 @@ public class RestLoggerRule {
* Builder class.
*/
@FluentSetters
- public static class Builder extends BeanBuilder<RestLoggerRule> {
+ public static class Builder extends BeanBuilder<CallLoggerRule> {
Predicate<Integer> statusFilter;
Predicate<HttpServletRequest> requestFilter;
@@ -64,7 +64,7 @@ public class RestLoggerRule {
Enablement enabled;
Predicate<HttpServletRequest> enabledTest;
Level level;
- RestLoggingDetail requestDetail, responseDetail;
+ CallLoggingDetail requestDetail, responseDetail;
boolean logStackTrace;
/**
@@ -73,12 +73,12 @@ public class RestLoggerRule {
* @param beanStore The bean store to use for creating beans.
*/
protected Builder(BeanStore beanStore) {
- super(RestLoggerRule.class, beanStore);
+ super(CallLoggerRule.class, beanStore);
}
@Override /* BeanBuilder */
- protected RestLoggerRule buildDefault() {
- return new RestLoggerRule(this);
+ protected CallLoggerRule buildDefault() {
+ return new CallLoggerRule(this);
}
//-------------------------------------------------------------------------------------------------------------
@@ -244,16 +244,16 @@ public class RestLoggerRule {
* The level of detail to log on a request.
*
* <ul class='values'>
- * <li>{@link RestLoggingDetail#STATUS_LINE STATUS_LINE} -
Log only the status line.
- * <li>{@link RestLoggingDetail#HEADER HEADER} - Log the
status line and headers.
- * <li>{@link RestLoggingDetail#ENTITY ENTITY} - Log the
status line and headers and content if available.
+ * <li>{@link CallLoggingDetail#STATUS_LINE STATUS_LINE} -
Log only the status line.
+ * <li>{@link CallLoggingDetail#HEADER HEADER} - Log the
status line and headers.
+ * <li>{@link CallLoggingDetail#ENTITY ENTITY} - Log the
status line and headers and content if available.
* </ul>
*
* @param value
* The new value for this property, or <jk>null</jk> to
inherit from the call logger.
* @return This object.
*/
- public Builder requestDetail(RestLoggingDetail value) {
+ public Builder requestDetail(CallLoggingDetail value) {
this.requestDetail = value;
return this;
}
@@ -262,16 +262,16 @@ public class RestLoggerRule {
* The level of detail to log on a response.
*
* <ul class='values'>
- * <li>{@link RestLoggingDetail#STATUS_LINE STATUS_LINE} -
Log only the status line.
- * <li>{@link RestLoggingDetail#HEADER HEADER} - Log the
status line and headers.
- * <li>{@link RestLoggingDetail#ENTITY ENTITY} - Log the
status line and headers and content if available.
+ * <li>{@link CallLoggingDetail#STATUS_LINE STATUS_LINE} -
Log only the status line.
+ * <li>{@link CallLoggingDetail#HEADER HEADER} - Log the
status line and headers.
+ * <li>{@link CallLoggingDetail#ENTITY ENTITY} - Log the
status line and headers and content if available.
* </ul>
*
* @param value
* The new value for this property, or <jk>null</jk> to
inherit from the call logger.
* @return This object.
*/
- public Builder responseDetail(RestLoggingDetail value) {
+ public Builder responseDetail(CallLoggingDetail value) {
this.responseDetail = value;
return this;
}
@@ -332,7 +332,7 @@ public class RestLoggerRule {
private final Level level;
private final Enablement enabled;
private final Predicate<HttpServletRequest> enabledTest;
- private final RestLoggingDetail requestDetail, responseDetail;
+ private final CallLoggingDetail requestDetail, responseDetail;
private final boolean logStackTrace;
/**
@@ -340,7 +340,7 @@ public class RestLoggerRule {
*
* @param b Builder
*/
- RestLoggerRule(Builder b) {
+ CallLoggerRule(Builder b) {
this.statusFilter = b.statusFilter;
this.exceptionFilter = b.exceptionFilter;
this.requestFilter = b.requestFilter;
@@ -380,7 +380,7 @@ public class RestLoggerRule {
*
* @return the detail level for HTTP requests, or <jk>null</jk> if it's
not set.
*/
- public RestLoggingDetail getRequestDetail() {
+ public CallLoggingDetail getRequestDetail() {
return requestDetail;
}
@@ -389,7 +389,7 @@ public class RestLoggerRule {
*
* @return the detail level for HTTP responses, or <jk>null</jk> if
it's not set.
*/
- public RestLoggingDetail getResponseDetail() {
+ public CallLoggingDetail getResponseDetail() {
return responseDetail;
}
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/logging/RestLoggingDetail.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/logger/CallLoggingDetail.java
similarity index 91%
rename from
juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/logging/RestLoggingDetail.java
rename to
juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/logger/CallLoggingDetail.java
index f774e94b6..86aa5ab41 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/logging/RestLoggingDetail.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/logger/CallLoggingDetail.java
@@ -10,7 +10,7 @@
// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
express or implied. See the License for the *
// * specific language governing permissions and limitations under the
License. *
//
***************************************************************************************************************************
-package org.apache.juneau.rest.logging;
+package org.apache.juneau.rest.logger;
import org.apache.juneau.internal.*;
@@ -22,7 +22,7 @@ import org.apache.juneau.internal.*;
* <li class='extlink'>{@source}
* </ul>
*/
-public enum RestLoggingDetail {
+public enum CallLoggingDetail {
/**
* Lowest detail - Log only the request and response status lines.
@@ -39,8 +39,8 @@ public enum RestLoggingDetail {
*/
ENTITY;
- boolean isOneOf(RestLoggingDetail...values) {
- for (RestLoggingDetail v : values)
+ boolean isOneOf(CallLoggingDetail...values) {
+ for (CallLoggingDetail v : values)
if (v == this)
return true;
return false;
@@ -52,7 +52,7 @@ public enum RestLoggingDetail {
* @param s The enum name to resolve.
* @return The resolved value.
*/
- public static RestLoggingDetail fromString(String s) {
+ public static CallLoggingDetail fromString(String s) {
if (! StringUtils.isEmpty(s)) {
try {
return valueOf(s.toUpperCase());
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/logger/RestLogger.java
similarity index 89%
rename from
juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/logging/RestLogger.java
rename to
juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/logger/RestLogger.java
index 78f91f7dd..0d6fbaf9d 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/logger/RestLogger.java
@@ -10,13 +10,13 @@
// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
express or implied. See the License for the *
// * specific language governing permissions and limitations under the
License. *
//
***************************************************************************************************************************
-package org.apache.juneau.rest.logging;
+package org.apache.juneau.rest.logger;
import static java.util.logging.Level.*;
import static org.apache.juneau.Enablement.*;
import static org.apache.juneau.internal.CollectionUtils.*;
import static org.apache.juneau.internal.SystemEnv.*;
-import static org.apache.juneau.rest.logging.RestLoggingDetail.*;
+import static org.apache.juneau.rest.logger.CallLoggingDetail.*;
import java.util.*;
import java.util.function.*;
@@ -39,10 +39,10 @@ import org.apache.juneau.rest.stats.*;
* <p>
* The following default implementations are also provided:
* <ul class='javatree'>
- * <li class='jc'>{@link BasicRestLogger} - The default logger typically
used.
- * <li class='jc'>{@link BasicDisabledRestLogger} - A no-op logger if you
want to turn off logging entirely.
- * <li class='jc'>{@link BasicTestRestLogger} - A logger useful for
testcases.
- * <li class='jc'>{@link BasicTestCaptureRestLogger} - Useful for
capturing log messages for testing logging itself.
+ * <li class='jc'>{@link CallLogger} - The default logger typically used.
+ * <li class='jc'>{@link BasicDisabledCallLogger} - A no-op logger if you
want to turn off logging entirely.
+ * <li class='jc'>{@link BasicTestCallLogger} - A logger useful for
testcases.
+ * <li class='jc'>{@link BasicTestCaptureCallLogger} - Useful for
capturing log messages for testing logging itself.
* </ul>
*
* <ul class='seealso'>
@@ -93,9 +93,9 @@ public interface RestLogger {
* Can also use a <c>JUNEAU_RESTLOGGER_REQUESTDETAIL</c> environment
variable.
*
* <ul class='values'>
- * <li>{@link RestLoggingDetail#STATUS_LINE "STATUS_LINE"}
(default) - Log only the status line.
- * <li>{@link RestLoggingDetail#HEADER "HEADER"} - Log the status
line and headers.
- * <li>{@link RestLoggingDetail#ENTITY "ENTITY"} - Log the status
line and headers and content if available.
+ * <li>{@link CallLoggingDetail#STATUS_LINE "STATUS_LINE"}
(default) - Log only the status line.
+ * <li>{@link CallLoggingDetail#HEADER "HEADER"} - Log the status
line and headers.
+ * <li>{@link CallLoggingDetail#ENTITY "ENTITY"} - Log the status
line and headers and content if available.
* </ul>
*/
public static final String SP_requestDetail =
"juneau.restLogger.requestDetail";
@@ -106,9 +106,9 @@ public interface RestLogger {
* Can also use a <c>JUNEAU_RESTLOGGER_RESPONSEDETAIL</c> environment
variable.
*
* <ul class='values'>
- * <li>{@link RestLoggingDetail#STATUS_LINE "STATUS_LINE"}
(default) - Log only the status line.
- * <li>{@link RestLoggingDetail#HEADER "HEADER"} - Log the status
line and headers.
- * <li>{@link RestLoggingDetail#ENTITY "ENTITY"} - Log the status
line and headers and content if available.
+ * <li>{@link CallLoggingDetail#STATUS_LINE "STATUS_LINE"}
(default) - Log only the status line.
+ * <li>{@link CallLoggingDetail#HEADER "HEADER"} - Log the status
line and headers.
+ * <li>{@link CallLoggingDetail#ENTITY "ENTITY"} - Log the status
line and headers and content if available.
* </ul>
*/
public static final String SP_responseDetail =
"juneau.restLogger.responseDetail";
@@ -153,10 +153,10 @@ public interface RestLogger {
Logger logger;
ThrownStore thrownStore;
- List<RestLoggerRule> normalRules = list(), debugRules = list();
+ List<CallLoggerRule> normalRules = list(), debugRules = list();
Enablement enabled;
Predicate<HttpServletRequest> enabledTest;
- RestLoggingDetail requestDetail, responseDetail;
+ CallLoggingDetail requestDetail, responseDetail;
Level level;
/**
@@ -165,7 +165,7 @@ public interface RestLogger {
* @param beanStore The bean store to use for creating beans.
*/
protected Builder(BeanStore beanStore) {
- super(BasicRestLogger.class, beanStore);
+ super(CallLogger.class, beanStore);
logger = Logger.getLogger(env(SP_logger, "global"));
enabled = env(SP_enabled, ALWAYS);
enabledTest = x -> false;
@@ -176,7 +176,7 @@ public interface RestLogger {
@Override /* BeanBuilder */
protected RestLogger buildDefault() {
- return new BasicRestLogger(this);
+ return new CallLogger(this);
}
@Override /* BeanBuilder */
@@ -200,7 +200,7 @@ public interface RestLogger {
* </ol>
*
* <p>
- * The {@link BasicRestLogger#getLogger()} method can also be
overridden to provide different logic.
+ * The {@link CallLogger#getLogger()} method can also be
overridden to provide different logic.
*
* @param value
* The logger to use for logging the request.
@@ -226,7 +226,7 @@ public interface RestLogger {
* </ol>
*
* <p>
- * The {@link BasicRestLogger#getLogger()} method can also be
overridden to provide different logic.
+ * The {@link CallLogger#getLogger()} method can also be
overridden to provide different logic.
*
* @param value
* The logger to use for logging the request.
@@ -350,16 +350,16 @@ public interface RestLogger {
* </ul>
*
* <ul class='values'>
- * <li>{@link RestLoggingDetail#STATUS_LINE STATUS_LINE} -
Log only the status line.
- * <li>{@link RestLoggingDetail#HEADER HEADER} - Log the
status line and headers.
- * <li>{@link RestLoggingDetail#ENTITY ENTITY} - Log the
status line and headers and content if available.
+ * <li>{@link CallLoggingDetail#STATUS_LINE STATUS_LINE} -
Log only the status line.
+ * <li>{@link CallLoggingDetail#HEADER HEADER} - Log the
status line and headers.
+ * <li>{@link CallLoggingDetail#ENTITY ENTITY} - Log the
status line and headers and content if available.
* </ul>
*
* @param value
* The new value for this property, or <jk>null</jk> to
use the default.
* @return This object.
*/
- public Builder requestDetail(RestLoggingDetail value) {
+ public Builder requestDetail(CallLoggingDetail value) {
requestDetail = value;
return this;
}
@@ -379,16 +379,16 @@ public interface RestLogger {
* </ul>
*
* <ul class='values'>
- * <li>{@link RestLoggingDetail#STATUS_LINE STATUS_LINE} -
Log only the status line.
- * <li>{@link RestLoggingDetail#HEADER HEADER} - Log the
status line and headers.
- * <li>{@link RestLoggingDetail#ENTITY ENTITY} - Log the
status line and headers and content if available.
+ * <li>{@link CallLoggingDetail#STATUS_LINE STATUS_LINE} -
Log only the status line.
+ * <li>{@link CallLoggingDetail#HEADER HEADER} - Log the
status line and headers.
+ * <li>{@link CallLoggingDetail#ENTITY ENTITY} - Log the
status line and headers and content if available.
* </ul>
*
* @param value
* The new value for this property, or <jk>null</jk> to
use the default.
* @return This object.
*/
- public Builder responseDetail(RestLoggingDetail value) {
+ public Builder responseDetail(CallLoggingDetail value) {
responseDetail = value;
return this;
}
@@ -425,8 +425,8 @@ public interface RestLogger {
* @param values The logging rules to add to the list of rules.
* @return This object.
*/
- public Builder normalRules(RestLoggerRule...values) {
- for (RestLoggerRule rule : values)
+ public Builder normalRules(CallLoggerRule...values) {
+ for (CallLoggerRule rule : values)
normalRules.add(rule);
return this;
}
@@ -440,8 +440,8 @@ public interface RestLogger {
* @param values The logging rules to add to the list of rules.
* @return This object.
*/
- public Builder debugRules(RestLoggerRule...values) {
- for (RestLoggerRule rule : values)
+ public Builder debugRules(CallLoggerRule...values) {
+ for (CallLoggerRule rule : values)
debugRules.add(rule);
return this;
}
@@ -455,7 +455,7 @@ public interface RestLogger {
* @param values The logging rules to add to the list of rules.
* @return This object.
*/
- public Builder rules(RestLoggerRule...values) {
+ public Builder rules(CallLoggerRule...values) {
return normalRules(values).debugRules(values);
}
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/logging/package-info.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/logger/package-info.java
similarity index 96%
rename from
juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/logging/package-info.java
rename to
juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/logger/package-info.java
index 9dd429666..f468db3b4 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/logging/package-info.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/logger/package-info.java
@@ -15,4 +15,4 @@
/**
* REST Logging API
*/
-package org.apache.juneau.rest.logging;
\ No newline at end of file
+package org.apache.juneau.rest.logger;
\ No newline at end of file
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/remote/RrpcInterfaceTest.java
b/juneau-utest/src/test/java/org/apache/juneau/http/remote/RrpcInterfaceTest.java
index 4da764acd..151ae20fa 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/remote/RrpcInterfaceTest.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/remote/RrpcInterfaceTest.java
@@ -30,7 +30,7 @@ import org.apache.juneau.msgpack.*;
import org.apache.juneau.parser.*;
import org.apache.juneau.rest.annotation.*;
import org.apache.juneau.rest.config.*;
-import org.apache.juneau.rest.logging.*;
+import org.apache.juneau.rest.logger.*;
import org.apache.juneau.rest.mock.*;
import org.apache.juneau.rest.servlet.*;
import org.apache.juneau.serializer.*;
@@ -230,7 +230,7 @@ public class RrpcInterfaceTest {
}
}
- @Rest(callLogger=BasicDisabledRestLogger.class)
+ @Rest(callLogger=BasicDisabledCallLogger.class)
@SerializerConfig(addRootType="true",addBeanTypes="true")
public static class InterfaceProxyResource extends BasicRestServlet
implements BasicUniversalJenaConfig {
private static final long serialVersionUID = 1L;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/RestAnnotation_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/RestAnnotation_Test.java
index 42682405b..4076ff63c 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/RestAnnotation_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/RestAnnotation_Test.java
@@ -26,7 +26,7 @@ import org.apache.juneau.rest.arg.*;
import org.apache.juneau.rest.converter.*;
import org.apache.juneau.rest.debug.*;
import org.apache.juneau.rest.guard.*;
-import org.apache.juneau.rest.logging.*;
+import org.apache.juneau.rest.logger.*;
import org.apache.juneau.rest.processor.*;
import org.apache.juneau.rest.staticfile.*;
import org.apache.juneau.rest.swagger.*;
@@ -162,7 +162,7 @@ public class RestAnnotation_Test {
+ "allowedMethodParams:'allowedMethodParams',"
+ "beanStore:'org.apache.juneau.cp.BeanStore',"
+
"builder:'org.apache.juneau.rest.RestContext$Builder$Void',"
- +
"callLogger:'org.apache.juneau.rest.logging.RestLogger',"
+ +
"callLogger:'org.apache.juneau.rest.logger.RestLogger',"
+ "children:['"+CNAME+"'],"
+ "clientVersionHeader:'clientVersionHeader',"
+ "config:'config',"
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Rest_Debug_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Rest_Debug_Test.java
index e95d45f79..264d0d7c7 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Rest_Debug_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Rest_Debug_Test.java
@@ -17,7 +17,7 @@ import static org.junit.runners.MethodSorters.*;
import org.apache.juneau.rest.RestRequest;
import org.apache.juneau.rest.client.*;
import org.apache.juneau.rest.config.*;
-import org.apache.juneau.rest.logging.*;
+import org.apache.juneau.rest.logger.*;
import org.apache.juneau.rest.mock.*;
import org.apache.juneau.rest.servlet.*;
import org.junit.*;
@@ -27,7 +27,7 @@ public class Rest_Debug_Test {
public static final CaptureLogger LOGGER = new CaptureLogger();
- public static class CaptureLogger extends BasicTestCaptureRestLogger {
+ public static class CaptureLogger extends BasicTestCaptureCallLogger {
public static CaptureLogger getInstance(RestLogger.Builder x) {
return LOGGER;
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Headers_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Headers_Test.java
index 015b97641..46c87a684 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Headers_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Headers_Test.java
@@ -27,7 +27,7 @@ import org.apache.juneau.httppart.*;
import org.apache.juneau.marshaller.*;
import org.apache.juneau.rest.annotation.*;
import org.apache.juneau.rest.config.*;
-import org.apache.juneau.rest.logging.*;
+import org.apache.juneau.rest.logger.*;
import org.apache.juneau.rest.mock.*;
import org.apache.juneau.rest.servlet.*;
import org.apache.juneau.serializer.*;
@@ -40,7 +40,7 @@ public class RestClient_Headers_Test {
public static final CaptureLogger LOGGER = new CaptureLogger();
- public static class CaptureLogger extends BasicTestCaptureRestLogger {
+ public static class CaptureLogger extends BasicTestCaptureCallLogger {
public static CaptureLogger getInstance(RestLogger.Builder x) {
return LOGGER;
}
