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 15:02:00 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-961 20ee4ea63 -> d685605bb


ignite-961


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

Branch: refs/heads/ignite-961
Commit: d685605bb26f84107f60fab12afe9e8f2d305d49
Parents: 20ee4ea
Author: sboikov <sboikov@gridgain.com>
Authored: Mon Dec 28 17:45:44 2015 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Mon Dec 28 17:45:44 2015 +0300

----------------------------------------------------------------------
 .../computegrid/ComputeTaskMapExample.java      |  2 +-
 .../examples/js/ExampleJsNodeStartup.java       |  4 +-
 .../processors/query/GridQueryProcessor.java    |  2 +-
 .../handlers/scripting/IgniteJsEmitResult.java  |  6 +--
 .../IgniteScriptingCommandHandler.java          | 53 +++++++++++++-------
 .../scripting/IgniteScriptingConverter.java     |  1 +
 .../scripting/IgniteScriptingProcessor.java     | 22 ++++----
 .../scripting/ScriptingClusterNode.java         |  2 +-
 .../processors/scripting/ScriptingJSIgnite.java |  4 +-
 .../processors/scripting/ScriptingJsCache.java  | 13 +++--
 .../processors/json/IgniteJsonArray.java        | 11 ++--
 .../processors/json/IgniteJsonArrayBuilder.java | 14 ++++--
 .../processors/json/IgniteJsonGenerator.java    | 19 +++++--
 .../processors/json/IgniteJsonLocation.java     |  2 +-
 .../json/IgniteJsonMessageFactory.java          |  5 +-
 .../processors/json/IgniteJsonNumber.java       |  7 +--
 .../processors/json/IgniteJsonObject.java       | 10 ++--
 .../json/IgniteJsonObjectBuilder.java           | 13 +++--
 .../json/IgniteJsonProcessorImpl.java           | 18 ++++---
 .../processors/json/IgniteJsonProvider.java     | 22 ++++++--
 .../processors/json/IgniteJsonString.java       |  4 +-
 .../processors/json/JsonCacheObject.java        | 12 +++--
 .../java/org/apache/ignite/json/IgniteJson.java |  7 ++-
 .../ignite/internal/NodeJsAbstractTest.java     | 33 ++++++------
 .../ignite/internal/NodeJsComputeSelfTest.java  | 15 +++---
 .../internal/NodeJsSecretKeySelfTest.java       |  2 +-
 .../ignite/internal/NodeJsSqlQuerySelfTest.java | 11 ++--
 .../testsuites/IgniteNodeJsTestSuite.java       |  9 +++-
 .../http/jetty/GridJettyRestHandler.java        |  5 +-
 29 files changed, 202 insertions(+), 126 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/d685605b/examples/src/main/java/org/apache/ignite/examples/computegrid/ComputeTaskMapExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/computegrid/ComputeTaskMapExample.java
