Repository: incubator-ignite Updated Branches: refs/heads/ignite-964-1 23c7add12 -> 832bf7797
#ignite-964: refactor if to switch. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/eb9c34f4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/eb9c34f4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/eb9c34f4 Branch: refs/heads/ignite-964-1 Commit: eb9c34f421936ce2b5478ea208831b2d379f1875 Parents: 23c7add Author: ivasilinets <ivasilin...@gridgain.com> Authored: Sun Jul 5 21:40:18 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Sun Jul 5 21:40:18 2015 +0300 ---------------------------------------------------------------------- .../rest/handlers/scripting/RestEntry.java | 4 +- .../http/jetty/GridJettyRestHandler.java | 81 ++++++++++++-------- 2 files changed, 53 insertions(+), 32 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/eb9c34f4/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/scripting/RestEntry.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/scripting/RestEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/scripting/RestEntry.java index f12f2f2..77af22f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/scripting/RestEntry.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/scripting/RestEntry.java @@ -44,14 +44,14 @@ public class RestEntry { /** * @return Value. */ - public Object getVal() { + public Object getValue() { return val; } /** * @param val Value. */ - public void setVal(Object val) { + public void setValue(Object val) { this.val = val; } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/eb9c34f4/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 f135e62..01fb450 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 @@ -403,46 +403,67 @@ public class GridJettyRestHandler extends AbstractHandler { Map<Object, Object> map = U.newHashMap(o.keySet().size()); - if (cmd == CACHE_PUT_ALL) { - List entries = (List)o.get("entries"); + switch (cmd) { + case CACHE_PUT_ALL: { + List entries = (List) o.get("entries"); - for (Object entry : entries) { - JSONCacheObject cacheEntry = new JSONCacheObject((JSONObject)entry); + for (Object entry : entries) { + JSONCacheObject cacheEntry = new JSONCacheObject((JSONObject) entry); - Object key = cacheEntry.getField("_key"); - Object val = cacheEntry.getField("_val"); + Object key = cacheEntry.getField("_key"); + Object val = cacheEntry.getField("_val"); - map.put(key, val); + map.put(key, val); + } + + restReq0.cacheName(F.isEmpty(cacheName) ? null : cacheName); + + restReq0.values(map); + + break; } - restReq0.cacheName(F.isEmpty(cacheName) ? null : cacheName); + case CACHE_GET_ALL: + case CACHE_REMOVE_ALL: + case CACHE_CONTAINS_KEYS: { + JSONCacheObject cacheObj = new JSONCacheObject(o); - restReq0.values(map); - } - else if (cmd == CACHE_GET_ALL || cmd == CACHE_REMOVE_ALL || cmd == CACHE_CONTAINS_KEYS) { - JSONCacheObject cacheObj = new JSONCacheObject(o); + List keys = (List) cacheObj.getField("keys"); - List keys = (List)cacheObj.getField("keys"); + for (Object key : keys) + map.put(key, null); - for (Object key : keys) - map.put(key, null); + restReq0.cacheName(F.isEmpty(cacheName) ? null : cacheName); - restReq0.cacheName(F.isEmpty(cacheName) ? null : cacheName); + restReq0.values(map); - restReq0.values(map); - } - else if (cmd == CACHE_GET || cmd == CACHE_PUT || cmd == CACHE_REMOVE || - cmd == CACHE_CONTAINS_KEY || cmd == CACHE_GET_AND_PUT || - cmd == CACHE_GET_AND_PUT_IF_ABSENT || cmd == CACHE_GET_AND_REMOVE || - cmd == CACHE_PUT_IF_ABSENT || cmd == CACHE_REMOVE_VALUE || cmd == CACHE_REPLACE || - cmd == CACHE_GET_AND_REPLACE || cmd == CACHE_REPLACE_VALUE) { - JSONCacheObject cacheObj = new JSONCacheObject(o); - - restReq0.cacheName(F.isEmpty(cacheName) ? null : cacheName); - - restReq0.key(cacheObj.getField("key")); - restReq0.value(cacheObj.getField("val")); - restReq0.value2(cacheObj.getField("oldVal")); + break; + } + + case CACHE_GET: + case CACHE_PUT: + case CACHE_REMOVE: + case CACHE_CONTAINS_KEY: + case CACHE_GET_AND_PUT: + case CACHE_GET_AND_PUT_IF_ABSENT: + case CACHE_GET_AND_REMOVE: + case CACHE_PUT_IF_ABSENT: + case CACHE_REMOVE_VALUE: + case CACHE_REPLACE: + case CACHE_GET_AND_REPLACE: + case CACHE_REPLACE_VALUE: { + JSONCacheObject cacheObj = new JSONCacheObject(o); + + restReq0.cacheName(F.isEmpty(cacheName) ? null : cacheName); + + restReq0.key(cacheObj.getField("key")); + restReq0.value(cacheObj.getField("val")); + restReq0.value2(cacheObj.getField("oldVal")); + break; + } + + default: + throw new IgniteCheckedException("Invalid command: " + cmd); } } else {
