ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [50/50] [abbrv] ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-961
Date Mon, 28 Dec 2015 14:22:11 GMT
Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-961

Conflicts:
	examples/pom.xml
	modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java
	modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java
	modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
	modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
	modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
	modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestProcessor.java
	modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/query/QueryCommandHandler.java
	modules/core/src/main/java/org/apache/ignite/internal/util/GridJavaProcess.java
	modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridJettyRestHandler.java
	parent/pom.xml
	pom.xml


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

Branch: refs/heads/ignite-961
Commit: 2139ef050580941331132f58bc693352cbb1e233
Parents: ec3819f
Author: sboikov <sboikov@gridgain.com>
Authored: Mon Dec 28 17:19:46 2015 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Mon Dec 28 17:19:46 2015 +0300

----------------------------------------------------------------------
 .../ignite/internal/GridKernalContext.java      |  2 +
 .../ignite/internal/GridKernalContextImpl.java  |  2 +
 .../apache/ignite/internal/IgniteKernal.java    |  1 +
 .../processors/query/GridQueryProcessor.java    | 80 +-------------------
 .../processors/rest/GridRestProcessor.java      |  3 +-
 .../IgniteScriptingCommandHandler.java          |  2 +-
 .../ignite/internal/util/GridJavaProcess.java   | 26 +++++--
 modules/json/pom.xml                            |  3 +-
 .../processors/json/JsonCacheObject.java        | 15 +++-
 modules/nodejs/pom.xml                          |  2 +-
 .../http/jetty/GridJettyRestHandler.java        |  9 ++-
 11 files changed, 51 insertions(+), 94 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/2139ef05/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java
b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java
index f813b04..c7f68f4 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java
@@ -48,6 +48,7 @@ import org.apache.ignite.internal.processors.igfs.IgfsHelper;
 import org.apache.ignite.internal.processors.igfs.IgfsProcessorAdapter;
 import org.apache.ignite.internal.processors.job.GridJobProcessor;
 import org.apache.ignite.internal.processors.jobmetrics.GridJobMetricsProcessor;
+import org.apache.ignite.internal.processors.json.IgniteJsonProcessor;
 import org.apache.ignite.internal.processors.offheap.GridOffHeapProcessor;
 import org.apache.ignite.internal.processors.platform.PlatformProcessor;
 import org.apache.ignite.internal.processors.plugin.IgnitePluginProcessor;
@@ -56,6 +57,7 @@ import org.apache.ignite.internal.processors.query.GridQueryProcessor;
 import org.apache.ignite.internal.processors.resource.GridResourceProcessor;
 import org.apache.ignite.internal.processors.rest.GridRestProcessor;
 import org.apache.ignite.internal.processors.schedule.IgniteScheduleProcessorAdapter;
+import org.apache.ignite.internal.processors.scripting.IgniteScriptingProcessor;
 import org.apache.ignite.internal.processors.security.GridSecurityProcessor;
 import org.apache.ignite.internal.processors.segmentation.GridSegmentationProcessor;
 import org.apache.ignite.internal.processors.service.GridServiceProcessor;

http://git-wip-us.apache.org/repos/asf/ignite/blob/2139ef05/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
index b2d5033..194d068 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
@@ -64,6 +64,7 @@ import org.apache.ignite.internal.processors.igfs.IgfsHelper;
 import org.apache.ignite.internal.processors.igfs.IgfsProcessorAdapter;
 import org.apache.ignite.internal.processors.job.GridJobProcessor;
 import org.apache.ignite.internal.processors.jobmetrics.GridJobMetricsProcessor;
+import org.apache.ignite.internal.processors.json.IgniteJsonProcessor;
 import org.apache.ignite.internal.processors.nodevalidation.DiscoveryNodeValidationProcessor;
 import org.apache.ignite.internal.processors.offheap.GridOffHeapProcessor;
 import org.apache.ignite.internal.processors.platform.PlatformProcessor;
@@ -73,6 +74,7 @@ import org.apache.ignite.internal.processors.query.GridQueryProcessor;
 import org.apache.ignite.internal.processors.resource.GridResourceProcessor;
 import org.apache.ignite.internal.processors.rest.GridRestProcessor;
 import org.apache.ignite.internal.processors.schedule.IgniteScheduleProcessorAdapter;
+import org.apache.ignite.internal.processors.scripting.IgniteScriptingProcessor;
 import org.apache.ignite.internal.processors.security.GridSecurityProcessor;
 import org.apache.ignite.internal.processors.segmentation.GridSegmentationProcessor;
 import org.apache.ignite.internal.processors.service.GridServiceProcessor;

