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/02/13 15:21:27 UTC

[43/51] [abbrv] Missed a couple of package-rename spots in query-validator, there still one compilation problem in QueryValidatorRunner.

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/482c5cef/stack/query-validator/src/test/java/org/apache/usergrid/query/validator/QueryValidatorRunner.java
----------------------------------------------------------------------
diff --git a/stack/query-validator/src/test/java/org/apache/usergrid/query/validator/QueryValidatorRunner.java b/stack/query-validator/src/test/java/org/apache/usergrid/query/validator/QueryValidatorRunner.java
new file mode 100644
index 0000000..4637ec5
--- /dev/null
+++ b/stack/query-validator/src/test/java/org/apache/usergrid/query/validator/QueryValidatorRunner.java
@@ -0,0 +1,207 @@
+/*******************************************************************************
+ * Copyright 2013 baas.io
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package org.apache.usergrid.query.validator;
+
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.lang.StringUtils;
+import org.junit.runner.notification.RunNotifier;
+import org.junit.runners.model.InitializationError;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.apache.usergrid.cassandra.DataControl;
+import org.apache.usergrid.persistence.Entity;
+import org.apache.usergrid.utils.JsonUtils;
+
+import java.io.IOException;
+import java.net.URL;
+import java.nio.charset.Charset;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import org.apache.cassandra.transport.Server;
+
+/**
+ * @author Sung-ju Jin(realbeast)
+ */
+public class QueryValidatorRunner extends CassandraRunner {
+
+    private static Logger logger = LoggerFactory.getLogger(QueryValidatorRunner.class);
+    private boolean enableLocalServer;
+    private static StandaloneServer standaloneServer;
+    private Properties properties;
+    private static QueryValidator validator;
+    private static boolean initialize = false;
+
+    public QueryValidatorRunner(Class<?> klass) throws InitializationError {
+        super(klass);
+    }
+
+    @Override
+    protected DataControl preTest(RunNotifier notifier) {
+        DataControl control = super.preTest(notifier);
+        try {
+            setup();
+        } catch (InitializationError initializationError) {
+            initializationError.printStackTrace();
+        }
+        return control;
+    }
+
+    public static QueryValidator getValidator() {
+        return validator;
+    }
+
+    public synchronized void setup() throws InitializationError {
+        if(initialize)
+            return;
+
+        try {
+            logger.info("Loading initialize...");
+            Thread.sleep(20*1000);
+        } catch (InterruptedException e) {}
+
+        validator = CassandraRunner.getBean(QueryValidator.class);
+        properties = CassandraRunner.getBean("properties",Properties.class);
+
+        if( validator == null || properties == null) {
+            throw new InitializationError("Application context not loaded.");
+        }
+
+        String enableString = (String)properties.get("usergrid.query.validator.api.enablelocal");
+        enableLocalServer = StringUtils.endsWithIgnoreCase("true", enableString);
+        if( enableLocalServer ) {
+            startStandaloneServer();
+            try {
+                logger.info("Loading standalone server...");
+                Thread.sleep(20*1000);
+            } catch (InterruptedException e) {}
+        }
+        initialize = true;
+
+        String endpoint = (String)properties.get("usergrid.query.validator.api.endpoint");
+        String organization = (String)properties.get("usergrid.query.validator.api.organization");
+        String app = (String)properties.get("usergrid.query.validator.api.app");
+        String email = (String)properties.get("usergrid.query.validator.api.authorize.email");
+        String password = (String)properties.get("usergrid.query.validator.api.authorize.password");
+
+        String collection = "user";
+        List<Entity> entities = loadEntities(collection);
+        QueryValidationConfiguration configuration = new QueryValidationConfiguration();
+        configuration.setEndpointUri(endpoint);
+        configuration.setOrg(organization);
+        configuration.setEmail(email);
+        configuration.setPassword(password);
+        configuration.setApp(app);
+        configuration.setCollection(collection);
+        configuration.setEntities(entities);
+        validator.setConfiguration(configuration);
+        validator.setup();
+
+    }
+
+    private List<Entity> loadEntities(String collection) {
+        String json = null;
+        try {
+            URL url = Thread.currentThread().getContextClassLoader().getResource(collection + ".json");
+            json = FileUtils.readFileToString(FileUtils.toFile(url), Charset.forName("UTF-8"));
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+
+        List<Entity> entities = new ArrayList<Entity>();
+        List<Map<String, Object>> datas = (List<Map<String, Object>>) JsonUtils.parse(json);
+        for(Map<String, Object> data : datas) {
+            Entity entity = new QueryEntity();
+            entity.setType(collection);
+            entity.setProperties(data);
+            entity.setCreated(System.currentTimeMillis());
+            entity.setModified(entity.getCreated());
+            entities.add(entity);
+        }
+        return entities;
+    }
+
+    private void startStandaloneServer() {
+        standaloneServer = new StandaloneServer();
+        try {
+            Thread thread = new Thread(standaloneServer);
+            thread.start();
+        } catch (Exception ex) {
+            logger.error("Could not schedule standalone server runner", ex);
+        }
+        Runtime.getRuntime().addShutdownHook(new Thread() {
+            @Override
+            public void run() {
+                try {
+                    logger.error("In shutdownHook");
+                    stopServer();
+                } catch (Exception ex) {
+                    ex.printStackTrace();
+                }
+            }
+        });
+        boolean loaded = false;
+        while (!loaded) {
+            if( standaloneServer.server.isRunning() ) {
+                if( standaloneServer.server.getManagementService() != null ) {
+                    loaded = true;
+                    continue;
+                }
+            }
+            try {
+                logger.info("Loding application context...");
+                Thread.sleep(2*1000);
+            } catch (InterruptedException e) {
+                continue;
+            }
+        }
+
+        if(loaded) {
+            ManagementService managementService = standaloneServer.server.getManagementService();
+            try {
+                managementService.setup();
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+
+        logger.info("Finish start standalone server.");
+    }
+
+    static class StandaloneServer implements Runnable {
+        public static Server server;
+
+        public StandaloneServer() {
+            server = new Server();
+        }
+
+        @Override
+        public void run() {
+            server.setInitializeDatabaseOnStart(true);
+            server.setDaemon(false);
+            server.startServer();
+        }
+
+        public void stop() {
+            server.stopServer();
+        }
+    }
+
+    private void stopServer() {
+        standaloneServer.stop();
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/482c5cef/stack/query-validator/src/test/java/org/usergrid/query/validator/QueryValidationTest.java
----------------------------------------------------------------------
diff --git a/stack/query-validator/src/test/java/org/usergrid/query/validator/QueryValidationTest.java b/stack/query-validator/src/test/java/org/usergrid/query/validator/QueryValidationTest.java
deleted file mode 100644
index 5054e45..0000000
--- a/stack/query-validator/src/test/java/org/usergrid/query/validator/QueryValidationTest.java
+++ /dev/null
@@ -1,339 +0,0 @@
-/*******************************************************************************
- * Copyright 2013 baas.io
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ******************************************************************************/
-package org.apache.usergrid.query.validator;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.Assert;
-
-/**
- * @author Sung-ju Jin(realbeast)
- */
-@RunWith(QueryValidatorRunner.class)
-public class QueryValidationTest {
-
-    private QueryValidator validator;
-
-    @Before
-    public void setup() {
-        validator = QueryValidatorRunner.getValidator();
-    }
-
-    @Test
-    public void sexEqualAndNameEqual() {
-        String sqlite = "SELECT * FROM users WHERE sex = 'male' and name = 'judekim' LIMIT 10";
-        String api = "SELECT * WHERE sex = 'male' AND name = 'judekim'";
-
-        QueryRequest request = new QueryRequest();
-        request.setDbQuery(sqlite);
-        request.getApiQuery().setQuery(api);
-        QueryResponse response = validator.execute(request);
-        Assert.assertTrue(response.toString(), response.result());
-    }
-
-    @Test
-    public void nameEqualAndSexEqual() {
-        String sqlite = "SELECT * FROM users WHERE name = 'judekim' and sex = 'male' LIMIT 10";
-        String api = "select * where name = 'judekim' and sex = 'male'";
-
-        QueryRequest request = new QueryRequest();
-        request.setDbQuery(sqlite);
-        request.getApiQuery().setQuery(api);
-        QueryResponse response = validator.execute(request);
-        Assert.assertTrue(response.toString(), response.result());
-    }
-
-    @Test
-    public void nameEqualAndSexEqual_limitL20() {
-        String sqlite = "SELECT * FROM users WHERE name = 'judekim' and sex = 'male' LIMIT 20";
-        String api = "select * where name = 'judekim' and sex = 'male'";
-        int limit = 20;
-
-        QueryRequest request = new QueryRequest();
-        request.setDbQuery(sqlite);
-        request.getApiQuery().setQuery(api);
-        request.getApiQuery().setLimit(limit);
-        QueryResponse response = validator.execute(request);
-        Assert.assertTrue(response.toString(), response.result());
-    }
-
-    @Test
-    public void sexEqualAndNameEqualExtra1() {
-        String sqlite = "SELECT * FROM users WHERE sex = 'female' and name = 'curioe' LIMIT 10";
-        String api = "select * where sex = 'female' and name = 'curioe'";
-
-        QueryRequest request = new QueryRequest();
-        request.setDbQuery(sqlite);
-        request.getApiQuery().setQuery(api);
-        QueryResponse response = validator.execute(request);
-        Assert.assertTrue(response.toString(), response.result());
-    }
-
-    @Test
-    public void sexEqualOrNameEqual() {
-        String sqlite = "SELECT * FROM users WHERE sex = 'female' or name = 'curioe' LIMIT 10";
-        String api = "select * where sex = 'female' or name = 'curioe'";
-
-        QueryRequest request = new QueryRequest();
-        request.setDbQuery(sqlite);
-        request.getApiQuery().setQuery(api);
-        QueryResponse response = validator.execute(request);
-        Assert.assertTrue(response.toString(), response.result());
-    }
-
-    @Test
-    public void nameBeginswithAndSexEqualAndAgeGreaterthanequalOrSexEqual_sortNameDesc() {
-        String sqlite = "SELECT * FROM users WHERE name LIKE 'a%' and sex = 'male' and age >= 35 or sex = 'female' ORDER BY name desc LIMIT 10";
-        String api = "select * where name = 'a*' and sex = 'male' and age >= 35 or sex = 'female' order by name desc";
-
-        QueryRequest request = new QueryRequest();
-        request.setDbQuery(sqlite);
-        request.getApiQuery().setQuery(api);
-        QueryResponse response = validator.execute(request);
-        Assert.assertTrue(response.toString(), response.result());
-    }
-
-    @Test
-    public void nameBeginswithAndSexEqualAndAgeGreaterthanequalOrSexEqual_sortAddressAscNameDesc() {
-        String sqlite = "SELECT * FROM users WHERE name LIKE 'a%' and sex = 'male' and age >= 35 or sex = 'female' ORDER BY address asc, name desc LIMIT 4";
-        String api = "select * where name = 'a*' and sex = 'male' and age >= 35 or sex = 'female' order by address asc, name desc";
-
-        QueryRequest request = new QueryRequest();
-        request.setDbQuery(sqlite);
-        request.getApiQuery().setQuery(api);
-        QueryResponse response = validator.execute(request);
-        Assert.assertTrue(response.toString(), response.result());
-    }
-
-    @Test
-    public void nameBeginswithAndSexEqualAndAgeGreaterthanequalOrSexEqual_sortAddressAscNameDesc_limitL4() {
-        String sqlite = "SELECT * FROM users WHERE name LIKE 'a%' and sex = 'male' and age >= 35 or sex = 'female' ORDER BY address asc, name desc LIMIT 4";
-        String api = "select * where name = 'a*' and sex = 'male' and age >= 35 or sex = 'female' order by address asc, name desc";
-
-        QueryRequest request = new QueryRequest();
-        request.setDbQuery(sqlite);
-        request.getApiQuery().setQuery(api);
-        QueryResponse response = validator.execute(request);
-        Assert.assertTrue(response.toString(), response.result());
-    }
-
-    @Test
-    public void sexEqual_sortAgeDescExtra1() {
-        String sqlite = "SELECT * FROM users WHERE sex = 'male' ORDER BY age desc LIMIT 10";
-        String api = "select * where sex = 'male' order by age desc";
-
-        QueryRequest request = new QueryRequest();
-        request.setDbQuery(sqlite);
-        request.getApiQuery().setQuery(api);
-        QueryResponse response = validator.execute(request);
-        Assert.assertTrue(response.toString(), response.result());
-    }
-
-    @Test
-    public void sexEqual_sortAgeDescExtra2() {
-        String sqlite = " SELECT * FROM users WHERE sex = 'female' ORDER BY age desc LIMIT 10";
-        String api = "select * where sex = 'female' order by age desc";
-
-        QueryRequest request = new QueryRequest();
-        request.setDbQuery(sqlite);
-        request.getApiQuery().setQuery(api);
-        QueryResponse response = validator.execute(request);
-        Assert.assertTrue(response.toString(), response.result());
-    }
-
-    @Test
-    public void sexEqualAndAgeGreaterthanequal() {
-        String sqlite = " SELECT * FROM users WHERE sex = 'male' and age >= 35 LIMIT 10";
-        String api = "select * where sex = 'male' and age >= 35";
-
-        QueryRequest request = new QueryRequest();
-        request.setDbQuery(sqlite);
-        request.getApiQuery().setQuery(api);
-        QueryResponse response = validator.execute(request);
-        Assert.assertTrue(response.toString(), response.result());
-    }
-
-    @Test
-    public void sexEqualAndAgeGreaterthanequal_sortAgeDesc() {
-        String sqlite = "SELECT * FROM users WHERE sex = 'male' and age >= 35 ORDER BY age desc LIMIT 10";
-        String api = "select * where sex = 'male' and age >= 35 order by age desc";
-
-        QueryRequest request = new QueryRequest();
-        request.setDbQuery(sqlite);
-        request.getApiQuery().setQuery(api);
-        QueryResponse response = validator.execute(request);
-        Assert.assertTrue(response.toString(), response.result());
-    }
-
-    @Test
-    public void sexEqualAndAgeGreaterthanequal_sortNameDesc() {
-        String sqlite = "SELECT * FROM users WHERE sex = 'male' and age >= 35 ORDER BY name desc LIMIT 10";
-        String api = "select * where sex = 'male' and age >= 35 order by name desc";
-
-        QueryRequest request = new QueryRequest();
-        request.setDbQuery(sqlite);
-        request.getApiQuery().setQuery(api);
-        QueryResponse response = validator.execute(request);
-        Assert.assertTrue(response.toString(), response.result());
-    }
-
-    @Test
-    public void sexEqualAndAgeGreaterthanequal_sortAgeDesc_limitL100() {
-        String sqlite = "SELECT * FROM users WHERE sex = 'male' and age >= 35 ORDER BY age desc LIMIT 100";
-        String api = "select * where sex = 'male' and age >= 35 order by age desc";
-        int limit = 100;
-
-        QueryRequest request = new QueryRequest();
-        request.setDbQuery(sqlite);
-        request.getApiQuery().setQuery(api);
-        request.getApiQuery().setLimit(limit);
-        QueryResponse response = validator.execute(request);
-        Assert.assertTrue(response.toString(), response.result());
-    }
-
-    @Test
-    public void qlSexEqualAndAgeGreaterthanequal_sortNameDesc_limitL100() {
-        String sqlite = "SELECT * FROM users WHERE sex = 'male' and age >= 35 ORDER BY name desc LIMIT 100";
-        String api = "select * where sex = 'male' and age >= 35 order by name desc";
-        int limit = 100;
-
-        QueryRequest request = new QueryRequest();
-        request.setDbQuery(sqlite);
-        request.getApiQuery().setQuery(api);
-        request.getApiQuery().setLimit(limit);
-        QueryResponse response = validator.execute(request);
-        Assert.assertTrue(response.toString(), response.result());
-    }
-
-    @Test
-    public void sexEqualAndAgeGreaterthanequalOrSexEqual() {
-        String sqlite = "SELECT * FROM users WHERE sex = 'male' and age >= 35 or sex = 'female' LIMIT 10";
-        String api = "select * where sex = 'male' and age >= 35 or sex = 'female'";
-
-        QueryRequest request = new QueryRequest();
-        request.setDbQuery(sqlite);
-        request.getApiQuery().setQuery(api);
-        QueryResponse response = validator.execute(request);
-        Assert.assertTrue(response.toString(), response.result());
-    }
-
-    @Test
-    public void sexEqualAndAgeGreaterthanequalOrSexEqual_sortAgeDesc() {
-        String sqlite = "SELECT * FROM users WHERE sex = 'male' and age >= 35 or sex = 'female' ORDER BY age desc LIMIT 10";
-        String api = "select * where sex = 'male' and age >= 35 or sex = 'female' order by age desc";
-
-        QueryRequest request = new QueryRequest();
-        request.setDbQuery(sqlite);
-        request.getApiQuery().setQuery(api);
-        QueryResponse response = validator.execute(request);
-        Assert.assertTrue(response.toString(), response.result());
-    }
-
-    @Test
-    public void limitL12() {
-        String sqlite = "SELECT * FROM users LIMIT 12";
-        String api = null;
-        int limit = 12;
-
-        QueryRequest request = new QueryRequest();
-        request.setDbQuery(sqlite);
-        request.getApiQuery().setQuery(api);
-        request.getApiQuery().setLimit(limit);
-        QueryResponse response = validator.execute(request);
-        Assert.assertTrue(response.toString(), response.result());
-    }
-
-    @Test
-    public void sexEqualAndAgeGreaterthanequalOrSexEqual_sortNameDesc() {
-        String sqlite = "SELECT * FROM users WHERE sex = 'male' and age >= 35 or sex = 'female' ORDER BY name desc LIMIT 10";
-        String api = "select * where sex = 'male' and age >= 35 or sex = 'female' order by name desc";
-
-        QueryRequest request = new QueryRequest();
-        request.setDbQuery(sqlite);
-        request.getApiQuery().setQuery(api);
-        QueryResponse response = validator.execute(request);
-        Assert.assertTrue(response.toString(), response.result());
-    }
-
-    @Test
-    public void sexEqualAndAgeGreaterthanequalOrSexEqual_sortNameDesc_limitL100() {
-        String sqlite = "SELECT * FROM users WHERE sex = 'male' and age >= 35 or sex = 'female' ORDER BY name desc LIMIT 100";
-        String api = "select * where sex = 'male' and age >= 35 or sex = 'female' order by name desc";
-        int limit = 100;
-
-        QueryRequest request = new QueryRequest();
-        request.setDbQuery(sqlite);
-        request.getApiQuery().setQuery(api);
-        request.getApiQuery().setLimit(limit);
-        QueryResponse response = validator.execute(request);
-        Assert.assertTrue(response.toString(), response.result());
-    }
-
-    @Test
-    public void limitL11() {
-        String sqlite = "SELECT * FROM users LIMIT 11";
-        String api = null;
-        int limit = 11;
-
-        QueryRequest request = new QueryRequest();
-        request.setDbQuery(sqlite);
-        request.getApiQuery().setQuery(api);
-        request.getApiQuery().setLimit(limit);
-        QueryResponse response = validator.execute(request);
-        Assert.assertTrue(response.toString(), response.result());
-    }
-
-    @Test
-    public void nameBeginswithAndSexEqualAndAgeGreaterthanequalOrSexEqual() {
-        String sqlite = "SELECT * FROM users WHERE name LIKE 'a%' and sex = 'male' and age >= 20 or sex = 'female' LIMIT 10";
-        String api = "select * where name = 'a*' and sex = 'male' and age >= 20 or sex = 'female'";
-
-        QueryRequest request = new QueryRequest();
-        request.setDbQuery(sqlite);
-        request.getApiQuery().setQuery(api);
-        QueryResponse response = validator.execute(request);
-        Assert.assertTrue(response.toString(), response.result());
-    }
-
-    @Test
-    public void nameBeginswithAndSexEqualAndAgeGreaterthanequalOrSexEqual_limitL20() {
-        String sqlite = "SELECT * FROM users WHERE name LIKE 'a%' and sex = 'male' and age >= 20 or sex = 'female' LIMIT 20";
-        String api = "select * where name = 'a*' and sex = 'male' and age >= 20 or sex = 'female'";
-        int limit = 20;
-
-        QueryRequest request = new QueryRequest();
-        request.setDbQuery(sqlite);
-        request.getApiQuery().setQuery(api);
-        request.getApiQuery().setLimit(limit);
-        QueryResponse response = validator.execute(request);
-        Assert.assertTrue(response.toString(), response.result());
-    }
-
-    @Test
-    public void sexEqualAndAgeGreaterthanequal_sortAddressDesc_limitL100() {
-        String sqlite = "SELECT * FROM users WHERE sex = 'male' and age >= 35 ORDER BY address desc LIMIT 100";
-        String api = "select * where sex = 'male' and age >= 35 order by address desc";
-        int limit = 100;
-
-        QueryRequest request = new QueryRequest();
-        request.setDbQuery(sqlite);
-        request.getApiQuery().setQuery(api);
-        request.getApiQuery().setLimit(limit);
-        QueryResponse response = validator.execute(request);
-        Assert.assertTrue(response.toString(), response.result());
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/482c5cef/stack/query-validator/src/test/java/org/usergrid/query/validator/QueryValidatorRunner.java
----------------------------------------------------------------------
diff --git a/stack/query-validator/src/test/java/org/usergrid/query/validator/QueryValidatorRunner.java b/stack/query-validator/src/test/java/org/usergrid/query/validator/QueryValidatorRunner.java
deleted file mode 100644
index bf264e9..0000000
--- a/stack/query-validator/src/test/java/org/usergrid/query/validator/QueryValidatorRunner.java
+++ /dev/null
@@ -1,209 +0,0 @@
-/*******************************************************************************
- * Copyright 2013 baas.io
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ******************************************************************************/
-package org.apache.usergrid.query.validator;
-
-import org.apache.commons.io.FileUtils;
-import org.apache.commons.lang.StringUtils;
-import org.junit.runner.notification.RunNotifier;
-import org.junit.runners.model.InitializationError;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.apache.usergrid.cassandra.CassandraRunner;
-import org.apache.usergrid.cassandra.DataControl;
-import org.apache.usergrid.management.ManagementService;
-import org.apache.usergrid.persistence.Entity;
-import org.apache.usergrid.standalone.Server;
-import org.apache.usergrid.utils.JsonUtils;
-
-import java.io.IOException;
-import java.net.URL;
-import java.nio.charset.Charset;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-
-/**
- * @author Sung-ju Jin(realbeast)
- */
-public class QueryValidatorRunner extends CassandraRunner {
-
-    private static Logger logger = LoggerFactory.getLogger(QueryValidatorRunner.class);
-    private boolean enableLocalServer;
-    private static StandaloneServer standaloneServer;
-    private Properties properties;
-    private static QueryValidator validator;
-    private static boolean initialize = false;
-
-    public QueryValidatorRunner(Class<?> klass) throws InitializationError {
-        super(klass);
-    }
-
-    @Override
-    protected DataControl preTest(RunNotifier notifier) {
-        DataControl control = super.preTest(notifier);
-        try {
-            setup();
-        } catch (InitializationError initializationError) {
-            initializationError.printStackTrace();
-        }
-        return control;
-    }
-
-    public static QueryValidator getValidator() {
-        return validator;
-    }
-
-    public synchronized void setup() throws InitializationError {
-        if(initialize)
-            return;
-
-        try {
-            logger.info("Loading initialize...");
-            Thread.sleep(20*1000);
-        } catch (InterruptedException e) {}
-
-        validator = CassandraRunner.getBean(QueryValidator.class);
-        properties = CassandraRunner.getBean("properties",Properties.class);
-
-        if( validator == null || properties == null) {
-            throw new InitializationError("Application context not loaded.");
-        }
-
-        String enableString = (String)properties.get("usergrid.query.validator.api.enablelocal");
-        enableLocalServer = StringUtils.endsWithIgnoreCase("true", enableString);
-        if( enableLocalServer ) {
-            startStandaloneServer();
-            try {
-                logger.info("Loading standalone server...");
-                Thread.sleep(20*1000);
-            } catch (InterruptedException e) {}
-        }
-        initialize = true;
-
-        String endpoint = (String)properties.get("usergrid.query.validator.api.endpoint");
-        String organization = (String)properties.get("usergrid.query.validator.api.organization");
-        String app = (String)properties.get("usergrid.query.validator.api.app");
-        String email = (String)properties.get("usergrid.query.validator.api.authorize.email");
-        String password = (String)properties.get("usergrid.query.validator.api.authorize.password");
-
-        String collection = "user";
-        List<Entity> entities = loadEntities(collection);
-        QueryValidationConfiguration configuration = new QueryValidationConfiguration();
-        configuration.setEndpointUri(endpoint);
-        configuration.setOrg(organization);
-        configuration.setEmail(email);
-        configuration.setPassword(password);
-        configuration.setApp(app);
-        configuration.setCollection(collection);
-        configuration.setEntities(entities);
-        validator.setConfiguration(configuration);
-        validator.setup();
-
-    }
-
-    private List<Entity> loadEntities(String collection) {
-        String json = null;
-        try {
-            URL url = Thread.currentThread().getContextClassLoader().getResource(collection + ".json");
-            json = FileUtils.readFileToString(FileUtils.toFile(url), Charset.forName("UTF-8"));
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-
-        List<Entity> entities = new ArrayList<Entity>();
-        List<Map<String, Object>> datas = (List<Map<String, Object>>) JsonUtils.parse(json);
-        for(Map<String, Object> data : datas) {
-            Entity entity = new QueryEntity();
-            entity.setType(collection);
-            entity.setProperties(data);
-            entity.setCreated(System.currentTimeMillis());
-            entity.setModified(entity.getCreated());
-            entities.add(entity);
-        }
-        return entities;
-    }
-
-    private void startStandaloneServer() {
-        standaloneServer = new StandaloneServer();
-        try {
-            Thread thread = new Thread(standaloneServer);
-            thread.start();
-        } catch (Exception ex) {
-            logger.error("Could not schedule standalone server runner", ex);
-        }
-        Runtime.getRuntime().addShutdownHook(new Thread() {
-            @Override
-            public void run() {
-                try {
-                    logger.error("In shutdownHook");
-                    stopServer();
-                } catch (Exception ex) {
-                    ex.printStackTrace();
-                }
-            }
-        });
-        boolean loaded = false;
-        while (!loaded) {
-            if( standaloneServer.server.isRunning() ) {
-                if( standaloneServer.server.getManagementService() != null ) {
-                    loaded = true;
-                    continue;
-                }
-            }
-            try {
-                logger.info("Loding application context...");
-                Thread.sleep(2*1000);
-            } catch (InterruptedException e) {
-                continue;
-            }
-        }
-
-        if(loaded) {
-            ManagementService managementService = standaloneServer.server.getManagementService();
-            try {
-                managementService.setup();
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-        }
-
-        logger.info("Finish start standalone server.");
-    }
-
-    static class StandaloneServer implements Runnable {
-        public static Server server;
-
-        public StandaloneServer() {
-            server = new Server();
-        }
-
-        @Override
-        public void run() {
-            server.setInitializeDatabaseOnStart(true);
-            server.setDaemon(false);
-            server.startServer();
-        }
-
-        public void stop() {
-            server.stopServer();
-        }
-    }
-
-    private void stopServer() {
-        standaloneServer.stop();
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/482c5cef/stack/rest/pom.xml
----------------------------------------------------------------------
diff --git a/stack/rest/pom.xml b/stack/rest/pom.xml
index 22c3c93..901b009 100644
--- a/stack/rest/pom.xml
+++ b/stack/rest/pom.xml
@@ -560,8 +560,6 @@
       <scope>test</scope>
     </dependency>
 
-
-
     <dependency>
       <groupId>org.usergrid</groupId>
       <artifactId>usergrid-java-client</artifactId>
@@ -575,5 +573,7 @@
       <scope>test</scope>
       <classifier>tests</classifier>
     </dependency>
+
   </dependencies>
+
 </project>