b/examples/src/main/java/org/apache/ignite/examples/computegrid/ComputeTaskMapExample.java
index 0a61ed5..f96dd6c 100644
--- a/examples/src/main/java/org/apache/ignite/examples/computegrid/ComputeTaskMapExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/computegrid/ComputeTaskMapExample.java
@@ -84,7 +84,7 @@ public class ComputeTaskMapExample {
 
             Iterator<ClusterNode> it = nodes.iterator();
 
-            for (final String word : words) {
+            for (final String word : arg.split(" ")) {
                 // If we used all nodes, restart the iterator.
                 if (!it.hasNext())
                     it = nodes.iterator();

http://git-wip-us.apache.org/repos/asf/ignite/blob/d685605b/examples/src/main/java/org/apache/ignite/examples/js/ExampleJsNodeStartup.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/js/ExampleJsNodeStartup.java
b/examples/src/main/java/org/apache/ignite/examples/js/ExampleJsNodeStartup.java
index c92ee20..d52a8b3 100644
--- a/examples/src/main/java/org/apache/ignite/examples/js/ExampleJsNodeStartup.java
+++ b/examples/src/main/java/org/apache/ignite/examples/js/ExampleJsNodeStartup.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.examples.js;
 
-import org.apache.ignite.*;
-import org.apache.ignite.spi.discovery.tcp.internal.*;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.Ignition;
 
 /**
  * Starts up an empty node with example node js configuration.

http://git-wip-us.apache.org/repos/asf/ignite/blob/d685605b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
index a2936df..624604d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
@@ -1490,7 +1490,7 @@ public class GridQueryProcessor extends GridProcessorAdapter {
     }
 
     /**
-     * Builds portable object property.
+     * TODO IGNITE-961.
      *
      * @param pathStr String representing path to the property. May contains dots '.' to
identify
      *      nested fields.

http://git-wip-us.apache.org/repos/asf/ignite/blob/d685605b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/scripting/IgniteJsEmitResult.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/scripting/IgniteJsEmitResult.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/scripting/IgniteJsEmitResult.java
index b5ae106..e2f49a1 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/scripting/IgniteJsEmitResult.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/scripting/IgniteJsEmitResult.java
@@ -17,9 +17,9 @@
 
 package org.apache.ignite.internal.processors.rest.handlers.scripting;
 
-import org.apache.ignite.internal.util.typedef.*;
-
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import org.apache.ignite.internal.util.typedef.T3;
 
 /**
  * Emit result binding.

http://git-wip-us.apache.org/repos/asf/ignite/blob/d685605b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/scripting/IgniteScriptingCommandHandler.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/scripting/IgniteScriptingCommandHandler.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/scripting/IgniteScriptingCommandHandler.java
index ed8b759..6f124b6 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/scripting/IgniteScriptingCommandHandler.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/scripting/IgniteScriptingCommandHandler.java
@@ -17,25 +17,40 @@
 
 package org.apache.ignite.internal.processors.rest.handlers.scripting;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.rest.*;
-import org.apache.ignite.internal.processors.rest.handlers.*;
-import org.apache.ignite.internal.processors.rest.request.*;
-import org.apache.ignite.internal.processors.scripting.*;
-import org.apache.ignite.internal.util.future.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.resources.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
-import java.util.concurrent.*;
-
-import static org.apache.ignite.internal.processors.rest.GridRestCommand.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.Callable;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.compute.ComputeJob;
+import org.apache.ignite.compute.ComputeJobAdapter;
+import org.apache.ignite.compute.ComputeJobResult;
+import org.apache.ignite.compute.ComputeTaskAdapter;
+import org.apache.ignite.internal.GridKernalContext;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.IgniteKernal;
+import org.apache.ignite.internal.processors.rest.GridRestCommand;
+import org.apache.ignite.internal.processors.rest.GridRestResponse;
+import org.apache.ignite.internal.processors.rest.handlers.GridRestCommandHandlerAdapter;
+import org.apache.ignite.internal.processors.rest.request.GridRestRequest;
+import org.apache.ignite.internal.processors.rest.request.RestMapReduceScriptRequest;
+import org.apache.ignite.internal.processors.rest.request.RestRunScriptRequest;
+import org.apache.ignite.internal.processors.scripting.IgniteScriptingProcessor;
+import org.apache.ignite.internal.util.future.GridFinishedFuture;
+import org.apache.ignite.internal.util.typedef.T3;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteCallable;
+import org.apache.ignite.resources.IgniteInstanceResource;
+import org.jetbrains.annotations.Nullable;
+
+import static org.apache.ignite.internal.processors.rest.GridRestCommand.AFFINITY_RUN_SCRIPT;
+import static org.apache.ignite.internal.processors.rest.GridRestCommand.EXECUTE_MAP_REDUCE_SCRIPT;
+import static org.apache.ignite.internal.processors.rest.GridRestCommand.RUN_SCRIPT;
 
 /**
  * Compute task command handler.

http://git-wip-us.apache.org/repos/asf/ignite/blob/d685605b/modules/core/src/main/java/org/apache/ignite/internal/processors/scripting/IgniteScriptingConverter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/scripting/IgniteScriptingConverter.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/scripting/IgniteScriptingConverter.java
index 5383c90..c0b11a9 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/scripting/IgniteScriptingConverter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/scripting/IgniteScriptingConverter.java
@@ -38,6 +38,7 @@ public class IgniteScriptingConverter {
     }
 
     /**
+     * @param key Field name.
      * @param o Object from script.
      * @return Object to store in cache.
      */

http://git-wip-us.apache.org/repos/asf/ignite/blob/d685605b/modules/core/src/main/java/org/apache/ignite/internal/processors/scripting/IgniteScriptingProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/scripting/IgniteScriptingProcessor.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/scripting/IgniteScriptingProcessor.java
index 1a5f882..597bfcb 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/scripting/IgniteScriptingProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/scripting/IgniteScriptingProcessor.java
@@ -17,15 +17,18 @@
 
 package org.apache.ignite.internal.processors.scripting;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.*;
-
-import javax.script.*;
-
-import java.lang.reflect.*;
-
-import static javax.script.ScriptContext.*;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+import javax.script.Bindings;
+import javax.script.Invocable;
+import javax.script.ScriptEngine;
+import javax.script.ScriptEngineManager;
+import javax.script.ScriptException;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.GridKernalContext;
+import org.apache.ignite.internal.processors.GridProcessorAdapter;
+
+import static javax.script.ScriptContext.ENGINE_SCOPE;
 
 /**
  * Ignite scripting processor.
@@ -173,6 +176,7 @@ public class IgniteScriptingProcessor extends GridProcessorAdapter {
     }
 
     /**
+     * @param key Field name.
      * @param o Object from script.
      * @return Object to store in cache.
      */

http://git-wip-us.apache.org/repos/asf/ignite/blob/d685605b/modules/core/src/main/java/org/apache/ignite/internal/processors/scripting/ScriptingClusterNode.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/scripting/ScriptingClusterNode.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/scripting/ScriptingClusterNode.java
index 7c42274..91083fe 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/scripting/ScriptingClusterNode.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/scripting/ScriptingClusterNode.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.internal.processors.scripting;
 
-import org.apache.ignite.cluster.*;
+import org.apache.ignite.cluster.ClusterNode;
 
 /**
  * Node js cluster node.

http://git-wip-us.apache.org/repos/asf/ignite/blob/d685605b/modules/core/src/main/java/org/apache/ignite/internal/processors/scripting/ScriptingJSIgnite.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/scripting/ScriptingJSIgnite.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/scripting/ScriptingJSIgnite.java
index a10d1e5..47785e7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/scripting/ScriptingJSIgnite.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/scripting/ScriptingJSIgnite.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.internal.processors.scripting;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.internal.IgniteKernal;
 
 /**
  * Node js ignite.

http://git-wip-us.apache.org/repos/asf/ignite/blob/d685605b/modules/core/src/main/java/org/apache/ignite/internal/processors/scripting/ScriptingJsCache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/scripting/ScriptingJsCache.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/scripting/ScriptingJsCache.java
index ff05cd4..be5a7f0 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/scripting/ScriptingJsCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/scripting/ScriptingJsCache.java
@@ -17,10 +17,12 @@
 
 package org.apache.ignite.internal.processors.scripting;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.internal.util.typedef.internal.U;
 
 /**
  * Scripting cache.
@@ -36,7 +38,7 @@ public class ScriptingJsCache {
      * @param cache Ignite cache.
      * @param proc Ignite scripting processor.
      */
-    public ScriptingJsCache(IgniteCache cache, IgniteScriptingProcessor proc) {
+    public ScriptingJsCache(IgniteCache<Object, Object> cache, IgniteScriptingProcessor
proc) {
         this.cache = cache;
         this.proc = proc;
     }
@@ -54,6 +56,7 @@ public class ScriptingJsCache {
 
     /**
      * @param key Key.
+     * @return Value.
      */
     public Object get(Object key) {
         Object cacheKey = proc.toJavaObject(key);

http://git-wip-us.apache.org/repos/asf/ignite/blob/d685605b/modules/json/src/main/java/org/apache/ignite/internal/processors/json/IgniteJsonArray.java
----------------------------------------------------------------------
diff --git a/modules/json/src/main/java/org/apache/ignite/internal/processors/json/IgniteJsonArray.java
b/modules/json/src/main/java/org/apache/ignite/internal/processors/json/IgniteJsonArray.java
index 11267ba..2f568ec 100644
--- a/modules/json/src/main/java/org/apache/ignite/internal/processors/json/IgniteJsonArray.java
+++ b/modules/json/src/main/java/org/apache/ignite/internal/processors/json/IgniteJsonArray.java
@@ -17,9 +17,14 @@
 
 package org.apache.ignite.internal.processors.json;
 
-import javax.json.*;
-import java.io.*;
-import java.util.*;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import javax.json.JsonArray;
+import javax.json.JsonNumber;
+import javax.json.JsonString;
+import javax.json.JsonValue;
 
 /**
  * Implementation of JsonArray

http://git-wip-us.apache.org/repos/asf/ignite/blob/d685605b/modules/json/src/main/java/org/apache/ignite/internal/processors/json/IgniteJsonArrayBuilder.java
----------------------------------------------------------------------
diff --git a/modules/json/src/main/java/org/apache/ignite/internal/processors/json/IgniteJsonArrayBuilder.java
b/modules/json/src/main/java/org/apache/ignite/internal/processors/json/IgniteJsonArrayBuilder.java
index b65fa6c..8da9da2 100644
--- a/modules/json/src/main/java/org/apache/ignite/internal/processors/json/IgniteJsonArrayBuilder.java
+++ b/modules/json/src/main/java/org/apache/ignite/internal/processors/json/IgniteJsonArrayBuilder.java
@@ -17,11 +17,15 @@
 
 package org.apache.ignite.internal.processors.json;
 
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import javax.json.*;
-import java.math.*;
-import java.util.*;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.util.ArrayList;
+import java.util.List;
+import javax.json.JsonArray;
+import javax.json.JsonArrayBuilder;
+import javax.json.JsonObjectBuilder;
+import javax.json.JsonValue;
+import org.apache.ignite.internal.util.typedef.internal.A;
 
 /**
  * Json array builder.

http://git-wip-us.apache.org/repos/asf/ignite/blob/d685605b/modules/json/src/main/java/org/apache/ignite/internal/processors/json/IgniteJsonGenerator.java
----------------------------------------------------------------------
diff --git a/modules/json/src/main/java/org/apache/ignite/internal/processors/json/IgniteJsonGenerator.java
b/modules/json/src/main/java/org/apache/ignite/internal/processors/json/IgniteJsonGenerator.java
index 3a90d38..f432887 100644
--- a/modules/json/src/main/java/org/apache/ignite/internal/processors/json/IgniteJsonGenerator.java
+++ b/modules/json/src/main/java/org/apache/ignite/internal/processors/json/IgniteJsonGenerator.java
@@ -17,11 +17,20 @@
 
 package org.apache.ignite.internal.processors.json;
 
-import javax.json.*;
-import javax.json.stream.*;
-import java.io.*;
-import java.math.*;
-import java.util.*;
+import java.io.BufferedWriter;
+import java.io.IOException;
+import java.io.Writer;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.util.LinkedList;
+import java.util.Map;
+import javax.json.JsonArray;
+import javax.json.JsonException;
+import javax.json.JsonNumber;
+import javax.json.JsonString;
+import javax.json.JsonValue;
+import javax.json.stream.JsonGenerationException;
+import javax.json.stream.JsonGenerator;
 
 /**
  * Json generator implementation.

http://git-wip-us.apache.org/repos/asf/ignite/blob/d685605b/modules/json/src/main/java/org/apache/ignite/internal/processors/json/IgniteJsonLocation.java
----------------------------------------------------------------------
diff --git a/modules/json/src/main/java/org/apache/ignite/internal/processors/json/IgniteJsonLocation.java
b/modules/json/src/main/java/org/apache/ignite/internal/processors/json/IgniteJsonLocation.java
index feb5a4d..791aa91 100644
--- a/modules/json/src/main/java/org/apache/ignite/internal/processors/json/IgniteJsonLocation.java
+++ b/modules/json/src/main/java/org/apache/ignite/internal/processors/json/IgniteJsonLocation.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.internal.processors.json;
 
-import javax.json.stream.*;
+import javax.json.stream.JsonLocation;
 
 /**
  * Json location implementation.

http://git-wip-us.apache.org/repos/asf/ignite/blob/d685605b/modules/json/src/main/java/org/apache/ignite/internal/processors/json/IgniteJsonMessageFactory.java
----------------------------------------------------------------------
diff --git a/modules/json/src/main/java/org/apache/ignite/internal/processors/json/IgniteJsonMessageFactory.java
b/modules/json/src/main/java/org/apache/ignite/internal/processors/json/IgniteJsonMessageFactory.java
index ff9f228..0186064 100644
--- a/modules/json/src/main/java/org/apache/ignite/internal/processors/json/IgniteJsonMessageFactory.java
+++ b/modules/json/src/main/java/org/apache/ignite/internal/processors/json/IgniteJsonMessageFactory.java
@@ -17,8 +17,9 @@
 
 package org.apache.ignite.internal.processors.json;
 
-import org.apache.ignite.plugin.extensions.communication.*;
-import org.jetbrains.annotations.*;
+import org.apache.ignite.plugin.extensions.communication.Message;
+import org.apache.ignite.plugin.extensions.communication.MessageFactory;
+import org.jetbrains.annotations.Nullable;
 
 /**
  *

http://git-wip-us.apache.org/repos/asf/ignite/blob/d685605b/modules/json/src/main/java/org/apache/ignite/internal/processors/json/IgniteJsonNumber.java
----------------------------------------------------------------------
diff --git a/modules/json/src/main/java/org/apache/ignite/internal/processors/json/IgniteJsonNumber.java
b/modules/json/src/main/java/org/apache/ignite/internal/processors/json/IgniteJsonNumber.java
index acbd50c..566d4a8 100644
--- a/modules/json/src/main/java/org/apache/ignite/internal/processors/json/IgniteJsonNumber.java
+++ b/modules/json/src/main/java/org/apache/ignite/internal/processors/json/IgniteJsonNumber.java
@@ -17,9 +17,10 @@
 
 package org.apache.ignite.internal.processors.json;
 
-import javax.json.*;
-import java.io.*;
-import java.math.*;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import javax.json.JsonNumber;
 
 /**
  * Json number implementation.

http://git-wip-us.apache.org/repos/asf/ignite/blob/d685605b/modules/json/src/main/java/org/apache/ignite/internal/processors/json/IgniteJsonObject.java
----------------------------------------------------------------------
diff --git a/modules/json/src/main/java/org/apache/ignite/internal/processors/json/IgniteJsonObject.java
b/modules/json/src/main/java/org/apache/ignite/internal/processors/json/IgniteJsonObject.java
index 54ed86d..b14e346 100644
--- a/modules/json/src/main/java/org/apache/ignite/internal/processors/json/IgniteJsonObject.java
+++ b/modules/json/src/main/java/org/apache/ignite/internal/processors/json/IgniteJsonObject.java
@@ -17,9 +17,13 @@
 
 package org.apache.ignite.internal.processors.json;
 
-import javax.json.*;
-import java.io.*;
-import java.util.*;
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+import javax.json.JsonArray;
+import javax.json.JsonNumber;
+import javax.json.JsonString;
+import javax.json.JsonValue;
 
 /**
  * IgniteJsonObject implementation.

http://git-wip-us.apache.org/repos/asf/ignite/blob/d685605b/modules/json/src/main/java/org/apache/ignite/internal/processors/json/IgniteJsonObjectBuilder.java
----------------------------------------------------------------------
diff --git a/modules/json/src/main/java/org/apache/ignite/internal/processors/json/IgniteJsonObjectBuilder.java
b/modules/json/src/main/java/org/apache/ignite/internal/processors/json/IgniteJsonObjectBuilder.java
index c5006fc..2e2c2ad 100644
--- a/modules/json/src/main/java/org/apache/ignite/internal/processors/json/IgniteJsonObjectBuilder.java
+++ b/modules/json/src/main/java/org/apache/ignite/internal/processors/json/IgniteJsonObjectBuilder.java
@@ -17,11 +17,14 @@
 
 package org.apache.ignite.internal.processors.json;
 
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import javax.json.*;
-import java.math.*;
-import java.util.*;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.util.HashMap;
+import java.util.Map;
+import javax.json.JsonArrayBuilder;
+import javax.json.JsonObjectBuilder;
+import javax.json.JsonValue;
+import org.apache.ignite.internal.util.typedef.internal.A;
 
 /**
  * Json object builder implementation.

http://git-wip-us.apache.org/repos/asf/ignite/blob/d685605b/modules/json/src/main/java/org/apache/ignite/internal/processors/json/IgniteJsonProcessorImpl.java
----------------------------------------------------------------------
diff --git a/modules/json/src/main/java/org/apache/ignite/internal/processors/json/IgniteJsonProcessorImpl.java
b/modules/json/src/main/java/org/apache/ignite/internal/processors/json/IgniteJsonProcessorImpl.java
index 3e23b83..1f599bb 100644
--- a/modules/json/src/main/java/org/apache/ignite/internal/processors/json/IgniteJsonProcessorImpl.java
+++ b/modules/json/src/main/java/org/apache/ignite/internal/processors/json/IgniteJsonProcessorImpl.java
@@ -17,13 +17,17 @@
 
 package org.apache.ignite.internal.processors.json;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.jetbrains.annotations.*;
-
-import javax.json.*;
+import javax.json.JsonNumber;
+import javax.json.JsonObject;
+import javax.json.JsonString;
+import javax.json.JsonValue;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.internal.GridKernalContext;
+import org.apache.ignite.internal.processors.GridProcessorAdapter;
+import org.apache.ignite.internal.processors.cache.CacheObject;
+import org.apache.ignite.internal.processors.cache.CacheObjectContext;
+import org.apache.ignite.internal.processors.cache.KeyCacheObject;
+import org.jetbrains.annotations.Nullable;
 
 /**
  *

http://git-wip-us.apache.org/repos/asf/ignite/blob/d685605b/modules/json/src/main/java/org/apache/ignite/internal/processors/json/IgniteJsonProvider.java
----------------------------------------------------------------------
diff --git a/modules/json/src/main/java/org/apache/ignite/internal/processors/json/IgniteJsonProvider.java
b/modules/json/src/main/java/org/apache/ignite/internal/processors/json/IgniteJsonProvider.java
index dbcd8b8..546b255 100644
--- a/modules/json/src/main/java/org/apache/ignite/internal/processors/json/IgniteJsonProvider.java
+++ b/modules/json/src/main/java/org/apache/ignite/internal/processors/json/IgniteJsonProvider.java
@@ -17,11 +17,23 @@
 
 package org.apache.ignite.internal.processors.json;
 
-import javax.json.*;
-import javax.json.spi.*;
-import javax.json.stream.*;
-import java.io.*;
-import java.util.*;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.Reader;
+import java.io.Writer;
+import java.util.Map;
+import javax.json.JsonArrayBuilder;
+import javax.json.JsonBuilderFactory;
+import javax.json.JsonObjectBuilder;
+import javax.json.JsonReader;
+import javax.json.JsonReaderFactory;
+import javax.json.JsonWriter;
+import javax.json.JsonWriterFactory;
+import javax.json.spi.JsonProvider;
+import javax.json.stream.JsonGenerator;
+import javax.json.stream.JsonGeneratorFactory;
+import javax.json.stream.JsonParser;
+import javax.json.stream.JsonParserFactory;
 
 /**
  * Json provider implementation.

http://git-wip-us.apache.org/repos/asf/ignite/blob/d685605b/modules/json/src/main/java/org/apache/ignite/internal/processors/json/IgniteJsonString.java
----------------------------------------------------------------------
diff --git a/modules/json/src/main/java/org/apache/ignite/internal/processors/json/IgniteJsonString.java
b/modules/json/src/main/java/org/apache/ignite/internal/processors/json/IgniteJsonString.java
index 3adeb6b..96744d5 100644
--- a/modules/json/src/main/java/org/apache/ignite/internal/processors/json/IgniteJsonString.java
+++ b/modules/json/src/main/java/org/apache/ignite/internal/processors/json/IgniteJsonString.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.internal.processors.json;
 
-import javax.json.*;
-import java.io.*;
+import java.io.Serializable;
+import javax.json.JsonString;
 
 /**
  * Json string implementation.

http://git-wip-us.apache.org/repos/asf/ignite/blob/d685605b/modules/json/src/main/java/org/apache/ignite/internal/processors/json/JsonCacheObject.java
----------------------------------------------------------------------
diff --git a/modules/json/src/main/java/org/apache/ignite/internal/processors/json/JsonCacheObject.java
b/modules/json/src/main/java/org/apache/ignite/internal/processors/json/JsonCacheObject.java
index 9cb13c4..165ecca 100644
--- a/modules/json/src/main/java/org/apache/ignite/internal/processors/json/JsonCacheObject.java
+++ b/modules/json/src/main/java/org/apache/ignite/internal/processors/json/JsonCacheObject.java
@@ -17,11 +17,13 @@
 
 package org.apache.ignite.internal.processors.json;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.jetbrains.annotations.*;
-
-import javax.json.*;
+import javax.json.JsonObject;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.processors.cache.CacheObject;
+import org.apache.ignite.internal.processors.cache.CacheObjectAdapter;
+import org.apache.ignite.internal.processors.cache.CacheObjectContext;
+import org.apache.ignite.internal.processors.cache.KeyCacheObject;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * TODO IGNITE-961

http://git-wip-us.apache.org/repos/asf/ignite/blob/d685605b/modules/json/src/main/java/org/apache/ignite/json/IgniteJson.java
----------------------------------------------------------------------
diff --git a/modules/json/src/main/java/org/apache/ignite/json/IgniteJson.java b/modules/json/src/main/java/org/apache/ignite/json/IgniteJson.java
index f55f06d..010d49f 100644
--- a/modules/json/src/main/java/org/apache/ignite/json/IgniteJson.java
+++ b/modules/json/src/main/java/org/apache/ignite/json/IgniteJson.java
@@ -17,10 +17,9 @@
 
 package org.apache.ignite.json;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.processors.json.*;
-
-import javax.json.spi.*;
+import javax.json.spi.JsonProvider;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.internal.processors.json.IgniteJsonProvider;
 
 /**
  *

http://git-wip-us.apache.org/repos/asf/ignite/blob/d685605b/modules/nodejs/src/test/java/org/apache/ignite/internal/NodeJsAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/nodejs/src/test/java/org/apache/ignite/internal/NodeJsAbstractTest.java
b/modules/nodejs/src/test/java/org/apache/ignite/internal/NodeJsAbstractTest.java
index 011d727..cf038d5 100644
--- a/modules/nodejs/src/test/java/org/apache/ignite/internal/NodeJsAbstractTest.java
+++ b/modules/nodejs/src/test/java/org/apache/ignite/internal/NodeJsAbstractTest.java
@@ -17,20 +17,25 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.cache.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.spi.discovery.tcp.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-import java.util.*;
-import java.util.concurrent.*;
-
-import static java.util.concurrent.TimeUnit.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.CountDownLatch;
+import org.apache.ignite.cache.CacheAtomicityMode;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.ConnectorConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.util.GridJavaProcess;
+import org.apache.ignite.internal.util.IgniteUtils;
+import org.apache.ignite.internal.util.typedef.CI1;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+
+import static java.util.concurrent.TimeUnit.SECONDS;
 
 /**
  * Abstract class for Node JS testing.

http://git-wip-us.apache.org/repos/asf/ignite/blob/d685605b/modules/nodejs/src/test/java/org/apache/ignite/internal/NodeJsComputeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/nodejs/src/test/java/org/apache/ignite/internal/NodeJsComputeSelfTest.java
b/modules/nodejs/src/test/java/org/apache/ignite/internal/NodeJsComputeSelfTest.java
index 1f8c3de..70f4050 100644
--- a/modules/nodejs/src/test/java/org/apache/ignite/internal/NodeJsComputeSelfTest.java
+++ b/modules/nodejs/src/test/java/org/apache/ignite/internal/NodeJsComputeSelfTest.java
@@ -17,14 +17,13 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.cache.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.testframework.*;
-
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.*;
+import java.util.ArrayList;
+import java.util.concurrent.Callable;
+import java.util.concurrent.atomic.AtomicInteger;
+import org.apache.ignite.cache.CacheAtomicityMode;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.testframework.GridTestUtils;
 
 /**
  * Test compute node js.

http://git-wip-us.apache.org/repos/asf/ignite/blob/d685605b/modules/nodejs/src/test/java/org/apache/ignite/internal/NodeJsSecretKeySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/nodejs/src/test/java/org/apache/ignite/internal/NodeJsSecretKeySelfTest.java
b/modules/nodejs/src/test/java/org/apache/ignite/internal/NodeJsSecretKeySelfTest.java
index ab7b961..e28d39a 100644
--- a/modules/nodejs/src/test/java/org/apache/ignite/internal/NodeJsSecretKeySelfTest.java
+++ b/modules/nodejs/src/test/java/org/apache/ignite/internal/NodeJsSecretKeySelfTest.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.configuration.*;
+import org.apache.ignite.configuration.IgniteConfiguration;
 
 /**
  * Test secret key.

http://git-wip-us.apache.org/repos/asf/ignite/blob/d685605b/modules/nodejs/src/test/java/org/apache/ignite/internal/NodeJsSqlQuerySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/nodejs/src/test/java/org/apache/ignite/internal/NodeJsSqlQuerySelfTest.java
b/modules/nodejs/src/test/java/org/apache/ignite/internal/NodeJsSqlQuerySelfTest.java
index f290820..3bbdb9c 100644
--- a/modules/nodejs/src/test/java/org/apache/ignite/internal/NodeJsSqlQuerySelfTest.java
+++ b/modules/nodejs/src/test/java/org/apache/ignite/internal/NodeJsSqlQuerySelfTest.java
@@ -17,12 +17,11 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.query.*;
-import org.apache.ignite.cache.query.annotations.*;
-import org.apache.ignite.configuration.*;
-
-import java.io.*;
+import java.io.Serializable;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.cache.query.SqlQuery;
+import org.apache.ignite.cache.query.annotations.QuerySqlField;
+import org.apache.ignite.configuration.CacheConfiguration;
 
 /**
  * Node js sql query test.

http://git-wip-us.apache.org/repos/asf/ignite/blob/d685605b/modules/nodejs/src/test/java/org/apache/ignite/testsuites/IgniteNodeJsTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/nodejs/src/test/java/org/apache/ignite/testsuites/IgniteNodeJsTestSuite.java
b/modules/nodejs/src/test/java/org/apache/ignite/testsuites/IgniteNodeJsTestSuite.java
index f6ab879..80e3799 100644
--- a/modules/nodejs/src/test/java/org/apache/ignite/testsuites/IgniteNodeJsTestSuite.java
+++ b/modules/nodejs/src/test/java/org/apache/ignite/testsuites/IgniteNodeJsTestSuite.java
@@ -17,8 +17,13 @@
 
 package org.apache.ignite.testsuites;
 
-import junit.framework.*;
-import org.apache.ignite.internal.*;
+import junit.framework.TestSuite;
+import org.apache.ignite.internal.NodeJsCacheApiSelfTest;
+import org.apache.ignite.internal.NodeJsComputeSelfTest;
+import org.apache.ignite.internal.NodeJsIgniteSelfTest;
+import org.apache.ignite.internal.NodeJsIgnitionSelfTest;
+import org.apache.ignite.internal.NodeJsSecretKeySelfTest;
+import org.apache.ignite.internal.NodeJsSqlQuerySelfTest;
 
 /**
  * Node JS test suite.

http://git-wip-us.apache.org/repos/asf/ignite/blob/d685605b/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridJettyRestHandler.java
----------------------------------------------------------------------
diff --git a/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridJettyRestHandler.java
b/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridJettyRestHandler.java
index a0dd648..b19bb23 100644
--- a/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridJettyRestHandler.java
+++ b/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridJettyRestHandler.java
@@ -110,7 +110,7 @@ public class GridJettyRestHandler extends AbstractHandler {
     /**
      * Creates new HTTP requests handler.
      *
-     * @param ctx Grid context.
+     * @param ctx Context.
      * @param hnd Handler.
      * @param authChecker Authentication checking closure.
      * @param log Logger.
@@ -438,9 +438,10 @@ public class GridJettyRestHandler extends AbstractHandler {
 
             List<Object> res = new ArrayList<>();
 
-            for (Object k : o.keySet())
+            for (Object k : o.keySet()) {
                 res.add(ctx.scripting().createScriptingEntry(ctx.scripting().toScriptObject(k),
                     ctx.scripting().toScriptObject(o.get(k))));
+            }
 
             cmdRes.setResponse(res);
 


Mime
View raw message