Merge branch 'release/2.6'

Author: jtnelson

.version

@@ -1 +1 @@
-2.6.0
+2.6.1

CHANGELOG.md

@@ -1,6 +1,9 @@
 # Changelog
 
-#### Version 2.6.0
+#### Version 2.6.1 (July 20, 2019)
+* Fixed a bug that caused a `ValueSymbol` containing a `Timestamp` value to be written in a CCL format that could not be re-parsed by a CCL parser. This bug cased a `SyntaxException` to thrown when attempting to tokenize a CCL statement generated by a Criteria that contained any `Timestamp` values.
+
+#### Version 2.6.0 (July 16, 2019)
 * Added support for **navigation keys**. A **navigation key** is used to traverse the document graph in Concourse. It is made up of multiple keys that are joined by the `.` character (i.e. `friends.friends.name`).
 
 #### Version 2.5.2 (February 16, 2019)

src/main/java/com/cinchapi/ccl/grammar/ValueSymbol.java

@@ -16,6 +16,7 @@
 package com.cinchapi.ccl.grammar;
 
 import com.cinchapi.common.base.AnyStrings;
+import com.cinchapi.common.reflect.Reflection;
 
 /**
  * A {@link Symbol} that contains a value.;
@@ -48,6 +49,15 @@ else if((value instanceof String || value.getClass().getName()
             return new StringBuilder().append(wrap).append(value).append(wrap)
                     .toString();
         }
+        else if(value.getClass().getName()
+                .equals("com.cinchapi.concourse.Timestamp")) {
+            // NOTE: See com.cinchapi.concourse.util.Convert to see the
+            // conventions for the way that a Timestamp is parsed from a long
+            // (microseconds) or string (natural language or date time format)
+            // wrapped in vertical bars.
+            long micros = Reflection.call(value, "getMicros"); // (Authorized)
+            return AnyStrings.format("|{}|", micros);
+        }
         else {
             return value;
         }

src/test/java/com/cinchapi/ccl/ParserTest.java

@@ -36,6 +36,7 @@
 import com.cinchapi.ccl.syntax.Visitor;
 import com.cinchapi.common.reflect.Reflection;
 import com.cinchapi.concourse.Tag;
+import com.cinchapi.concourse.Timestamp;
 import com.cinchapi.concourse.lang.Criteria;
 import com.cinchapi.concourse.thrift.Operator;
 import com.cinchapi.concourse.time.Time;
@@ -1020,6 +1021,25 @@ public void testParseNumericNumber() {
         }
     }
 
+    @Test
+    public void testCriteriaWithTimestampValueParse() {
+        Timestamp start = Timestamp.now();
+        Timestamp end = Timestamp.now();
+        Criteria criteria = Criteria.where().key("foo")
+                .operator(Operator.BETWEEN).value(start).value(end).build();
+        Parser parser = createParser(criteria.getCclString());
+        int count = 0;
+        for (Symbol symbol : parser.tokenize()) {
+            if(symbol instanceof ValueSymbol) {
+                ValueSymbol $symbol = (ValueSymbol) symbol;
+                Assert.assertEquals(Timestamp.class, $symbol.value().getClass());
+                Assert.assertTrue($symbol.value().equals(start) || $symbol.value().equals(end));
+                ++count;
+            }
+        }
+        Assert.assertEquals(2, count);
+    }
+
     protected abstract Parser createParser(String ccl);
 
     protected abstract Parser createParser(String ccl,