[sling-org-apache-sling-graphql-core] branch master updated: SLING-9872 - move to util package

[bd...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

bdelacretaz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-graphql-core.git


The following commit(s) were added to refs/heads/master by this push:
     new eda9907  SLING-9872 - move to util package
eda9907 is described below

commit eda9907671c0cd46d6c4e6845d650be9e58a94b1
Author: Bertrand Delacretaz <bd...@apache.org>
AuthorDate: Thu Nov 5 10:36:36 2020 +0100

    SLING-9872 - move to util package
---
 .../apache/sling/graphql/core/engine/DefaultQueryExecutor.java |  4 ++--
 .../core/{logging/Sanitizer.java => util/LogSanitizer.java}    |  4 ++--
 .../{logging/SanitizerTest.java => util/LogSanitizerTest.java} | 10 +++++-----
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/main/java/org/apache/sling/graphql/core/engine/DefaultQueryExecutor.java b/src/main/java/org/apache/sling/graphql/core/engine/DefaultQueryExecutor.java
index 4e7897c..d2a1df6 100644
--- a/src/main/java/org/apache/sling/graphql/core/engine/DefaultQueryExecutor.java
+++ b/src/main/java/org/apache/sling/graphql/core/engine/DefaultQueryExecutor.java
@@ -32,7 +32,7 @@ import org.apache.sling.graphql.api.SlingGraphQLException;
 import org.apache.sling.graphql.api.engine.QueryExecutor;
 import org.apache.sling.graphql.api.engine.ValidationResult;
 import org.apache.sling.graphql.api.SlingTypeResolver;
-import org.apache.sling.graphql.core.logging.Sanitizer;
+import org.apache.sling.graphql.core.util.LogSanitizer;
 import org.apache.sling.graphql.core.scalars.SlingScalarsProvider;
 import org.apache.sling.graphql.core.schema.RankedSchemaProviders;
 import org.apache.sling.graphql.core.util.SlingGraphQLErrorHelper;
@@ -80,7 +80,7 @@ public class DefaultQueryExecutor implements QueryExecutor {
     public static final String RESOLVER_OPTIONS = "options";
     public static final String RESOLVER_SOURCE = "source";
 
-    private static final Sanitizer cleanLog = new Sanitizer();
+    private static final LogSanitizer cleanLog = new LogSanitizer();
 
     @Reference
     private RankedSchemaProviders schemaProvider;
diff --git a/src/main/java/org/apache/sling/graphql/core/logging/Sanitizer.java b/src/main/java/org/apache/sling/graphql/core/util/LogSanitizer.java
similarity index 96%
rename from src/main/java/org/apache/sling/graphql/core/logging/Sanitizer.java
rename to src/main/java/org/apache/sling/graphql/core/util/LogSanitizer.java
index 47d7641..87f17c6 100644
--- a/src/main/java/org/apache/sling/graphql/core/logging/Sanitizer.java
+++ b/src/main/java/org/apache/sling/graphql/core/util/LogSanitizer.java
@@ -17,13 +17,13 @@
  * under the License.
  */
 
-package org.apache.sling.graphql.core.logging;
+package org.apache.sling.graphql.core.util;
 
 import java.text.CharacterIterator;
 import java.text.StringCharacterIterator;
 
 /** Sanitize strings for logging */
-public class Sanitizer {
+public class LogSanitizer {
 
     /** Character that replaces unwanted ones in input */
     public static final char REPLACEMENT_CHAR = '_';
diff --git a/src/test/java/org/apache/sling/graphql/core/logging/SanitizerTest.java b/src/test/java/org/apache/sling/graphql/core/util/LogSanitizerTest.java
similarity index 92%
rename from src/test/java/org/apache/sling/graphql/core/logging/SanitizerTest.java
rename to src/test/java/org/apache/sling/graphql/core/util/LogSanitizerTest.java
index 90553c2..c82b1c2 100644
--- a/src/test/java/org/apache/sling/graphql/core/logging/SanitizerTest.java
+++ b/src/test/java/org/apache/sling/graphql/core/util/LogSanitizerTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.graphql.core.logging;
+package org.apache.sling.graphql.core.util;
 
 import static org.junit.Assert.assertEquals;
 
@@ -30,9 +30,9 @@ import org.junit.runners.Parameterized;
 import org.junit.runners.Parameterized.Parameters;
 
 @RunWith(Parameterized.class)
-public class SanitizerTest {
+public class LogSanitizerTest {
     private static final String UNCHANGED = "\u0451";
-    private final Sanitizer s = new Sanitizer();
+    private final LogSanitizer s = new LogSanitizer();
     private final String in;
     private final String out;
 
@@ -55,7 +55,7 @@ public class SanitizerTest {
         result.add(new Object[] { in, out});
     }
 
-    public SanitizerTest(String in, String out) {
+    public LogSanitizerTest(String in, String out) {
         this.in = in;
         this.out = out;
     }
@@ -68,4 +68,4 @@ public class SanitizerTest {
             assertEquals(out, s.sanitize(in));
         }
     }
-}
+}
\ No newline at end of file