You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ss...@apache.org on 2017/05/30 08:54:35 UTC
svn commit: r1796819 -
/sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/loader/ContentLoader.java
Author: sseifert
Date: Tue May 30 08:54:35 2017
New Revision: 1796819
URL: http://svn.apache.org/viewvc?rev=1796819&view=rev
Log:
SLING-6874 activate json quote tick parsing by default
Modified:
sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/loader/ContentLoader.java
Modified: sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/loader/ContentLoader.java
URL: http://svn.apache.org/viewvc/sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/loader/ContentLoader.java?rev=1796819&r1=1796818&r2=1796819&view=diff
==============================================================================
--- sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/loader/ContentLoader.java (original)
+++ sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/loader/ContentLoader.java Tue May 30 08:54:35 2017
@@ -20,6 +20,7 @@ package org.apache.sling.testing.mock.sl
import java.io.IOException;
import java.io.InputStream;
+import java.util.EnumSet;
import java.util.HashMap;
import java.util.Map;
import java.util.Set;
@@ -34,6 +35,7 @@ import org.apache.sling.commons.mime.Mim
import org.apache.sling.jcr.contentparser.ContentParser;
import org.apache.sling.jcr.contentparser.ContentParserFactory;
import org.apache.sling.jcr.contentparser.ContentType;
+import org.apache.sling.jcr.contentparser.JsonParserFeature;
import org.apache.sling.jcr.contentparser.ParseException;
import org.apache.sling.jcr.contentparser.ParserOptions;
import org.osgi.framework.BundleContext;
@@ -65,7 +67,8 @@ public final class ContentLoader {
private static ContentParser JSON_PARSER = ContentParserFactory.create(ContentType.JSON, new ParserOptions()
.detectCalendarValues(true)
.ignorePropertyNames(IGNORED_NAMES)
- .ignoreResourceNames(IGNORED_NAMES));
+ .ignoreResourceNames(IGNORED_NAMES)
+ .jsonParserFeatures(EnumSet.of(JsonParserFeature.COMMENTS, JsonParserFeature.QUOTE_TICK)));
private final ResourceResolver resourceResolver;
private final BundleContext bundleContext;