You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by iv...@apache.org on 2015/07/23 15:51:25 UTC
[27/27] incubator-ignite git commit: #ignite-961: remove unused class.
#ignite-961: remove unused class.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/5993321a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5993321a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5993321a
Branch: refs/heads/ignite-961
Commit: 5993321a5cea1bf359f8d70e3e6f7b464b67a5e9
Parents: ba38952
Author: ivasilinets <iv...@gridgain.com>
Authored: Thu Jul 23 16:50:51 2015 +0300
Committer: ivasilinets <iv...@gridgain.com>
Committed: Thu Jul 23 16:50:51 2015 +0300
----------------------------------------------------------------------
.../scripting/IgniteScriptingConverter.java | 7 +-
.../scripting/IgniteScriptingProcessor.java | 1 -
.../org/apache/ignite/json/JSONCacheObject.java | 95 --------------------
3 files changed, 1 insertion(+), 102 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5993321a/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 b51d00e..5383c90 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
@@ -17,8 +17,6 @@
package org.apache.ignite.internal.processors.scripting;
-import org.apache.ignite.json.*;
-
/**
* Convert json object ot java objects.
*/
@@ -28,7 +26,7 @@ public class IgniteScriptingConverter {
* @return Object for Ignite cache.
*/
public Object toJavaObject(Object o) {
- return JSONCacheObject.toSimpleObject(o);
+ return o;
}
/**
@@ -44,9 +42,6 @@ public class IgniteScriptingConverter {
* @return Object to store in cache.
*/
public Object getField(String key, Object o) {
- if (o instanceof JSONCacheObject)
- return ((JSONCacheObject)o).getField(key);
-
return null;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5993321a/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 49f2c8a..1a5f882 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
@@ -20,7 +20,6 @@ package org.apache.ignite.internal.processors.scripting;
import org.apache.ignite.*;
import org.apache.ignite.internal.*;
import org.apache.ignite.internal.processors.*;
-import org.apache.ignite.json.*;
import javax.script.*;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5993321a/modules/core/src/main/java/org/apache/ignite/json/JSONCacheObject.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/json/JSONCacheObject.java b/modules/core/src/main/java/org/apache/ignite/json/JSONCacheObject.java
deleted file mode 100644
index 13c9321..0000000
--- a/modules/core/src/main/java/org/apache/ignite/json/JSONCacheObject.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You 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.ignite.json;
-
-import java.util.*;
-
-/**
- * JSON cache object.
- */
-public class JSONCacheObject extends HashMap<Object, Object> {
- /** */
- private static final long serialVersionUID = 0L;
-
- /**
- * Empty constructor.
- */
- public JSONCacheObject() {
- // No-op.
- }
-
- /**
- * @param key Field name.
- * @return Field value.
- */
- public Object getField(Object key) {
- return get(key);
- }
-
- /**
- * Convert JSON object to RestJSONCacheObject
- *
- * @param o Object to convert.
- * @return Converted object.
- */
- public static Object toSimpleObject(Object o) {
- if (o == null)
- return null;
-
- if (o instanceof Map) {
- Map o1 = (Map)o;
-
- JSONCacheObject res = new JSONCacheObject();
-
- for (Object key : o1.keySet())
- res.put(toSimpleObject(key), toSimpleObject(o1.get(key)));
-
- return res;
- }
- else if (o instanceof List) {
- List o1 = (List) o;
-
- List<Object> val = new ArrayList<>();
-
- for (Object v : o1)
- val.add(toSimpleObject(v));
-
- return val;
- }
- else if (o.getClass().isArray()) {
- Object[] o1 = (Object[]) o;
-
- List<Object> val = new ArrayList<>();
-
- for (Object v : o1)
- val.add(toSimpleObject(v));
-
- return val;
- }
-
- return o;
- }
-
- /** {@inheritDoc} */
- @Override public boolean equals(Object obj) {
- if (obj == null || !(obj instanceof JSONCacheObject))
- return false;
-
- return super.equals(obj);
- }
-}