From 4a70a3c8500649edde2dd809d9cc168ea7ac9829 Mon Sep 17 00:00:00 2001 From: Archimedes Trajano Date: Thu, 24 Sep 2015 00:46:15 -0400 Subject: [PATCH] Reduce the amount of logging by the library --- .../java/com/jayway/jsonpath/Criteria.java | 26 ++----------------- .../main/java/com/jayway/jsonpath/Filter.java | 5 ---- .../jsonpath/internal/CompiledPath.java | 9 ------- .../jayway/jsonpath/internal/JsonReader.java | 24 ----------------- .../internal/token/ArrayPathToken.java | 11 +++----- .../internal/token/PredicateContextImpl.java | 7 +---- 6 files changed, 7 insertions(+), 75 deletions(-) diff --git a/json-path/src/main/java/com/jayway/jsonpath/Criteria.java b/json-path/src/main/java/com/jayway/jsonpath/Criteria.java index 8a3f2982..298da4f6 100644 --- a/json-path/src/main/java/com/jayway/jsonpath/Criteria.java +++ b/json-path/src/main/java/com/jayway/jsonpath/Criteria.java @@ -19,8 +19,6 @@ import com.jayway.jsonpath.internal.PathCompiler; import com.jayway.jsonpath.internal.Utils; import com.jayway.jsonpath.internal.token.PredicateContextImpl; import com.jayway.jsonpath.spi.json.JsonProvider; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import java.math.BigDecimal; import java.util.Arrays; @@ -40,8 +38,6 @@ import static com.jayway.jsonpath.internal.Utils.notNull; @SuppressWarnings("unchecked") public class Criteria implements Predicate { - private static final Logger logger = LoggerFactory.getLogger(Criteria.class); - private static final String CRITERIA_WRAPPER_CHAR = "¦"; private static final String[] OPERATORS = { @@ -76,7 +72,6 @@ public class Criteria implements Predicate { @Override boolean eval(Object expected, Object model, PredicateContext ctx) { boolean res = (0 == safeCompare(expected, model, ctx)); - if (logger.isDebugEnabled()) logger.debug("[{}] {} [{}] => {}", model, name(), expected, res); return res; } @@ -89,7 +84,6 @@ public class Criteria implements Predicate { @Override boolean eval(Object expected, Object model, PredicateContext ctx) { boolean res = (0 != safeCompare(expected, model, ctx)); - if (logger.isDebugEnabled()) logger.debug("[{}] {} [{}] => {}", model, name(), expected, res); return res; } @@ -105,7 +99,6 @@ public class Criteria implements Predicate { return false; } boolean res = (0 > safeCompare(expected, model)); - if (logger.isDebugEnabled()) logger.debug("[{}] {} [{}] => {}", model, name(), expected, res); return res; } @@ -121,7 +114,6 @@ public class Criteria implements Predicate { return false; } boolean res = (0 >= safeCompare(expected, model)); - if (logger.isDebugEnabled()) logger.debug("[{}] {} [{}] => {}", model, name(), expected, res); return res; } @@ -137,7 +129,6 @@ public class Criteria implements Predicate { return false; } boolean res = (0 < safeCompare(expected, model)); - if (logger.isDebugEnabled()) logger.debug("[{}] {} [{}] => {}", model, name(), expected, res); return res; } @@ -153,7 +144,6 @@ public class Criteria implements Predicate { return false; } boolean res = (0 <= safeCompare(expected, model)); - if (logger.isDebugEnabled()) logger.debug("[{}] {} [{}] => {}", model, name(), expected, res); return res; } @@ -180,8 +170,8 @@ public class Criteria implements Predicate { if (target != null) { res = pattern.matcher(target.toString()).matches(); } - if (logger.isDebugEnabled()) - logger.debug("[{}] {} [{}] => {}", model == null ? "null" : model.toString(), name(), expected == null ? "null" : expected.toString(), res); + //if (logger.isDebugEnabled()) + // logger.debug("[{}] {} [{}] => {}", model == null ? "null" : model.toString(), name(), expected == null ? "null" : expected.toString(), res); return res; } @@ -201,7 +191,6 @@ public class Criteria implements Predicate { break; } } - if (logger.isDebugEnabled()) logger.debug("[{}] {} [{}] => {}", model, name(), join(", ", exps), res); return res; } @@ -215,7 +204,6 @@ public class Criteria implements Predicate { boolean eval(Object expected, Object model, PredicateContext ctx) { Collection nexps = (Collection) expected; boolean res = !nexps.contains(model); - if (logger.isDebugEnabled()) logger.debug("[{}] {} [{}] => {}", model, name(), join(", ", nexps), res); return res; } @@ -242,7 +230,6 @@ public class Criteria implements Predicate { res = ((String) model).contains((String) expected); } } - if (logger.isDebugEnabled()) logger.debug("[{}] {} [{}] => {}", model, name(), expected, res); return res; } @@ -270,11 +257,8 @@ public class Criteria implements Predicate { break; } } - if (logger.isDebugEnabled()) - logger.debug("[{}] {} [{}] => {}", join(", ", ctx.configuration().jsonProvider().toIterable(model)), name(), join(", ", exps), res); } else { res = false; - if (logger.isDebugEnabled()) logger.debug("[{}] {} [{}] => {}", "", name(), join(", ", exps), res); } return res; } @@ -292,15 +276,11 @@ public class Criteria implements Predicate { if (ctx.configuration().jsonProvider().isArray(model)) { int length = ctx.configuration().jsonProvider().length(model); res = (length == size); - if (logger.isDebugEnabled()) logger.debug("Array with size {} {} {} => {}", length, name(), size, res); } else if (model instanceof String) { int length = ((String) model).length(); res = length == size; - if (logger.isDebugEnabled()) logger.debug("String with length {} {} {} => {}", length, name(), size, res); } else { res = false; - if (logger.isDebugEnabled()) - logger.debug("{} {} {} => {}", model == null ? "null" : model.getClass().getName(), name(), size, res); } return res; } @@ -357,11 +337,9 @@ public class Criteria implements Predicate { if (ctx.configuration().jsonProvider().isArray(model)) { int len = ctx.configuration().jsonProvider().length(model); res = (0 != len); - if (logger.isDebugEnabled()) logger.debug("array length = {} {} => {}", len, name(), res); } else if (model instanceof String) { int len = ((String) model).length(); res = (0 != len); - if (logger.isDebugEnabled()) logger.debug("string length = {} {} => {}", len, name(), res); } } return res; diff --git a/json-path/src/main/java/com/jayway/jsonpath/Filter.java b/json-path/src/main/java/com/jayway/jsonpath/Filter.java index 8d75761a..b1fa44bb 100644 --- a/json-path/src/main/java/com/jayway/jsonpath/Filter.java +++ b/json-path/src/main/java/com/jayway/jsonpath/Filter.java @@ -14,9 +14,6 @@ */ package com.jayway.jsonpath; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import java.util.ArrayList; import java.util.Collection; import java.util.Iterator; @@ -30,7 +27,6 @@ import static java.util.Arrays.asList; */ public abstract class Filter implements Predicate { - private static final Logger logger = LoggerFactory.getLogger(Filter.class); private static final Pattern OPERATOR_SPLIT = Pattern.compile("((?<=&&|\\|\\|)|(?=&&|\\|\\|))"); private static final String AND = "&&"; private static final String OR = "||"; @@ -225,7 +221,6 @@ public abstract class Filter implements Predicate { throw new InvalidPathException("Invalid operators " + filter); } - if(logger.isDebugEnabled()) logger.debug("Parsed filter: " + root.toString()); return root; } diff --git a/json-path/src/main/java/com/jayway/jsonpath/internal/CompiledPath.java b/json-path/src/main/java/com/jayway/jsonpath/internal/CompiledPath.java index 4a2f9cfc..16abc4f3 100644 --- a/json-path/src/main/java/com/jayway/jsonpath/internal/CompiledPath.java +++ b/json-path/src/main/java/com/jayway/jsonpath/internal/CompiledPath.java @@ -17,18 +17,13 @@ package com.jayway.jsonpath.internal; import com.jayway.jsonpath.Configuration; import com.jayway.jsonpath.internal.token.EvaluationContextImpl; import com.jayway.jsonpath.internal.token.PathToken; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; public class CompiledPath implements Path { - private static final Logger logger = LoggerFactory.getLogger(CompiledPath.class); - private final PathToken root; private final boolean isRootPath; - public CompiledPath(PathToken root, boolean isRootPath) { this.root = root; this.isRootPath = isRootPath; @@ -41,10 +36,6 @@ public class CompiledPath implements Path { @Override public EvaluationContext evaluate(Object document, Object rootDocument, Configuration configuration, boolean forUpdate) { - if (logger.isDebugEnabled()) { - logger.debug("Evaluating path: {}", toString()); - } - EvaluationContextImpl ctx = new EvaluationContextImpl(this, rootDocument, configuration, forUpdate); try { PathRef op = ctx.forUpdate() ? PathRef.createRoot(rootDocument) : PathRef.NO_OP; diff --git a/json-path/src/main/java/com/jayway/jsonpath/internal/JsonReader.java b/json-path/src/main/java/com/jayway/jsonpath/internal/JsonReader.java index 7f207802..bf38d55f 100644 --- a/json-path/src/main/java/com/jayway/jsonpath/internal/JsonReader.java +++ b/json-path/src/main/java/com/jayway/jsonpath/internal/JsonReader.java @@ -23,8 +23,6 @@ import com.jayway.jsonpath.ParseContext; import com.jayway.jsonpath.Predicate; import com.jayway.jsonpath.ReadContext; import com.jayway.jsonpath.TypeRef; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import java.io.File; import java.io.FileInputStream; @@ -38,8 +36,6 @@ import static com.jayway.jsonpath.internal.Utils.notNull; public class JsonReader implements ParseContext, DocumentContext { - private static final Logger logger = LoggerFactory.getLogger(JsonReader.class); - private final Configuration configuration; private Object json; private Object patch; @@ -186,11 +182,6 @@ public class JsonReader implements ParseContext, DocumentContext { @Override public DocumentContext set(JsonPath path, Object newValue){ List modified = path.set(json, newValue, configuration.addOptions(Option.AS_PATH_LIST)); - if(logger.isDebugEnabled()){ - for (String p : modified) { - logger.debug("Set path {} new value {}", p, newValue); - } - } return this; } @@ -202,11 +193,6 @@ public class JsonReader implements ParseContext, DocumentContext { @Override public DocumentContext delete(JsonPath path) { List modified = path.delete(json, configuration.addOptions(Option.AS_PATH_LIST)); - if(logger.isDebugEnabled()){ - for (String p : modified) { - logger.debug("Delete path {}"); - } - } return this; } @@ -218,11 +204,6 @@ public class JsonReader implements ParseContext, DocumentContext { @Override public DocumentContext add(JsonPath path, Object value){ List modified = path.add(json, value, configuration.addOptions(Option.AS_PATH_LIST)); - if(logger.isDebugEnabled()){ - for (String p : modified) { - logger.debug("Add path {} new value {}", p, value); - } - } return this; } @@ -234,11 +215,6 @@ public class JsonReader implements ParseContext, DocumentContext { @Override public DocumentContext put(JsonPath path, String key, Object value){ List modified = path.put(json, key, value, configuration.addOptions(Option.AS_PATH_LIST)); - if(logger.isDebugEnabled()){ - for (String p : modified) { - logger.debug("Put path {} key {} value {}", p, key, value); - } - } return this; } diff --git a/json-path/src/main/java/com/jayway/jsonpath/internal/token/ArrayPathToken.java b/json-path/src/main/java/com/jayway/jsonpath/internal/token/ArrayPathToken.java index af6f1077..82459eeb 100644 --- a/json-path/src/main/java/com/jayway/jsonpath/internal/token/ArrayPathToken.java +++ b/json-path/src/main/java/com/jayway/jsonpath/internal/token/ArrayPathToken.java @@ -17,8 +17,7 @@ package com.jayway.jsonpath.internal.token; import com.jayway.jsonpath.InvalidPathException; import com.jayway.jsonpath.PathNotFoundException; import com.jayway.jsonpath.internal.PathRef; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import com.jayway.jsonpath.internal.Utils; import static java.lang.String.format; @@ -27,8 +26,6 @@ import static java.lang.String.format; */ public class ArrayPathToken extends PathToken { - private static final Logger logger = LoggerFactory.getLogger(ArrayPathToken.class); - private final ArraySliceOperation arraySliceOperation; private final ArrayIndexOperation arrayIndexOperation; @@ -107,7 +104,7 @@ public class ArrayPathToken extends PathToken { } from = Math.max(0, from); - logger.debug("Slice from index on array with length: {}. From index: {} to: {}. Input: {}", length, from, length - 1, toString()); + //logger.debug("Slice from index on array with length: {}. From index: {} to: {}. Input: {}", length, from, length - 1, toString()); if (length == 0 || from >= length) { return; @@ -128,7 +125,7 @@ public class ArrayPathToken extends PathToken { return; } - logger.debug("Slice between indexes on array with length: {}. From index: {} to: {}. Input: {}", length, from, to, toString()); + //logger.debug("Slice between indexes on array with length: {}. From index: {} to: {}. Input: {}", length, from, to, toString()); for (int i = from; i < to; i++) { handleArrayIndex(i, currentPath, model, ctx); @@ -147,7 +144,7 @@ public class ArrayPathToken extends PathToken { } to = Math.min(length, to); - logger.debug("Slice to index on array with length: {}. From index: 0 to: {}. Input: {}", length, to, toString()); + //logger.debug("Slice to index on array with length: {}. From index: 0 to: {}. Input: {}", length, to, toString()); for (int i = 0; i < to; i++) { handleArrayIndex(i, currentPath, model, ctx); diff --git a/json-path/src/main/java/com/jayway/jsonpath/internal/token/PredicateContextImpl.java b/json-path/src/main/java/com/jayway/jsonpath/internal/token/PredicateContextImpl.java index 3abc68d5..f98c79ba 100644 --- a/json-path/src/main/java/com/jayway/jsonpath/internal/token/PredicateContextImpl.java +++ b/json-path/src/main/java/com/jayway/jsonpath/internal/token/PredicateContextImpl.java @@ -18,15 +18,11 @@ import com.jayway.jsonpath.Configuration; import com.jayway.jsonpath.Predicate; import com.jayway.jsonpath.internal.Path; import com.jayway.jsonpath.spi.mapper.MappingException; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import java.util.HashMap; public class PredicateContextImpl implements Predicate.PredicateContext { - private static final Logger logger = LoggerFactory.getLogger(PredicateContextImpl.class); - private final Object contextDocument; private final Object rootDocument; private final Configuration configuration; @@ -43,7 +39,6 @@ public class PredicateContextImpl implements Predicate.PredicateContext { Object result; if(path.isRootPath()){ if(documentPathCache.containsKey(path)){ - logger.debug("Using cached result for root path: " + path.toString()); result = documentPathCache.get(path); } else { result = path.evaluate(rootDocument, rootDocument, configuration).getValue(); @@ -79,4 +74,4 @@ public class PredicateContextImpl implements Predicate.PredicateContext { return configuration; } -} \ No newline at end of file +}