fixed escaping of array brackets (#209)

Author: rashtao

src/main/java/com/arangodb/springframework/core/util/AqlUtils.java

@@ -20,13 +20,13 @@
 
 package com.arangodb.springframework.core.util;
 
-import java.util.StringJoiner;
-
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Sort;
 import org.springframework.lang.Nullable;
 import org.springframework.util.StringUtils;
 
+import java.util.StringJoiner;
+
 /**
  * 
  * @author Christian Lechner
@@ -155,16 +155,12 @@ else if (currChar == '`') {
 					throw new IllegalArgumentException(
 							"Sort properties must only contain backticks at beginning/end of attributes or when escaped.");
 				}
-			}
-
-			else if (currChar == '.') {
+			} else if (currChar == '.') {
 				// the dot is part of an attribute name when inside escaped sequence
 				if (inEscapedSeq) {
 					// add dot without escaping
 					escaped.append('.');
-				}
-
-				else {
+				} else {
 					// properties can only contain 2+ dots in escaped sequences
 					if (nextChar == '.') {
 						throw new IllegalArgumentException(
@@ -179,6 +175,21 @@ else if (nextChar == '`') {
 					// close previous escape sequence and open new one
 					escaped.append("`.`");
 				}
+			} else if (currChar == '[' || currChar == ']') {
+				//  square brackets are part of an attribute name when inside escaped sequence
+				if (inEscapedSeq) {
+					escaped.append(currChar);
+				} else {
+					if (currChar == '[') {
+						// close previous escape sequence
+						escaped.append("`");
+					}
+					escaped.append(currChar);
+					if (nextChar == '.') {
+						escaped.append(".`");
+						i++;
+					}
+				}
 			}
 
 			// keep others

src/test/java/com/arangodb/springframework/core/util/AqlUtilsTest.java

@@ -20,16 +20,16 @@
 
 package com.arangodb.springframework.core.util;
 
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.core.Is.is;
-
 import org.junit.Assert;
 import org.junit.Test;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.domain.Sort.Direction;
 
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.core.Is.is;
+
 /**
  * 
  * @author Christian Lechner
@@ -119,15 +119,21 @@ public void sortClauseEscapingTest() {
 			is("SORT `property`.`\\\\\\``.`property` ASC"));
 
 		assertThat(AqlUtils.buildSortClause(Sort.by("`property.\\`.property`")),
-			is("SORT `property.\\`.property` ASC"));
+				is("SORT `property.\\`.property` ASC"));
 
 		assertThat(AqlUtils.buildSortClause(Sort.by("`property.\\``.property")),
-			is("SORT `property.\\``.`property` ASC"));
+				is("SORT `property.\\``.`property` ASC"));
 
 		assertThat(AqlUtils.buildSortClause(Sort.by("`property..property`")), is("SORT `property..property` ASC"));
 
 		assertThat(AqlUtils.buildSortClause(Sort.by("property\\. REMOVE doc IN collection //")),
-			is("SORT `property\\\\`.` REMOVE doc IN collection //` ASC"));
+				is("SORT `property\\\\`.` REMOVE doc IN collection //` ASC"));
+
+		assertThat(AqlUtils.buildSortClause(Sort.by("values[0].date")),
+				is("SORT `values`[0].`date` ASC"));
+
+		assertThat(AqlUtils.buildSortClause(Sort.by("`values[0]`.date")),
+				is("SORT `values[0]`.`date` ASC"));
 
 		// Illegal sort properties