Merge pull request #237 from Sparksoniq/Escaping

Escaping

Author: ghislainfourny

Diff for: LICENSE-Apache-Commons-Text.txt

@@ -0,0 +1,113 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and  To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

Diff for: LICENSE.txt

@@ -22,25 +22,31 @@ licenses.
 
 
 ========================================================================
-For ANTLR v4
+For ANTLR 4.7
 ========================================================================
 
 See license/LICENSE-ANTLR.txt
 
 ========================================================================
-For JLine 3.0.2
+For JLine 3.11.0
 ========================================================================
 
 See license/LICENSE-JLine.txt
 
 ========================================================================
-For org.json
+For org.json 20160810
 ========================================================================
 
 See license/LICENSE-org.json.txt
 
 ========================================================================
-For Spark 1.6.2
+For Spark 2.2.1
 ========================================================================
 
 See license/LICENSE-Spark.txt
+
+========================================================================
+For Apache Commons Text 1.6
+========================================================================
+
+See license/LICENSE-Apache-Commons-Text.txt

Diff for: pom.xml

@@ -82,7 +82,7 @@
          <dependency>
              <groupId>org.jline</groupId>
              <artifactId>jline</artifactId>
-             <version>3.2.0</version>
+             <version>3.11.0</version>
          </dependency>
          <dependency>
              <groupId>com.esotericsoftware</groupId>
@@ -95,6 +95,11 @@
             <version>4.12</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-text</artifactId>
+            <version>1.6</version>
+        </dependency>
      </dependencies>
 
 

Diff for: src/main/java/sparksoniq/io/shell/JiqsJLineShell.java

@@ -25,6 +25,7 @@
 import org.jline.reader.LineReaderBuilder;
 import org.jline.reader.UserInterruptException;
 import org.jline.reader.impl.DefaultHighlighter;
+import org.jline.reader.impl.DefaultParser;
 import org.jline.terminal.Terminal;
 import org.jline.terminal.TerminalBuilder;
 import sparksoniq.JsoniqQueryExecutor;
@@ -110,8 +111,10 @@ private void initialize() throws IOException {
         Terminal terminal = TerminalBuilder.builder()
                 .system(true)
                 .build();
+        DefaultParser parser = new DefaultParser();
+        parser.setEscapeChars(null);
         lineReader = LineReaderBuilder.builder()
-
+                .parser(parser)
                 .terminal(terminal)
 //                .completer(new MyCompleter())
                 .highlighter(new DefaultHighlighter())

Diff for: src/main/java/sparksoniq/jsoniq/item/ArrayItem.java

@@ -26,6 +26,9 @@
 import sparksoniq.semantics.types.ItemTypes;
 
 import javax.naming.OperationNotSupportedException;
+
+import org.apache.commons.lang3.StringEscapeUtils;
+
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
@@ -92,7 +95,7 @@ public String serialize() {
             boolean isStringValue = item instanceof StringItem;
             if(isStringValue) {
                 sb.append("\"");
-                sb.append(item.serialize().replace("\"", "\\\"").replace("\n", "\\n"));
+                sb.append(StringEscapeUtils.escapeJson(item.serialize()));
                 sb.append("\"");
             } else {
               sb.append(item.serialize());

Diff for: src/main/java/sparksoniq/jsoniq/item/ObjectItem.java

@@ -28,6 +28,9 @@
 import sparksoniq.semantics.types.ItemTypes;
 
 import javax.naming.OperationNotSupportedException;
+
+import org.apache.commons.lang3.StringEscapeUtils;
+
 import java.util.*;
 
 public class ObjectItem extends JsonItem{
@@ -147,12 +150,11 @@ public String serialize() {
             String key = _keys.get(i);
             Item value = _values.get(i);
             boolean isStringValue = value instanceof StringItem;
-
-            sb.append("\"" + key.replace("\"", "\\\"").replace("\n", "\\n") + "\"" + " : ");
+            sb.append("\"" + StringEscapeUtils.escapeJson(key) + "\"" + " : ");
             if(isStringValue)
             {
                 sb.append("\"");
-                sb.append(value.serialize().replace("\"", "\\\"").replace("\n", "\\n"));
+                sb.append(StringEscapeUtils.escapeJson(value.serialize()));
                 sb.append("\"");
             } else {
                 sb.append(value.serialize());

Diff for: src/main/java/sparksoniq/jsoniq/runtime/iterator/primary/StringRuntimeIterator.java

@@ -19,6 +19,8 @@
  */
  package sparksoniq.jsoniq.runtime.iterator.primary;
 
+import org.apache.commons.lang3.StringEscapeUtils;
+
 import sparksoniq.exceptions.IteratorFlowException;
 import sparksoniq.jsoniq.item.StringItem;
 import sparksoniq.jsoniq.runtime.iterator.RuntimeIterator;
@@ -39,7 +41,7 @@ public StringItem next() {
     public StringRuntimeIterator(String value, IteratorMetadata iteratorMetadata) {
         super(null, iteratorMetadata);
         this._item = value;
-
+        _item = StringEscapeUtils.unescapeJson(_item);
     }
 
     private String _item;