svn commit: r1795976 - in /sling/trunk/tooling/maven/maven-sling-plugin: pom.xml src/main/java/org/apache/sling/maven/bundlesupport/JsonSupport.java src/test/java/org/apache/sling/maven/bundlesupport/JsonSupportTest.java

[sseifert]

Author: sseifert
Date: Tue May 23 21:56:52 2017
New Revision: 1795976

URL: http://svn.apache.org/viewvc?rev=1795976&view=rev
Log:
SLING-6875 maven-sling-plugin: Support tick as well as double quote when 
validating JSON files

Modified:
    sling/trunk/tooling/maven/maven-sling-plugin/pom.xml
    
sling/trunk/tooling/maven/maven-sling-plugin/src/main/java/org/apache/sling/maven/bundlesupport/JsonSupport.java
    
sling/trunk/tooling/maven/maven-sling-plugin/src/test/java/org/apache/sling/maven/bundlesupport/JsonSupportTest.java

Modified: sling/trunk/tooling/maven/maven-sling-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/tooling/maven/maven-sling-plugin/pom.xml?rev=1795976&r1=1795975&r2=1795976&view=diff
==============================================================================
--- sling/trunk/tooling/maven/maven-sling-plugin/pom.xml (original)
+++ sling/trunk/tooling/maven/maven-sling-plugin/pom.xml Tue May 23 21:56:52 
2017
@@ -141,15 +141,15 @@
             <scope>compile</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.johnzon</groupId>
-            <artifactId>johnzon-core</artifactId>
-            <version>1.0.0</version>
+            <groupId>org.apache.sling</groupId>
+            <artifactId>org.apache.sling.jcr.contentparser</artifactId>
+            <version>1.1.1-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-json_1.0_spec</artifactId>
-            <version>1.0-alpha-1</version>
+            <groupId>org.apache.johnzon</groupId>
+            <artifactId>johnzon-core</artifactId>
+            <version>1.0.0</version>
             <scope>compile</scope>
         </dependency>
         <dependency>

Modified: 
sling/trunk/tooling/maven/maven-sling-plugin/src/main/java/org/apache/sling/maven/bundlesupport/JsonSupport.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/tooling/maven/maven-sling-plugin/src/main/java/org/apache/sling/maven/bundlesupport/JsonSupport.java?rev=1795976&r1=1795975&r2=1795976&view=diff
==============================================================================
--- 
sling/trunk/tooling/maven/maven-sling-plugin/src/main/java/org/apache/sling/maven/bundlesupport/JsonSupport.java
 (original)
+++ 
sling/trunk/tooling/maven/maven-sling-plugin/src/main/java/org/apache/sling/maven/bundlesupport/JsonSupport.java
 Tue May 23 21:56:52 2017
@@ -18,6 +18,8 @@
  */
 package org.apache.sling.maven.bundlesupport;
 
+import static 
org.apache.sling.jcr.contentparser.impl.JsonTicksConverter.tickToDoubleQuote;
+
 import java.io.StringReader;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -55,7 +57,7 @@ public final class JsonSupport {
      * @return JSON object
      */
     public static JsonObject parseObject(String jsonString) {
-        try (StringReader reader = new StringReader(jsonString);
+        try (StringReader reader = new 
StringReader(tickToDoubleQuote(jsonString));
                 JsonReader jsonReader = 
JSON_READER_FACTORY.createReader(reader)) {
             return jsonReader.readObject();
         }
@@ -67,7 +69,7 @@ public final class JsonSupport {
      * @return JSON array
      */
     public static JsonArray parseArray(String jsonString) {
-        try (StringReader reader = new StringReader(jsonString);
+        try (StringReader reader = new 
StringReader(tickToDoubleQuote(jsonString));
                 JsonReader jsonReader = 
JSON_READER_FACTORY.createReader(reader)) {
             return jsonReader.readArray();
         }
@@ -79,7 +81,7 @@ public final class JsonSupport {
      * @throws javax.json.JsonException when JSON structure is invalid
      */
     public static void validateJsonStructure(String jsonString) {
-        try (StringReader reader = new StringReader(jsonString);
+        try (StringReader reader = new 
StringReader(tickToDoubleQuote(jsonString));
                 JsonReader jsonReader = 
JSON_READER_FACTORY.createReader(reader)) {
             jsonReader.read();
         }

Modified: 
sling/trunk/tooling/maven/maven-sling-plugin/src/test/java/org/apache/sling/maven/bundlesupport/JsonSupportTest.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/tooling/maven/maven-sling-plugin/src/test/java/org/apache/sling/maven/bundlesupport/JsonSupportTest.java?rev=1795976&r1=1795975&r2=1795976&view=diff
==============================================================================
--- 
sling/trunk/tooling/maven/maven-sling-plugin/src/test/java/org/apache/sling/maven/bundlesupport/JsonSupportTest.java
 (original)
+++ 
sling/trunk/tooling/maven/maven-sling-plugin/src/test/java/org/apache/sling/maven/bundlesupport/JsonSupportTest.java
 Tue May 23 21:56:52 2017
@@ -56,6 +56,7 @@ public class JsonSupportTest {
     public void testValidateJsonStructure() {
         validateJsonStructure("{\"prop1\":123}");
         validateJsonStructure("[{\"prop1\":123}]");
+        validateJsonStructure("{'prop1':123}");
     }
 
     @Test(expected=JsonException.class)