ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject ignite git commit: ignite-961
Date Mon, 28 Dec 2015 14:33:55 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-961 2139ef050 -> 20ee4ea63


ignite-961


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/20ee4ea6
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/20ee4ea6
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/20ee4ea6

Branch: refs/heads/ignite-961
Commit: 20ee4ea633bb69b9bcbab2ff610848512200d248
Parents: 2139ef0
Author: sboikov <sboikov@gridgain.com>
Authored: Mon Dec 28 17:33:49 2015 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Mon Dec 28 17:33:49 2015 +0300

----------------------------------------------------------------------
 .../JettyRestProcessorAbstractSelfTest.java     | 24 +++++++++-----------
 .../rest/request/RestQueryRequest.java          | 10 ++++----
 2 files changed, 16 insertions(+), 18 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/20ee4ea6/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java
b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java
index 959ff1a..6dbb296 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java
@@ -20,10 +20,13 @@ package org.apache.ignite.internal.processors.rest;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.LineNumberReader;
+import java.io.PrintStream;
 import java.io.Serializable;
+import java.net.HttpURLConnection;
 import java.net.URL;
 import java.net.URLConnection;
 import java.net.URLEncoder;
+import java.nio.charset.Charset;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -34,6 +37,7 @@ import java.util.concurrent.ConcurrentHashMap;
 import java.util.regex.Pattern;
 import net.sf.json.JSONNull;
 import net.sf.json.JSONObject;
+import org.apache.ignite.Ignite;
 import org.apache.ignite.IgniteCache;
 import org.apache.ignite.cache.CacheMode;
 import org.apache.ignite.cache.CachePeekMode;
@@ -44,6 +48,7 @@ import org.apache.ignite.configuration.CacheConfiguration;
 import org.apache.ignite.internal.processors.cache.IgniteCacheProxy;
 import org.apache.ignite.internal.processors.cache.query.GridCacheSqlIndexMetadata;
 import org.apache.ignite.internal.processors.cache.query.GridCacheSqlMetadata;
+import org.apache.ignite.internal.processors.json.IgniteJsonString;
 import org.apache.ignite.internal.processors.rest.handlers.GridRestCommandHandler;
 import org.apache.ignite.internal.util.typedef.F;
 import org.apache.ignite.internal.util.typedef.internal.U;
@@ -52,11 +57,7 @@ import org.apache.ignite.lang.IgniteBiPredicate;
 import org.apache.ignite.lang.IgnitePredicate;
 import org.apache.ignite.testframework.GridTestUtils;
 
-import java.io.*;
-import java.net.*;
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.regex.*;
+import static org.apache.ignite.IgniteSystemProperties.IGNITE_JETTY_PORT;
 
 /**
  * Tests for Jetty REST protocol.
@@ -93,12 +94,6 @@ public abstract class JettyRestProcessorAbstractSelfTest extends AbstractRestPro
     }
 
     /**
-     * @return Signature.
-     * @throws Exception If failed.
-     */
-    protected abstract String signature() throws Exception;
-
-    /**
      * @return Port to use for rest. Needs to be changed over time
      *      because Jetty has some delay before port unbind.
      */
@@ -1568,7 +1563,7 @@ public abstract class JettyRestProcessorAbstractSelfTest extends AbstractRestPro
         params.put("cmd", GridRestCommand.EXECUTE_SCAN_QUERY.key());
         params.put("pageSize", "10");
         params.put("cacheName", "person");
-        params.put("classname", ScanFilter.class.getName() + 1);
+        params.put("className", ScanFilter.class.getName() + 1);
 
         String ret = content(params);
 
@@ -1774,9 +1769,12 @@ public abstract class JettyRestProcessorAbstractSelfTest extends AbstractRestPro
         assertFalse(queryCursorFound());
     }
 
+    /**
+     * @return Signature.
+     * @throws Exception If failed.
+     */
     protected abstract String signature() throws Exception;
 
-
     /**
      * @throws Exception If failed.
      */

http://git-wip-us.apache.org/repos/asf/ignite/blob/20ee4ea6/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/request/RestQueryRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/request/RestQueryRequest.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/request/RestQueryRequest.java
index a719776..8d33b55 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/request/RestQueryRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/request/RestQueryRequest.java
@@ -42,7 +42,7 @@ public class RestQueryRequest extends GridRestRequest {
     private String typeName;
 
     /** Predicate class name for scan query. */
-    private String className;
+    private String clsName;
 
     /** Query type. */
     private QueryType type;
@@ -135,14 +135,14 @@ public class RestQueryRequest extends GridRestRequest {
      * @return Predicate class name for scan query.
      */
     public String className() {
-        return className;
+        return clsName;
     }
 
     /**
-     * @param className Predicate class name for scan query.
+     * @param clsName Predicate class name for scan query.
      */
-    public void className(String className) {
-        this.className = className;
+    public void className(String clsName) {
+        this.clsName = clsName;
     }
 
     /**


Mime
View raw message