You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sn...@apache.org on 2014/03/05 21:26:27 UTC

[1/5] git commit: Fixed s3 cloud exporting functionality. Fixed and retested integration test to make sure.

Repository: incubator-usergrid
Updated Branches:
  refs/heads/two-dot-o 228a7180b -> da870213a
  refs/pull/60/head a7504dee8 -> a02b08c7f


Fixed s3 cloud exporting functionality.
Fixed and retested integration test to make sure.


Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/a02b08c7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/a02b08c7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/a02b08c7

Branch: refs/pull/60/head
Commit: a02b08c7fe8c498c2968df7e27b3cc6fec6efdbd
Parents: a7504de
Author: grey <gr...@apigee.com>
Authored: Wed Mar 5 11:59:03 2014 -0800
Committer: grey <gr...@apigee.com>
Committed: Wed Mar 5 11:59:03 2014 -0800

----------------------------------------------------------------------
 .../rest/management/ManagementResourceIT.java   | 11 +--
 .../management/export/S3ExportImpl.java         | 10 ++-
 .../cassandra/ManagementServiceIT.java          | 80 ++++++++++----------
 3 files changed, 52 insertions(+), 49 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a02b08c7/stack/rest/src/test/java/org/apache/usergrid/rest/management/ManagementResourceIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/management/ManagementResourceIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/management/ManagementResourceIT.java
