You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2015/06/23 19:47:34 UTC
[08/20] incubator-ignite git commit: #ignite-965: code style
RestComputeTaskRequest.
#ignite-965: code style RestComputeTaskRequest.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/dbc29fde
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/dbc29fde
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/dbc29fde
Branch: refs/heads/ignite-965
Commit: dbc29fdec5e79012d6046d38d02d8e229d27e84c
Parents: 8268791
Author: ivasilinets <iv...@gridgain.com>
Authored: Tue Jun 23 19:46:25 2015 +0300
Committer: ivasilinets <iv...@gridgain.com>
Committed: Tue Jun 23 19:46:25 2015 +0300
----------------------------------------------------------------------
.../IgniteComputeTaskCommandHandler.java | 2 +-
.../rest/request/RestComputeTaskRequest.java | 44 +++++++++++++-------
.../http/jetty/GridJettyRestHandler.java | 4 +-
3 files changed, 32 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dbc29fde/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/compute/IgniteComputeTaskCommandHandler.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/compute/IgniteComputeTaskCommandHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/compute/IgniteComputeTaskCommandHandler.java
index 59feae7..4112ff8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/compute/IgniteComputeTaskCommandHandler.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/compute/IgniteComputeTaskCommandHandler.java
@@ -63,7 +63,7 @@ public class IgniteComputeTaskCommandHandler extends GridRestCommandHandlerAdapt
final RestComputeTaskRequest req0 = (RestComputeTaskRequest) req;
Object execRes = ctx.grid().compute().execute(
- new JsTask(req0.mapFunc(), req0.argument(), req0.reduceFunc(), ctx), null);
+ new JsTask(req0.mapFunction(), req0.argument(), req0.reduceFunction(), ctx), null);
return new GridFinishedFuture<>(new GridRestResponse(execRes));
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dbc29fde/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/request/RestComputeTaskRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/request/RestComputeTaskRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/request/RestComputeTaskRequest.java
index 89e04da..cf5c7c0 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/request/RestComputeTaskRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/request/RestComputeTaskRequest.java
@@ -17,10 +17,6 @@
package org.apache.ignite.internal.processors.rest.request;
-import org.apache.ignite.internal.util.typedef.T3;
-
-import java.util.*;
-
/**
* Compute task request.
*/
@@ -31,30 +27,48 @@ public class RestComputeTaskRequest extends GridRestRequest {
/** Function argument. */
private String arg;
+ /** Reduce function. */
private String reduceFunc;
- public void reduceFunc(String reduceFunc) {
+ /**
+ * @param reduceFunc Reduce function.
+ */
+ public void reduceFunction(String reduceFunc) {
this.reduceFunc = reduceFunc;
}
- public String reduceFunc() {
-
+ /**
+ * @return Reduce function.
+ */
+ public String reduceFunction() {
return reduceFunc;
}
- public String mapFunc() {
- return mapFunc;
- }
-
- public String argument() {
- return arg;
+ /**
+ * @param mapFunc Map function.
+ */
+ public void mapFunction(String mapFunc) {
+ this.mapFunc = mapFunc;
}
- public void mapFunc(String mapFunc) {
- this.mapFunc = mapFunc;
+ /**
+ * @return Map function.
+ */
+ public String mapFunction() {
+ return mapFunc;
}
+ /**
+ * @param arg Argument.
+ */
public void argument(String arg) {
this.arg = arg;
}
+
+ /**
+ * @return Argument.
+ */
+ public String argument() {
+ return arg;
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dbc29fde/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 249b9ca..0d961be 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
@@ -463,9 +463,9 @@ public class GridJettyRestHandler extends AbstractHandler {
case EXECUTE_TASK: {
RestComputeTaskRequest restReq0 = new RestComputeTaskRequest();
- restReq0.mapFunc((String)params.get("map"));
+ restReq0.mapFunction((String) params.get("map"));
restReq0.argument((String)params.get("arg"));
- restReq0.reduceFunc((String)params.get("reduce"));
+ restReq0.reduceFunction((String) params.get("reduce"));
restReq = restReq0;