http://git-wip-us.apache.org/repos/asf/ignite/blob/2139ef05/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
index 987b4cb..a0162bc 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
@@ -129,6 +129,7 @@ import org.apache.ignite.internal.processors.query.GridQueryProcessor;
 import org.apache.ignite.internal.processors.resource.GridResourceProcessor;
 import org.apache.ignite.internal.processors.resource.GridSpringResourceContext;
 import org.apache.ignite.internal.processors.rest.GridRestProcessor;
+import org.apache.ignite.internal.processors.scripting.IgniteScriptingProcessor;
 import org.apache.ignite.internal.processors.security.GridSecurityProcessor;
 import org.apache.ignite.internal.processors.segmentation.GridSegmentationProcessor;
 import org.apache.ignite.internal.processors.service.GridServiceProcessor;

http://git-wip-us.apache.org/repos/asf/ignite/blob/2139ef05/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 de65b1a..a2936df 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
@@ -279,7 +279,8 @@ public class GridQueryProcessor extends GridProcessorAdapter {
                             altTypeId = new TypeId(ccfg.getName(), valCls);
                     }
                     else if (ctx.json().jsonType(desc.keyClass()) || ctx.json().jsonType(desc.valueClass()))
{
-                        processJsonMeta(meta, desc);
+                        // TODO IGNITE-961
+                        // processJsonMeta(meta, desc);
 
                         typeId = new TypeId(ccfg.getName(), valCls);
 
@@ -1489,79 +1490,6 @@ public class GridQueryProcessor extends GridProcessorAdapter {
     }
 
     /**
-     * Processes declarative metadata for json object.
-     *
-     * @param meta Declared metadata.
-     * @param d Type descriptor.
-     * @throws IgniteCheckedException If failed.
-     */
-    private void processJsonMeta(CacheTypeMetadata meta, TypeDescriptor d)
-        throws IgniteCheckedException {
-        for (Map.Entry<String, Class<?>> entry : meta.getAscendingFields().entrySet())
{
-            JsonProperty prop = buildJsonProperty(entry.getKey(), entry.getValue());
-
-            d.addProperty(prop, false);
-
-            String idxName = prop.name() + "_idx";
-
-            d.addIndex(idxName, idx.isGeometryClass(prop.type()) ? GEO_SPATIAL : SORTED);
-
-            d.addFieldToIndex(idxName, prop.name(), 0, false);
-        }
-
-        for (Map.Entry<String, Class<?>> entry : meta.getDescendingFields().entrySet())
{
-            JsonProperty prop = buildJsonProperty(entry.getKey(), entry.getValue());
-
-            d.addProperty(prop, false);
-
-            String idxName = prop.name() + "_idx";
-
-            d.addIndex(idxName, idx.isGeometryClass(prop.type()) ? GEO_SPATIAL : SORTED);
-
-            d.addFieldToIndex(idxName, prop.name(), 0, true);
-        }
-
-        for (String txtIdx : meta.getTextFields()) {
-            JsonProperty prop = buildJsonProperty(txtIdx, String.class);
-
-            d.addProperty(prop, false);
-
-            d.addFieldToTextIndex(prop.name());
-        }
-
-        Map<String, LinkedHashMap<String, IgniteBiTuple<Class<?>, Boolean>>>
grps = meta.getGroups();
-
-        if (grps != null) {
-            for (Map.Entry<String, LinkedHashMap<String, IgniteBiTuple<Class<?>,
Boolean>>> entry : grps.entrySet()) {
-                String idxName = entry.getKey();
-
-                LinkedHashMap<String, IgniteBiTuple<Class<?>, Boolean>>
idxFields = entry.getValue();
-
-                int order = 0;
-
-                for (Map.Entry<String, IgniteBiTuple<Class<?>, Boolean>>
idxField : idxFields.entrySet()) {
-                    JsonProperty prop = buildJsonProperty(idxField.getKey(), idxField.getValue().get1());
-
-                    d.addProperty(prop, false);
-
-                    Boolean descending = idxField.getValue().get2();
-
-                    d.addFieldToIndex(idxName, prop.name(), order, descending != null &&
descending);
-
-                    order++;
-                }
-            }
-        }
-
-        for (Map.Entry<String, Class<?>> entry : meta.getQueryFields().entrySet())
{
-            JsonProperty prop = buildJsonProperty(entry.getKey(), entry.getValue());
-
-            if (!d.props.containsKey(prop.name()))
-                d.addProperty(prop, false);
-        }
-    }
-
-    /**
      * Builds portable object property.
      *
      * @param pathStr String representing path to the property. May contains dots '.' to
identify
@@ -2030,9 +1958,9 @@ public class GridQueryProcessor extends GridProcessorAdapter {
     }
 
     /**
-     *
+     * TODO IGNITE-961
      */
-    private class JsonProperty extends Property {
+    private class JsonProperty extends GridQueryProperty {
         /** Property name. */
         private String propName;
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/2139ef05/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestProcessor.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestProcessor.java
index d82cff9..cd2b6b4 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestProcessor.java
@@ -45,9 +45,10 @@ import org.apache.ignite.internal.processors.rest.handlers.GridRestCommandHandle
 import org.apache.ignite.internal.processors.rest.handlers.cache.GridCacheCommandHandler;
 import org.apache.ignite.internal.processors.rest.handlers.datastructures.DataStructuresCommandHandler;
 import org.apache.ignite.internal.processors.rest.handlers.query.QueryCommandHandler;
+import org.apache.ignite.internal.processors.rest.handlers.scripting.IgniteScriptingCommandHandler;
 import org.apache.ignite.internal.processors.rest.handlers.task.GridTaskCommandHandler;
 import org.apache.ignite.internal.processors.rest.handlers.top.GridTopologyCommandHandler;
-import org.apache.ignite.internal.processors.rest.handlers.version.GridVersionCommandHandler;
+import org.apache.ignite.internal.processors.rest.handlers.version.GridVersionNameCommandHandler;
 import org.apache.ignite.internal.processors.rest.protocols.tcp.GridTcpRestProtocol;
 import org.apache.ignite.internal.processors.rest.request.GridRestCacheRequest;
 import org.apache.ignite.internal.processors.rest.request.GridRestRequest;

http://git-wip-us.apache.org/repos/asf/ignite/blob/2139ef05/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 afca1c5..ed8b759 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
@@ -119,7 +119,7 @@ public class IgniteScriptingCommandHandler extends GridRestCommandHandlerAdapter
             init = true;
         }
         catch (IgniteCheckedException e) {
-            ctx.log().error(e.getMessage());
+            ctx.log(getClass()).error(e.getMessage());
         }
     }
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/2139ef05/modules/core/src/main/java/org/apache/ignite/internal/util/GridJavaProcess.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridJavaProcess.java
b/modules/core/src/main/java/org/apache/ignite/internal/util/GridJavaProcess.java
index cc7fb0c..11736fd 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridJavaProcess.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridJavaProcess.java
@@ -27,6 +27,7 @@ import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 import org.apache.ignite.IgniteLogger;
 import org.apache.ignite.internal.util.lang.GridAbsClosure;
 import org.apache.ignite.internal.util.typedef.internal.U;
@@ -87,8 +88,11 @@ public final class GridJavaProcess {
      * @return Wrapper around {@link Process}
      * @throws Exception If any problem occurred.
      */
-    public static GridJavaProcess exec(Class cls, String params, @Nullable IgniteLogger log,
-        @Nullable IgniteInClosure<String> printC, @Nullable GridAbsClosure procKilledC)
throws Exception {
+    public static GridJavaProcess exec(Class cls,
+        String params,
+        @Nullable IgniteLogger log,
+        @Nullable IgniteInClosure<String> printC,
+        @Nullable GridAbsClosure procKilledC) throws Exception {
         return exec(cls.getCanonicalName(), params, log, printC, procKilledC, null, null,
null);
     }
 
@@ -105,9 +109,13 @@ public final class GridJavaProcess {
      * @return Wrapper around {@link Process}
      * @throws Exception If any problem occurred.
      */
-    public static GridJavaProcess exec(Class cls, String params, @Nullable IgniteLogger log,
-        @Nullable IgniteInClosure<String> printC, @Nullable GridAbsClosure procKilledC,
-        @Nullable Collection<String> jvmArgs, @Nullable String cp) throws Exception
{
+    public static GridJavaProcess exec(Class cls,
+        String params,
+        @Nullable IgniteLogger log,
+        @Nullable IgniteInClosure<String> printC,
+        @Nullable GridAbsClosure procKilledC,
+        @Nullable Collection<String> jvmArgs,
+        @Nullable String cp) throws Exception {
         return exec(cls.getCanonicalName(), params, log, printC, procKilledC, null, jvmArgs,
cp);
     }
 
@@ -183,9 +191,11 @@ public final class GridJavaProcess {
      * @return Wrapper around {@link Process}
      * @throws Exception If any problem occurred.
      */
-    public static GridJavaProcess exec(List<String> cmd, Map<String, String>
env, @Nullable IgniteLogger log,
-        @Nullable IgniteInClosure<String> printC, @Nullable GridAbsClosure procKilledC)
-        throws Exception {
+    public static GridJavaProcess exec(List<String> cmd,
+        Map<String, String> env,
+        @Nullable IgniteLogger log,
+        @Nullable IgniteInClosure<String> printC,
+        @Nullable GridAbsClosure procKilledC) throws Exception {
         ProcessBuilder builder = new ProcessBuilder(cmd);
 
         builder.redirectErrorStream(true);

http://git-wip-us.apache.org/repos/asf/ignite/blob/2139ef05/modules/json/pom.xml
----------------------------------------------------------------------
diff --git a/modules/json/pom.xml b/modules/json/pom.xml
index 35863ac..33788d0 100644
--- a/modules/json/pom.xml
+++ b/modules/json/pom.xml
@@ -31,7 +31,8 @@
     </parent>
 
     <artifactId>ignite-json</artifactId>
-    <version>1.4.1-SNAPSHOT</version>
+    <version>1.5.0.final-SNAPSHOT</version>
+    <url>http://ignite.apache.org</url>
 
     <dependencies>
         <dependency>

http://git-wip-us.apache.org/repos/asf/ignite/blob/2139ef05/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 b266eb5..9cb13c4 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
@@ -24,7 +24,7 @@ import org.jetbrains.annotations.*;
 import javax.json.*;
 
 /**
- *
+ * TODO IGNITE-961
  */
 public class JsonCacheObject extends CacheObjectAdapter implements KeyCacheObject {
     /**
@@ -42,7 +42,14 @@ public class JsonCacheObject extends CacheObjectAdapter implements KeyCacheObjec
     }
 
     /** {@inheritDoc} */
-    @Override public byte type() {
+    @Override public boolean isPlatformType() {
+        // TODO IGNITE-961
+        return false;
+    }
+
+    /** {@inheritDoc} */
+    @Override public byte cacheObjectType() {
+        // TODO IGNITE-961
         return 10;
     }
 
@@ -103,13 +110,13 @@ public class JsonCacheObject extends CacheObjectAdapter implements KeyCacheObjec
 
     /** {@inheritDoc}*/
     @Override public int hashCode() {
-        //TODO: do correct
+        // TODO IGNITE-961
         return val.hashCode();
     }
 
     /** {@inheritDoc}*/
     @Override public boolean equals(Object obj) {
-        //TODO: do correct
+        // TODO IGNITE-961
         if (obj == null || !(obj instanceof JsonCacheObject))
             return false;
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/2139ef05/modules/nodejs/pom.xml
----------------------------------------------------------------------
diff --git a/modules/nodejs/pom.xml b/modules/nodejs/pom.xml
index aa649f1..abfa333 100644
--- a/modules/nodejs/pom.xml
+++ b/modules/nodejs/pom.xml
@@ -31,7 +31,7 @@
     </parent>
 
     <artifactId>ignite-nodejs</artifactId>
-    <version>1.4.1-SNAPSHOT</version>
+    <version>1.5.0.final-SNAPSHOT</version>
 
     <dependencies>
         <dependency>

http://git-wip-us.apache.org/repos/asf/ignite/blob/2139ef05/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 95a385a..a0dd648 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
@@ -24,7 +24,9 @@ import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.LineNumberReader;
 import java.net.InetSocketAddress;
+import java.util.ArrayList;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
@@ -52,13 +54,16 @@ import org.apache.ignite.internal.processors.rest.request.GridRestLogRequest;
 import org.apache.ignite.internal.processors.rest.request.GridRestRequest;
 import org.apache.ignite.internal.processors.rest.request.GridRestTaskRequest;
 import org.apache.ignite.internal.processors.rest.request.GridRestTopologyRequest;
+import org.apache.ignite.internal.processors.rest.request.RestMapReduceScriptRequest;
 import org.apache.ignite.internal.processors.rest.request.RestQueryRequest;
+import org.apache.ignite.internal.processors.rest.request.RestRunScriptRequest;
 import org.apache.ignite.internal.util.typedef.F;
 import org.apache.ignite.internal.util.typedef.internal.U;
 import org.apache.ignite.lang.IgniteClosure;
 import org.apache.ignite.plugin.security.SecurityCredentials;
 import org.eclipse.jetty.server.Request;
 import org.eclipse.jetty.server.handler.AbstractHandler;
+import org.glassfish.json.JsonProviderImpl;
 import org.jetbrains.annotations.Nullable;
 
 import static org.apache.ignite.internal.processors.rest.GridRestCommand.CACHE_CONTAINS_KEYS;
@@ -75,11 +80,11 @@ import static org.apache.ignite.internal.processors.rest.GridRestResponse.STATUS
 public class GridJettyRestHandler extends AbstractHandler {
     /** JSON value processor that does not transform input object. */
     private static final JsonValueProcessor SKIP_STR_VAL_PROC = new JsonValueProcessor()
{
-        @Override public Object processArrayValue(Object o, JsonConfig jsonConfig) {
+        @Override public Object processArrayValue(Object o, JsonConfig jsonCfg) {
             return o;
         }
 
-        @Override public Object processObjectValue(String s, Object o, JsonConfig jsonConfig)
{
+        @Override public Object processObjectValue(String s, Object o, JsonConfig jsonCfg)
{
             return o;
         }
     };


Mime
View raw message