index a914237..00a8a97 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/management/ManagementResourceIT.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/management/ManagementResourceIT.java
@@ -552,7 +552,7 @@ public class ManagementResourceIT extends AbstractRestIT {
 //        assertEquals( Status.OK, responseStatus );
 //    }
 
-
+//is this test still valid knowing that the sch. won't run in intelliJ?
     @Ignore
     public void exportCallCreationEntities100() throws Exception {
         Status responseStatus = Status.OK;
@@ -562,16 +562,12 @@ public class ManagementResourceIT extends AbstractRestIT {
         Map<String, Object> properties = new HashMap<String, Object>();
         Map<String, Object> storage_info = new HashMap<String, Object>();
         //TODO: make sure to put a valid admin token here.
-        storage_info.put( "admin_token", adminToken() );
         //TODO: always put dummy values here and ignore this test.
-        storage_info.put( "s3_key", "insert key here" );
-        storage_info.put( "s3_accessId", "insert access id here" );
-        storage_info.put( "bucket_location", "insert bucket name here" );
+
 
         properties.put( "storage_provider", "s3" );
         properties.put( "storage_info", storage_info );
 
-        payload.put( "path", "test-organization/test-app/user" );
         payload.put( "properties", properties );
 
         for ( int i = 0; i < 100; i++ ) {
@@ -583,7 +579,8 @@ public class ManagementResourceIT extends AbstractRestIT {
         }
 
         try {
-            node = resource().path( "/management/orgs/test-organization/apps/test-app/export" )
+            node = resource().path( "/management/orgs/test-organization/apps/test-app/export" ).queryParam(
+                    "access_token", adminToken() )
                              .accept( MediaType.APPLICATION_JSON ).type( MediaType.APPLICATION_JSON_TYPE )
                              .post( JsonNode.class, payload );
         }

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a02b08c7/stack/services/src/main/java/org/apache/usergrid/management/export/S3ExportImpl.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/apache/usergrid/management/export/S3ExportImpl.java b/stack/services/src/main/java/org/apache/usergrid/management/export/S3ExportImpl.java
index 4cf9272..7439acf 100644
--- a/stack/services/src/main/java/org/apache/usergrid/management/export/S3ExportImpl.java
+++ b/stack/services/src/main/java/org/apache/usergrid/management/export/S3ExportImpl.java
@@ -34,9 +34,13 @@ public class S3ExportImpl implements S3Export {
 
         Logger logger = LoggerFactory.getLogger( ExportServiceImpl.class );
         /*won't need any of the properties as I have the export info*/
-        String bucketName = ( String ) exportInfo.get( "bucket_location" );
-        String accessId = ( String ) exportInfo.get( "s3_accessId" );
-        String secretKey = ( String ) exportInfo.get( "s3_key" );
+        Map<String,Object> properties = ( Map<String, Object> ) exportInfo.get( "properties" );
+
+        Map<String, Object> storage_info = (Map<String,Object>)properties.get( "storage_info" );
+
+        String bucketName = ( String ) storage_info.get( "bucket_location" );
+        String accessId = ( String ) storage_info.get( "s3_accessId" );
+        String secretKey = ( String ) storage_info.get( "s3_key" );
 
         Properties overrides = new Properties();
         overrides.setProperty( "s3" + ".identity", accessId );

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a02b08c7/stack/services/src/test/java/org/apache/usergrid/management/cassandra/ManagementServiceIT.java
----------------------------------------------------------------------
diff --git a/stack/services/src/test/java/org/apache/usergrid/management/cassandra/ManagementServiceIT.java b/stack/services/src/test/java/org/apache/usergrid/management/cassandra/ManagementServiceIT.java
index 686b5c6..b4c07ad 100644
--- a/stack/services/src/test/java/org/apache/usergrid/management/cassandra/ManagementServiceIT.java
+++ b/stack/services/src/test/java/org/apache/usergrid/management/cassandra/ManagementServiceIT.java
@@ -32,6 +32,7 @@ import org.apache.usergrid.management.UserInfo;
 import org.apache.usergrid.management.export.ExportJob;
 import org.apache.usergrid.management.export.ExportService;
 import org.apache.usergrid.management.export.S3Export;
+import org.apache.usergrid.management.export.S3ExportImpl;
 import org.apache.usergrid.persistence.CredentialsInfo;
 import org.apache.usergrid.persistence.Entity;
 import org.apache.usergrid.persistence.EntityManager;
@@ -53,7 +54,6 @@ import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
-
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
@@ -1385,44 +1385,46 @@ public class ManagementServiceIT {
 //    }
 //
 //
-//    @Ignore //For this test please input your s3 credentials into payload builder.
-//    public void testIntegration100EntitiesOn() throws Exception {
-//
-//        S3Export s3Export = new S3ExportImpl();
-//        ExportService exportService = setup.getExportService();
-//        HashMap<String, Object> payload = payloadBuilder();
-//
-//        ExportInfo exportInfo = new ExportInfo( payload );
-//        exportInfo.setApplicationId( applicationId );
-//
-//        EntityManager em = setup.getEmf().getEntityManager( applicationId );
-//        //intialize user object to be posted
-//        Map<String, Object> userProperties = null;
-//        Entity[] entity;
-//        entity = new Entity[100];
-//        //creates entities
-//        for ( int i = 0; i < 100; i++ ) {
-//            userProperties = new LinkedHashMap<String, Object>();
-//            userProperties.put( "username", "billybob" + i );
-//            userProperties.put( "email", "test" + i + "@anuff.com" );//String.format( "test%i@anuff.com", i ) );
-//
-//            entity[i] = em.create( "user", userProperties );
-//        }
-//
-//        UUID exportUUID = exportService.schedule( exportInfo );
-//        exportService.setS3Export( s3Export );
-//
-//        //create and initialize jobData returned in JobExecution.
-//        JobData jobData = new JobData();
-//        jobData.setProperty( "jobName", "exportJob" );
-//        jobData.setProperty( "exportInfo", exportInfo );
-//        jobData.setProperty( "exportId", exportUUID );
-//
-//        JobExecution jobExecution = mock( JobExecution.class );
-//        when( jobExecution.getJobData() ).thenReturn( jobData );
-//
-//        exportService.doExport( exportInfo, jobExecution );
-//    }
+    @Ignore //For this test please input your s3 credentials into payload builder.
+    public void testIntegration100EntitiesOn() throws Exception {
+
+        S3Export s3Export = new S3ExportImpl();
+        ExportService exportService = setup.getExportService();
+        HashMap<String, Object> payload = payloadBuilder();
+
+       // ExportInfo exportInfo = new ExportInfo( payload );
+        //exportInfo.setApplicationId( applicationId );
+
+        payload.put("applicationId",applicationId);
+
+        EntityManager em = setup.getEmf().getEntityManager( applicationId );
+        //intialize user object to be posted
+        Map<String, Object> userProperties = null;
+        Entity[] entity;
+        entity = new Entity[100];
+        //creates entities
+        for ( int i = 0; i < 100; i++ ) {
+            userProperties = new LinkedHashMap<String, Object>();
+            userProperties.put( "username", "billybob" + i );
+            userProperties.put( "email", "test" + i + "@anuff.com" );//String.format( "test%i@anuff.com", i ) );
+
+            entity[i] = em.create( "user", userProperties );
+        }
+
+        UUID exportUUID = exportService.schedule( payload );
+        exportService.setS3Export( s3Export );
+
+        //create and initialize jobData returned in JobExecution.
+        JobData jobData = new JobData();
+        jobData.setProperty( "jobName", "exportJob" );
+        jobData.setProperty( "exportInfo", payload );
+        jobData.setProperty( "exportId", exportUUID );
+
+        JobExecution jobExecution = mock( JobExecution.class );
+        when( jobExecution.getJobData() ).thenReturn( jobData );
+
+        exportService.doExport( jobExecution );
+    }
 
 
     /*Creates fake payload for testing purposes.*/


[2/5] git commit: Enable testCollectionOrdering() test, also: use more specific exceptions.

Posted by sn...@apache.org.
Enable testCollectionOrdering() test, also: use more specific exceptions.


Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/5dbfdf38
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/5dbfdf38
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/5dbfdf38

Branch: refs/heads/two-dot-o
Commit: 5dbfdf383d411c01a534c096b7feac3e5c0fcf50
Parents: 228a718
Author: Dave Johnson <dm...@apigee.com>
Authored: Wed Mar 5 15:06:04 2014 -0500
Committer: Dave Johnson <dm...@apigee.com>
Committed: Wed Mar 5 15:06:04 2014 -0500

----------------------------------------------------------------------
 .../persistence/exceptions/IndexException.java  | 41 ++++++++++++++++++++
 .../persistence/exceptions/QueryException.java  | 41 ++++++++++++++++++++
 .../index/impl/EsEntityCollectionIndex.java     | 12 +++---
 .../persistence/index/impl/EsQueryVistor.java   |  1 -
 .../usergrid/persistence/query/Query.java       |  5 ++-
 .../usergrid/persistence/index/impl/GeoIT.java  |  4 +-
 .../persistence/index/impl/IndexIT.java         |  2 -
 .../usergrid/persistence/query/QueryTest.java   |  1 +
 .../persistence/query/tree/GrammarTreeTest.java |  2 +-
 9 files changed, 94 insertions(+), 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/5dbfdf38/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/exceptions/IndexException.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/exceptions/IndexException.java b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/exceptions/IndexException.java
new file mode 100644
index 0000000..ab625d2
--- /dev/null
+++ b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/exceptions/IndexException.java
@@ -0,0 +1,41 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  The ASF licenses this file to You
+ * 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.  For additional information regarding
+ * copyright in this work, please see the NOTICE file in the top level
+ * directory of this distribution.
+ */
+package org.apache.usergrid.persistence.exceptions;
+
+
+public class IndexException extends RuntimeException {
+
+    public IndexException() {
+        super();
+    }
+
+
+    public IndexException( String message, Throwable cause ) {
+        super( message, cause );
+    }
+
+
+    public IndexException( String message ) {
+        super( message );
+    }
+
+
+    public IndexException( Throwable cause ) {
+        super( cause );
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/5dbfdf38/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/exceptions/QueryException.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/exceptions/QueryException.java b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/exceptions/QueryException.java
new file mode 100644
index 0000000..e8f9b43
--- /dev/null
+++ b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/exceptions/QueryException.java
@@ -0,0 +1,41 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  The ASF licenses this file to You
+ * 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.  For additional information regarding
+ * copyright in this work, please see the NOTICE file in the top level
+ * directory of this distribution.
+ */
+package org.apache.usergrid.persistence.exceptions;
+
+
+public class QueryException extends RuntimeException {
+
+    public QueryException() {
+        super();
+    }
+
+
+    public QueryException( String message, Throwable cause ) {
+        super( message, cause );
+    }
+
+
+    public QueryException( String message ) {
+        super( message );
+    }
+
+
+    public QueryException( Throwable cause ) {
+        super( cause );
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/5dbfdf38/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityCollectionIndex.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityCollectionIndex.java b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityCollectionIndex.java
index 3e7b62b..2854d9c 100644
--- a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityCollectionIndex.java
+++ b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityCollectionIndex.java
@@ -30,6 +30,7 @@ import java.util.UUID;
 import org.apache.usergrid.persistence.collection.CollectionScope;
 import org.apache.usergrid.persistence.collection.EntityCollectionManager;
 import org.apache.usergrid.persistence.collection.EntityCollectionManagerFactory;
+import org.apache.usergrid.persistence.exceptions.IndexException;
 import org.apache.usergrid.persistence.index.EntityCollectionIndex;
 import org.apache.usergrid.persistence.index.IndexFig;
 import org.apache.usergrid.persistence.model.entity.Entity;
@@ -125,15 +126,14 @@ public class EsEntityCollectionIndex implements EntityCollectionIndex {
 
     public void index(Entity entity) {
 
-        // TODO: real exception types here
         if (entity.getId() == null) {
-            throw new RuntimeException("Cannot index entity with id null");
+            throw new IllegalArgumentException("Cannot index entity with id null");
         }
         if (entity.getId().getUuid() == null || entity.getId().getType() == null) {
-            throw new RuntimeException("Cannot index entity with incomplete id");
+            throw new IllegalArgumentException("Cannot index entity with incomplete id");
         }
         if (entity.getVersion() == null) {
-            throw new RuntimeException("Cannot index entity with version null");
+            throw new IllegalArgumentException("Cannot index entity with version null");
         }
 
         Map<String, Object> entityAsMap = EsEntityCollectionIndex.entityToMap(entity);
@@ -173,7 +173,6 @@ public class EsEntityCollectionIndex implements EntityCollectionIndex {
 
     public Results execute(Query query) {
 
-        // TODO add support for cursor
         QueryBuilder qb = query.createQueryBuilder();
         log.debug("Executing query on type {} query: {} ", scope.getName(), query.toString());
 
@@ -235,8 +234,7 @@ public class EsEntityCollectionIndex implements EntityCollectionIndex {
 
             Entity entity = manager.load(entityId).toBlockingObservable().last();
             if (entity == null) {
-                // TODO exception types instead of RuntimeException
-                throw new RuntimeException("Entity id [" + entityId + "] not found");
+                throw new IndexException("Entity id [" + entityId + "] not found");
             }
 
             UUID entityVersion = UUID.fromString(version);

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/5dbfdf38/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsQueryVistor.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsQueryVistor.java b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsQueryVistor.java
index 50f88f9..e510a93 100644
--- a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsQueryVistor.java
+++ b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsQueryVistor.java
@@ -86,7 +86,6 @@ public class EsQueryVistor implements QueryVisitor {
         float lon = op.getLongitude().getFloatValue();
         float distance = op.getDistance().getFloatValue();
 
-        // TODO: provide some way to set units for the distance filter 
         FilterBuilder fb = FilterBuilders.geoDistanceFilter( name + GEO_SUFFIX )
            .lat( lat ).lon( lon ).distance( distance, DistanceUnit.METERS );
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/5dbfdf38/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/query/Query.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/query/Query.java b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/query/Query.java
index b0f004d..c81bc85 100644
--- a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/query/Query.java
+++ b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/query/Query.java
@@ -38,6 +38,7 @@ import org.apache.commons.lang.StringUtils;
 import static org.apache.commons.lang.StringUtils.isBlank;
 import static org.apache.commons.lang.StringUtils.split;
 import org.apache.usergrid.persistence.exceptions.PersistenceException;
+import org.apache.usergrid.persistence.exceptions.QueryParseException;
 import org.apache.usergrid.persistence.index.impl.EsQueryVistor;
 import org.apache.usergrid.persistence.model.entity.Id;
 import org.apache.usergrid.persistence.query.Results.Level;
@@ -253,7 +254,7 @@ public class Query {
         Boolean pad = firstBoolean( params.get( "pad" ) );
 
         for ( Entry<String, List<String>> param : params.entrySet() ) {
-            Id identifier = null; // TODO Identifier.from( param.getKey() );
+            Id identifier = null;
             if ( ( param.getValue() == null ) || ( param.getValue().size() == 0 ) ) {
                 if ( identifier != null ) {
                     if ( identifiers == null ) {
@@ -723,7 +724,7 @@ public class Query {
         if ( ( startResult == null ) && ( cursor != null ) ) {
             byte[] cursorBytes = decodeBase64( cursor );
             if ( ( cursorBytes != null ) && ( cursorBytes.length == 16 ) ) {
-                startResult = null; // TODO uuid( cursorBytes );
+                startResult = null; 
             }
         }
         return startResult;

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/5dbfdf38/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/GeoIT.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/GeoIT.java b/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/GeoIT.java
index 71d384f..5580dbe 100644
--- a/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/GeoIT.java
+++ b/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/GeoIT.java
@@ -282,7 +282,7 @@ public class GeoIT {
         }
         while ( results.getCursor() != null );
 
-        // check we got back all 500 entities
+        // check we got back all entities
         assertEquals( numEntities, count );
     }
 
@@ -400,7 +400,7 @@ public class GeoIT {
             collectionManagerFactory, collectionIndexFactory );
         assertNotNull( em );
 
-        int size = 100;
+        int size = 10;
         int min = 50;
         int max = 90;
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/5dbfdf38/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/IndexIT.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/IndexIT.java b/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/IndexIT.java
index 46d975b..ce3a9ae 100644
--- a/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/IndexIT.java
+++ b/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/IndexIT.java
@@ -40,7 +40,6 @@ import org.jukito.JukitoRunner;
 import org.jukito.UseModules;
 import static org.junit.Assert.assertEquals;
 import org.junit.ClassRule;
-import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -79,7 +78,6 @@ public class IndexIT {
             "X-ray", "Yankee", "Zulu"
     };
 
-    @Ignore // TODO: enable when Cursor support implemented
     @Test
     public void testCollectionOrdering() throws Exception {
         LOG.info( "testCollectionOrdering" );

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/5dbfdf38/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/query/QueryTest.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/query/QueryTest.java b/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/query/QueryTest.java
index 68d9a6d..3b09c86 100644
--- a/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/query/QueryTest.java
+++ b/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/query/QueryTest.java
@@ -22,6 +22,7 @@ package org.apache.usergrid.persistence.query;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
+import org.apache.usergrid.persistence.exceptions.QueryParseException;
 
 import org.junit.Test;
 import org.slf4j.Logger;

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/5dbfdf38/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/query/tree/GrammarTreeTest.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/query/tree/GrammarTreeTest.java b/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/query/tree/GrammarTreeTest.java
index d2150a4..345bfea 100644
--- a/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/query/tree/GrammarTreeTest.java
+++ b/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/query/tree/GrammarTreeTest.java
@@ -26,9 +26,9 @@ import java.util.UUID;
 import org.antlr.runtime.ANTLRStringStream;
 import org.antlr.runtime.RecognitionException;
 import org.antlr.runtime.TokenRewriteStream;
+import org.apache.usergrid.persistence.exceptions.QueryParseException;
 import org.junit.Test;
 import org.apache.usergrid.persistence.query.Query;
-import org.apache.usergrid.persistence.query.QueryParseException;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;


[4/5] Ignore ANTLR output.

Posted by sn...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/da870213/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/query/tree/QueryFilterParser.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/query/tree/QueryFilterParser.java b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/query/tree/QueryFilterParser.java
deleted file mode 100644
index a54816e..0000000
--- a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/query/tree/QueryFilterParser.java
+++ /dev/null
@@ -1,2186 +0,0 @@
-// $ANTLR 3.5.1 org/apache/usergrid/persistence/query/tree/QueryFilter.g 2014-02-21 08:18:25
-
-package org.apache.usergrid.persistence.query.tree;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.apache.usergrid.persistence.query.Query;
-import org.apache.usergrid.persistence.query.Query.SortPredicate;
-
-
-
-import org.antlr.runtime.*;
-import java.util.Stack;
-import java.util.List;
-import java.util.ArrayList;
-
-import org.antlr.runtime.tree.*;
-
-
-@SuppressWarnings("all")
-public class QueryFilterParser extends Parser {
-	public static final String[] tokenNames = new String[] {
-		"<invalid>", "<EOR>", "<DOWN>", "<UP>", "AND", "ASC", "BOOLEAN", "CONTAINS", 
-		"DESC", "EQ", "ESC_SEQ", "EXPONENT", "FALSE", "FLOAT", "GT", "GTE", "HEX_DIGIT", 
-		"ID", "LONG", "LT", "LTE", "NOT", "OCTAL_ESC", "OF", "OR", "STRING", "TRUE", 
-		"UNICODE_ESC", "UUID", "WITHIN", "WS", "'('", "')'", "'*'", "','", "':'", 
-		"'order by'", "'select'", "'where'", "'{'", "'}'"
-	};
-	public static final int EOF=-1;
-	public static final int T__31=31;
-	public static final int T__32=32;
-	public static final int T__33=33;
-	public static final int T__34=34;
-	public static final int T__35=35;
-	public static final int T__36=36;
-	public static final int T__37=37;
-	public static final int T__38=38;
-	public static final int T__39=39;
-	public static final int T__40=40;
-	public static final int AND=4;
-	public static final int ASC=5;
-	public static final int BOOLEAN=6;
-	public static final int CONTAINS=7;
-	public static final int DESC=8;
-	public static final int EQ=9;
-	public static final int ESC_SEQ=10;
-	public static final int EXPONENT=11;
-	public static final int FALSE=12;
-	public static final int FLOAT=13;
-	public static final int GT=14;
-	public static final int GTE=15;
-	public static final int HEX_DIGIT=16;
-	public static final int ID=17;
-	public static final int LONG=18;
-	public static final int LT=19;
-	public static final int LTE=20;
-	public static final int NOT=21;
-	public static final int OCTAL_ESC=22;
-	public static final int OF=23;
-	public static final int OR=24;
-	public static final int STRING=25;
-	public static final int TRUE=26;
-	public static final int UNICODE_ESC=27;
-	public static final int UUID=28;
-	public static final int WITHIN=29;
-	public static final int WS=30;
-
-	// delegates
-	public Parser[] getDelegates() {
-		return new Parser[] {};
-	}
-
-	// delegators
-
-
-	public QueryFilterParser(TokenStream input) {
-		this(input, new RecognizerSharedState());
-	}
-	public QueryFilterParser(TokenStream input, RecognizerSharedState state) {
-		super(input, state);
-	}
-
-	protected TreeAdaptor adaptor = new CommonTreeAdaptor();
-
-	public void setTreeAdaptor(TreeAdaptor adaptor) {
-		this.adaptor = adaptor;
-	}
-	public TreeAdaptor getTreeAdaptor() {
-		return adaptor;
-	}
-	@Override public String[] getTokenNames() { return QueryFilterParser.tokenNames; }
-	@Override public String getGrammarFileName() { return "org/apache/usergrid/persistence/query/tree/QueryFilter.g"; }
-
-
-		Query query = new Query();
-
-	  private static final Logger logger = LoggerFactory
-	      .getLogger(QueryFilterLexer.class);
-
-		@Override
-		public void emitErrorMessage(String msg) {
-			logger.info(msg);
-		}
-
-
-	public static class property_return extends ParserRuleReturnScope {
-		Object tree;
-		@Override
-		public Object getTree() { return tree; }
-	};
-
-
-	// $ANTLR start "property"
-	// org/apache/usergrid/persistence/query/tree/QueryFilter.g:175:1: property : ID ;
-	public final QueryFilterParser.property_return property() throws RecognitionException {
-		QueryFilterParser.property_return retval = new QueryFilterParser.property_return();
-		retval.start = input.LT(1);
-
-		Object root_0 = null;
-
-		Token ID1=null;
-
-		Object ID1_tree=null;
-
-		try {
-			// org/apache/usergrid/persistence/query/tree/QueryFilter.g:175:10: ( ID )
-			// org/apache/usergrid/persistence/query/tree/QueryFilter.g:175:12: ID
-			{
-			root_0 = (Object)adaptor.nil();
-
-
-			ID1=(Token)match(input,ID,FOLLOW_ID_in_property991); 
-			ID1_tree = new Property(ID1) ;
-			adaptor.addChild(root_0, ID1_tree);
-
-			}
-
-			retval.stop = input.LT(-1);
-
-			retval.tree = (Object)adaptor.rulePostProcessing(root_0);
-			adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop);
-
-		}
-		 
-		finally {
-			// do for sure before leaving
-		}
-		return retval;
-	}
-	// $ANTLR end "property"
-
-
-	public static class containsproperty_return extends ParserRuleReturnScope {
-		Object tree;
-		@Override
-		public Object getTree() { return tree; }
-	};
-
-
-	// $ANTLR start "containsproperty"
-	// org/apache/usergrid/persistence/query/tree/QueryFilter.g:177:1: containsproperty : ID ;
-	public final QueryFilterParser.containsproperty_return containsproperty() throws RecognitionException {
-		QueryFilterParser.containsproperty_return retval = new QueryFilterParser.containsproperty_return();
-		retval.start = input.LT(1);
-
-		Object root_0 = null;
-
-		Token ID2=null;
-
-		Object ID2_tree=null;
-
-		try {
-			// org/apache/usergrid/persistence/query/tree/QueryFilter.g:177:18: ( ID )
-			// org/apache/usergrid/persistence/query/tree/QueryFilter.g:177:20: ID
-			{
-			root_0 = (Object)adaptor.nil();
-
-
-			ID2=(Token)match(input,ID,FOLLOW_ID_in_containsproperty1002); 
-			ID2_tree = new ContainsProperty(ID2) ;
-			adaptor.addChild(root_0, ID2_tree);
-
-			}
-
-			retval.stop = input.LT(-1);
-
-			retval.tree = (Object)adaptor.rulePostProcessing(root_0);
-			adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop);
-
-		}
-		 
-		finally {
-			// do for sure before leaving
-		}
-		return retval;
-	}
-	// $ANTLR end "containsproperty"
-
-
-	public static class withinproperty_return extends ParserRuleReturnScope {
-		Object tree;
-		@Override
-		public Object getTree() { return tree; }
-	};
-
-
-	// $ANTLR start "withinproperty"
-	// org/apache/usergrid/persistence/query/tree/QueryFilter.g:179:1: withinproperty : ID ;
-	public final QueryFilterParser.withinproperty_return withinproperty() throws RecognitionException {
-		QueryFilterParser.withinproperty_return retval = new QueryFilterParser.withinproperty_return();
-		retval.start = input.LT(1);
-
-		Object root_0 = null;
-
-		Token ID3=null;
-
-		Object ID3_tree=null;
-
-		try {
-			// org/apache/usergrid/persistence/query/tree/QueryFilter.g:179:16: ( ID )
-			// org/apache/usergrid/persistence/query/tree/QueryFilter.g:179:18: ID
-			{
-			root_0 = (Object)adaptor.nil();
-
-
-			ID3=(Token)match(input,ID,FOLLOW_ID_in_withinproperty1013); 
-			ID3_tree = new WithinProperty(ID3) ;
-			adaptor.addChild(root_0, ID3_tree);
-
-			}
-
-			retval.stop = input.LT(-1);
-
-			retval.tree = (Object)adaptor.rulePostProcessing(root_0);
-			adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop);
-
-		}
-		 
-		finally {
-			// do for sure before leaving
-		}
-		return retval;
-	}
-	// $ANTLR end "withinproperty"
-
-
-	public static class booleanliteral_return extends ParserRuleReturnScope {
-		Object tree;
-		@Override
-		public Object getTree() { return tree; }
-	};
-
-
-	// $ANTLR start "booleanliteral"
-	// org/apache/usergrid/persistence/query/tree/QueryFilter.g:181:1: booleanliteral : BOOLEAN ;
-	public final QueryFilterParser.booleanliteral_return booleanliteral() throws RecognitionException {
-		QueryFilterParser.booleanliteral_return retval = new QueryFilterParser.booleanliteral_return();
-		retval.start = input.LT(1);
-
-		Object root_0 = null;
-
-		Token BOOLEAN4=null;
-
-		Object BOOLEAN4_tree=null;
-
-		try {
-			// org/apache/usergrid/persistence/query/tree/QueryFilter.g:181:15: ( BOOLEAN )
-			// org/apache/usergrid/persistence/query/tree/QueryFilter.g:181:17: BOOLEAN
-			{
-			root_0 = (Object)adaptor.nil();
-
-
-			BOOLEAN4=(Token)match(input,BOOLEAN,FOLLOW_BOOLEAN_in_booleanliteral1024); 
-			BOOLEAN4_tree = new BooleanLiteral(BOOLEAN4) ;
-			adaptor.addChild(root_0, BOOLEAN4_tree);
-
-			}
-
-			retval.stop = input.LT(-1);
-
-			retval.tree = (Object)adaptor.rulePostProcessing(root_0);
-			adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop);
-
-		}
-		 
-		finally {
-			// do for sure before leaving
-		}
-		return retval;
-	}
-	// $ANTLR end "booleanliteral"
-
-
-	public static class longliteral_return extends ParserRuleReturnScope {
-		Object tree;
-		@Override
-		public Object getTree() { return tree; }
-	};
-
-
-	// $ANTLR start "longliteral"
-	// org/apache/usergrid/persistence/query/tree/QueryFilter.g:184:1: longliteral : LONG ;
-	public final QueryFilterParser.longliteral_return longliteral() throws RecognitionException {
-		QueryFilterParser.longliteral_return retval = new QueryFilterParser.longliteral_return();
-		retval.start = input.LT(1);
-
-		Object root_0 = null;
-
-		Token LONG5=null;
-
-		Object LONG5_tree=null;
-
-		try {
-			// org/apache/usergrid/persistence/query/tree/QueryFilter.g:184:13: ( LONG )
-			// org/apache/usergrid/persistence/query/tree/QueryFilter.g:185:3: LONG
-			{
-			root_0 = (Object)adaptor.nil();
-
-
-			LONG5=(Token)match(input,LONG,FOLLOW_LONG_in_longliteral1038); 
-			LONG5_tree = new LongLiteral(LONG5) ;
-			adaptor.addChild(root_0, LONG5_tree);
-
-			}
-
-			retval.stop = input.LT(-1);
-
-			retval.tree = (Object)adaptor.rulePostProcessing(root_0);
-			adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop);
-
-		}
-		 
-		finally {
-			// do for sure before leaving
-		}
-		return retval;
-	}
-	// $ANTLR end "longliteral"
-
-
-	public static class uuidliteral_return extends ParserRuleReturnScope {
-		Object tree;
-		@Override
-		public Object getTree() { return tree; }
-	};
-
-
-	// $ANTLR start "uuidliteral"
-	// org/apache/usergrid/persistence/query/tree/QueryFilter.g:187:1: uuidliteral : UUID ;
-	public final QueryFilterParser.uuidliteral_return uuidliteral() throws RecognitionException {
-		QueryFilterParser.uuidliteral_return retval = new QueryFilterParser.uuidliteral_return();
-		retval.start = input.LT(1);
-
-		Object root_0 = null;
-
-		Token UUID6=null;
-
-		Object UUID6_tree=null;
-
-		try {
-			// org/apache/usergrid/persistence/query/tree/QueryFilter.g:187:13: ( UUID )
-			// org/apache/usergrid/persistence/query/tree/QueryFilter.g:188:3: UUID
-			{
-			root_0 = (Object)adaptor.nil();
-
-
-			UUID6=(Token)match(input,UUID,FOLLOW_UUID_in_uuidliteral1052); 
-			UUID6_tree = new UUIDLiteral(UUID6) ;
-			adaptor.addChild(root_0, UUID6_tree);
-
-			}
-
-			retval.stop = input.LT(-1);
-
-			retval.tree = (Object)adaptor.rulePostProcessing(root_0);
-			adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop);
-
-		}
-		 
-		finally {
-			// do for sure before leaving
-		}
-		return retval;
-	}
-	// $ANTLR end "uuidliteral"
-
-
-	public static class stringliteral_return extends ParserRuleReturnScope {
-		Object tree;
-		@Override
-		public Object getTree() { return tree; }
-	};
-
-
-	// $ANTLR start "stringliteral"
-	// org/apache/usergrid/persistence/query/tree/QueryFilter.g:190:1: stringliteral : STRING ;
-	public final QueryFilterParser.stringliteral_return stringliteral() throws RecognitionException {
-		QueryFilterParser.stringliteral_return retval = new QueryFilterParser.stringliteral_return();
-		retval.start = input.LT(1);
-
-		Object root_0 = null;
-
-		Token STRING7=null;
-
-		Object STRING7_tree=null;
-
-		try {
-			// org/apache/usergrid/persistence/query/tree/QueryFilter.g:190:15: ( STRING )
-			// org/apache/usergrid/persistence/query/tree/QueryFilter.g:191:3: STRING
-			{
-			root_0 = (Object)adaptor.nil();
-
-
-			STRING7=(Token)match(input,STRING,FOLLOW_STRING_in_stringliteral1065); 
-			STRING7_tree = new StringLiteral(STRING7) ;
-			adaptor.addChild(root_0, STRING7_tree);
-
-			}
-
-			retval.stop = input.LT(-1);
-
-			retval.tree = (Object)adaptor.rulePostProcessing(root_0);
-			adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop);
-
-		}
-		 
-		finally {
-			// do for sure before leaving
-		}
-		return retval;
-	}
-	// $ANTLR end "stringliteral"
-
-
-	public static class floatliteral_return extends ParserRuleReturnScope {
-		Object tree;
-		@Override
-		public Object getTree() { return tree; }
-	};
-
-
-	// $ANTLR start "floatliteral"
-	// org/apache/usergrid/persistence/query/tree/QueryFilter.g:193:1: floatliteral : FLOAT ;
-	public final QueryFilterParser.floatliteral_return floatliteral() throws RecognitionException {
-		QueryFilterParser.floatliteral_return retval = new QueryFilterParser.floatliteral_return();
-		retval.start = input.LT(1);
-
-		Object root_0 = null;
-
-		Token FLOAT8=null;
-
-		Object FLOAT8_tree=null;
-
-		try {
-			// org/apache/usergrid/persistence/query/tree/QueryFilter.g:193:14: ( FLOAT )
-			// org/apache/usergrid/persistence/query/tree/QueryFilter.g:194:3: FLOAT
-			{
-			root_0 = (Object)adaptor.nil();
-
-
-			FLOAT8=(Token)match(input,FLOAT,FOLLOW_FLOAT_in_floatliteral1080); 
-			FLOAT8_tree = new FloatLiteral(FLOAT8) ;
-			adaptor.addChild(root_0, FLOAT8_tree);
-
-			}
-
-			retval.stop = input.LT(-1);
-
-			retval.tree = (Object)adaptor.rulePostProcessing(root_0);
-			adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop);
-
-		}
-		 
-		finally {
-			// do for sure before leaving
-		}
-		return retval;
-	}
-	// $ANTLR end "floatliteral"
-
-
-	public static class value_return extends ParserRuleReturnScope {
-		Object tree;
-		@Override
-		public Object getTree() { return tree; }
-	};
-
-
-	// $ANTLR start "value"
-	// org/apache/usergrid/persistence/query/tree/QueryFilter.g:197:1: value : ( booleanliteral | longliteral | uuidliteral | stringliteral | floatliteral );
-	public final QueryFilterParser.value_return value() throws RecognitionException {
-		QueryFilterParser.value_return retval = new QueryFilterParser.value_return();
-		retval.start = input.LT(1);
-
-		Object root_0 = null;
-
-		ParserRuleReturnScope booleanliteral9 =null;
-		ParserRuleReturnScope longliteral10 =null;
-		ParserRuleReturnScope uuidliteral11 =null;
-		ParserRuleReturnScope stringliteral12 =null;
-		ParserRuleReturnScope floatliteral13 =null;
-
-
-		try {
-			// org/apache/usergrid/persistence/query/tree/QueryFilter.g:197:7: ( booleanliteral | longliteral | uuidliteral | stringliteral | floatliteral )
-			int alt1=5;
-			switch ( input.LA(1) ) {
-			case BOOLEAN:
-				{
-				alt1=1;
-				}
-				break;
-			case LONG:
-				{
-				alt1=2;
-				}
-				break;
-			case UUID:
-				{
-				alt1=3;
-				}
-				break;
-			case STRING:
-				{
-				alt1=4;
-				}
-				break;
-			case FLOAT:
-				{
-				alt1=5;
-				}
-				break;
-			default:
-				NoViableAltException nvae =
-					new NoViableAltException("", 1, 0, input);
-				throw nvae;
-			}
-			switch (alt1) {
-				case 1 :
-					// org/apache/usergrid/persistence/query/tree/QueryFilter.g:198:3: booleanliteral
-					{
-					root_0 = (Object)adaptor.nil();
-
-
-					pushFollow(FOLLOW_booleanliteral_in_value1096);
-					booleanliteral9=booleanliteral();
-					state._fsp--;
-
-					adaptor.addChild(root_0, booleanliteral9.getTree());
-
-					}
-					break;
-				case 2 :
-					// org/apache/usergrid/persistence/query/tree/QueryFilter.g:199:5: longliteral
-					{
-					root_0 = (Object)adaptor.nil();
-
-
-					pushFollow(FOLLOW_longliteral_in_value1102);
-					longliteral10=longliteral();
-					state._fsp--;
-
-					adaptor.addChild(root_0, longliteral10.getTree());
-
-					}
-					break;
-				case 3 :
-					// org/apache/usergrid/persistence/query/tree/QueryFilter.g:200:5: uuidliteral
-					{
-					root_0 = (Object)adaptor.nil();
-
-
-					pushFollow(FOLLOW_uuidliteral_in_value1108);
-					uuidliteral11=uuidliteral();
-					state._fsp--;
-
-					adaptor.addChild(root_0, uuidliteral11.getTree());
-
-					}
-					break;
-				case 4 :
-					// org/apache/usergrid/persistence/query/tree/QueryFilter.g:201:5: stringliteral
-					{
-					root_0 = (Object)adaptor.nil();
-
-
-					pushFollow(FOLLOW_stringliteral_in_value1114);
-					stringliteral12=stringliteral();
-					state._fsp--;
-
-					adaptor.addChild(root_0, stringliteral12.getTree());
-
-					}
-					break;
-				case 5 :
-					// org/apache/usergrid/persistence/query/tree/QueryFilter.g:202:5: floatliteral
-					{
-					root_0 = (Object)adaptor.nil();
-
-
-					pushFollow(FOLLOW_floatliteral_in_value1120);
-					floatliteral13=floatliteral();
-					state._fsp--;
-
-					adaptor.addChild(root_0, floatliteral13.getTree());
-
-					}
-					break;
-
-			}
-			retval.stop = input.LT(-1);
-
-			retval.tree = (Object)adaptor.rulePostProcessing(root_0);
-			adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop);
-
-		}
-		 
-		finally {
-			// do for sure before leaving
-		}
-		return retval;
-	}
-	// $ANTLR end "value"
-
-
-	public static class equalityop_return extends ParserRuleReturnScope {
-		Object tree;
-		@Override
-		public Object getTree() { return tree; }
-	};
-
-
-	// $ANTLR start "equalityop"
-	// org/apache/usergrid/persistence/query/tree/QueryFilter.g:213:1: equalityop : ( property LT ^ value | property LTE ^ value | property EQ ^ value | property GT ^ value | property GTE ^ value );
-	public final QueryFilterParser.equalityop_return equalityop() throws RecognitionException {
-		QueryFilterParser.equalityop_return retval = new QueryFilterParser.equalityop_return();
-		retval.start = input.LT(1);
-
-		Object root_0 = null;
-
-		Token LT15=null;
-		Token LTE18=null;
-		Token EQ21=null;
-		Token GT24=null;
-		Token GTE27=null;
-		ParserRuleReturnScope property14 =null;
-		ParserRuleReturnScope value16 =null;
-		ParserRuleReturnScope property17 =null;
-		ParserRuleReturnScope value19 =null;
-		ParserRuleReturnScope property20 =null;
-		ParserRuleReturnScope value22 =null;
-		ParserRuleReturnScope property23 =null;
-		ParserRuleReturnScope value25 =null;
-		ParserRuleReturnScope property26 =null;
-		ParserRuleReturnScope value28 =null;
-
-		Object LT15_tree=null;
-		Object LTE18_tree=null;
-		Object EQ21_tree=null;
-		Object GT24_tree=null;
-		Object GTE27_tree=null;
-
-		try {
-			// org/apache/usergrid/persistence/query/tree/QueryFilter.g:213:12: ( property LT ^ value | property LTE ^ value | property EQ ^ value | property GT ^ value | property GTE ^ value )
-			int alt2=5;
-			int LA2_0 = input.LA(1);
-			if ( (LA2_0==ID) ) {
-				switch ( input.LA(2) ) {
-				case LT:
-					{
-					alt2=1;
-					}
-					break;
-				case LTE:
-					{
-					alt2=2;
-					}
-					break;
-				case EQ:
-					{
-					alt2=3;
-					}
-					break;
-				case GT:
-					{
-					alt2=4;
-					}
-					break;
-				case GTE:
-					{
-					alt2=5;
-					}
-					break;
-				default:
-					int nvaeMark = input.mark();
-					try {
-						input.consume();
-						NoViableAltException nvae =
-							new NoViableAltException("", 2, 1, input);
-						throw nvae;
-					} finally {
-						input.rewind(nvaeMark);
-					}
-				}
-			}
-
-			else {
-				NoViableAltException nvae =
-					new NoViableAltException("", 2, 0, input);
-				throw nvae;
-			}
-
-			switch (alt2) {
-				case 1 :
-					// org/apache/usergrid/persistence/query/tree/QueryFilter.g:214:3: property LT ^ value
-					{
-					root_0 = (Object)adaptor.nil();
-
-
-					pushFollow(FOLLOW_property_in_equalityop1145);
-					property14=property();
-					state._fsp--;
-
-					adaptor.addChild(root_0, property14.getTree());
-
-					LT15=(Token)match(input,LT,FOLLOW_LT_in_equalityop1147); 
-					LT15_tree = new LessThan(LT15) ;
-					root_0 = (Object)adaptor.becomeRoot(LT15_tree, root_0);
-
-					pushFollow(FOLLOW_value_in_equalityop1153);
-					value16=value();
-					state._fsp--;
-
-					adaptor.addChild(root_0, value16.getTree());
-
-					}
-					break;
-				case 2 :
-					// org/apache/usergrid/persistence/query/tree/QueryFilter.g:215:4: property LTE ^ value
-					{
-					root_0 = (Object)adaptor.nil();
-
-
-					pushFollow(FOLLOW_property_in_equalityop1158);
-					property17=property();
-					state._fsp--;
-
-					adaptor.addChild(root_0, property17.getTree());
-
-					LTE18=(Token)match(input,LTE,FOLLOW_LTE_in_equalityop1160); 
-					LTE18_tree = new LessThanEqual(LTE18) ;
-					root_0 = (Object)adaptor.becomeRoot(LTE18_tree, root_0);
-
-					pushFollow(FOLLOW_value_in_equalityop1166);
-					value19=value();
-					state._fsp--;
-
-					adaptor.addChild(root_0, value19.getTree());
-
-					}
-					break;
-				case 3 :
-					// org/apache/usergrid/persistence/query/tree/QueryFilter.g:216:4: property EQ ^ value
-					{
-					root_0 = (Object)adaptor.nil();
-
-
-					pushFollow(FOLLOW_property_in_equalityop1171);
-					property20=property();
-					state._fsp--;
-
-					adaptor.addChild(root_0, property20.getTree());
-
-					EQ21=(Token)match(input,EQ,FOLLOW_EQ_in_equalityop1173); 
-					EQ21_tree = new Equal(EQ21) ;
-					root_0 = (Object)adaptor.becomeRoot(EQ21_tree, root_0);
-
-					pushFollow(FOLLOW_value_in_equalityop1179);
-					value22=value();
-					state._fsp--;
-
-					adaptor.addChild(root_0, value22.getTree());
-
-					}
-					break;
-				case 4 :
-					// org/apache/usergrid/persistence/query/tree/QueryFilter.g:217:4: property GT ^ value
-					{
-					root_0 = (Object)adaptor.nil();
-
-
-					pushFollow(FOLLOW_property_in_equalityop1184);
-					property23=property();
-					state._fsp--;
-
-					adaptor.addChild(root_0, property23.getTree());
-
-					GT24=(Token)match(input,GT,FOLLOW_GT_in_equalityop1186); 
-					GT24_tree = new GreaterThan(GT24) ;
-					root_0 = (Object)adaptor.becomeRoot(GT24_tree, root_0);
-
-					pushFollow(FOLLOW_value_in_equalityop1192);
-					value25=value();
-					state._fsp--;
-
-					adaptor.addChild(root_0, value25.getTree());
-
-					}
-					break;
-				case 5 :
-					// org/apache/usergrid/persistence/query/tree/QueryFilter.g:218:4: property GTE ^ value
-					{
-					root_0 = (Object)adaptor.nil();
-
-
-					pushFollow(FOLLOW_property_in_equalityop1197);
-					property26=property();
-					state._fsp--;
-
-					adaptor.addChild(root_0, property26.getTree());
-
-					GTE27=(Token)match(input,GTE,FOLLOW_GTE_in_equalityop1199); 
-					GTE27_tree = new GreaterThanEqual(GTE27) ;
-					root_0 = (Object)adaptor.becomeRoot(GTE27_tree, root_0);
-
-					pushFollow(FOLLOW_value_in_equalityop1205);
-					value28=value();
-					state._fsp--;
-
-					adaptor.addChild(root_0, value28.getTree());
-
-					}
-					break;
-
-			}
-			retval.stop = input.LT(-1);
-
-			retval.tree = (Object)adaptor.rulePostProcessing(root_0);
-			adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop);
-
-		}
-		 
-		finally {
-			// do for sure before leaving
-		}
-		return retval;
-	}
-	// $ANTLR end "equalityop"
-
-
-	public static class locationop_return extends ParserRuleReturnScope {
-		Object tree;
-		@Override
-		public Object getTree() { return tree; }
-	};
-
-
-	// $ANTLR start "locationop"
-	// org/apache/usergrid/persistence/query/tree/QueryFilter.g:222:1: locationop : withinproperty WITHIN ^ ( floatliteral | longliteral ) OF ! ( floatliteral | longliteral ) ',' ! ( floatliteral | longliteral ) ;
-	public final QueryFilterParser.locationop_return locationop() throws RecognitionException {
-		QueryFilterParser.locationop_return retval = new QueryFilterParser.locationop_return();
-		retval.start = input.LT(1);
-
-		Object root_0 = null;
-
-		Token WITHIN30=null;
-		Token OF33=null;
-		Token char_literal36=null;
-		ParserRuleReturnScope withinproperty29 =null;
-		ParserRuleReturnScope floatliteral31 =null;
-		ParserRuleReturnScope longliteral32 =null;
-		ParserRuleReturnScope floatliteral34 =null;
-		ParserRuleReturnScope longliteral35 =null;
-		ParserRuleReturnScope floatliteral37 =null;
-		ParserRuleReturnScope longliteral38 =null;
-
-		Object WITHIN30_tree=null;
-		Object OF33_tree=null;
-		Object char_literal36_tree=null;
-
-		try {
-			// org/apache/usergrid/persistence/query/tree/QueryFilter.g:222:12: ( withinproperty WITHIN ^ ( floatliteral | longliteral ) OF ! ( floatliteral | longliteral ) ',' ! ( floatliteral | longliteral ) )
-			// org/apache/usergrid/persistence/query/tree/QueryFilter.g:223:3: withinproperty WITHIN ^ ( floatliteral | longliteral ) OF ! ( floatliteral | longliteral ) ',' ! ( floatliteral | longliteral )
-			{
-			root_0 = (Object)adaptor.nil();
-
-
-			pushFollow(FOLLOW_withinproperty_in_locationop1220);
-			withinproperty29=withinproperty();
-			state._fsp--;
-
-			adaptor.addChild(root_0, withinproperty29.getTree());
-
-			WITHIN30=(Token)match(input,WITHIN,FOLLOW_WITHIN_in_locationop1222); 
-			WITHIN30_tree = new WithinOperand(WITHIN30) ;
-			root_0 = (Object)adaptor.becomeRoot(WITHIN30_tree, root_0);
-
-			// org/apache/usergrid/persistence/query/tree/QueryFilter.g:223:41: ( floatliteral | longliteral )
-			int alt3=2;
-			int LA3_0 = input.LA(1);
-			if ( (LA3_0==FLOAT) ) {
-				alt3=1;
-			}
-			else if ( (LA3_0==LONG) ) {
-				alt3=2;
-			}
-
-			else {
-				NoViableAltException nvae =
-					new NoViableAltException("", 3, 0, input);
-				throw nvae;
-			}
-
-			switch (alt3) {
-				case 1 :
-					// org/apache/usergrid/persistence/query/tree/QueryFilter.g:223:42: floatliteral
-					{
-					pushFollow(FOLLOW_floatliteral_in_locationop1229);
-					floatliteral31=floatliteral();
-					state._fsp--;
-
-					adaptor.addChild(root_0, floatliteral31.getTree());
-
-					}
-					break;
-				case 2 :
-					// org/apache/usergrid/persistence/query/tree/QueryFilter.g:223:55: longliteral
-					{
-					pushFollow(FOLLOW_longliteral_in_locationop1231);
-					longliteral32=longliteral();
-					state._fsp--;
-
-					adaptor.addChild(root_0, longliteral32.getTree());
-
-					}
-					break;
-
-			}
-
-			OF33=(Token)match(input,OF,FOLLOW_OF_in_locationop1234); 
-			// org/apache/usergrid/persistence/query/tree/QueryFilter.g:223:72: ( floatliteral | longliteral )
-			int alt4=2;
-			int LA4_0 = input.LA(1);
-			if ( (LA4_0==FLOAT) ) {
-				alt4=1;
-			}
-			else if ( (LA4_0==LONG) ) {
-				alt4=2;
-			}
-
-			else {
-				NoViableAltException nvae =
-					new NoViableAltException("", 4, 0, input);
-				throw nvae;
-			}
-
-			switch (alt4) {
-				case 1 :
-					// org/apache/usergrid/persistence/query/tree/QueryFilter.g:223:73: floatliteral
-					{
-					pushFollow(FOLLOW_floatliteral_in_locationop1238);
-					floatliteral34=floatliteral();
-					state._fsp--;
-
-					adaptor.addChild(root_0, floatliteral34.getTree());
-
-					}
-					break;
-				case 2 :
-					// org/apache/usergrid/persistence/query/tree/QueryFilter.g:223:86: longliteral
-					{
-					pushFollow(FOLLOW_longliteral_in_locationop1240);
-					longliteral35=longliteral();
-					state._fsp--;
-
-					adaptor.addChild(root_0, longliteral35.getTree());
-
-					}
-					break;
-
-			}
-
-			char_literal36=(Token)match(input,34,FOLLOW_34_in_locationop1243); 
-			// org/apache/usergrid/persistence/query/tree/QueryFilter.g:223:104: ( floatliteral | longliteral )
-			int alt5=2;
-			int LA5_0 = input.LA(1);
-			if ( (LA5_0==FLOAT) ) {
-				alt5=1;
-			}
-			else if ( (LA5_0==LONG) ) {
-				alt5=2;
-			}
-
-			else {
-				NoViableAltException nvae =
-					new NoViableAltException("", 5, 0, input);
-				throw nvae;
-			}
-
-			switch (alt5) {
-				case 1 :
-					// org/apache/usergrid/persistence/query/tree/QueryFilter.g:223:105: floatliteral
-					{
-					pushFollow(FOLLOW_floatliteral_in_locationop1247);
-					floatliteral37=floatliteral();
-					state._fsp--;
-
-					adaptor.addChild(root_0, floatliteral37.getTree());
-
-					}
-					break;
-				case 2 :
-					// org/apache/usergrid/persistence/query/tree/QueryFilter.g:223:118: longliteral
-					{
-					pushFollow(FOLLOW_longliteral_in_locationop1249);
-					longliteral38=longliteral();
-					state._fsp--;
-
-					adaptor.addChild(root_0, longliteral38.getTree());
-
-					}
-					break;
-
-			}
-
-			}
-
-			retval.stop = input.LT(-1);
-
-			retval.tree = (Object)adaptor.rulePostProcessing(root_0);
-			adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop);
-
-		}
-		 
-		finally {
-			// do for sure before leaving
-		}
-		return retval;
-	}
-	// $ANTLR end "locationop"
-
-
-	public static class containsop_return extends ParserRuleReturnScope {
-		Object tree;
-		@Override
-		public Object getTree() { return tree; }
-	};
-
-
-	// $ANTLR start "containsop"
-	// org/apache/usergrid/persistence/query/tree/QueryFilter.g:226:1: containsop : containsproperty CONTAINS ^ stringliteral ;
-	public final QueryFilterParser.containsop_return containsop() throws RecognitionException {
-		QueryFilterParser.containsop_return retval = new QueryFilterParser.containsop_return();
-		retval.start = input.LT(1);
-
-		Object root_0 = null;
-
-		Token CONTAINS40=null;
-		ParserRuleReturnScope containsproperty39 =null;
-		ParserRuleReturnScope stringliteral41 =null;
-
-		Object CONTAINS40_tree=null;
-
-		try {
-			// org/apache/usergrid/persistence/query/tree/QueryFilter.g:226:12: ( containsproperty CONTAINS ^ stringliteral )
-			// org/apache/usergrid/persistence/query/tree/QueryFilter.g:227:3: containsproperty CONTAINS ^ stringliteral
-			{
-			root_0 = (Object)adaptor.nil();
-
-
-			pushFollow(FOLLOW_containsproperty_in_containsop1263);
-			containsproperty39=containsproperty();
-			state._fsp--;
-
-			adaptor.addChild(root_0, containsproperty39.getTree());
-
-			CONTAINS40=(Token)match(input,CONTAINS,FOLLOW_CONTAINS_in_containsop1265); 
-			CONTAINS40_tree = new ContainsOperand(CONTAINS40) ;
-			root_0 = (Object)adaptor.becomeRoot(CONTAINS40_tree, root_0);
-
-			pushFollow(FOLLOW_stringliteral_in_containsop1271);
-			stringliteral41=stringliteral();
-			state._fsp--;
-
-			adaptor.addChild(root_0, stringliteral41.getTree());
-
-			}
-
-			retval.stop = input.LT(-1);
-
-			retval.tree = (Object)adaptor.rulePostProcessing(root_0);
-			adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop);
-
-		}
-		 
-		finally {
-			// do for sure before leaving
-		}
-		return retval;
-	}
-	// $ANTLR end "containsop"
-
-
-	public static class operation_return extends ParserRuleReturnScope {
-		Object tree;
-		@Override
-		public Object getTree() { return tree; }
-	};
-
-
-	// $ANTLR start "operation"
-	// org/apache/usergrid/persistence/query/tree/QueryFilter.g:230:1: operation : ( '(' ! expression ')' !| equalityop | locationop | containsop );
-	public final QueryFilterParser.operation_return operation() throws RecognitionException {
-		QueryFilterParser.operation_return retval = new QueryFilterParser.operation_return();
-		retval.start = input.LT(1);
-
-		Object root_0 = null;
-
-		Token char_literal42=null;
-		Token char_literal44=null;
-		ParserRuleReturnScope expression43 =null;
-		ParserRuleReturnScope equalityop45 =null;
-		ParserRuleReturnScope locationop46 =null;
-		ParserRuleReturnScope containsop47 =null;
-
-		Object char_literal42_tree=null;
-		Object char_literal44_tree=null;
-
-		try {
-			// org/apache/usergrid/persistence/query/tree/QueryFilter.g:230:11: ( '(' ! expression ')' !| equalityop | locationop | containsop )
-			int alt6=4;
-			int LA6_0 = input.LA(1);
-			if ( (LA6_0==31) ) {
-				alt6=1;
-			}
-			else if ( (LA6_0==ID) ) {
-				switch ( input.LA(2) ) {
-				case EQ:
-				case GT:
-				case GTE:
-				case LT:
-				case LTE:
-					{
-					alt6=2;
-					}
-					break;
-				case WITHIN:
-					{
-					alt6=3;
-					}
-					break;
-				case CONTAINS:
-					{
-					alt6=4;
-					}
-					break;
-				default:
-					int nvaeMark = input.mark();
-					try {
-						input.consume();
-						NoViableAltException nvae =
-							new NoViableAltException("", 6, 2, input);
-						throw nvae;
-					} finally {
-						input.rewind(nvaeMark);
-					}
-				}
-			}
-
-			else {
-				NoViableAltException nvae =
-					new NoViableAltException("", 6, 0, input);
-				throw nvae;
-			}
-
-			switch (alt6) {
-				case 1 :
-					// org/apache/usergrid/persistence/query/tree/QueryFilter.g:231:2: '(' ! expression ')' !
-					{
-					root_0 = (Object)adaptor.nil();
-
-
-					char_literal42=(Token)match(input,31,FOLLOW_31_in_operation1281); 
-					pushFollow(FOLLOW_expression_in_operation1284);
-					expression43=expression();
-					state._fsp--;
-
-					adaptor.addChild(root_0, expression43.getTree());
-
-					char_literal44=(Token)match(input,32,FOLLOW_32_in_operation1286); 
-					}
-					break;
-				case 2 :
-					// org/apache/usergrid/persistence/query/tree/QueryFilter.g:232:6: equalityop
-					{
-					root_0 = (Object)adaptor.nil();
-
-
-					pushFollow(FOLLOW_equalityop_in_operation1294);
-					equalityop45=equalityop();
-					state._fsp--;
-
-					adaptor.addChild(root_0, equalityop45.getTree());
-
-					}
-					break;
-				case 3 :
-					// org/apache/usergrid/persistence/query/tree/QueryFilter.g:233:6: locationop
-					{
-					root_0 = (Object)adaptor.nil();
-
-
-					pushFollow(FOLLOW_locationop_in_operation1302);
-					locationop46=locationop();
-					state._fsp--;
-
-					adaptor.addChild(root_0, locationop46.getTree());
-
-					}
-					break;
-				case 4 :
-					// org/apache/usergrid/persistence/query/tree/QueryFilter.g:234:6: containsop
-					{
-					root_0 = (Object)adaptor.nil();
-
-
-					pushFollow(FOLLOW_containsop_in_operation1310);
-					containsop47=containsop();
-					state._fsp--;
-
-					adaptor.addChild(root_0, containsop47.getTree());
-
-					}
-					break;
-
-			}
-			retval.stop = input.LT(-1);
-
-			retval.tree = (Object)adaptor.rulePostProcessing(root_0);
-			adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop);
-
-		}
-		 
-		finally {
-			// do for sure before leaving
-		}
-		return retval;
-	}
-	// $ANTLR end "operation"
-
-
-	public static class notexp_return extends ParserRuleReturnScope {
-		Object tree;
-		@Override
-		public Object getTree() { return tree; }
-	};
-
-
-	// $ANTLR start "notexp"
-	// org/apache/usergrid/persistence/query/tree/QueryFilter.g:238:1: notexp : ( NOT ^ operation | operation );
-	public final QueryFilterParser.notexp_return notexp() throws RecognitionException {
-		QueryFilterParser.notexp_return retval = new QueryFilterParser.notexp_return();
-		retval.start = input.LT(1);
-
-		Object root_0 = null;
-
-		Token NOT48=null;
-		ParserRuleReturnScope operation49 =null;
-		ParserRuleReturnScope operation50 =null;
-
-		Object NOT48_tree=null;
-
-		try {
-			// org/apache/usergrid/persistence/query/tree/QueryFilter.g:238:8: ( NOT ^ operation | operation )
-			int alt7=2;
-			int LA7_0 = input.LA(1);
-			if ( (LA7_0==NOT) ) {
-				alt7=1;
-			}
-			else if ( (LA7_0==ID||LA7_0==31) ) {
-				alt7=2;
-			}
-
-			else {
-				NoViableAltException nvae =
-					new NoViableAltException("", 7, 0, input);
-				throw nvae;
-			}
-
-			switch (alt7) {
-				case 1 :
-					// org/apache/usergrid/persistence/query/tree/QueryFilter.g:240:2: NOT ^ operation
-					{
-					root_0 = (Object)adaptor.nil();
-
-
-					NOT48=(Token)match(input,NOT,FOLLOW_NOT_in_notexp1326); 
-					NOT48_tree = new NotOperand(NOT48) ;
-					root_0 = (Object)adaptor.becomeRoot(NOT48_tree, root_0);
-
-					pushFollow(FOLLOW_operation_in_notexp1332);
-					operation49=operation();
-					state._fsp--;
-
-					adaptor.addChild(root_0, operation49.getTree());
-
-					}
-					break;
-				case 2 :
-					// org/apache/usergrid/persistence/query/tree/QueryFilter.g:241:3: operation
-					{
-					root_0 = (Object)adaptor.nil();
-
-
-					pushFollow(FOLLOW_operation_in_notexp1338);
-					operation50=operation();
-					state._fsp--;
-
-					adaptor.addChild(root_0, operation50.getTree());
-
-					}
-					break;
-
-			}
-			retval.stop = input.LT(-1);
-
-			retval.tree = (Object)adaptor.rulePostProcessing(root_0);
-			adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop);
-
-		}
-		 
-		finally {
-			// do for sure before leaving
-		}
-		return retval;
-	}
-	// $ANTLR end "notexp"
-
-
-	public static class andexp_return extends ParserRuleReturnScope {
-		Object tree;
-		@Override
-		public Object getTree() { return tree; }
-	};
-
-
-	// $ANTLR start "andexp"
-	// org/apache/usergrid/persistence/query/tree/QueryFilter.g:246:1: andexp : notexp ( AND ^ notexp )* ;
-	public final QueryFilterParser.andexp_return andexp() throws RecognitionException {
-		QueryFilterParser.andexp_return retval = new QueryFilterParser.andexp_return();
-		retval.start = input.LT(1);
-
-		Object root_0 = null;
-
-		Token AND52=null;
-		ParserRuleReturnScope notexp51 =null;
-		ParserRuleReturnScope notexp53 =null;
-
-		Object AND52_tree=null;
-
-		try {
-			// org/apache/usergrid/persistence/query/tree/QueryFilter.g:246:8: ( notexp ( AND ^ notexp )* )
-			// org/apache/usergrid/persistence/query/tree/QueryFilter.g:247:2: notexp ( AND ^ notexp )*
-			{
-			root_0 = (Object)adaptor.nil();
-
-
-			pushFollow(FOLLOW_notexp_in_andexp1352);
-			notexp51=notexp();
-			state._fsp--;
-
-			adaptor.addChild(root_0, notexp51.getTree());
-
-			// org/apache/usergrid/persistence/query/tree/QueryFilter.g:247:9: ( AND ^ notexp )*
-			loop8:
-			while (true) {
-				int alt8=2;
-				int LA8_0 = input.LA(1);
-				if ( (LA8_0==AND) ) {
-					alt8=1;
-				}
-
-				switch (alt8) {
-				case 1 :
-					// org/apache/usergrid/persistence/query/tree/QueryFilter.g:247:10: AND ^ notexp
-					{
-					AND52=(Token)match(input,AND,FOLLOW_AND_in_andexp1355); 
-					AND52_tree = new AndOperand(AND52) ;
-					root_0 = (Object)adaptor.becomeRoot(AND52_tree, root_0);
-
-					pushFollow(FOLLOW_notexp_in_andexp1361);
-					notexp53=notexp();
-					state._fsp--;
-
-					adaptor.addChild(root_0, notexp53.getTree());
-
-					}
-					break;
-
-				default :
-					break loop8;
-				}
-			}
-
-			}
-
-			retval.stop = input.LT(-1);
-
-			retval.tree = (Object)adaptor.rulePostProcessing(root_0);
-			adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop);
-
-		}
-		 
-		finally {
-			// do for sure before leaving
-		}
-		return retval;
-	}
-	// $ANTLR end "andexp"
-
-
-	public static class expression_return extends ParserRuleReturnScope {
-		Object tree;
-		@Override
-		public Object getTree() { return tree; }
-	};
-
-
-	// $ANTLR start "expression"
-	// org/apache/usergrid/persistence/query/tree/QueryFilter.g:252:1: expression : andexp ( OR ^ andexp )* ;
-	public final QueryFilterParser.expression_return expression() throws RecognitionException {
-		QueryFilterParser.expression_return retval = new QueryFilterParser.expression_return();
-		retval.start = input.LT(1);
-
-		Object root_0 = null;
-
-		Token OR55=null;
-		ParserRuleReturnScope andexp54 =null;
-		ParserRuleReturnScope andexp56 =null;
-
-		Object OR55_tree=null;
-
-		try {
-			// org/apache/usergrid/persistence/query/tree/QueryFilter.g:252:12: ( andexp ( OR ^ andexp )* )
-			// org/apache/usergrid/persistence/query/tree/QueryFilter.g:253:2: andexp ( OR ^ andexp )*
-			{
-			root_0 = (Object)adaptor.nil();
-
-
-			pushFollow(FOLLOW_andexp_in_expression1378);
-			andexp54=andexp();
-			state._fsp--;
-
-			adaptor.addChild(root_0, andexp54.getTree());
-
-			// org/apache/usergrid/persistence/query/tree/QueryFilter.g:253:9: ( OR ^ andexp )*
-			loop9:
-			while (true) {
-				int alt9=2;
-				int LA9_0 = input.LA(1);
-				if ( (LA9_0==OR) ) {
-					alt9=1;
-				}
-
-				switch (alt9) {
-				case 1 :
-					// org/apache/usergrid/persistence/query/tree/QueryFilter.g:253:10: OR ^ andexp
-					{
-					OR55=(Token)match(input,OR,FOLLOW_OR_in_expression1381); 
-					OR55_tree = new OrOperand(OR55) ;
-					root_0 = (Object)adaptor.becomeRoot(OR55_tree, root_0);
-
-					pushFollow(FOLLOW_andexp_in_expression1387);
-					andexp56=andexp();
-					state._fsp--;
-
-					adaptor.addChild(root_0, andexp56.getTree());
-
-					}
-					break;
-
-				default :
-					break loop9;
-				}
-			}
-
-			}
-
-			retval.stop = input.LT(-1);
-
-			retval.tree = (Object)adaptor.rulePostProcessing(root_0);
-			adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop);
-
-		}
-		 
-		finally {
-			// do for sure before leaving
-		}
-		return retval;
-	}
-	// $ANTLR end "expression"
-
-
-	public static class direction_return extends ParserRuleReturnScope {
-		Object tree;
-		@Override
-		public Object getTree() { return tree; }
-	};
-
-
-	// $ANTLR start "direction"
-	// org/apache/usergrid/persistence/query/tree/QueryFilter.g:262:1: direction : ( ASC | DESC ) ;
-	public final QueryFilterParser.direction_return direction() throws RecognitionException {
-		QueryFilterParser.direction_return retval = new QueryFilterParser.direction_return();
-		retval.start = input.LT(1);
-
-		Object root_0 = null;
-
-		Token set57=null;
-
-		Object set57_tree=null;
-
-		try {
-			// org/apache/usergrid/persistence/query/tree/QueryFilter.g:262:12: ( ( ASC | DESC ) )
-			// org/apache/usergrid/persistence/query/tree/QueryFilter.g:
-			{
-			root_0 = (Object)adaptor.nil();
-
-
-			set57=input.LT(1);
-			if ( input.LA(1)==ASC||input.LA(1)==DESC ) {
-				input.consume();
-				adaptor.addChild(root_0, (Object)adaptor.create(set57));
-				state.errorRecovery=false;
-			}
-			else {
-				MismatchedSetException mse = new MismatchedSetException(null,input);
-				throw mse;
-			}
-			}
-
-			retval.stop = input.LT(-1);
-
-			retval.tree = (Object)adaptor.rulePostProcessing(root_0);
-			adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop);
-
-		}
-		 
-		finally {
-			// do for sure before leaving
-		}
-		return retval;
-	}
-	// $ANTLR end "direction"
-
-
-	public static class order_return extends ParserRuleReturnScope {
-		Object tree;
-		@Override
-		public Object getTree() { return tree; }
-	};
-
-
-	// $ANTLR start "order"
-	// org/apache/usergrid/persistence/query/tree/QueryFilter.g:265:1: order : ( property ( direction )? ) ;
-	public final QueryFilterParser.order_return order() throws RecognitionException {
-		QueryFilterParser.order_return retval = new QueryFilterParser.order_return();
-		retval.start = input.LT(1);
-
-		Object root_0 = null;
-
-		ParserRuleReturnScope property58 =null;
-		ParserRuleReturnScope direction59 =null;
-
-
-		try {
-			// org/apache/usergrid/persistence/query/tree/QueryFilter.g:266:3: ( ( property ( direction )? ) )
-			// org/apache/usergrid/persistence/query/tree/QueryFilter.g:266:5: ( property ( direction )? )
-			{
-			root_0 = (Object)adaptor.nil();
-
-
-			// org/apache/usergrid/persistence/query/tree/QueryFilter.g:266:5: ( property ( direction )? )
-			// org/apache/usergrid/persistence/query/tree/QueryFilter.g:266:6: property ( direction )?
-			{
-			pushFollow(FOLLOW_property_in_order1424);
-			property58=property();
-			state._fsp--;
-
-			adaptor.addChild(root_0, property58.getTree());
-
-			// org/apache/usergrid/persistence/query/tree/QueryFilter.g:266:15: ( direction )?
-			int alt10=2;
-			int LA10_0 = input.LA(1);
-			if ( (LA10_0==ASC||LA10_0==DESC) ) {
-				alt10=1;
-			}
-			switch (alt10) {
-				case 1 :
-					// org/apache/usergrid/persistence/query/tree/QueryFilter.g:266:15: direction
-					{
-					pushFollow(FOLLOW_direction_in_order1426);
-					direction59=direction();
-					state._fsp--;
-
-					adaptor.addChild(root_0, direction59.getTree());
-
-					}
-					break;
-
-			}
-
-			}
-
-
-					String property = (property58!=null?input.toString(property58.start,property58.stop):null); 
-					String direction = (direction59!=null?input.toString(direction59.start,direction59.stop):null);
-					query.addSort(new SortPredicate(property, direction));
-			    
-			  
-			}
-
-			retval.stop = input.LT(-1);
-
-			retval.tree = (Object)adaptor.rulePostProcessing(root_0);
-			adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop);
-
-		}
-		 
-		finally {
-			// do for sure before leaving
-		}
-		return retval;
-	}
-	// $ANTLR end "order"
-
-
-	public static class select_subject_return extends ParserRuleReturnScope {
-		Object tree;
-		@Override
-		public Object getTree() { return tree; }
-	};
-
-
-	// $ANTLR start "select_subject"
-	// org/apache/usergrid/persistence/query/tree/QueryFilter.g:277:1: select_subject : ID ;
-	public final QueryFilterParser.select_subject_return select_subject() throws RecognitionException {
-		QueryFilterParser.select_subject_return retval = new QueryFilterParser.select_subject_return();
-		retval.start = input.LT(1);
-
-		Object root_0 = null;
-
-		Token ID60=null;
-
-		Object ID60_tree=null;
-
-		try {
-			// org/apache/usergrid/persistence/query/tree/QueryFilter.g:278:3: ( ID )
-			// org/apache/usergrid/persistence/query/tree/QueryFilter.g:278:5: ID
-			{
-			root_0 = (Object)adaptor.nil();
-
-
-			ID60=(Token)match(input,ID,FOLLOW_ID_in_select_subject1445); 
-			ID60_tree = (Object)adaptor.create(ID60);
-			adaptor.addChild(root_0, ID60_tree);
-
-
-
-			  query.addSelect((ID60!=null?ID60.getText():null));
-
-
-			}
-
-			retval.stop = input.LT(-1);
-
-			retval.tree = (Object)adaptor.rulePostProcessing(root_0);
-			adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop);
-
-		}
-		 
-		finally {
-			// do for sure before leaving
-		}
-		return retval;
-	}
-	// $ANTLR end "select_subject"
-
-
-	public static class select_assign_return extends ParserRuleReturnScope {
-		Object tree;
-		@Override
-		public Object getTree() { return tree; }
-	};
-
-
-	// $ANTLR start "select_assign"
-	// org/apache/usergrid/persistence/query/tree/QueryFilter.g:286:1: select_assign : target= ID ':' source= ID ;
-	public final QueryFilterParser.select_assign_return select_assign() throws RecognitionException {
-		QueryFilterParser.select_assign_return retval = new QueryFilterParser.select_assign_return();
-		retval.start = input.LT(1);
-
-		Object root_0 = null;
-
-		Token target=null;
-		Token source=null;
-		Token char_literal61=null;
-
-		Object target_tree=null;
-		Object source_tree=null;
-		Object char_literal61_tree=null;
-
-		try {
-			// org/apache/usergrid/persistence/query/tree/QueryFilter.g:287:3: (target= ID ':' source= ID )
-			// org/apache/usergrid/persistence/query/tree/QueryFilter.g:287:5: target= ID ':' source= ID
-			{
-			root_0 = (Object)adaptor.nil();
-
-
-			target=(Token)match(input,ID,FOLLOW_ID_in_select_assign1462); 
-			target_tree = (Object)adaptor.create(target);
-			adaptor.addChild(root_0, target_tree);
-
-			char_literal61=(Token)match(input,35,FOLLOW_35_in_select_assign1464); 
-			char_literal61_tree = (Object)adaptor.create(char_literal61);
-			adaptor.addChild(root_0, char_literal61_tree);
-
-			source=(Token)match(input,ID,FOLLOW_ID_in_select_assign1468); 
-			source_tree = (Object)adaptor.create(source);
-			adaptor.addChild(root_0, source_tree);
-
-
-
-			  query.addSelect((target!=null?target.getText():null), (source!=null?source.getText():null));
-
-
-			}
-
-			retval.stop = input.LT(-1);
-
-			retval.tree = (Object)adaptor.rulePostProcessing(root_0);
-			adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop);
-
-		}
-		 
-		finally {
-			// do for sure before leaving
-		}
-		return retval;
-	}
-	// $ANTLR end "select_assign"
-
-
-	public static class select_expr_return extends ParserRuleReturnScope {
-		Object tree;
-		@Override
-		public Object getTree() { return tree; }
-	};
-
-
-	// $ANTLR start "select_expr"
-	// org/apache/usergrid/persistence/query/tree/QueryFilter.g:293:1: select_expr : ( '*' | select_subject ( ',' select_subject )* | '{' select_assign ( ',' select_assign )* '}' ) ;
-	public final QueryFilterParser.select_expr_return select_expr() throws RecognitionException {
-		QueryFilterParser.select_expr_return retval = new QueryFilterParser.select_expr_return();
-		retval.start = input.LT(1);
-
-		Object root_0 = null;
-
-		Token char_literal62=null;
-		Token char_literal64=null;
-		Token char_literal66=null;
-		Token char_literal68=null;
-		Token char_literal70=null;
-		ParserRuleReturnScope select_subject63 =null;
-		ParserRuleReturnScope select_subject65 =null;
-		ParserRuleReturnScope select_assign67 =null;
-		ParserRuleReturnScope select_assign69 =null;
-
-		Object char_literal62_tree=null;
-		Object char_literal64_tree=null;
-		Object char_literal66_tree=null;
-		Object char_literal68_tree=null;
-		Object char_literal70_tree=null;
-
-		try {
-			// org/apache/usergrid/persistence/query/tree/QueryFilter.g:294:3: ( ( '*' | select_subject ( ',' select_subject )* | '{' select_assign ( ',' select_assign )* '}' ) )
-			// org/apache/usergrid/persistence/query/tree/QueryFilter.g:294:5: ( '*' | select_subject ( ',' select_subject )* | '{' select_assign ( ',' select_assign )* '}' )
-			{
-			root_0 = (Object)adaptor.nil();
-
-
-			// org/apache/usergrid/persistence/query/tree/QueryFilter.g:294:5: ( '*' | select_subject ( ',' select_subject )* | '{' select_assign ( ',' select_assign )* '}' )
-			int alt13=3;
-			switch ( input.LA(1) ) {
-			case 33:
-				{
-				alt13=1;
-				}
-				break;
-			case ID:
-				{
-				alt13=2;
-				}
-				break;
-			case 39:
-				{
-				alt13=3;
-				}
-				break;
-			default:
-				NoViableAltException nvae =
-					new NoViableAltException("", 13, 0, input);
-				throw nvae;
-			}
-			switch (alt13) {
-				case 1 :
-					// org/apache/usergrid/persistence/query/tree/QueryFilter.g:294:6: '*'
-					{
-					char_literal62=(Token)match(input,33,FOLLOW_33_in_select_expr1482); 
-					char_literal62_tree = (Object)adaptor.create(char_literal62);
-					adaptor.addChild(root_0, char_literal62_tree);
-
-					}
-					break;
-				case 2 :
-					// org/apache/usergrid/persistence/query/tree/QueryFilter.g:294:12: select_subject ( ',' select_subject )*
-					{
-					pushFollow(FOLLOW_select_subject_in_select_expr1486);
-					select_subject63=select_subject();
-					state._fsp--;
-
-					adaptor.addChild(root_0, select_subject63.getTree());
-
-					// org/apache/usergrid/persistence/query/tree/QueryFilter.g:294:27: ( ',' select_subject )*
-					loop11:
-					while (true) {
-						int alt11=2;
-						int LA11_0 = input.LA(1);
-						if ( (LA11_0==34) ) {
-							alt11=1;
-						}
-
-						switch (alt11) {
-						case 1 :
-							// org/apache/usergrid/persistence/query/tree/QueryFilter.g:294:28: ',' select_subject
-							{
-							char_literal64=(Token)match(input,34,FOLLOW_34_in_select_expr1489); 
-							char_literal64_tree = (Object)adaptor.create(char_literal64);
-							adaptor.addChild(root_0, char_literal64_tree);
-
-							pushFollow(FOLLOW_select_subject_in_select_expr1491);
-							select_subject65=select_subject();
-							state._fsp--;
-
-							adaptor.addChild(root_0, select_subject65.getTree());
-
-							}
-							break;
-
-						default :
-							break loop11;
-						}
-					}
-
-					}
-					break;
-				case 3 :
-					// org/apache/usergrid/persistence/query/tree/QueryFilter.g:294:52: '{' select_assign ( ',' select_assign )* '}'
-					{
-					char_literal66=(Token)match(input,39,FOLLOW_39_in_select_expr1498); 
-					char_literal66_tree = (Object)adaptor.create(char_literal66);
-					adaptor.addChild(root_0, char_literal66_tree);
-
-					pushFollow(FOLLOW_select_assign_in_select_expr1500);
-					select_assign67=select_assign();
-					state._fsp--;
-
-					adaptor.addChild(root_0, select_assign67.getTree());
-
-					// org/apache/usergrid/persistence/query/tree/QueryFilter.g:294:70: ( ',' select_assign )*
-					loop12:
-					while (true) {
-						int alt12=2;
-						int LA12_0 = input.LA(1);
-						if ( (LA12_0==34) ) {
-							alt12=1;
-						}
-
-						switch (alt12) {
-						case 1 :
-							// org/apache/usergrid/persistence/query/tree/QueryFilter.g:294:71: ',' select_assign
-							{
-							char_literal68=(Token)match(input,34,FOLLOW_34_in_select_expr1503); 
-							char_literal68_tree = (Object)adaptor.create(char_literal68);
-							adaptor.addChild(root_0, char_literal68_tree);
-
-							pushFollow(FOLLOW_select_assign_in_select_expr1505);
-							select_assign69=select_assign();
-							state._fsp--;
-
-							adaptor.addChild(root_0, select_assign69.getTree());
-
-							}
-							break;
-
-						default :
-							break loop12;
-						}
-					}
-
-					char_literal70=(Token)match(input,40,FOLLOW_40_in_select_expr1510); 
-					char_literal70_tree = (Object)adaptor.create(char_literal70);
-					adaptor.addChild(root_0, char_literal70_tree);
-
-					}
-					break;
-
-			}
-
-			}
-
-			retval.stop = input.LT(-1);
-
-			retval.tree = (Object)adaptor.rulePostProcessing(root_0);
-			adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop);
-
-		}
-		 
-		finally {
-			// do for sure before leaving
-		}
-		return retval;
-	}
-	// $ANTLR end "select_expr"
-
-
-	public static class ql_return extends ParserRuleReturnScope {
-		public Query query;
-		Object tree;
-		@Override
-		public Object getTree() { return tree; }
-	};
-
-
-	// $ANTLR start "ql"
-	// org/apache/usergrid/persistence/query/tree/QueryFilter.g:298:1: ql returns [Query query] : ( 'select' ! select_expr !)? ( ( 'where' !)? expression )? ( 'order by' ! order ! ( ',' ! order !)* )? ;
-	public final QueryFilterParser.ql_return ql() throws RecognitionException {
-		QueryFilterParser.ql_return retval = new QueryFilterParser.ql_return();
-		retval.start = input.LT(1);
-
-		Object root_0 = null;
-
-		Token string_literal71=null;
-		Token string_literal73=null;
-		Token string_literal75=null;
-		Token char_literal77=null;
-		ParserRuleReturnScope select_expr72 =null;
-		ParserRuleReturnScope expression74 =null;
-		ParserRuleReturnScope order76 =null;
-		ParserRuleReturnScope order78 =null;
-
-		Object string_literal71_tree=null;
-		Object string_literal73_tree=null;
-		Object string_literal75_tree=null;
-		Object char_literal77_tree=null;
-
-		try {
-			// org/apache/usergrid/persistence/query/tree/QueryFilter.g:299:3: ( ( 'select' ! select_expr !)? ( ( 'where' !)? expression )? ( 'order by' ! order ! ( ',' ! order !)* )? )
-			// org/apache/usergrid/persistence/query/tree/QueryFilter.g:299:5: ( 'select' ! select_expr !)? ( ( 'where' !)? expression )? ( 'order by' ! order ! ( ',' ! order !)* )?
-			{
-			root_0 = (Object)adaptor.nil();
-
-
-			// org/apache/usergrid/persistence/query/tree/QueryFilter.g:299:5: ( 'select' ! select_expr !)?
-			int alt14=2;
-			int LA14_0 = input.LA(1);
-			if ( (LA14_0==37) ) {
-				alt14=1;
-			}
-			switch (alt14) {
-				case 1 :
-					// org/apache/usergrid/persistence/query/tree/QueryFilter.g:299:6: 'select' ! select_expr !
-					{
-					string_literal71=(Token)match(input,37,FOLLOW_37_in_ql1533); 
-					pushFollow(FOLLOW_select_expr_in_ql1536);
-					select_expr72=select_expr();
-					state._fsp--;
-
-					}
-					break;
-
-			}
-
-			// org/apache/usergrid/persistence/query/tree/QueryFilter.g:299:31: ( ( 'where' !)? expression )?
-			int alt16=2;
-			int LA16_0 = input.LA(1);
-			if ( (LA16_0==ID||LA16_0==NOT||LA16_0==31||LA16_0==38) ) {
-				alt16=1;
-			}
-			switch (alt16) {
-				case 1 :
-					// org/apache/usergrid/persistence/query/tree/QueryFilter.g:299:32: ( 'where' !)? expression
-					{
-					// org/apache/usergrid/persistence/query/tree/QueryFilter.g:299:39: ( 'where' !)?
-					int alt15=2;
-					int LA15_0 = input.LA(1);
-					if ( (LA15_0==38) ) {
-						alt15=1;
-					}
-					switch (alt15) {
-						case 1 :
-							// org/apache/usergrid/persistence/query/tree/QueryFilter.g:299:39: 'where' !
-							{
-							string_literal73=(Token)match(input,38,FOLLOW_38_in_ql1542); 
-							}
-							break;
-
-					}
-
-					pushFollow(FOLLOW_expression_in_ql1546);
-					expression74=expression();
-					state._fsp--;
-
-					adaptor.addChild(root_0, expression74.getTree());
-
-					}
-					break;
-
-			}
-
-			// org/apache/usergrid/persistence/query/tree/QueryFilter.g:299:55: ( 'order by' ! order ! ( ',' ! order !)* )?
-			int alt18=2;
-			int LA18_0 = input.LA(1);
-			if ( (LA18_0==36) ) {
-				alt18=1;
-			}
-			switch (alt18) {
-				case 1 :
-					// org/apache/usergrid/persistence/query/tree/QueryFilter.g:299:56: 'order by' ! order ! ( ',' ! order !)*
-					{
-					string_literal75=(Token)match(input,36,FOLLOW_36_in_ql1551); 
-					pushFollow(FOLLOW_order_in_ql1554);
-					order76=order();
-					state._fsp--;
-
-					// org/apache/usergrid/persistence/query/tree/QueryFilter.g:299:75: ( ',' ! order !)*
-					loop17:
-					while (true) {
-						int alt17=2;
-						int LA17_0 = input.LA(1);
-						if ( (LA17_0==34) ) {
-							alt17=1;
-						}
-
-						switch (alt17) {
-						case 1 :
-							// org/apache/usergrid/persistence/query/tree/QueryFilter.g:299:76: ',' ! order !
-							{
-							char_literal77=(Token)match(input,34,FOLLOW_34_in_ql1558); 
-							pushFollow(FOLLOW_order_in_ql1561);
-							order78=order();
-							state._fsp--;
-
-							}
-							break;
-
-						default :
-							break loop17;
-						}
-					}
-
-					}
-					break;
-
-			}
-
-
-
-			  if((expression74!=null?((Object)expression74.getTree()):null) instanceof Operand){
-			    query.setRootOperand((Operand)(expression74!=null?((Object)expression74.getTree()):null));
-			  }
-			  
-			  retval.query = query;
-
-
-
-			}
-
-			retval.stop = input.LT(-1);
-
-			retval.tree = (Object)adaptor.rulePostProcessing(root_0);
-			adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop);
-
-		}
-		 
-		finally {
-			// do for sure before leaving
-		}
-		return retval;
-	}
-	// $ANTLR end "ql"
-
-	// Delegated rules
-
-
-
-	public static final BitSet FOLLOW_ID_in_property991 = new BitSet(new long[]{0x0000000000000002L});
-	public static final BitSet FOLLOW_ID_in_containsproperty1002 = new BitSet(new long[]{0x0000000000000002L});
-	public static final BitSet FOLLOW_ID_in_withinproperty1013 = new BitSet(new long[]{0x0000000000000002L});
-	public static final BitSet FOLLOW_BOOLEAN_in_booleanliteral1024 = new BitSet(new long[]{0x0000000000000002L});
-	public static final BitSet FOLLOW_LONG_in_longliteral1038 = new BitSet(new long[]{0x0000000000000002L});
-	public static final BitSet FOLLOW_UUID_in_uuidliteral1052 = new BitSet(new long[]{0x0000000000000002L});
-	public static final BitSet FOLLOW_STRING_in_stringliteral1065 = new BitSet(new long[]{0x0000000000000002L});
-	public static final BitSet FOLLOW_FLOAT_in_floatliteral1080 = new BitSet(new long[]{0x0000000000000002L});
-	public static final BitSet FOLLOW_booleanliteral_in_value1096 = new BitSet(new long[]{0x0000000000000002L});
-	public static final BitSet FOLLOW_longliteral_in_value1102 = new BitSet(new long[]{0x0000000000000002L});
-	public static final BitSet FOLLOW_uuidliteral_in_value1108 = new BitSet(new long[]{0x0000000000000002L});
-	public static final BitSet FOLLOW_stringliteral_in_value1114 = new BitSet(new long[]{0x0000000000000002L});
-	public static final BitSet FOLLOW_floatliteral_in_value1120 = new BitSet(new long[]{0x0000000000000002L});
-	public static final BitSet FOLLOW_property_in_equalityop1145 = new BitSet(new long[]{0x0000000000080000L});
-	public static final BitSet FOLLOW_LT_in_equalityop1147 = new BitSet(new long[]{0x0000000012042040L});
-	public static final BitSet FOLLOW_value_in_equalityop1153 = new BitSet(new long[]{0x0000000000000002L});
-	public static final BitSet FOLLOW_property_in_equalityop1158 = new BitSet(new long[]{0x0000000000100000L});
-	public static final BitSet FOLLOW_LTE_in_equalityop1160 = new BitSet(new long[]{0x0000000012042040L});
-	public static final BitSet FOLLOW_value_in_equalityop1166 = new BitSet(new long[]{0x0000000000000002L});
-	public static final BitSet FOLLOW_property_in_equalityop1171 = new BitSet(new long[]{0x0000000000000200L});
-	public static final BitSet FOLLOW_EQ_in_equalityop1173 = new BitSet(new long[]{0x0000000012042040L});
-	public static final BitSet FOLLOW_value_in_equalityop1179 = new BitSet(new long[]{0x0000000000000002L});
-	public static final BitSet FOLLOW_property_in_equalityop1184 = new BitSet(new long[]{0x0000000000004000L});
-	public static final BitSet FOLLOW_GT_in_equalityop1186 = new BitSet(new long[]{0x0000000012042040L});
-	public static final BitSet FOLLOW_value_in_equalityop1192 = new BitSet(new long[]{0x0000000000000002L});
-	public static final BitSet FOLLOW_property_in_equalityop1197 = new BitSet(new long[]{0x0000000000008000L});
-	public static final BitSet FOLLOW_GTE_in_equalityop1199 = new BitSet(new long[]{0x0000000012042040L});
-	public static final BitSet FOLLOW_value_in_equalityop1205 = new BitSet(new long[]{0x0000000000000002L});
-	public static final BitSet FOLLOW_withinproperty_in_locationop1220 = new BitSet(new long[]{0x0000000020000000L});
-	public static final BitSet FOLLOW_WITHIN_in_locationop1222 = new BitSet(new long[]{0x0000000000042000L});
-	public static final BitSet FOLLOW_floatliteral_in_locationop1229 = new BitSet(new long[]{0x0000000000800000L});
-	public static final BitSet FOLLOW_longliteral_in_locationop1231 = new BitSet(new long[]{0x0000000000800000L});
-	public static final BitSet FOLLOW_OF_in_locationop1234 = new BitSet(new long[]{0x0000000000042000L});
-	public static final BitSet FOLLOW_floatliteral_in_locationop1238 = new BitSet(new long[]{0x0000000400000000L});
-	public static final BitSet FOLLOW_longliteral_in_locationop1240 = new BitSet(new long[]{0x0000000400000000L});
-	public static final BitSet FOLLOW_34_in_locationop1243 = new BitSet(new long[]{0x0000000000042000L});
-	public static final BitSet FOLLOW_floatliteral_in_locationop1247 = new BitSet(new long[]{0x0000000000000002L});
-	public static final BitSet FOLLOW_longliteral_in_locationop1249 = new BitSet(new long[]{0x0000000000000002L});
-	public static final BitSet FOLLOW_containsproperty_in_containsop1263 = new BitSet(new long[]{0x0000000000000080L});
-	public static final BitSet FOLLOW_CONTAINS_in_containsop1265 = new BitSet(new long[]{0x0000000002000000L});
-	public static final BitSet FOLLOW_stringliteral_in_containsop1271 = new BitSet(new long[]{0x0000000000000002L});
-	public static final BitSet FOLLOW_31_in_operation1281 = new BitSet(new long[]{0x0000000080220000L});
-	public static final BitSet FOLLOW_expression_in_operation1284 = new BitSet(new long[]{0x0000000100000000L});
-	public static final BitSet FOLLOW_32_in_operation1286 = new BitSet(new long[]{0x0000000000000002L});
-	public static final BitSet FOLLOW_equalityop_in_operation1294 = new BitSet(new long[]{0x0000000000000002L});
-	public static final BitSet FOLLOW_locationop_in_operation1302 = new BitSet(new long[]{0x0000000000000002L});
-	public static final BitSet FOLLOW_containsop_in_operation1310 = new BitSet(new long[]{0x0000000000000002L});
-	public static final BitSet FOLLOW_NOT_in_notexp1326 = new BitSet(new long[]{0x0000000080020000L});
-	public static final BitSet FOLLOW_operation_in_notexp1332 = new BitSet(new long[]{0x0000000000000002L});
-	public static final BitSet FOLLOW_operation_in_notexp1338 = new BitSet(new long[]{0x0000000000000002L});
-	public static final BitSet FOLLOW_notexp_in_andexp1352 = new BitSet(new long[]{0x0000000000000012L});
-	public static final BitSet FOLLOW_AND_in_andexp1355 = new BitSet(new long[]{0x0000000080220000L});
-	public static final BitSet FOLLOW_notexp_in_andexp1361 = new BitSet(new long[]{0x0000000000000012L});
-	public static final BitSet FOLLOW_andexp_in_expression1378 = new BitSet(new long[]{0x0000000001000002L});
-	public static final BitSet FOLLOW_OR_in_expression1381 = new BitSet(new long[]{0x0000000080220000L});
-	public static final BitSet FOLLOW_andexp_in_expression1387 = new BitSet(new long[]{0x0000000001000002L});
-	public static final BitSet FOLLOW_property_in_order1424 = new BitSet(new long[]{0x0000000000000122L});
-	public static final BitSet FOLLOW_direction_in_order1426 = new BitSet(new long[]{0x0000000000000002L});
-	public static final BitSet FOLLOW_ID_in_select_subject1445 = new BitSet(new long[]{0x0000000000000002L});
-	public static final BitSet FOLLOW_ID_in_select_assign1462 = new BitSet(new long[]{0x0000000800000000L});
-	public static final BitSet FOLLOW_35_in_select_assign1464 = new BitSet(new long[]{0x0000000000020000L});
-	public static final BitSet FOLLOW_ID_in_select_assign1468 = new BitSet(new long[]{0x0000000000000002L});
-	public static final BitSet FOLLOW_33_in_select_expr1482 = new BitSet(new long[]{0x0000000000000002L});
-	public static final BitSet FOLLOW_select_subject_in_select_expr1486 = new BitSet(new long[]{0x0000000400000002L});
-	public static final BitSet FOLLOW_34_in_select_expr1489 = new BitSet(new long[]{0x0000000000020000L});
-	public static final BitSet FOLLOW_select_subject_in_select_expr1491 = new BitSet(new long[]{0x0000000400000002L});
-	public static final BitSet FOLLOW_39_in_select_expr1498 = new BitSet(new long[]{0x0000000000020000L});
-	public static final BitSet FOLLOW_select_assign_in_select_expr1500 = new BitSet(new long[]{0x0000010400000000L});
-	public static final BitSet FOLLOW_34_in_select_expr1503 = new BitSet(new long[]{0x0000000000020000L});
-	public static final BitSet FOLLOW_select_assign_in_select_expr1505 = new BitSet(new long[]{0x0000010400000000L});
-	public static final BitSet FOLLOW_40_in_select_expr1510 = new BitSet(new long[]{0x0000000000000002L});
-	public static final BitSet FOLLOW_37_in_ql1533 = new BitSet(new long[]{0x0000008200020000L});
-	public static final BitSet FOLLOW_select_expr_in_ql1536 = new BitSet(new long[]{0x0000005080220002L});
-	public static final BitSet FOLLOW_38_in_ql1542 = new BitSet(new long[]{0x0000000080220000L});
-	public static final BitSet FOLLOW_expression_in_ql1546 = new BitSet(new long[]{0x0000001000000002L});
-	public static final BitSet FOLLOW_36_in_ql1551 = new BitSet(new long[]{0x0000000000020000L});
-	public static final BitSet FOLLOW_order_in_ql1554 = new BitSet(new long[]{0x0000000400000002L});
-	public static final BitSet FOLLOW_34_in_ql1558 = new BitSet(new long[]{0x0000000000020000L});
-	public static final BitSet FOLLOW_order_in_ql1561 = new BitSet(new long[]{0x0000000400000002L});
-}


