You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juneau.apache.org by ja...@apache.org on 2019/07/31 16:14:12 UTC
[juneau] branch master updated: Clean up console logging in tests.
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 8034e3c Clean up console logging in tests.
8034e3c is described below
commit 8034e3ca9001434469a9162a57fabaa5af811101
Author: JamesBognar <ja...@apache.org>
AuthorDate: Wed Jul 31 12:13:57 2019 -0400
Clean up console logging in tests.
---
.../java/org/apache/juneau/BeanConfigAnnotationTest.java | 2 --
.../org/apache/juneau/jena/RdfConfigAnnotationTest.java | 2 --
.../apache/juneau/rest/test/client/InterfaceProxyTest.java | 6 +++++-
.../juneau/rest/test/client/ThirdPartyProxyResource.java | 5 ++++-
.../juneau/rest/annotation/RestResourceLoggingTest.java | 2 +-
.../java/org/apache/juneau/rest/BasicRestCallLogger.java | 3 +++
.../java/org/apache/juneau/rest/RestCallLoggerConfig.java | 14 ++++++++++++++
7 files changed, 27 insertions(+), 7 deletions(-)
diff --git a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/BeanConfigAnnotationTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/BeanConfigAnnotationTest.java
index 5307eaf..33b4777 100644
--- a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/BeanConfigAnnotationTest.java
+++ b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/BeanConfigAnnotationTest.java
@@ -160,8 +160,6 @@ public class BeanConfigAnnotationTest {
AnnotationList al = a.getAnnotationList(null);
BeanTraverseSession bc = JsonSerializer.create().applyAnnotations(al, sr).build().createSession();
- System.err.println(bc.getImplClasses().values().iterator().next().getClass().getSimpleName());
-
check("PRIVATE", bc.getBeanClassVisibility());
check("PRIVATE", bc.getBeanConstructorVisibility());
check("A1,A3", bc.getBeanDictionaryClasses());
diff --git a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/jena/RdfConfigAnnotationTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/jena/RdfConfigAnnotationTest.java
index 8b2e0bd..07c07de 100644
--- a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/jena/RdfConfigAnnotationTest.java
+++ b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/jena/RdfConfigAnnotationTest.java
@@ -22,7 +22,6 @@ import java.util.stream.*;
import org.apache.juneau.*;
import org.apache.juneau.internal.*;
import org.apache.juneau.jena.annotation.*;
-import org.apache.juneau.marshall.*;
import org.apache.juneau.reflect.*;
import org.apache.juneau.svl.*;
import org.junit.*;
@@ -114,7 +113,6 @@ public class RdfConfigAnnotationTest {
check("true", x.isUseXmlNamespaces());
Map<String,Object> jp = x.getJenaProperties();
- SimpleJson.DEFAULT.println(jp);
check("true", jp.get(RDF_arp_embedding.substring(15)));
check("strict", jp.get(RDF_arp_errorMode.substring(15)));
check("strict", jp.get(RDF_arp_iriRules.substring(15)));
diff --git a/juneau-microservice/juneau-microservice-ftest/src/test/java/org/apache/juneau/rest/test/client/InterfaceProxyTest.java b/juneau-microservice/juneau-microservice-ftest/src/test/java/org/apache/juneau/rest/test/client/InterfaceProxyTest.java
index a471380..ecc4264 100644
--- a/juneau-microservice/juneau-microservice-ftest/src/test/java/org/apache/juneau/rest/test/client/InterfaceProxyTest.java
+++ b/juneau-microservice/juneau-microservice-ftest/src/test/java/org/apache/juneau/rest/test/client/InterfaceProxyTest.java
@@ -229,7 +229,11 @@ public class InterfaceProxyTest {
}
}
- @RestResource
+ @RestResource(
+ logging=@Logging(
+ disabled="true"
+ )
+ )
@SerializerConfig(addRootType="true",addBeanTypes="true")
public static class InterfaceProxyResource extends BasicRestServletJena {
private static final long serialVersionUID = 1L;
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 3db48e1..741d4dc 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
@@ -38,7 +38,10 @@ import org.apache.juneau.utils.*;
* JUnit automated testcase resource.
*/
@RestResource(
- path="/testThirdPartyProxy"
+ path="/testThirdPartyProxy",
+ logging=@Logging(
+ disabled="true"
+ )
)
@SerializerConfig(addRootType="true",addBeanTypes="true")
@SuppressWarnings({"serial"})
diff --git a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/RestResourceLoggingTest.java b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/RestResourceLoggingTest.java
index bdc0e0c..74ecc65 100644
--- a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/RestResourceLoggingTest.java
+++ b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/RestResourceLoggingTest.java
@@ -657,7 +657,7 @@ public class RestResourceLoggingTest {
logging=@Logging(
useStackTraceHashing="true",
rules={
- @LoggingRule(codes=">=500", level="warning", req="short", res="short")
+ @LoggingRule(codes=">=500", level="off", req="short", res="short")
}
)
)
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/BasicRestCallLogger.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/BasicRestCallLogger.java
index a517e46..3a411dd 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/BasicRestCallLogger.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/BasicRestCallLogger.java
@@ -106,6 +106,9 @@ public class BasicRestCallLogger implements RestCallLogger {
@Override /* RestCallLogger */
public void log(RestCallLoggerConfig config, HttpServletRequest req, HttpServletResponse res) {
+ if (config.isDisabled(req))
+ return;
+
RestCallLoggerRule rule = config.getRule(req, res);
if (rule == null)
return;
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestCallLoggerConfig.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestCallLoggerConfig.java
index 02c5f3c..e695412 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestCallLoggerConfig.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestCallLoggerConfig.java
@@ -287,6 +287,20 @@ public class RestCallLoggerConfig {
return null;
}
+ /**
+ * Returns <jk>true</jk> if logging is disabled for this request.
+ *
+ * @param req The HTTP request.
+ * @return <jk>true</jk> if logging is disabled for this request.
+ */
+ public boolean isDisabled(HttpServletRequest req) {
+ if (disabled == TRUE)
+ return true;
+ if (disabled == FALSE)
+ return false;
+ return isNoTraceAttr(req);
+ }
+
private boolean isDebug(HttpServletRequest req) {
Boolean b = boolAttr(req, "Debug");
return (b != null && b == true);