[5/5] git commit: Ignore ANTLR output.

Posted by sn...@apache.org.
Ignore ANTLR output.


Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/da870213
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/da870213
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/da870213

Branch: refs/heads/two-dot-o
Commit: da870213a4aa25adec9e470233ccc61c019b6c99
Parents: 5cae5cf
Author: Dave Johnson <dm...@apigee.com>
Authored: Wed Mar 5 15:12:55 2014 -0500
Committer: Dave Johnson <dm...@apigee.com>
Committed: Wed Mar 5 15:12:55 2014 -0500

----------------------------------------------------------------------
 .gitignore                                      |    4 +-
 .../query/tree/QueryFilterLexer.java            | 2565 ------------------
 .../query/tree/QueryFilterParser.java           | 2186 ---------------
 3 files changed, 3 insertions(+), 4752 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/da870213/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 55bed8a..5bc4549 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,8 @@
 .DS_Store
 .AppleDouble
 .LSOverride
+QueryFilterLexer.java
+QueryFilterParser.java
 
 # Icon must ends with two \r.
 Icon
@@ -24,4 +26,4 @@ Icon
 /stack/corepersistence/collection/nbactions.xml
 /stack/corepersistence/nbactions.xml
 /stack/corepersistence/graph/nbactions.xml
-/stack/corepersistence/model/nbactions.xml
\ No newline at end of file
+/stack/corepersistence/model/nbactions.xml

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/da870213/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/query/tree/QueryFilterLexer.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/query/tree/QueryFilterLexer.java b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/query/tree/QueryFilterLexer.java
deleted file mode 100644
index 6413800..0000000
--- a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/query/tree/QueryFilterLexer.java
+++ /dev/null
@@ -1,2565 +0,0 @@
-// $ANTLR 3.5.1 org/apache/usergrid/persistence/query/tree/QueryFilter.g 2014-02-21 08:18:25
-
-package org.apache.usergrid.persistence.query.tree;
-
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.apache.usergrid.persistence.query.QueryTokenException;
-
-
-
-import org.antlr.runtime.*;
-import java.util.Stack;
-import java.util.List;
-import java.util.ArrayList;
-
-@SuppressWarnings("all")
-public class QueryFilterLexer extends Lexer {
-	public static final int EOF=-1;
-	public static final int T__31=31;
-	public static final int T__32=32;
-	public static final int T__33=33;
-	public static final int T__34=34;
-	public static final int T__35=35;
-	public static final int T__36=36;
-	public static final int T__37=37;
-	public static final int T__38=38;
-	public static final int T__39=39;
-	public static final int T__40=40;
-	public static final int AND=4;
-	public static final int ASC=5;
-	public static final int BOOLEAN=6;
-	public static final int CONTAINS=7;
-	public static final int DESC=8;
-	public static final int EQ=9;
-	public static final int ESC_SEQ=10;
-	public static final int EXPONENT=11;
-	public static final int FALSE=12;
-	public static final int FLOAT=13;
-	public static final int GT=14;
-	public static final int GTE=15;
-	public static final int HEX_DIGIT=16;
-	public static final int ID=17;
-	public static final int LONG=18;
-	public static final int LT=19;
-	public static final int LTE=20;
-	public static final int NOT=21;
-	public static final int OCTAL_ESC=22;
-	public static final int OF=23;
-	public static final int OR=24;
-	public static final int STRING=25;
-	public static final int TRUE=26;
-	public static final int UNICODE_ESC=27;
-	public static final int UUID=28;
-	public static final int WITHIN=29;
-	public static final int WS=30;
-
-
-
-
-	  private static final Logger logger = LoggerFactory
-	      .getLogger(QueryFilterLexer.class);
-
-
-
-
-		@Override
-		public void emitErrorMessage(String msg) {
-			logger.info(msg);
-		}
-
-		@Override
-	    public void recover(RecognitionException e) {
-	         //We don't want to recover, we want to re-throw to the user since they passed us invalid input
-	         throw new QueryTokenException(e);
-	    }
-
-
-
-
-	// delegates
-	// delegators
-	public Lexer[] getDelegates() {
-		return new Lexer[] {};
-	}
-
-	public QueryFilterLexer() {} 
-	public QueryFilterLexer(CharStream input) {
-		this(input, new RecognizerSharedState());
-	}
-	public QueryFilterLexer(CharStream input, RecognizerSharedState state) {
-		super(input,state);
-	}
-	@Override public String getGrammarFileName() { return "org/apache/usergrid/persistence/query/tree/QueryFilter.g"; }
-
-	// $ANTLR start "T__31"
-	public final void mT__31() throws RecognitionException {
-		try {
-			int _type = T__31;
-			int _channel = DEFAULT_TOKEN_CHANNEL;
-			// org/apache/usergrid/persistence/query/tree/QueryFilter.g:35:7: ( '(' )
-			// org/apache/usergrid/persistence/query/tree/QueryFilter.g:35:9: '('
-			{
-			match('('); 
-			}
-
-			state.type = _type;
-			state.channel = _channel;
-		}
-		finally {
-			// do for sure before leaving
-		}
-	}
-	// $ANTLR end "T__31"
-
-	// $ANTLR start "T__32"
-	public final void mT__32() throws RecognitionException {
-		try {
-			int _type = T__32;
-			int _channel = DEFAULT_TOKEN_CHANNEL;
-			// org/apache/usergrid/persistence/query/tree/QueryFilter.g:36:7: ( ')' )
-			// org/apache/usergrid/persistence/query/tree/QueryFilter.g:36:9: ')'
-			{
-			match(')'); 
-			}
-
-			state.type = _type;
-			state.channel = _channel;
-		}
-		finally {
-			// do for sure before leaving
-		}
-	}
-	// $ANTLR end "T__32"
-
-	// $ANTLR start "T__33"
-	public final void mT__33() throws RecognitionException {
-		try {
-			int _type = T__33;
-			int _channel = DEFAULT_TOKEN_CHANNEL;
-			// org/apache/usergrid/persistence/query/tree/QueryFilter.g:37:7: ( '*' )
-			// org/apache/usergrid/persistence/query/tree/QueryFilter.g:37:9: '*'
-			{
-			match('*'); 
-			}
-
-			state.type = _type;
-			state.channel = _channel;
-		}
-		finally {
-			// do for sure before leaving
-		}
-	}
-	// $ANTLR end "T__33"
-
-	// $ANTLR start "T__34"
-	public final void mT__34() throws RecognitionException {
-		try {
-			int _type = T__34;
-			int _channel = DEFAULT_TOKEN_CHANNEL;
-			// org/apache/usergrid/persistence/query/tree/QueryFilter.g:38:7: ( ',' )
-			// org/apache/usergrid/persistence/query/tree/QueryFilter.g:38:9: ','
-			{
-			match(','); 
-			}
-
-			state.type = _type;
-			state.channel = _channel;
-		}
-		finally {
-			// do for sure before leaving
-		}
-	}
-	// $ANTLR end "T__34"
-
-	// $ANTLR start "T__35"
-	public final void mT__35() throws RecognitionException {
-		try {
-			int _type = T__35;
-			int _channel = DEFAULT_TOKEN_CHANNEL;
-			// org/apache/usergrid/persistence/query/tree/QueryFilter.g:39:7: ( ':' )
-			// org/apache/usergrid/persistence/query/tree/QueryFilter.g:39:9: ':'
-			{
-			match(':'); 
-			}
-
-			state.type = _type;
-			state.channel = _channel;
-		}
-		finally {
-			// do for sure before leaving
-		}
-	}
-	// $ANTLR end "T__35"
-
-	// $ANTLR start "T__36"
-	public final void mT__36() throws RecognitionException {
-		try {
-			int _type = T__36;
-			int _channel = DEFAULT_TOKEN_CHANNEL;
-			// org/apache/usergrid/persistence/query/tree/QueryFilter.g:40:7: ( 'order by' )
-			// org/apache/usergrid/persistence/query/tree/QueryFilter.g:40:9: 'order by'
-			{
-			match("order by"); 
-
-			}
-
-			state.type = _type;
-			state.channel = _channel;
-		}
-		finally {
-			// do for sure before leaving
-		}
-	}
-	// $ANTLR end "T__36"
-
-	// $ANTLR start "T__37"
-	public final void mT__37() throws RecognitionException {
-		try {
-			int _type = T__37;
-			int _channel = DEFAULT_TOKEN_CHANNEL;
-			// org/apache/usergrid/persistence/query/tree/QueryFilter.g:41:7: ( 'select' )
-			// org/apache/usergrid/persistence/query/tree/QueryFilter.g:41:9: 'select'
-			{
-			match("select"); 
-
-			}
-
-			state.type = _type;
-			state.channel = _channel;
-		}
-		finally {
-			// do for sure before leaving
-		}
-	}
-	// $ANTLR end "T__37"
-
-	// $ANTLR start "T__38"
-	public final void mT__38() throws RecognitionException {
-		try {
-			int _type = T__38;
-			int _channel = DEFAULT_TOKEN_CHANNEL;
-			// org/apache/usergrid/persistence/query/tree/QueryFilter.g:42:7: ( 'where' )
-			// org/apache/usergrid/persistence/query/tree/QueryFilter.g:42:9: 'where'
-			{
-			match("where"); 
-
-			}
-
-			state.type = _type;
-			state.channel = _channel;
-		}
-		finally {
-			// do for sure before leaving
-		}
-	}
-	// $ANTLR end "T__38"
-
-	// $ANTLR start "T__39"
-	public final void mT__39() throws RecognitionException {
-		try {
-			int _type = T__39;
-			int _channel = DEFAULT_TOKEN_CHANNEL;
-			// org/apache/usergrid/persistence/query/tree/QueryFilter.g:43:7: ( '{' )
-			// org/apache/usergrid/persistence/query/tree/QueryFilter.g:43:9: '{'
-			{
-			match('{'); 
-			}
-
-			state.type = _type;
-			state.channel = _channel;
-		}
-		finally {
-			// do for sure before leaving
-		}
-	}
-	// $ANTLR end "T__39"
-
-	// $ANTLR start "T__40"
-	public final void mT__40() throws RecognitionException {
-		try {
-			int _type = T__40;
-			int _channel = DEFAULT_TOKEN_CHANNEL;
-			// org/apache/usergrid/persistence/query/tree/QueryFilter.g:44:7: ( '}' )
-			// org/apache/usergrid/persistence/query/tree/QueryFilter.g:44:9: '}'
-			{
-			match('}'); 
-			}
-
-			state.type = _type;
-			state.channel = _channel;
-		}
-		finally {
-			// do for sure before leaving
-		}
-	}
-	// $ANTLR end "T__40"
-
-	// $ANTLR start "LT"
-	public final void mLT() throws RecognitionException {
-		try {
-			int _type = LT;
-			int _channel = DEFAULT_TOKEN_CHANNEL;
-			// org/apache/usergrid/persistence/query/tree/QueryFilter.g:71:5: ( '<' | 'lt' )
-			int alt1=2;
-			int LA1_0 = input.LA(1);
-			if ( (LA1_0=='<') ) {
-				alt1=1;
-			}
-			else if ( (LA1_0=='l') ) {
-				alt1=2;
-			}
-
-			else {
-				NoViableAltException nvae =
-					new NoViableAltException("", 1, 0, input);
-				throw nvae;
-			}
-
-			switch (alt1) {
-				case 1 :
-					// org/apache/usergrid/persistence/query/tree/QueryFilter.g:71:7: '<'
-					{
-					match('<'); 
-					}
-					break;
-				case 2 :
-					// org/apache/usergrid/persistence/query/tree/QueryFilter.g:71:13: 'lt'
-					{
-					match("lt"); 
-
-					}
-					break;
-
-			}
-			state.type = _type;
-			state.channel = _channel;
-		}
-		finally {
-			// do for sure before leaving
-		}
-	}
-	// $ANTLR end "LT"
-
-	// $ANTLR start "LTE"
-	public final void mLTE() throws RecognitionException {
-		try {
-			int _type = LTE;
-			int _channel = DEFAULT_TOKEN_CHANNEL;
-			// org/apache/usergrid/persistence/query/tree/QueryFilter.g:73:5: ( '<=' | 'lte' )
-			int alt2=2;
-			int LA2_0 = input.LA(1);
-			if ( (LA2_0=='<') ) {
-				alt2=1;
-			}
-			else if ( (LA2_0=='l') ) {
-				alt2=2;
-			}
-
-			else {
-				NoViableAltException nvae =
-					new NoViableAltException("", 2, 0, input);
-				throw nvae;
-			}
-
-			switch (alt2) {
-				case 1 :
-					// org/apache/usergrid/persistence/query/tree/QueryFilter.g:73:7: '<='
-					{
-					match("<="); 
-
-					}
-					break;
-				case 2 :
-					// org/apache/usergrid/persistence/query/tree/QueryFilter.g:73:15: 'lte'
-					{
-					match("lte"); 
-
-					}
-					break;
-
-			}
-			state.type = _type;
-			state.channel = _channel;
-		}
-		finally {
-			// do for sure before leaving
-		}
-	}
-	// $ANTLR end "LTE"
-
-	// $ANTLR start "EQ"
-	public final void mEQ() throws RecognitionException {
-		try {
-			int _type = EQ;
-			int _channel = DEFAULT_TOKEN_CHANNEL;
-			// org/apache/usergrid/persistence/query/tree/QueryFilter.g:75:5: ( '=' | 'eq' )
-			int alt3=2;
-			int LA3_0 = input.LA(1);
-			if ( (LA3_0=='=') ) {
-				alt3=1;
-			}
-			else if ( (LA3_0=='e') ) {
-				alt3=2;
-			}
-
-			else {
-				NoViableAltException nvae =
-					new NoViableAltException("", 3, 0, input);
-				throw nvae;
-			}
-
-			switch (alt3) {
-				case 1 :
-					// org/apache/usergrid/persistence/query/tree/QueryFilter.g:75:7: '='
-					{
-					match('='); 
-					}
-					break;
-				case 2 :
-					// org/apache/usergrid/persistence/query/tree/QueryFilter.g:75:13: 'eq'
-					{
-					match("eq"); 
-
-					}
-					break;
-
-			}
-			state.type = _type;
-			state.channel = _channel;
-		}
-		finally {
-			// do for sure before leaving
-		}
-	}
-	// $ANTLR end "EQ"
-
-	// $ANTLR start "GT"
-	public final void mGT() throws RecognitionException {
-		try {
-			int _type = GT;
-			int _channel = DEFAULT_TOKEN_CHANNEL;
-			// org/apache/usergrid/persistence/query/tree/QueryFilter.g:77:5: ( '>' | 'gt' )
-			int alt4=2;
-			int LA4_0 = input.LA(1);
-			if ( (LA4_0=='>') ) {
-				alt4=1;
-			}
-			else if ( (LA4_0=='g') ) {
-				alt4=2;
-			}
-
-			else {
-				NoViableAltException nvae =
-					new NoViableAltException("", 4, 0, input);
-				throw nvae;
-			}
-
-			switch (alt4) {
-				case 1 :
-					// org/apache/usergrid/persistence/query/tree/QueryFilter.g:77:7: '>'
-					{
-					match('>'); 
-					}
-					break;
-				case 2 :
-					// org/apache/usergrid/persistence/query/tree/QueryFilter.g:77:13: 'gt'
-					{
-					match("gt"); 
-
-					}
-					break;
-
-			}
-			state.type = _type;
-			state.channel = _channel;
-		}
-		finally {
-			// do for sure before leaving
-		}
-	}
-	// $ANTLR end "GT"
-
-	// $ANTLR start "GTE"
-	public final void mGTE() throws RecognitionException {
-		try {
-			int _type = GTE;
-			int _channel = DEFAULT_TOKEN_CHANNEL;
-			// org/apache/usergrid/persistence/query/tree/QueryFilter.g:79:5: ( '>=' | 'gte' )
-			int alt5=2;
-			int LA5_0 = input.LA(1);
-			if ( (LA5_0=='>') ) {
-				alt5=1;
-			}
-			else if ( (LA5_0=='g') ) {
-				alt5=2;
-			}
-
-			else {
-				NoViableAltException nvae =
-					new NoViableAltException("", 5, 0, input);
-				throw nvae;
-			}
-
-			switch (alt5) {
-				case 1 :
-					// org/apache/usergrid/persistence/query/tree/QueryFilter.g:79:7: '>='
-					{
-					match(">="); 
-
-					}
-					break;
-				case 2 :
-					// org/apache/usergrid/persistence/query/tree/QueryFilter.g:79:15: 'gte'
-					{
-					match("gte"); 
-
-					}
-					break;
-
-			}
-			state.type = _type;
-			state.channel = _channel;
-		}
-		finally {
-			// do for sure before leaving
-		}
-	}
-	// $ANTLR end "GTE"
-
-	// $ANTLR start "BOOLEAN"
-	public final void mBOOLEAN() throws RecognitionException {
-		try {
-			int _type = BOOLEAN;
-			int _channel = DEFAULT_TOKEN_CHANNEL;
-			// org/apache/usergrid/persistence/query/tree/QueryFilter.g:83:9: ( ( TRUE | FALSE ) )
-			// org/apache/usergrid/persistence/query/tree/QueryFilter.g:83:11: ( TRUE | FALSE )
-			{
-			// org/apache/usergrid/persistence/query/tree/QueryFilter.g:83:11: ( TRUE | FALSE )
-			int alt6=2;
-			int LA6_0 = input.LA(1);
-			if ( (LA6_0=='T'||LA6_0=='t') ) {
-				alt6=1;
-			}
-			else if ( (LA6_0=='F'||LA6_0=='f') ) {
-				alt6=2;
-			}
-
-			else {
-				NoViableAltException nvae =
-					new NoViableAltException("", 6, 0, input);
-				throw nvae;
-			}
-
-			switch (alt6) {
-				case 1 :
-					// org/apache/usergrid/persistence/query/tree/QueryFilter.g:83:12: TRUE
-					{
-					mTRUE(); 
-
-					}
-					break;
-				case 2 :
-					// org/apache/usergrid/persistence/query/tree/QueryFilter.g:83:17: FALSE
-					{
-					mFALSE(); 
-
-					}
-					break;
-
-			}
-
-			}
-
-			state.type = _type;
-			state.channel = _channel;
-		}
-		finally {
-			// do for sure before leaving
-		}
-	}
-	// $ANTLR end "BOOLEAN"
-
-	// $ANTLR start "AND"
-	public final void mAND() throws RecognitionException {
-		try {
-			int _type = AND;
-			int _channel = DEFAULT_TOKEN_CHANNEL;
-			// org/apache/usergrid/persistence/query/tree/QueryFilter.g:85:5: ( ( 'A' | 'a' ) ( 'N' | 'n' ) ( 'D' | 'd' ) | '&&' )
-			int alt7=2;
-			int LA7_0 = input.LA(1);
-			if ( (LA7_0=='A'||LA7_0=='a') ) {
-				alt7=1;
-			}
-			else if ( (LA7_0=='&') ) {
-				alt7=2;
-			}
-
-			else {
-				NoViableAltException nvae =
-					new NoViableAltException("", 7, 0, input);
-				throw nvae;
-			}
-
-			switch (alt7) {
-				case 1 :
-					// org/apache/usergrid/persistence/query/tree/QueryFilter.g:85:7: ( 'A' | 'a' ) ( 'N' | 'n' ) ( 'D' | 'd' )
-					{
-					if ( input.LA(1)=='A'||input.LA(1)=='a' ) {
-						input.consume();
-					}
-					else {
-						MismatchedSetException mse = new MismatchedSetException(null,input);
-						recover(mse);
-						throw mse;
-					}
-					if ( input.LA(1)=='N'||input.LA(1)=='n' ) {
-						input.consume();
-					}
-					else {
-						MismatchedSetException mse = new MismatchedSetException(null,input);
-						recover(mse);
-						throw mse;
-					}
-					if ( input.LA(1)=='D'||input.LA(1)=='d' ) {
-						input.consume();
-					}
-					else {
-						MismatchedSetException mse = new MismatchedSetException(null,input);
-						recover(mse);
-						throw mse;
-					}
-					}
-					break;
-				case 2 :
-					// org/apache/usergrid/persistence/query/tree/QueryFilter.g:85:37: '&&'
-					{
-					match("&&"); 
-
-					}
-					break;
-
-			}
-			state.type = _type;
-			state.channel = _channel;
-		}
-		finally {
-			// do for sure before leaving
-		}
-	}
-	// $ANTLR end "AND"
-
-	// $ANTLR start "OR"
-	public final void mOR() throws RecognitionException {
-		try {
-			int _type = OR;
-			int _channel = DEFAULT_TOKEN_CHANNEL;
-			// org/apache/usergrid/persistence/query/tree/QueryFilter.g:87:5: ( ( 'O' | 'o' ) ( 'R' | 'r' ) | '||' )
-			int alt8=2;
-			int LA8_0 = input.LA(1);
-			if ( (LA8_0=='O'||LA8_0=='o') ) {
-				alt8=1;
-			}
-			else if ( (LA8_0=='|') ) {
-				alt8=2;
-			}
-
-			else {
-				NoViableAltException nvae =
-					new NoViableAltException("", 8, 0, input);
-				throw nvae;
-			}
-
-			switch (alt8) {
-				case 1 :
-					// org/apache/usergrid/persistence/query/tree/QueryFilter.g:87:7: ( 'O' | 'o' ) ( 'R' | 'r' )
-					{
-					if ( input.LA(1)=='O'||input.LA(1)=='o' ) {
-						input.consume();
-					}
-					else {
-						MismatchedSetException mse = new MismatchedSetException(null,input);
-						recover(mse);
-						throw mse;
-					}
-					if ( input.LA(1)=='R'||input.LA(1)=='r' ) {
-						input.consume();
-					}
-					else {
-						MismatchedSetException mse = new MismatchedSetException(null,input);
-						recover(mse);
-						throw mse;
-					}
-					}
-					break;
-				case 2 :
-					// org/apache/usergrid/persistence/query/tree/QueryFilter.g:87:28: '||'
-					{
-					match("||"); 
-
-					}
-					break;
-
-			}
-			state.type = _type;
-			state.channel = _channel;
-		}
-		finally {
-			// do for sure before leaving
-		}
-	}
-	// $ANTLR end "OR"
-
-	// $ANTLR start "NOT"
-	public final void mNOT() throws RecognitionException {
-		try {
-			int _type = NOT;
-			int _channel = DEFAULT_TOKEN_CHANNEL;
-			// org/apache/usergrid/persistence/query/tree/QueryFilter.g:89:5: ( ( 'N' | 'n' ) ( 'O' | 'o' ) ( 'T' | 't' ) )
-			// org/apache/usergrid/persistence/query/tree/QueryFilter.g:89:7: ( 'N' | 'n' ) ( 'O' | 'o' ) ( 'T' | 't' )
-			{
-			if ( input.LA(1)=='N'||input.LA(1)=='n' ) {
-				input.consume();
-			}
-			else {
-				MismatchedSetException mse = new MismatchedSetException(null,input);
-				recover(mse);
-				throw mse;
-			}
-			if ( input.LA(1)=='O'||input.LA(1)=='o' ) {
-				input.consume();
-			}
-			else {
-				MismatchedSetException mse = new MismatchedSetException(null,input);
-				recover(mse);
-				throw mse;
-			}
-			if ( input.LA(1)=='T'||input.LA(1)=='t' ) {
-				input.consume();
-			}
-			else {
-				MismatchedSetException mse = new MismatchedSetException(null,input);
-				recover(mse);
-				throw mse;
-			}
-			}
-
-			state.type = _type;
-			state.channel = _channel;
-		}
-		finally {
-			// do for sure before leaving
-		}
-	}
-	// $ANTLR end "NOT"
-
-	// $ANTLR start "ASC"
-	public final void mASC() throws RecognitionException {
-		try {
-			int _type = ASC;
-			int _channel = DEFAULT_TOKEN_CHANNEL;
-			// org/apache/usergrid/persistence/query/tree/QueryFilter.g:91:5: ( ( 'A' | 'a' ) ( 'S' | 's' ) ( 'C' | 'c' ) )
-			// org/apache/usergrid/persistence/query/tree/QueryFilter.g:91:7: ( 'A' | 'a' ) ( 'S' | 's' ) ( 'C' | 'c' )
-			{
-			if ( input.LA(1)=='A'||input.LA(1)=='a' ) {
-				input.consume();
-			}
-			else {
-				MismatchedSetException mse = new MismatchedSetException(null,input);
-				recover(mse);
-				throw mse;
-			}
-			if ( input.LA(1)=='S'||input.LA(1)=='s' ) {
-				input.consume();
-			}
-			else {
-				MismatchedSetException mse = new MismatchedSetException(null,input);
-				recover(mse);
-				throw mse;
-			}
-			if ( input.LA(1)=='C'||input.LA(1)=='c' ) {
-				input.consume();
-			}
-			else {
-				MismatchedSetException mse = new MismatchedSetException(null,input);
-				recover(mse);
-				throw mse;
-			}
-			}
-
-			state.type = _type;
-			state.channel = _channel;
-		}
-		finally {
-			// do for sure before leaving
-		}
-	}
-	// $ANTLR end "ASC"
-
-	// $ANTLR start "DESC"
-	public final void mDESC() throws RecognitionException {
-		try {
-			int _type = DESC;
-			int _channel = DEFAULT_TOKEN_CHANNEL;
-			// org/apache/usergrid/persistence/query/tree/QueryFilter.g:93:6: ( ( 'D' | 'd' ) ( 'E' | 'e' ) ( 'S' | 's' ) ( 'C' | 'c' ) )
-			// org/apache/usergrid/persistence/query/tree/QueryFilter.g:93:8: ( 'D' | 'd' ) ( 'E' | 'e' ) ( 'S' | 's' ) ( 'C' | 'c' )
-			{
-			if ( input.LA(1)=='D'||input.LA(1)=='d' ) {
-				input.consume();
-			}
-			else {
-				MismatchedSetException mse = new MismatchedSetException(null,input);
-				recover(mse);
-				throw mse;
-			}
-			if ( input.LA(1)=='E'||input.LA(1)=='e' ) {
-				input.consume();
-			}
-			else {
-				MismatchedSetException mse = new MismatchedSetException(null,input);
-				recover(mse);
-				throw mse;
-			}
-			if ( input.LA(1)=='S'||input.LA(1)=='s' ) {
-				input.consume();
-			}
-			else {
-				MismatchedSetException mse = new MismatchedSetException(null,input);
-				recover(mse);
-				throw mse;
-			}
-			if ( input.LA(1)=='C'||input.LA(1)=='c' ) {
-				input.consume();
-			}
-			else {
-				MismatchedSetException mse = new MismatchedSetException(null,input);
-				recover(mse);
-				throw mse;
-			}
-			}
-
-			state.type = _type;
-			state.channel = _channel;
-		}
-		finally {
-			// do for sure before leaving
-		}
-	}
-	// $ANTLR end "DESC"
-
-	// $ANTLR start "CONTAINS"
-	public final void mCONTAINS() throws RecognitionException {
-		try {
-			int _type = CONTAINS;
-			int _channel = DEFAULT_TOKEN_CHANNEL;
-			// org/apache/usergrid/persistence/query/tree/QueryFilter.g:95:10: ( ( 'C' | 'c' ) ( 'O' | 'o' ) ( 'N' | 'n' ) ( 'T' | 't' ) ( 'A' | 'a' ) ( 'I' | 'i' ) ( 'N' | 'n' ) ( 'S' | 's' ) )
-			// org/apache/usergrid/persistence/query/tree/QueryFilter.g:95:12: ( 'C' | 'c' ) ( 'O' | 'o' ) ( 'N' | 'n' ) ( 'T' | 't' ) ( 'A' | 'a' ) ( 'I' | 'i' ) ( 'N' | 'n' ) ( 'S' | 's' )
-			{
-			if ( input.LA(1)=='C'||input.LA(1)=='c' ) {
-				input.consume();
-			}
-			else {
-				MismatchedSetException mse = new MismatchedSetException(null,input);
-				recover(mse);
-				throw mse;
-			}
-			if ( input.LA(1)=='O'||input.LA(1)=='o' ) {
-				input.consume();
-			}
-			else {
-				MismatchedSetException mse = new MismatchedSetException(null,input);
-				recover(mse);
-				throw mse;
-			}
-			if ( input.LA(1)=='N'||input.LA(1)=='n' ) {
-				input.consume();
-			}
-			else {
-				MismatchedSetException mse = new MismatchedSetException(null,input);
-				recover(mse);
-				throw mse;
-			}
-			if ( input.LA(1)=='T'||input.LA(1)=='t' ) {
-				input.consume();
-			}
-			else {
-				MismatchedSetException mse = new MismatchedSetException(null,input);
-				recover(mse);
-				throw mse;
-			}
-			if ( input.LA(1)=='A'||input.LA(1)=='a' ) {
-				input.consume();
-			}
-			else {
-				MismatchedSetException mse = new MismatchedSetException(null,input);
-				recover(mse);
-				throw mse;
-			}
-			if ( input.LA(1)=='I'||input.LA(1)=='i' ) {
-				input.consume();
-			}
-			else {
-				MismatchedSetException mse = new MismatchedSetException(null,input);
-				recover(mse);
-				throw mse;
-			}
-			if ( input.LA(1)=='N'||input.LA(1)=='n' ) {
-				input.consume();
-			}
-			else {
-				MismatchedSetException mse = new MismatchedSetException(null,input);
-				recover(mse);
-				throw mse;
-			}
-			if ( input.LA(1)=='S'||input.LA(1)=='s' ) {
-				input.consume();
-			}
-			else {
-				MismatchedSetException mse = new MismatchedSetException(null,input);
-				recover(mse);
-				throw mse;
-			}
-			}
-
-			state.type = _type;
-			state.channel = _channel;
-		}
-		finally {
-			// do for sure before leaving
-		}
-	}
-	// $ANTLR end "CONTAINS"
-
-	// $ANTLR start "WITHIN"
-	public final void mWITHIN() throws RecognitionException {
-		try {
-			int _type = WITHIN;
-			int _channel = DEFAULT_TOKEN_CHANNEL;
-			// org/apache/usergrid/persistence/query/tree/QueryFilter.g:97:8: ( ( 'W' | 'w' ) ( 'I' | 'i' ) ( 'T' | 't' ) ( 'H' | 'h' ) ( 'I' | 'i' ) ( 'N' | 'n' ) )
-			// org/apache/usergrid/persistence/query/tree/QueryFilter.g:97:10: ( 'W' | 'w' ) ( 'I' | 'i' ) ( 'T' | 't' ) ( 'H' | 'h' ) ( 'I' | 'i' ) ( 'N' | 'n' )
-			{
-			if ( input.LA(1)=='W'||input.LA(1)=='w' ) {
-				input.consume();
-			}
-			else {
-				MismatchedSetException mse = new MismatchedSetException(null,input);
-				recover(mse);
-				throw mse;
-			}
-			if ( input.LA(1)=='I'||input.LA(1)=='i' ) {
-				input.consume();
-			}
-			else {
-				MismatchedSetException mse = new MismatchedSetException(null,input);
-				recover(mse);
-				throw mse;
-			}
-			if ( input.LA(1)=='T'||input.LA(1)=='t' ) {
-				input.consume();
-			}
-			else {
-				MismatchedSetException mse = new MismatchedSetException(null,input);
-				recover(mse);
-				throw mse;
-			}
-			if ( input.LA(1)=='H'||input.LA(1)=='h' ) {
-				input.consume();
-			}
-			else {
-				MismatchedSetException mse = new MismatchedSetException(null,input);
-				recover(mse);
-				throw mse;
-			}
-			if ( input.LA(1)=='I'||input.LA(1)=='i' ) {
-				input.consume();
-			}
-			else {
-				MismatchedSetException mse = new MismatchedSetException(null,input);
-				recover(mse);
-				throw mse;
-			}
-			if ( input.LA(1)=='N'||input.LA(1)=='n' ) {
-				input.consume();
-			}
-			else {
-				MismatchedSetException mse = new MismatchedSetException(null,input);
-				recover(mse);
-				throw mse;
-			}
-			}
-
-			state.type = _type;
-			state.channel = _channel;
-		}
-		finally {
-			// do for sure before leaving
-		}
-	}
-	// $ANTLR end "WITHIN"
-
-	// $ANTLR start "OF"
-	public final void mOF() throws RecognitionException {
-		try {
-			int _type = OF;
-			int _channel = DEFAULT_TOKEN_CHANNEL;
-			// org/apache/usergrid/persistence/query/tree/QueryFilter.g:99:4: ( ( 'O' | 'o' ) ( 'F' | 'f' ) )
-			// org/apache/usergrid/persistence/query/tree/QueryFilter.g:99:6: ( 'O' | 'o' ) ( 'F' | 'f' )
-			{
-			if ( input.LA(1)=='O'||input.LA(1)=='o' ) {
-				input.consume();
-			}
-			else {
-				MismatchedSetException mse = new MismatchedSetException(null,input);
-				recover(mse);
-				throw mse;
-			}
-			if ( input.LA(1)=='F'||input.LA(1)=='f' ) {
-				input.consume();
-			}
-			else {
-				MismatchedSetException mse = new MismatchedSetException(null,input);
-				recover(mse);
-				throw mse;
-			}
-			}
-
-			state.type = _type;
-			state.channel = _channel;
-		}
-		finally {
-			// do for sure before leaving
-		}
-	}
-	// $ANTLR end "OF"
-
-	// $ANTLR start "UUID"
-	public final void mUUID() throws RecognitionException {
-		try {
-			int _type = UUID;
-			int _channel = DEFAULT_TOKEN_CHANNEL;
-			// org/apache/usergrid/persistence/query/tree/QueryFilter.g:101:6: ( HEX_DIGIT HEX_DIGIT HEX_DIGIT HEX_DIGIT HEX_DIGIT HEX_DIGIT HEX_DIGIT HEX_DIGIT '-' HEX_DIGIT HEX_DIGIT HEX_DIGIT HEX_DIGIT '-' HEX_DIGIT HEX_DIGIT HEX_DIGIT HEX_DIGIT '-' HEX_DIGIT HEX_DIGIT HEX_DIGIT HEX_DIGIT '-' HEX_DIGIT HEX_DIGIT HEX_DIGIT HEX_DIGIT HEX_DIGIT HEX_DIGIT HEX_DIGIT HEX_DIGIT HEX_DIGIT HEX_DIGIT HEX_DIGIT HEX_DIGIT )
-			// org/apache/usergrid/persistence/query/tree/QueryFilter.g:101:9: HEX_DIGIT HEX_DIGIT HEX_DIGIT HEX_DIGIT HEX_DIGIT HEX_DIGIT HEX_DIGIT HEX_DIGIT '-' HEX_DIGIT HEX_DIGIT HEX_DIGIT HEX_DIGIT '-' HEX_DIGIT HEX_DIGIT HEX_DIGIT HEX_DIGIT '-' HEX_DIGIT HEX_DIGIT HEX_DIGIT HEX_DIGIT '-' HEX_DIGIT HEX_DIGIT HEX_DIGIT HEX_DIGIT HEX_DIGIT HEX_DIGIT HEX_DIGIT HEX_DIGIT HEX_DIGIT HEX_DIGIT HEX_DIGIT HEX_DIGIT
-			{
-			mHEX_DIGIT(); 
-
-			mHEX_DIGIT(); 
-
-			mHEX_DIGIT(); 
-
-			mHEX_DIGIT(); 
-
-			mHEX_DIGIT(); 
-
-			mHEX_DIGIT(); 
-
-			mHEX_DIGIT(); 
-
-			mHEX_DIGIT(); 
-
-			match('-'); 
-			mHEX_DIGIT(); 
-
-			mHEX_DIGIT(); 
-
-			mHEX_DIGIT(); 
-
-			mHEX_DIGIT(); 
-
-			match('-'); 
-			mHEX_DIGIT(); 
-
-			mHEX_DIGIT(); 
-
-			mHEX_DIGIT(); 
-
-			mHEX_DIGIT(); 
-
-			match('-'); 
-			mHEX_DIGIT(); 
-
-			mHEX_DIGIT(); 
-
-			mHEX_DIGIT(); 
-
-			mHEX_DIGIT(); 
-
-			match('-'); 
-			mHEX_DIGIT(); 
-
-			mHEX_DIGIT(); 
-
-			mHEX_DIGIT(); 
-
-			mHEX_DIGIT(); 
-
-			mHEX_DIGIT(); 
-
-			mHEX_DIGIT(); 
-
-			mHEX_DIGIT(); 
-
-			mHEX_DIGIT(); 
-
-			mHEX_DIGIT(); 
-
-			mHEX_DIGIT(); 
-
-			mHEX_DIGIT(); 
-
-			mHEX_DIGIT(); 
-
-			}
-
-			state.type = _type;
-			state.channel = _channel;
-		}
-		finally {
-			// do for sure before leaving
-		}
-	}
-	// $ANTLR end "UUID"
-
-	// $ANTLR start "ID"
-	public final void mID() throws RecognitionException {
-		try {
-			int _type = ID;
-			int _channel = DEFAULT_TOKEN_CHANNEL;
-			// org/apache/usergrid/persistence/query/tree/QueryFilter.g:112:5: ( ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '0' .. '9' | '_' | '.' | '-' )* )
-			// org/apache/usergrid/persistence/query/tree/QueryFilter.g:112:7: ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '0' .. '9' | '_' | '.' | '-' )*
-			{
-			if ( (input.LA(1) >= 'A' && input.LA(1) <= 'Z')||input.LA(1)=='_'||(input.LA(1) >= 'a' && input.LA(1) <= 'z') ) {
-				input.consume();
-			}
-			else {
-				MismatchedSetException mse = new MismatchedSetException(null,input);
-				recover(mse);
-				throw mse;
-			}
-			// org/apache/usergrid/persistence/query/tree/QueryFilter.g:112:31: ( 'a' .. 'z' | 'A' .. 'Z' | '0' .. '9' | '_' | '.' | '-' )*
-			loop9:
-			while (true) {
-				int alt9=2;
-				int LA9_0 = input.LA(1);
-				if ( ((LA9_0 >= '-' && LA9_0 <= '.')||(LA9_0 >= '0' && LA9_0 <= '9')||(LA9_0 >= 'A' && LA9_0 <= 'Z')||LA9_0=='_'||(LA9_0 >= 'a' && LA9_0 <= 'z')) ) {
-					alt9=1;
-				}
-
-				switch (alt9) {
-				case 1 :
-					// org/apache/usergrid/persistence/query/tree/QueryFilter.g:
-					{
-					if ( (input.LA(1) >= '-' && input.LA(1) <= '.')||(input.LA(1) >= '0' && input.LA(1) <= '9')||(input.LA(1) >= 'A' && input.LA(1) <= 'Z')||input.LA(1)=='_'||(input.LA(1) >= 'a' && input.LA(1) <= 'z') ) {
-						input.consume();
-					}
-					else {
-						MismatchedSetException mse = new MismatchedSetException(null,input);
-						recover(mse);
-						throw mse;
-					}
-					}
-					break;
-
-				default :
-					break loop9;
-				}
-			}
-
-			}
-
-			state.type = _type;
-			state.channel = _channel;
-		}
-		finally {
-			// do for sure before leaving
-		}
-	}
-	// $ANTLR end "ID"
-
-	// $ANTLR start "LONG"
-	public final void mLONG() throws RecognitionException {
-		try {
-			int _type = LONG;
-			int _channel = DEFAULT_TOKEN_CHANNEL;
-			// org/apache/usergrid/persistence/query/tree/QueryFilter.g:115:6: ( ( '-' )? ( '0' .. '9' )+ )
-			// org/apache/usergrid/persistence/query/tree/QueryFilter.g:115:8: ( '-' )? ( '0' .. '9' )+
-			{
-			// org/apache/usergrid/persistence/query/tree/QueryFilter.g:115:8: ( '-' )?
-			int alt10=2;
-			int LA10_0 = input.LA(1);
-			if ( (LA10_0=='-') ) {
-				alt10=1;
-			}
-			switch (alt10) {
-				case 1 :
-					// org/apache/usergrid/persistence/query/tree/QueryFilter.g:115:9: '-'
-					{
-					match('-'); 
-					}
-					break;
-
-			}
-
-			// org/apache/usergrid/persistence/query/tree/QueryFilter.g:115:15: ( '0' .. '9' )+
-			int cnt11=0;
-			loop11:
-			while (true) {
-				int alt11=2;
-				int LA11_0 = input.LA(1);
-				if ( ((LA11_0 >= '0' && LA11_0 <= '9')) ) {
-					alt11=1;
-				}
-
-				switch (alt11) {
-				case 1 :
-					// org/apache/usergrid/persistence/query/tree/QueryFilter.g:
-					{
-					if ( (input.LA(1) >= '0' && input.LA(1) <= '9') ) {
-						input.consume();
-					}
-					else {
-						MismatchedSetException mse = new MismatchedSetException(null,input);
-						recover(mse);
-						throw mse;
-					}
-					}
-					break;
-
-				default :
-					if ( cnt11 >= 1 ) break loop11;
-					EarlyExitException eee = new EarlyExitException(11, input);
-					throw eee;
-				}
-				cnt11++;
-			}
-
-			}
-
-			state.type = _type;
-			state.channel = _channel;
-		}
-		finally {
-			// do for sure before leaving
-		}
-	}
-	// $ANTLR end "LONG"
-
-	// $ANTLR start "FLOAT"
-	public final void mFLOAT() throws RecognitionException {
-		try {
-			int _type = FLOAT;
-			int _channel = DEFAULT_TOKEN_CHANNEL;
-			// org/apache/usergrid/persistence/query/tree/QueryFilter.g:119:5: ( ( '-' )? ( ( '0' .. '9' )+ '.' ( '0' .. '9' )* ( EXPONENT )? | '.' ( '0' .. '9' )+ ( EXPONENT )? | ( '0' .. '9' )+ EXPONENT ) )
-			// org/apache/usergrid/persistence/query/tree/QueryFilter.g:119:8: ( '-' )? ( ( '0' .. '9' )+ '.' ( '0' .. '9' )* ( EXPONENT )? | '.' ( '0' .. '9' )+ ( EXPONENT )? | ( '0' .. '9' )+ EXPONENT )
-			{
-			// org/apache/usergrid/persistence/query/tree/QueryFilter.g:119:8: ( '-' )?
-			int alt12=2;
-			int LA12_0 = input.LA(1);
-			if ( (LA12_0=='-') ) {
-				alt12=1;
-			}
-			switch (alt12) {
-				case 1 :
-					// org/apache/usergrid/persistence/query/tree/QueryFilter.g:119:9: '-'
-					{
-					match('-'); 
-					}
-					break;
-
-			}
-
-			// org/apache/usergrid/persistence/query/tree/QueryFilter.g:119:15: ( ( '0' .. '9' )+ '.' ( '0' .. '9' )* ( EXPONENT )? | '.' ( '0' .. '9' )+ ( EXPONENT )? | ( '0' .. '9' )+ EXPONENT )
-			int alt19=3;
-			alt19 = dfa19.predict(input);
-			switch (alt19) {
-				case 1 :
-					// org/apache/usergrid/persistence/query/tree/QueryFilter.g:119:17: ( '0' .. '9' )+ '.' ( '0' .. '9' )* ( EXPONENT )?
-					{
-					// org/apache/usergrid/persistence/query/tree/QueryFilter.g:119:17: ( '0' .. '9' )+
-					int cnt13=0;
-					loop13:
-					while (true) {
-						int alt13=2;
-						int LA13_0 = input.LA(1);
-						if ( ((LA13_0 >= '0' && LA13_0 <= '9')) ) {
-							alt13=1;
-						}
-
-						switch (alt13) {
-						case 1 :
-							// org/apache/usergrid/persistence/query/tree/QueryFilter.g:
-							{
-							if ( (input.LA(1) >= '0' && input.LA(1) <= '9') ) {
-								input.consume();
-							}
-							else {
-								MismatchedSetException mse = new MismatchedSetException(null,input);
-								recover(mse);
-								throw mse;
-							}
-							}
-							break;
-
-						default :
-							if ( cnt13 >= 1 ) break loop13;
-							EarlyExitException eee = new EarlyExitException(13, input);
-							throw eee;
-						}
-						cnt13++;
-					}
-
-					match('.'); 
-					// org/apache/usergrid/persistence/query/tree/QueryFilter.g:119:33: ( '0' .. '9' )*
-					loop14:
-					while (true) {
-						int alt14=2;
-						int LA14_0 = input.LA(1);
-						if ( ((LA14_0 >= '0' && LA14_0 <= '9')) ) {
-							alt14=1;
-						}
-
-						switch (alt14) {
-						case 1 :
-							// org/apache/usergrid/persistence/query/tree/QueryFilter.g:
-							{
-							if ( (input.LA(1) >= '0' && input.LA(1) <= '9') ) {
-								input.consume();
-							}
-							else {
-								MismatchedSetException mse = new MismatchedSetException(null,input);
-								recover(mse);
-								throw mse;
-							}
-							}
-							break;
-
-						default :
-							break loop14;
-						}
-					}
-
-					// org/apache/usergrid/persistence/query/tree/QueryFilter.g:119:45: ( EXPONENT )?
-					int alt15=2;
-					int LA15_0 = input.LA(1);
-					if ( (LA15_0=='E'||LA15_0=='e') ) {
-						alt15=1;
-					}
-					switch (alt15) {
-						case 1 :
-							// org/apache/usergrid/persistence/query/tree/QueryFilter.g:119:45: EXPONENT
-							{
-							mEXPONENT(); 
-
-							}
-							break;
-
-					}
-
-					}
-					break;
-				case 2 :
-					// org/apache/usergrid/persistence/query/tree/QueryFilter.g:120:9: '.' ( '0' .. '9' )+ ( EXPONENT )?
-					{
-					match('.'); 
-					// org/apache/usergrid/persistence/query/tree/QueryFilter.g:120:13: ( '0' .. '9' )+
-					int cnt16=0;
-					loop16:
-					while (true) {
-						int alt16=2;
-						int LA16_0 = input.LA(1);
-						if ( ((LA16_0 >= '0' && LA16_0 <= '9')) ) {
-							alt16=1;
-						}
-
-						switch (alt16) {
-						case 1 :
-							// org/apache/usergrid/persistence/query/tree/QueryFilter.g:
-							{
-							if ( (input.LA(1) >= '0' && input.LA(1) <= '9') ) {
-								input.consume();
-							}
-							else {
-								MismatchedSetException mse = new MismatchedSetException(null,input);
-								recover(mse);
-								throw mse;
-							}
-							}
-							break;
-
-						default :
-							if ( cnt16 >= 1 ) break loop16;
-							EarlyExitException eee = new EarlyExitException(16, input);
-							throw eee;
-						}
-						cnt16++;
-					}
-
-					// org/apache/usergrid/persistence/query/tree/QueryFilter.g:120:25: ( EXPONENT )?
-					int alt17=2;
-					int LA17_0 = input.LA(1);
-					if ( (LA17_0=='E'||LA17_0=='e') ) {
-						alt17=1;
-					}
-					switch (alt17) {
-						case 1 :
-							// org/apache/usergrid/persistence/query/tree/QueryFilter.g:120:25: EXPONENT
-							{
-							mEXPONENT(); 
-
-							}
-							break;
-
-					}
-
-					}
-					break;
-				case 3 :
-					// org/apache/usergrid/persistence/query/tree/QueryFilter.g:121:9: ( '0' .. '9' )+ EXPONENT
-					{
-					// org/apache/usergrid/persistence/query/tree/QueryFilter.g:121:9: ( '0' .. '9' )+
-					int cnt18=0;
-					loop18:
-					while (true) {
-						int alt18=2;
-						int LA18_0 = input.LA(1);
-						if ( ((LA18_0 >= '0' && LA18_0 <= '9')) ) {
-							alt18=1;
-						}
-
-						switch (alt18) {
-						case 1 :
-							// org/apache/usergrid/persistence/query/tree/QueryFilter.g:
-							{
-							if ( (input.LA(1) >= '0' && input.LA(1) <= '9') ) {
-								input.consume();
-							}
-							else {
-								MismatchedSetException mse = new MismatchedSetException(null,input);
-								recover(mse);
-								throw mse;
-							}
-							}
-							break;
-
-						default :
-							if ( cnt18 >= 1 ) break loop18;
-							EarlyExitException eee = new EarlyExitException(18, input);
-							throw eee;
-						}
-						cnt18++;
-					}
-
-					mEXPONENT(); 
-
-					}
-					break;
-
-			}
-
-			}
-
-			state.type = _type;
-			state.channel = _channel;
-		}
-		finally {
-			// do for sure before leaving
-		}
-	}
-	// $ANTLR end "FLOAT"
-
-	// $ANTLR start "STRING"
-	public final void mSTRING() throws RecognitionException {
-		try {
-			int _type = STRING;
-			int _channel = DEFAULT_TOKEN_CHANNEL;
-			// org/apache/usergrid/persistence/query/tree/QueryFilter.g:125:5: ( '\\'' ( ESC_SEQ |~ ( '\\\\' | '\\'' ) )* '\\'' )
-			// org/apache/usergrid/persistence/query/tree/QueryFilter.g:125:8: '\\'' ( ESC_SEQ |~ ( '\\\\' | '\\'' ) )* '\\''
-			{
-			match('\''); 
-			// org/apache/usergrid/persistence/query/tree/QueryFilter.g:125:13: ( ESC_SEQ |~ ( '\\\\' | '\\'' ) )*
-			loop20:
-			while (true) {
-				int alt20=3;
-				int LA20_0 = input.LA(1);
-				if ( (LA20_0=='\\') ) {
-					alt20=1;
-				}
-				else if ( ((LA20_0 >= '\u0000' && LA20_0 <= '&')||(LA20_0 >= '(' && LA20_0 <= '[')||(LA20_0 >= ']' && LA20_0 <= '\uFFFF')) ) {
-					alt20=2;
-				}
-
-				switch (alt20) {
-				case 1 :
-					// org/apache/usergrid/persistence/query/tree/QueryFilter.g:125:15: ESC_SEQ
-					{
-					mESC_SEQ(); 
-
-					}
-					break;
-				case 2 :
-					// org/apache/usergrid/persistence/query/tree/QueryFilter.g:125:25: ~ ( '\\\\' | '\\'' )
-					{
-					if ( (input.LA(1) >= '\u0000' && input.LA(1) <= '&')||(input.LA(1) >= '(' && input.LA(1) <= '[')||(input.LA(1) >= ']' && input.LA(1) <= '\uFFFF') ) {
-						input.consume();
-					}
-					else {
-						MismatchedSetException mse = new MismatchedSetException(null,input);
-						recover(mse);
-						throw mse;
-					}
-					}
-					break;
-
-				default :
-					break loop20;
-				}
-			}
-
-			match('\''); 
-			}
-
-			state.type = _type;
-			state.channel = _channel;
-		}
-		finally {
-			// do for sure before leaving
-		}
-	}
-	// $ANTLR end "STRING"
-
-	// $ANTLR start "WS"
-	public final void mWS() throws RecognitionException {
-		try {
-			int _type = WS;
-			int _channel = DEFAULT_TOKEN_CHANNEL;
-			// org/apache/usergrid/persistence/query/tree/QueryFilter.g:130:4: ( ( ' ' | '\\t' | '\\n' | '\\r' | '\\f' )+ )
-			// org/apache/usergrid/persistence/query/tree/QueryFilter.g:130:6: ( ' ' | '\\t' | '\\n' | '\\r' | '\\f' )+
-			{
-			// org/apache/usergrid/persistence/query/tree/QueryFilter.g:130:6: ( ' ' | '\\t' | '\\n' | '\\r' | '\\f' )+
-			int cnt21=0;
-			loop21:
-			while (true) {
-				int alt21=2;
-				int LA21_0 = input.LA(1);
-				if ( ((LA21_0 >= '\t' && LA21_0 <= '\n')||(LA21_0 >= '\f' && LA21_0 <= '\r')||LA21_0==' ') ) {
-					alt21=1;
-				}
-
-				switch (alt21) {
-				case 1 :
-					// org/apache/usergrid/persistence/query/tree/QueryFilter.g:
-					{
-					if ( (input.LA(1) >= '\t' && input.LA(1) <= '\n')||(input.LA(1) >= '\f' && input.LA(1) <= '\r')||input.LA(1)==' ' ) {
-						input.consume();
-					}
-					else {
-						MismatchedSetException mse = new MismatchedSetException(null,input);
-						recover(mse);
-						throw mse;
-					}
-					}
-					break;
-
-				default :
-					if ( cnt21 >= 1 ) break loop21;
-					EarlyExitException eee = new EarlyExitException(21, input);
-					throw eee;
-				}
-				cnt21++;
-			}
-
-			_channel=HIDDEN;
-			}
-
-			state.type = _type;
-			state.channel = _channel;
-		}
-		finally {
-			// do for sure before leaving
-		}
-	}
-	// $ANTLR end "WS"
-
-	// $ANTLR start "TRUE"
-	public final void mTRUE() throws RecognitionException {
-		try {
-			// org/apache/usergrid/persistence/query/tree/QueryFilter.g:138:15: ( ( 'T' | 't' ) ( 'R' | 'r' ) ( 'U' | 'u' ) ( 'E' | 'e' ) )
-			// org/apache/usergrid/persistence/query/tree/QueryFilter.g:138:17: ( 'T' | 't' ) ( 'R' | 'r' ) ( 'U' | 'u' ) ( 'E' | 'e' )
-			{
-			if ( input.LA(1)=='T'||input.LA(1)=='t' ) {
-				input.consume();
-			}
-			else {
-				MismatchedSetException mse = new MismatchedSetException(null,input);
-				recover(mse);
-				throw mse;
-			}
-			if ( input.LA(1)=='R'||input.LA(1)=='r' ) {
-				input.consume();
-			}
-			else {
-				MismatchedSetException mse = new MismatchedSetException(null,input);
-				recover(mse);
-				throw mse;
-			}
-			if ( input.LA(1)=='U'||input.LA(1)=='u' ) {
-				input.consume();
-			}
-			else {
-				MismatchedSetException mse = new MismatchedSetException(null,input);
-				recover(mse);
-				throw mse;
-			}
-			if ( input.LA(1)=='E'||input.LA(1)=='e' ) {
-				input.consume();
-			}
-			else {
-				MismatchedSetException mse = new MismatchedSetException(null,input);
-				recover(mse);
-				throw mse;
-			}
-			}
-
-		}
-		finally {
-			// do for sure before leaving
-		}
-	}
-	// $ANTLR end "TRUE"
-
-	// $ANTLR start "FALSE"
-	public final void mFALSE() throws RecognitionException {
-		try {
-			// org/apache/usergrid/persistence/query/tree/QueryFilter.g:140:16: ( ( 'F' | 'f' ) ( 'A' | 'a' ) ( 'L' | 'l' ) ( 'S' | 's' ) ( 'E' | 'e' ) )
-			// org/apache/usergrid/persistence/query/tree/QueryFilter.g:140:18: ( 'F' | 'f' ) ( 'A' | 'a' ) ( 'L' | 'l' ) ( 'S' | 's' ) ( 'E' | 'e' )
-			{
-			if ( input.LA(1)=='F'||input.LA(1)=='f' ) {
-				input.consume();
-			}
-			else {
-				MismatchedSetException mse = new MismatchedSetException(null,input);
-				recover(mse);
-				throw mse;
-			}
-			if ( input.LA(1)=='A'||input.LA(1)=='a' ) {
-				input.consume();
-			}
-			else {
-				MismatchedSetException mse = new MismatchedSetException(null,input);
-				recover(mse);
-				throw mse;
-			}
-			if ( input.LA(1)=='L'||input.LA(1)=='l' ) {
-				input.consume();
-			}
-			else {
-				MismatchedSetException mse = new MismatchedSetException(null,input);
-				recover(mse);
-				throw mse;
-			}
-			if ( input.LA(1)=='S'||input.LA(1)=='s' ) {
-				input.consume();
-			}
-			else {
-				MismatchedSetException mse = new MismatchedSetException(null,input);
-				recover(mse);
-				throw mse;
-			}
-			if ( input.LA(1)=='E'||input.LA(1)=='e' ) {
-				input.consume();
-			}
-			else {
-				MismatchedSetException mse = new MismatchedSetException(null,input);
-				recover(mse);
-				throw mse;
-			}
-			}
-
-		}
-		finally {
-			// do for sure before leaving
-		}
-	}
-	// $ANTLR end "FALSE"
-
-	// $ANTLR start "EXPONENT"
-	public final void mEXPONENT() throws RecognitionException {
-		try {
-			// org/apache/usergrid/persistence/query/tree/QueryFilter.g:145:10: ( ( 'e' | 'E' ) ( '+' | '-' )? ( '0' .. '9' )+ )
-			// org/apache/usergrid/persistence/query/tree/QueryFilter.g:145:12: ( 'e' | 'E' ) ( '+' | '-' )? ( '0' .. '9' )+
-			{
-			if ( input.LA(1)=='E'||input.LA(1)=='e' ) {
-				input.consume();
-			}
-			else {
-				MismatchedSetException mse = new MismatchedSetException(null,input);
-				recover(mse);
-				throw mse;
-			}
-			// org/apache/usergrid/persistence/query/tree/QueryFilter.g:145:22: ( '+' | '-' )?
-			int alt22=2;
-			int LA22_0 = input.LA(1);
-			if ( (LA22_0=='+'||LA22_0=='-') ) {
-				alt22=1;
-			}
-			switch (alt22) {
-				case 1 :
-					// org/apache/usergrid/persistence/query/tree/QueryFilter.g:
-					{
-					if ( input.LA(1)=='+'||input.LA(1)=='-' ) {
-						input.consume();
-					}
-					else {
-						MismatchedSetException mse = new MismatchedSetException(null,input);
-						recover(mse);
-						throw mse;
-					}
-					}
-					break;
-
-			}
-
-			// org/apache/usergrid/persistence/query/tree/QueryFilter.g:145:33: ( '0' .. '9' )+
-			int cnt23=0;
-			loop23:
-			while (true) {
-				int alt23=2;
-				int LA23_0 = input.LA(1);
-				if ( ((LA23_0 >= '0' && LA23_0 <= '9')) ) {
-					alt23=1;
-				}
-
-				switch (alt23) {
-				case 1 :
-					// org/apache/usergrid/persistence/query/tree/QueryFilter.g:
-					{
-					if ( (input.LA(1) >= '0' && input.LA(1) <= '9') ) {
-						input.consume();
-					}
-					else {
-						MismatchedSetException mse = new MismatchedSetException(null,input);
-						recover(mse);
-						throw mse;
-					}
-					}
-					break;
-
-				default :
-					if ( cnt23 >= 1 ) break loop23;
-					EarlyExitException eee = new EarlyExitException(23, input);
-					throw eee;
-				}
-				cnt23++;
-			}
-
-			}
-
-		}
-		finally {
-			// do for sure before leaving
-		}
-	}
-	// $ANTLR end "EXPONENT"
-
-	// $ANTLR start "HEX_DIGIT"
-	public final void mHEX_DIGIT() throws RecognitionException {
-		try {
-			// org/apache/usergrid/persistence/query/tree/QueryFilter.g:148:11: ( ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' ) )
-			// org/apache/usergrid/persistence/query/tree/QueryFilter.g:
-			{
-			if ( (input.LA(1) >= '0' && input.LA(1) <= '9')||(input.LA(1) >= 'A' && input.LA(1) <= 'F')||(input.LA(1) >= 'a' && input.LA(1) <= 'f') ) {
-				input.consume();
-			}
-			else {
-				MismatchedSetException mse = new MismatchedSetException(null,input);
-				recover(mse);
-				throw mse;
-			}
-			}
-
-		}
-		finally {
-			// do for sure before leaving
-		}
-	}
-	// $ANTLR end "HEX_DIGIT"
-
-	// $ANTLR start "ESC_SEQ"
-	public final void mESC_SEQ() throws RecognitionException {
-		try {
-			// org/apache/usergrid/persistence/query/tree/QueryFilter.g:152:5: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | UNICODE_ESC | OCTAL_ESC )
-			int alt24=3;
-			int LA24_0 = input.LA(1);
-			if ( (LA24_0=='\\') ) {
-				switch ( input.LA(2) ) {
-				case '\"':
-				case '\'':
-				case '\\':
-				case 'b':
-				case 'f':
-				case 'n':
-				case 'r':
-				case 't':
-					{
-					alt24=1;
-					}
-					break;
-				case 'u':
-					{
-					alt24=2;
-					}
-					break;
-				case '0':
-				case '1':
-				case '2':
-				case '3':
-				case '4':
-				case '5':
-				case '6':
-				case '7':
-					{
-					alt24=3;
-					}
-					break;
-				default:
-					int nvaeMark = input.mark();
-					try {
-						input.consume();
-						NoViableAltException nvae =
-							new NoViableAltException("", 24, 1, input);
-						throw nvae;
-					} finally {
-						input.rewind(nvaeMark);
-					}
-				}
-			}
-
-			else {
-				NoViableAltException nvae =
-					new NoViableAltException("", 24, 0, input);
-				throw nvae;
-			}
-
-			switch (alt24) {
-				case 1 :
-					// org/apache/usergrid/persistence/query/tree/QueryFilter.g:152:9: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' )
-					{
-					match('\\'); 
-					if ( input.LA(1)=='\"'||input.LA(1)=='\''||input.LA(1)=='\\'||input.LA(1)=='b'||input.LA(1)=='f'||input.LA(1)=='n'||input.LA(1)=='r'||input.LA(1)=='t' ) {
-						input.consume();
-					}
-					else {
-						MismatchedSetException mse = new MismatchedSetException(null,input);
-						recover(mse);
-						throw mse;
-					}
-					}
-					break;
-				case 2 :
-					// org/apache/usergrid/persistence/query/tree/QueryFilter.g:153:9: UNICODE_ESC
-					{
-					mUNICODE_ESC(); 
-
-					}
-					break;
-				case 3 :
-					// org/apache/usergrid/persistence/query/tree/QueryFilter.g:154:9: OCTAL_ESC
-					{
-					mOCTAL_ESC(); 
-
-					}
-					break;
-
-			}
-		}
-		finally {
-			// do for sure before leaving
-		}
-	}
-	// $ANTLR end "ESC_SEQ"
-
-	// $ANTLR start "OCTAL_ESC"
-	public final void mOCTAL_ESC() throws RecognitionException {
-		try {
-			// org/apache/usergrid/persistence/query/tree/QueryFilter.g:159:5: ( '\\\\' ( '0' .. '3' ) ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) )
-			int alt25=3;
-			int LA25_0 = input.LA(1);
-			if ( (LA25_0=='\\') ) {
-				int LA25_1 = input.LA(2);
-				if ( ((LA25_1 >= '0' && LA25_1 <= '3')) ) {
-					int LA25_2 = input.LA(3);
-					if ( ((LA25_2 >= '0' && LA25_2 <= '7')) ) {
-						int LA25_4 = input.LA(4);
-						if ( ((LA25_4 >= '0' && LA25_4 <= '7')) ) {
-							alt25=1;
-						}
-
-						else {
-							alt25=2;
-						}
-
-					}
-
-					else {
-						alt25=3;
-					}
-
-				}
-				else if ( ((LA25_1 >= '4' && LA25_1 <= '7')) ) {
-					int LA25_3 = input.LA(3);
-					if ( ((LA25_3 >= '0' && LA25_3 <= '7')) ) {
-						alt25=2;
-					}
-
-					else {
-						alt25=3;
-					}
-
-				}
-
-				else {
-					int nvaeMark = input.mark();
-					try {
-						input.consume();
-						NoViableAltException nvae =
-							new NoViableAltException("", 25, 1, input);
-						throw nvae;
-					} finally {
-						input.rewind(nvaeMark);
-					}
-				}
-
-			}
-
-			else {
-				NoViableAltException nvae =
-					new NoViableAltException("", 25, 0, input);
-				throw nvae;
-			}
-
-			switch (alt25) {
-				case 1 :
-					// org/apache/usergrid/persistence/query/tree/QueryFilter.g:159:9: '\\\\' ( '0' .. '3' ) ( '0' .. '7' ) ( '0' .. '7' )
-					{
-					match('\\'); 
-					if ( (input.LA(1) >= '0' && input.LA(1) <= '3') ) {
-						input.consume();
-					}
-					else {
-						MismatchedSetException mse = new MismatchedSetException(null,input);
-						recover(mse);
-						throw mse;
-					}
-					if ( (input.LA(1) >= '0' && input.LA(1) <= '7') ) {
-						input.consume();
-					}
-					else {
-						MismatchedSetException mse = new MismatchedSetException(null,input);
-						recover(mse);
-						throw mse;
-					}
-					if ( (input.LA(1) >= '0' && input.LA(1) <= '7') ) {
-						input.consume();
-					}
-					else {
-						MismatchedSetException mse = new MismatchedSetException(null,input);
-						recover(mse);
-						throw mse;
-					}
-					}
-					break;
-				case 2 :
-					// org/apache/usergrid/persistence/query/tree/QueryFilter.g:160:9: '\\\\' ( '0' .. '7' ) ( '0' .. '7' )
-					{
-					match('\\'); 
-					if ( (input.LA(1) >= '0' && input.LA(1) <= '7') ) {
-						input.consume();
-					}
-					else {
-						MismatchedSetException mse = new MismatchedSetException(null,input);
-						recover(mse);
-						throw mse;
-					}
-					if ( (input.LA(1) >= '0' && input.LA(1) <= '7') ) {
-						input.consume();
-					}
-					else {
-						MismatchedSetException mse = new MismatchedSetException(null,input);
-						recover(mse);
-						throw mse;
-					}
-					}
-					break;
-				case 3 :
-					// org/apache/usergrid/persistence/query/tree/QueryFilter.g:161:9: '\\\\' ( '0' .. '7' )
-					{
-					match('\\'); 
-					if ( (input.LA(1) >= '0' && input.LA(1) <= '7') ) {
-						input.consume();
-					}
-					else {
-						MismatchedSetException mse = new MismatchedSetException(null,input);
-						recover(mse);
-						throw mse;
-					}
-					}
-					break;
-
-			}
-		}
-		finally {
-			// do for sure before leaving
-		}
-	}
-	// $ANTLR end "OCTAL_ESC"
-
-	// $ANTLR start "UNICODE_ESC"
-	public final void mUNICODE_ESC() throws RecognitionException {
-		try {
-			// org/apache/usergrid/persistence/query/tree/QueryFilter.g:166:5: ( '\\\\' 'u' HEX_DIGIT HEX_DIGIT HEX_DIGIT HEX_DIGIT )
-			// org/apache/usergrid/persistence/query/tree/QueryFilter.g:166:9: '\\\\' 'u' HEX_DIGIT HEX_DIGIT HEX_DIGIT HEX_DIGIT
-			{
-			match('\\'); 
-			match('u'); 
-			mHEX_DIGIT(); 
-
-			mHEX_DIGIT(); 
-
-			mHEX_DIGIT(); 
-
-			mHEX_DIGIT(); 
-
-			}
-
-		}
-		finally {
-			// do for sure before leaving
-		}
-	}
-	// $ANTLR end "UNICODE_ESC"
-
-	@Override
-	public void mTokens() throws RecognitionException {
-		// org/apache/usergrid/persistence/query/tree/QueryFilter.g:1:8: ( T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | T__38 | T__39 | T__40 | LT | LTE | EQ | GT | GTE | BOOLEAN | AND | OR | NOT | ASC | DESC | CONTAINS | WITHIN | OF | UUID | ID | LONG | FLOAT | STRING | WS )
-		int alt26=30;
-		alt26 = dfa26.predict(input);
-		switch (alt26) {
-			case 1 :
-				// org/apache/usergrid/persistence/query/tree/QueryFilter.g:1:10: T__31
-				{
-				mT__31(); 
-
-				}
-				break;
-			case 2 :
-				// org/apache/usergrid/persistence/query/tree/QueryFilter.g:1:16: T__32
-				{
-				mT__32(); 
-
-				}
-				break;
-			case 3 :
-				// org/apache/usergrid/persistence/query/tree/QueryFilter.g:1:22: T__33
-				{
-				mT__33(); 
-
-				}
-				break;
-			case 4 :
-				// org/apache/usergrid/persistence/query/tree/QueryFilter.g:1:28: T__34
-				{
-				mT__34(); 
-
-				}
-				break;
-			case 5 :
-				// org/apache/usergrid/persistence/query/tree/QueryFilter.g:1:34: T__35
-				{
-				mT__35(); 
-
-				}
-				break;
-			case 6 :
-				// org/apache/usergrid/persistence/query/tree/QueryFilter.g:1:40: T__36
-				{
-				mT__36(); 
-
-				}
-				break;
-			case 7 :
-				// org/apache/usergrid/persistence/query/tree/QueryFilter.g:1:46: T__37
-				{
-				mT__37(); 
-
-				}
-				break;
-			case 8 :
-				// org/apache/usergrid/persistence/query/tree/QueryFilter.g:1:52: T__38
-				{
-				mT__38(); 
-
-				}
-				break;
-			case 9 :
-				// org/apache/usergrid/persistence/query/tree/QueryFilter.g:1:58: T__39
-				{
-				mT__39(); 
-
-				}
-				break;
-			case 10 :
-				// org/apache/usergrid/persistence/query/tree/QueryFilter.g:1:64: T__40
-				{
-				mT__40(); 
-
-				}
-				break;
-			case 11 :
-				// org/apache/usergrid/persistence/query/tree/QueryFilter.g:1:70: LT
-				{
-				mLT(); 
-
-				}
-				break;
-			case 12 :
-				// org/apache/usergrid/persistence/query/tree/QueryFilter.g:1:73: LTE
-				{
-				mLTE(); 
-
-				}
-				break;
-			case 13 :
-				// org/apache/usergrid/persistence/query/tree/QueryFilter.g:1:77: EQ
-				{
-				mEQ(); 
-
-				}
-				break;
-			case 14 :
-				// org/apache/usergrid/persistence/query/tree/QueryFilter.g:1:80: GT
-				{
-				mGT(); 
-
-				}
-				break;
-			case 15 :
-				// org/apache/usergrid/persistence/query/tree/QueryFilter.g:1:83: GTE
-				{
-				mGTE(); 
-
-				}
-				break;
-			case 16 :
-				// org/apache/usergrid/persistence/query/tree/QueryFilter.g:1:87: BOOLEAN
-				{
-				mBOOLEAN(); 
-
-				}
-				break;
-			case 17 :
-				// org/apache/usergrid/persistence/query/tree/QueryFilter.g:1:95: AND
-				{
-				mAND(); 
-
-				}
-				break;
-			case 18 :
-				// org/apache/usergrid/persistence/query/tree/QueryFilter.g:1:99: OR
-				{
-				mOR(); 
-
-				}
-				break;
-			case 19 :
-				// org/apache/usergrid/persistence/query/tree/QueryFilter.g:1:102: NOT
-				{
-				mNOT(); 
-
-				}
-				break;
-			case 20 :
-				// org/apache/usergrid/persistence/query/tree/QueryFilter.g:1:106: ASC
-				{
-				mASC(); 
-
-				}
-				break;
-			case 21 :
-				// org/apache/usergrid/persistence/query/tree/QueryFilter.g:1:110: DESC
-				{
-				mDESC(); 
-
-				}
-				break;
-			case 22 :
-				// org/apache/usergrid/persistence/query/tree/QueryFilter.g:1:115: CONTAINS
-				{
-				mCONTAINS(); 
-
-				}
-				break;
-			case 23 :
-				// org/apache/usergrid/persistence/query/tree/QueryFilter.g:1:124: WITHIN
-				{
-				mWITHIN(); 
-
-				}
-				break;
-			case 24 :
-				// org/apache/usergrid/persistence/query/tree/QueryFilter.g:1:131: OF
-				{
-				mOF(); 
-
-				}
-				break;
-			case 25 :
-				// org/apache/usergrid/persistence/query/tree/QueryFilter.g:1:134: UUID
-				{
-				mUUID(); 
-
-				}
-				break;
-			case 26 :
-				// org/apache/usergrid/persistence/query/tree/QueryFilter.g:1:139: ID
-				{
-				mID(); 
-
-				}
-				break;
-			case 27 :
-				// org/apache/usergrid/persistence/query/tree/QueryFilter.g:1:142: LONG
-				{
-				mLONG(); 
-
-				}
-				break;
-			case 28 :
-				// org/apache/usergrid/persistence/query/tree/QueryFilter.g:1:147: FLOAT
-				{
-				mFLOAT(); 
-
-				}
-				break;
-			case 29 :
-				// org/apache/usergrid/persistence/query/tree/QueryFilter.g:1:153: STRING
-				{
-				mSTRING(); 
-
-				}
-				break;
-			case 30 :
-				// org/apache/usergrid/persistence/query/tree/QueryFilter.g:1:160: WS
-				{
-				mWS(); 
-
-				}
-				break;
-
-		}
-	}
-
-
-	protected DFA19 dfa19 = new DFA19(this);
-	protected DFA26 dfa26 = new DFA26(this);
-	static final String DFA19_eotS =
-		"\5\uffff";
-	static final String DFA19_eofS =
-		"\5\uffff";
-	static final String DFA19_minS =
-		"\2\56\3\uffff";
-	static final String DFA19_maxS =
-		"\1\71\1\145\3\uffff";
-	static final String DFA19_acceptS =
-		"\2\uffff\1\2\1\1\1\3";
-	static final String DFA19_specialS =
-		"\5\uffff}>";
-	static final String[] DFA19_transitionS = {
-			"\1\2\1\uffff\12\1",
-			"\1\3\1\uffff\12\1\13\uffff\1\4\37\uffff\1\4",
-			"",
-			"",
-			""
-	};
-
-	static final short[] DFA19_eot = DFA.unpackEncodedString(DFA19_eotS);
-	static final short[] DFA19_eof = DFA.unpackEncodedString(DFA19_eofS);
-	static final char[] DFA19_min = DFA.unpackEncodedStringToUnsignedChars(DFA19_minS);
-	static final char[] DFA19_max = DFA.unpackEncodedStringToUnsignedChars(DFA19_maxS);
-	static final short[] DFA19_accept = DFA.unpackEncodedString(DFA19_acceptS);
-	static final short[] DFA19_special = DFA.unpackEncodedString(DFA19_specialS);
-	static final short[][] DFA19_transition;
-
-	static {
-		int numStates = DFA19_transitionS.length;
-		DFA19_transition = new short[numStates][];
-		for (int i=0; i<numStates; i++) {
-			DFA19_transition[i] = DFA.unpackEncodedString(DFA19_transitionS[i]);
-		}
-	}
-
-	protected class DFA19 extends DFA {
-
-		public DFA19(BaseRecognizer recognizer) {
-			this.recognizer = recognizer;
-			this.decisionNumber = 19;
-			this.eot = DFA19_eot;
-			this.eof = DFA19_eof;
-			this.min = DFA19_min;
-			this.max = DFA19_max;
-			this.accept = DFA19_accept;
-			this.special = DFA19_special;
-			this.transition = DFA19_transition;
-		}
-		@Override
-		public String getDescription() {
-			return "119:15: ( ( '0' .. '9' )+ '.' ( '0' .. '9' )* ( EXPONENT )? | '.' ( '0' .. '9' )+ ( EXPONENT )? | ( '0' .. '9' )+ EXPONENT )";
-		}
-	}
-
-	static final String DFA26_eotS =
-		"\6\uffff\3\35\2\uffff\1\51\1\35\1\uffff\1\35\1\56\4\35\1\uffff\1\35\1"+
-		"\uffff\5\35\1\67\5\uffff\2\26\1\75\3\35\2\uffff\1\51\1\15\1\35\2\uffff"+
-		"\1\56\7\35\1\uffff\1\67\2\uffff\1\67\1\35\1\uffff\3\35\1\50\1\35\1\55"+
-		"\2\35\1\24\1\125\1\126\2\35\1\67\1\uffff\1\37\5\35\1\141\1\35\2\uffff"+
-		"\1\143\1\35\1\67\1\uffff\1\37\2\35\1\152\2\35\1\uffff\1\141\1\uffff\1"+
-		"\35\1\67\1\uffff\1\37\1\uffff\1\161\1\uffff\1\162\2\35\1\67\1\uffff\1"+
-		"\37\2\uffff\2\35\1\67\1\uffff\1\37\1\35\1\176\1\67\1\uffff\1\37\1\35\2"+
-		"\uffff\1\35\1\37\1\35\1\37\1\35\1\37\1\35\1\37\26\35\1\72";
-	static final String DFA26_eofS =
-		"\u009f\uffff";
-	static final String DFA26_minS =
-		"\1\11\5\uffff\1\106\1\145\1\111\2\uffff\1\75\1\164\1\uffff\1\60\1\75\1"+
-		"\164\1\122\2\60\1\uffff\1\106\1\uffff\1\117\2\60\1\111\1\60\1\56\1\uffff"+
-		"\1\56\3\uffff\3\55\1\154\1\145\1\124\2\uffff\2\55\1\60\2\uffff\1\55\1"+
-		"\125\1\60\1\104\1\103\1\124\1\60\1\116\1\uffff\1\56\1\53\1\uffff\1\56"+
-		"\1\145\1\uffff\1\145\1\162\1\110\1\55\1\60\1\55\1\105\1\123\3\55\1\103"+
-		"\1\124\1\56\1\53\1\60\1\162\1\143\1\145\1\111\1\60\1\55\1\105\2\uffff"+
-		"\1\55\1\101\1\56\1\53\1\60\1\40\1\164\1\55\1\116\1\60\1\uffff\1\55\1\uffff"+
-		"\1\111\1\56\1\53\1\60\1\uffff\1\55\1\uffff\1\55\1\60\1\116\1\56\1\53\1"+
-		"\60\2\uffff\1\60\1\123\1\56\1\53\1\60\3\55\1\53\1\55\1\60\1\uffff\7\60"+
-		"\2\55\4\60\1\55\4\60\1\55\14\60\1\55";
-	static final String DFA26_maxS =
-		"\1\175\5\uffff\1\162\1\145\1\151\2\uffff\1\75\1\164\1\uffff\1\161\1\75"+
-		"\1\164\1\162\1\146\1\163\1\uffff\1\162\1\uffff\1\157\1\146\1\157\1\151"+
-		"\2\146\1\uffff\1\71\3\uffff\3\172\1\154\1\145\1\164\2\uffff\2\172\1\146"+
-		"\2\uffff\1\172\1\165\1\154\1\144\1\143\1\164\1\163\1\156\1\uffff\2\146"+
-		"\1\uffff\2\145\1\uffff\1\145\1\162\1\150\1\172\1\146\1\172\1\145\1\163"+
-		"\3\172\1\143\1\164\3\146\1\162\1\143\1\145\1\151\1\146\1\172\1\145\2\uffff"+
-		"\1\172\1\141\3\146\1\40\1\164\1\172\1\156\1\146\1\uffff\1\172\1\uffff"+
-		"\1\151\3\146\1\uffff\1\172\1\uffff\1\172\1\146\1\156\3\146\2\uffff\1\146"+
-		"\1\163\3\146\1\55\1\172\1\145\1\71\1\55\1\146\1\uffff\7\146\2\55\4\146"+
-		"\1\55\4\146\1\55\14\146\1\172";
-	static final String DFA26_acceptS =
-		"\1\uffff\1\1\1\2\1\3\1\4\1\5\3\uffff\1\11\1\12\2\uffff\1\15\6\uffff\1"+
-		"\21\1\uffff\1\22\6\uffff\1\32\1\uffff\1\34\1\35\1\36\6\uffff\1\14\1\13"+
-		"\3\uffff\1\17\1\16\10\uffff\1\33\2\uffff\1\31\2\uffff\1\30\27\uffff\1"+
-		"\24\1\23\12\uffff\1\20\1\uffff\1\25\4\uffff\1\6\1\uffff\1\10\6\uffff\1"+
-		"\7\1\27\13\uffff\1\26\40\uffff";
-	static final String DFA26_specialS =
-		"\u009f\uffff}>";
-	static final String[] DFA26_transitionS = {
-			"\2\41\1\uffff\2\41\22\uffff\1\41\5\uffff\1\24\1\40\1\1\1\2\1\3\1\uffff"+
-			"\1\4\1\36\1\37\1\uffff\12\34\1\5\1\uffff\1\13\1\15\1\17\2\uffff\1\23"+
-			"\1\33\1\31\1\30\1\33\1\22\7\35\1\27\1\25\4\35\1\21\2\35\1\32\3\35\4\uffff"+
-			"\1\35\1\uffff\1\23\1\33\1\31\1\30\1\16\1\22\1\20\4\35\1\14\1\35\1\27"+
-			"\1\6\3\35\1\7\1\21\2\35\1\10\3\35\1\11\1\26\1\12",
-			"",
-			"",
-			"",
-			"",
-			"",
-			"\1\44\13\uffff\1\43\23\uffff\1\44\13\uffff\1\42",
-			"\1\45",
-			"\1\47\36\uffff\1\46\1\47",
-			"",
-			"",
-			"\1\50",
-			"\1\52",
-			"",
-			"\12\54\7\uffff\6\54\32\uffff\6\54\12\uffff\1\53",
-			"\1\55",
-			"\1\57",
-			"\1\60\37\uffff\1\60",
-			"\12\54\7\uffff\1\61\5\54\32\uffff\1\61\5\54",
-			"\12\54\7\uffff\6\54\7\uffff\1\62\4\uffff\1\63\15\uffff\6\54\7\uffff"+
-			"\1\62\4\uffff\1\63",
-			"",
-			"\1\44\13\uffff\1\43\23\uffff\1\44\13\uffff\1\43",
-			"",
-			"\1\64\37\uffff\1\64",
-			"\12\54\7\uffff\4\54\1\65\1\54\32\uffff\4\54\1\65\1\54",
-			"\12\54\7\uffff\6\54\10\uffff\1\66\21\uffff\6\54\10\uffff\1\66",
-			"\1\47\37\uffff\1\47",
-			"\12\54\7\uffff\6\54\32\uffff\6\54",
-			"\1\37\1\uffff\12\70\7\uffff\4\72\1\71\1\72\32\uffff\4\72\1\71\1\72",
-			"",
-			"\1\37\1\uffff\12\73",
-			"",
-			"",
-			"",
-			"\2\35\1\uffff\12\35\7\uffff\32\35\4\uffff\1\35\1\uffff\3\35\1\74\26"+
-			"\35",
-			"\2\35\1\uffff\12\35\7\uffff\32\35\4\uffff\1\35\1\uffff\32\35",
-			"\2\35\1\uffff\12\35\7\uffff\32\35\4\uffff\1\35\1\uffff\32\35",
-			"\1\76",
-			"\1\77",
-			"\1\100\37\uffff\1\100",
-			"",
-			"",
-			"\2\35\1\uffff\12\35\7\uffff\32\35\4\uffff\1\35\1\uffff\4\35\1\101\25"+
-			"\35",
-			"\2\35\1\uffff\12\35\7\uffff\32\35\4\uffff\1\35\1\uffff\32\35",
-			"\12\102\7\uffff\6\102\32\uffff\6\102",
-			"",
-			"",
-			"\2\35\1\uffff\12\35\7\uffff\32\35\4\uffff\1\35\1\uffff\4\35\1\103\25"+
-			"\35",
-			"\1\104\37\uffff\1\104",
-			"\12\102\7\uffff\6\102\5\uffff\1\105\24\uffff\6\102\5\uffff\1\105",
-			"\1\106\37\uffff\1\106",
-			"\1\107\37\uffff\1\107",
-			"\1\110\37\uffff\1\110",
-			"\12\102\7\uffff\6\102\14\uffff\1\111\15\uffff\6\102\14\uffff\1\111",
-			"\1\112\37\uffff\1\112",
-			"",
-			"\1\37\1\uffff\12\113\7\uffff\4\72\1\114\1\72\32\uffff\4\72\1\114\1\72",
-			"\1\37\1\uffff\1\37\2\uffff\12\115\7\uffff\6\72\32\uffff\6\72",
-			"",
-			"\1\37\1\uffff\12\73\13\uffff\1\37\37\uffff\1\37",
-			"\1\116",
-			"",
-			"\1\117",
-			"\1\120",
-			"\1\121\37\uffff\1\121",
-			"\2\35\1\uffff\12\35\7\uffff\32\35\4\uffff\1\35\1\uffff\32\35",
-			"\12\122\7\uffff\6\122\32\uffff\6\122",
-			"\2\35\1\uffff\12\35\7\uffff\32\35\4\uffff\1\35\1\uffff\32\35",
-			"\1\123\37\uffff\1\123",
-			"\1\124\37\uffff\1\124",
-			"\2\35\1\uffff\12\35\7\uffff\32\35\4\uffff\1\35\1\uffff\32\35",
-			"\2\35\1\uffff\12\35\7\uffff\32\35\4\uffff\1\35\1\uffff\32\35",
-			"\2\35\1\uffff\12\35\7\uffff\32\35\4\uffff\1\35\1\uffff\32\35",
-			"\1\127\37\uffff\1\127",
-			"\1\130\37\uffff\1\130",
-			"\1\37\1\uffff\12\131\7\uffff\4\72\1\132\1\72\32\uffff\4\72\1\132\1\72",
-			"\1\37\1\uffff\1\37\2\uffff\12\133\7\uffff\6\72\32\uffff\6\72",
-			"\12\133\7\uffff\6\72\32\uffff\6\72",
-			"\1\134",
-			"\1\135",
-			"\1\136",
-			"\1\137\37\uffff\1\137",
-			"\12\140\7\uffff\6\140\32\uffff\6\140",
-			"\2\35\1\uffff\12\35\7\uffff\32\35\4\uffff\1\35\1\uffff\32\35",
-			"\1\142\37\uffff\1\142",
-			"",
-			"",
-			"\2\35\1\uffff\12\35\7\uffff\32\35\4\uffff\1\35\1\uffff\32\35",
-			"\1\144\37\uffff\1\144",
-			"\1\37\1\uffff\12\145\7\uffff\4\72\1\146\1\72\32\uffff\4\72\1\146\1\72",
-			"\1\37\1\uffff\1\37\2\uffff\12\147\7\uffff\6\72\32\uffff\6\72",
-			"\12\147\7\uffff\6\72\32\uffff\6\72",
-			"\1\150",
-			"\1\151",
-			"\2\35\1\uffff\12\35\7\uffff\32\35\4\uffff\1\35\1\uffff\32\35",
-			"\1\153\37\uffff\1\153",
-			"\12\154\7\uffff\6\154\32\uffff\6\154",
-			"",
-			"\2\35\1\uffff\12\35\7\uffff\32\35\4\uffff\1\35\1\uffff\32\35",
-			"",
-			"\1\155\37\uffff\1\155",
-			"\1\37\1\uffff\12\156\7\uffff\4\72\1\157\1\72\32\uffff\4\72\1\157\1\72",
-			"\1\37\1\uffff\1\37\2\uffff\12\160\7\uffff\6\72\32\uffff\6\72",
-			"\12\160\7\uffff\6\72\32\uffff\6\72",
-			"",
-			"\2\35\1\uffff\12\35\7\uffff\32\35\4\uffff\1\35\1\uffff\32\35",
-			"",
-			"\2\35\1\uffff\12\35\7\uffff\32\35\4\uffff\1\35\1\uffff\32\35",
-			"\12\163\7\uffff\6\163\32\uffff\6\163",
-			"\1\164\37\uffff\1\164",
-			"\1\37\1\uffff\12\165\7\uffff\4\72\1\166\1\72\32\uffff\4\72\1\166\1\72",
-			"\1\37\1\uffff\1\37\2\uffff\12\167\7\uffff\6\72\32\uffff\6\72",
-			"\12\167\7\uffff\6\72\32\uffff\6\72",
-			"",
-			"",
-			"\12\170\7\uffff\6\170\32\uffff\6\170",
-			"\1\171\37\uffff\1\171",
-			"\1\37\1\uffff\12\172\7\uffff\4\72\1\173\1\72\32\uffff\4\72\1\173\1\72",
-			"\1\37\1\uffff\1\37\2\uffff\12\174\7\uffff\6\72\32\uffff\6\72",
-			"\12\174\7\uffff\6\72\32\uffff\6\72",
-			"\1\175",
-			"\2\35\1\uffff\12\35\7\uffff\32\35\4\uffff\1\35\1\uffff\32\35",
-			"\1\72\1\37\1\uffff\12\73\13\uffff\1\37\37\uffff\1\37",
-			"\1\37\1\uffff\1\177\2\uffff\12\37",
-			"\1\72",
-			"\12\u0080\7\uffff\6\u0080\32\uffff\6\u0080",
-			"",
-			"\12\u0081\7\uffff\6\72\32\uffff\6\72",
-			"\12\u0082\7\uffff\6\u0082\32\uffff\6\u0082",
-			"\12\u0083\7\uffff\6\72\32\uffff\6\72",
-			"\12\u0084\7\uffff\6\u0084\32\uffff\6\u0084",
-			"\12\u0085\7\uffff\6\72\32\uffff\6\72",
-			"\12\u0086\7\uffff\6\u0086\32\uffff\6\u0086",
-			"\12\u0087\7\uffff\6\72\32\uffff\6\72",
-			"\1\u0088",
-			"\1\72",
-			"\12\u0089\7\uffff\6\u0089\32\uffff\6\u0089",
-			"\12\u008a\7\uffff\6\u008a\32\uffff\6\u008a",
-			"\12\u008b\7\uffff\6\u008b\32\uffff\6\u008b",
-			"\12\u008c\7\uffff\6\u008c\32\uffff\6\u008c",
-			"\1\u008d",
-			"\12\u008e\7\uffff\6\u008e\32\uffff\6\u008e",
-			"\12\u008f\7\uffff\6\u008f\32\uffff\6\u008f",
-			"\12\u0090\7\uffff\6\u0090\32\uffff\6\u0090",
-			"\12\u0091\7\uffff\6\u0091\32\uffff\6\u0091",
-			"\1\u0092",
-			"\12\u0093\7\uffff\6\u0093\32\uffff\6\u0093",
-			"\12\u0094\7\uffff\6\u0094\32\uffff\6\u0094",
-			"\12\u0095\7\uffff\6\u0095\32\uffff\6\u0095",
-			"\12\u0096\7\uffff\6\u0096\32\uffff\6\u0096",
-			"\12\u0097\7\uffff\6\u0097\32\uffff\6\u0097",
-			"\12\u0098\7\uffff\6\u0098\32\uffff\6\u0098",
-			"\12\u0099\7\uffff\6\u0099\32\uffff\6\u0099",
-			"\12\u009a\7\uffff\6\u009a\32\uffff\6\u009a",
-			"\12\u009b\7\uffff\6\u009b\32\uffff\6\u009b",
-			"\12\u009c\7\uffff\6\u009c\32\uffff\6\u009c",
-			"\12\u009d\7\uffff\6\u009d\32\uffff\6\u009d",
-			"\12\u009e\7\uffff\6\u009e\32\uffff\6\u009e",
-			"\2\35\1\uffff\12\35\7\uffff\32\35\4\uffff\1\35\1\uffff\32\35"
-	};
-
-	static final short[] DFA26_eot = DFA.unpackEncodedString(DFA26_eotS);
-	static final short[] DFA26_eof = DFA.unpackEncodedString(DFA26_eofS);
-	static final char[] DFA26_min = DFA.unpackEncodedStringToUnsignedChars(DFA26_minS);
-	static final char[] DFA26_max = DFA.unpackEncodedStringToUnsignedChars(DFA26_maxS);
-	static final short[] DFA26_accept = DFA.unpackEncodedString(DFA26_acceptS);
-	static final short[] DFA26_special = DFA.unpackEncodedString(DFA26_specialS);
-	static final short[][] DFA26_transition;
-
-	static {
-		int numStates = DFA26_transitionS.length;
-		DFA26_transition = new short[numStates][];
-		for (int i=0; i<numStates; i++) {
-			DFA26_transition[i] = DFA.unpackEncodedString(DFA26_transitionS[i]);
-		}
-	}
-
-	protected class DFA26 extends DFA {
-
-		public DFA26(BaseRecognizer recognizer) {
-			this.recognizer = recognizer;
-			this.decisionNumber = 26;
-			this.eot = DFA26_eot;
-			this.eof = DFA26_eof;
-			this.min = DFA26_min;
-			this.max = DFA26_max;
-			this.accept = DFA26_accept;
-			this.special = DFA26_special;
-			this.transition = DFA26_transition;
-		}
-		@Override
-		public String getDescription() {
-			return "1:1: Tokens : ( T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | T__38 | T__39 | T__40 | LT | LTE | EQ | GT | GTE | BOOLEAN | AND | OR | NOT | ASC | DESC | CONTAINS | WITHIN | OF | UUID | ID | LONG | FLOAT | STRING | WS );";
-		}
-	}
-
-}


[3/5] git commit: re-enable ANTLR plugin.

Posted by sn...@apache.org.
re-enable ANTLR plugin.


Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/5cae5cfa
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/5cae5cfa
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/5cae5cfa

Branch: refs/heads/two-dot-o
Commit: 5cae5cfa2acbf202be157cd20e25e7e58ed45edc
Parents: 5dbfdf3
Author: Dave Johnson <dm...@apigee.com>
Authored: Wed Mar 5 15:07:46 2014 -0500
Committer: Dave Johnson <dm...@apigee.com>
Committed: Wed Mar 5 15:07:46 2014 -0500

----------------------------------------------------------------------
 stack/corepersistence/queryindex/pom.xml        | 17 ++++-
 .../persistence/query/tree/QueryFilter.g        |  4 +-
 .../persistence/query/QueryParseException.java  | 65 --------------------
 .../persistence/query/QueryTokenException.java  | 54 ----------------
 4 files changed, 18 insertions(+), 122 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/5cae5cfa/stack/corepersistence/queryindex/pom.xml
----------------------------------------------------------------------
diff --git a/stack/corepersistence/queryindex/pom.xml b/stack/corepersistence/queryindex/pom.xml
index 28d236f..9b9e67a 100644
--- a/stack/corepersistence/queryindex/pom.xml
+++ b/stack/corepersistence/queryindex/pom.xml
@@ -30,6 +30,21 @@
         <plugins>
 
             <plugin>
+                <groupId>org.antlr</groupId>
+                <artifactId>antlr3-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <configuration>
+                            <outputDirectory>src/main/java</outputDirectory>
+                        </configuration>
+                        <goals>
+                            <goal>antlr</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
                 <groupId>org.safehaus.chop</groupId>
                 <artifactId>chop-maven-plugin</artifactId>
                 <version>${chop.version}</version>
@@ -98,7 +113,7 @@
 
         <!-- Cassandra wants ANTLR 3.2 -->
 
-       <dependency>
+        <dependency>
             <groupId>org.antlr</groupId>
             <artifactId>antlr-runtime</artifactId>
             <version>3.2</version>

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/5cae5cfa/stack/corepersistence/queryindex/src/main/antlr3/org/apache/usergrid/persistence/query/tree/QueryFilter.g
----------------------------------------------------------------------
diff --git a/stack/corepersistence/queryindex/src/main/antlr3/org/apache/usergrid/persistence/query/tree/QueryFilter.g b/stack/corepersistence/queryindex/src/main/antlr3/org/apache/usergrid/persistence/query/tree/QueryFilter.g
index c566ef9..d39069b 100644
--- a/stack/corepersistence/queryindex/src/main/antlr3/org/apache/usergrid/persistence/query/tree/QueryFilter.g
+++ b/stack/corepersistence/queryindex/src/main/antlr3/org/apache/usergrid/persistence/query/tree/QueryFilter.g
@@ -14,8 +14,8 @@ package org.apache.usergrid.persistence.query.tree;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.apache.usergrid.persistence.Query;
-import org.apache.usergrid.persistence.Query.SortPredicate;
+import org.apache.usergrid.persistence.query.Query;
+import org.apache.usergrid.persistence.query.Query.SortPredicate;
 
 }
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/5cae5cfa/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/query/QueryParseException.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/query/QueryParseException.java b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/query/QueryParseException.java
deleted file mode 100644
index 0afe799..0000000
--- a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/query/QueryParseException.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- *  contributor license agreements.  The ASF licenses this file to You
- * 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.  For additional information regarding
- * copyright in this work, please see the NOTICE file in the top level
- * directory of this distribution.
- */
-package org.apache.usergrid.persistence.query;
-
-
-/**
- * An exception thrown when a query cannot be parsed
- *
- * @author tnine
- */
-public class QueryParseException extends RuntimeException {
-
-    /**
-     *
-     */
-    private static final long serialVersionUID = 1L;
-
-
-    /**
-     *
-     */
-    public QueryParseException() {
-        super();
-    }
-
-
-    /**
-     * @param arg0
-     * @param arg1
-     */
-    public QueryParseException( String arg0, Throwable arg1 ) {
-        super( arg0, arg1 );
-    }
-
-
-    /**
-     * @param arg0
-     */
-    public QueryParseException( String arg0 ) {
-        super( arg0 );
-    }
-
-
-    /**
-     * @param arg0
-     */
-    public QueryParseException( Throwable arg0 ) {
-        super( arg0 );
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/5cae5cfa/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/query/QueryTokenException.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/query/QueryTokenException.java b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/query/QueryTokenException.java
deleted file mode 100644
index 3b751da..0000000
--- a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/query/QueryTokenException.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- *  contributor license agreements.  The ASF licenses this file to You
- * 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.  For additional information regarding
- * copyright in this work, please see the NOTICE file in the top level
- * directory of this distribution.
- */
-package org.apache.usergrid.persistence.query;
-
-
-/**
- * An exception thrown when a query encounters a token it doesn't recognize
- * @author tnine
- */
-public class QueryTokenException extends RuntimeException {
-
-    /**
-     *
-     */
-    private static final long serialVersionUID = 1L;
-
-
-
-
-    /**
-     * @param arg0
-     */
-    public QueryTokenException( Throwable arg0 ) {
-        super( arg0 );
-    }
-
-
-    @Override
-    public String getMessage() {
-        //antlr errors or strange.  We have to do this, there's no message
-        return getCause().toString();
-    }
-
-
-    @Override
-    public String getLocalizedMessage() {
-        return getMessage();
-    }
-}