You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vo...@apache.org on 2016/08/24 14:05:07 UTC

[44/50] [abbrv] ignite git commit: Cleanup.

Cleanup.


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

Branch: refs/heads/ignite-2649
Commit: 2cc423b2de360901960ef616062da9f386e09562
Parents: 28c4d93
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Wed Aug 24 16:26:22 2016 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Wed Aug 24 16:26:22 2016 +0300

----------------------------------------------------------------------
 .../ignite/internal/binary/BinaryUtils.java     |  4 +-
 .../ignite/marshaller/MarshallerUtils.java      | 97 ++++++++++----------
 .../spi/checkpoint/sharedfs/SharedFsUtils.java  |  2 +-
 .../ignite/spi/discovery/tcp/ClientImpl.java    |  8 +-
 .../ignite/spi/discovery/tcp/ServerImpl.java    |  4 +-
 .../spi/discovery/tcp/TcpDiscoverySpi.java      |  4 +-
 6 files changed, 60 insertions(+), 59 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/2cc423b2/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java
index 0ce4916..5b048cd 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java
@@ -1590,8 +1590,8 @@ public class BinaryUtils {
         ByteArrayInputStream input = new ByteArrayInputStream(in.array(), in.position(), len);
 
         try {
-            return MarshallerUtils.unmarshal(ctx.optimizedMarsh(), input,
-                U.resolveClassLoader(clsLdr, ctx.configuration()), ctx.configuration().getGridName());
+            return MarshallerUtils.unmarshal(ctx.configuration().getGridName(), ctx.optimizedMarsh(), input,
+                U.resolveClassLoader(clsLdr, ctx.configuration()));
         }
         catch (IgniteCheckedException e) {
             throw new BinaryObjectException("Failed to unmarshal object with optimized marshaller", e);

http://git-wip-us.apache.org/repos/asf/ignite/blob/2cc423b2/modules/core/src/main/java/org/apache/ignite/marshaller/MarshallerUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/MarshallerUtils.java b/modules/core/src/main/java/org/apache/ignite/marshaller/MarshallerUtils.java
index 5651766..fd13937 100644
--- a/modules/core/src/main/java/org/apache/ignite/marshaller/MarshallerUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/marshaller/MarshallerUtils.java
@@ -29,7 +29,7 @@ import java.io.OutputStream;
 /**
  * Utility marshaller methods.
  */
-public final class MarshallerUtils {
+public class MarshallerUtils {
     /**
      * Marshal object with provided node name.
      *
@@ -40,10 +40,10 @@ public final class MarshallerUtils {
      * @throws IgniteCheckedException If failed.
      */
     public static byte[] marshal(String name, Marshaller marsh, @Nullable Object obj) throws IgniteCheckedException {
-        final LocalGridName gridNameTl = gridName();
+        LocalGridName gridNameTl = gridName();
 
-        final String gridNameStr = gridNameTl.getGridName();
-        final boolean init = gridNameTl.isSet();
+        String gridNameStr = gridNameTl.getGridName();
+        boolean init = gridNameTl.isSet();
 
         try {
             gridNameTl.setGridName(true, name);
@@ -64,18 +64,19 @@ public final class MarshallerUtils {
      * @param out Output stream.
      * @throws IgniteCheckedException If fail.
      */
-    public static void marshal(final String name, final Marshaller marshaller, final @Nullable Object obj,
-        final OutputStream out) throws IgniteCheckedException {
-        final LocalGridName gridNameTl = gridName();
+    public static void marshal(String name, Marshaller marshaller, @Nullable Object obj, OutputStream out)
+        throws IgniteCheckedException {
+        LocalGridName gridNameTl = gridName();
 
-        final String gridNameStr = gridNameTl.getGridName();
-        final boolean init = gridNameTl.isSet();
+        String gridNameStr = gridNameTl.getGridName();
+        boolean init = gridNameTl.isSet();
 
         try {
             gridNameTl.setGridName(true, name);
 
             marshaller.marshal(obj, out);
-        } finally {
+        }
+        finally {
             gridNameTl.setGridName(init, gridNameStr);
         }
     }
@@ -107,26 +108,26 @@ public final class MarshallerUtils {
     /**
      * Unmarshal object from stream and set grid name thread local.
      *
-     * @param marshaller Marshaller.
+     * @param name Grid name.
+     * @param marsh Marshaller.
      * @param in Input stream.
-     * @param clsLdr Class loader.
-     * @param gridName Grid name.
-     * @param <T> Target type.
+     * @param ldr Class loader.
      * @return Deserialized object.
      * @throws IgniteCheckedException If failed.
      */
-    public static <T> T unmarshal(final Marshaller marshaller, InputStream in, @Nullable ClassLoader clsLdr,
-        final String gridName) throws IgniteCheckedException {
-        final LocalGridName gridNameTl = gridName();
+    public static <T> T unmarshal(String name, Marshaller marsh, InputStream in, @Nullable ClassLoader ldr)
+        throws IgniteCheckedException {
+        LocalGridName gridNameTl = gridName();
 
-        final String gridNameStr = gridNameTl.getGridName();
-        final boolean init = gridNameTl.isSet();
+        String gridNameStr = gridNameTl.getGridName();
+        boolean init = gridNameTl.isSet();
 
         try {
-            gridNameTl.setGridName(true, gridName);
+            gridNameTl.setGridName(true, name);
 
-            return marshaller.unmarshal(in, clsLdr);
-        } finally {
+            return marsh.unmarshal(in, ldr);
+        }
+        finally {
             gridNameTl.setGridName(init, gridNameStr);
         }
     }
@@ -134,26 +135,26 @@ public final class MarshallerUtils {
     /**
      * Unmarshal object and set grid name thread local.
      *
-     * @param marshaller Marshaller.
-     * @param arr Bianry data.
-     * @param clsLdr Class loader.
-     * @param gridName Grid name.
-     * @param <T> Target type
+     * @param marsh Marshaller.
+     * @param arr Binary data.
+     * @param ldr Class loader.
+     * @param name Grid name.
      * @return Deserialized object.
-     * @throws IgniteCheckedException If fail.
+     * @throws IgniteCheckedException If failed.
      */
-    public static <T> T unmarshal(final Marshaller marshaller, byte[] arr, @Nullable ClassLoader clsLdr,
-        final String gridName) throws IgniteCheckedException {
-        final LocalGridName gridNameTl = gridName();
+    public static <T> T unmarshal( Marshaller marsh, byte[] arr, @Nullable ClassLoader ldr,
+        String name) throws IgniteCheckedException {
+        LocalGridName gridNameTl = gridName();
 
-        final String gridNameStr = gridNameTl.getGridName();
-        final boolean init = gridNameTl.isSet();
+        String gridNameStr = gridNameTl.getGridName();
+        boolean init = gridNameTl.isSet();
 
         try {
-            gridNameTl.setGridName(true, gridName);
+            gridNameTl.setGridName(true, name);
 
-            return marshaller.unmarshal(arr, clsLdr);
-        } finally {
+            return marsh.unmarshal(arr, ldr);
+        }
+        finally {
             gridNameTl.setGridName(init, gridNameStr);
         }
     }
@@ -161,26 +162,26 @@ public final class MarshallerUtils {
     /**
      * Marshal and unmarshal object.
      *
-     * @param <T> Target type.
-     * @param gridName Grid name.
-     * @param marshaller Marshaller.
+     * @param name Grid name.
+     * @param marsh Marshaller.
      * @param obj Object to clone.
      * @param clsLdr Class loader.
      * @return Deserialized value.
-     * @throws IgniteCheckedException If fail.
+     * @throws IgniteCheckedException If failed.
      */
-    public static <T> T marshalUnmarshal(final String gridName, final Marshaller marshaller, T obj,
-        @Nullable ClassLoader clsLdr) throws IgniteCheckedException {
-        final LocalGridName gridNameTl = gridName();
+    public static <T> T marshalUnmarshal(String name, Marshaller marsh, T obj, @Nullable ClassLoader clsLdr)
+        throws IgniteCheckedException {
+        LocalGridName gridNameTl = gridName();
 
-        final String gridNameStr = gridNameTl.getGridName();
-        final boolean init = gridNameTl.isSet();
+        String gridNameStr = gridNameTl.getGridName();
+        boolean init = gridNameTl.isSet();
 
         try {
-            gridNameTl.setGridName(true, gridName);
+            gridNameTl.setGridName(true, name);
 
-            return marshaller.unmarshal(marshaller.marshal(obj), clsLdr);
-        } finally {
+            return marsh.unmarshal(marsh.marshal(obj), clsLdr);
+        }
+        finally {
             gridNameTl.setGridName(init, gridNameStr);
         }
     }

http://git-wip-us.apache.org/repos/asf/ignite/blob/2cc423b2/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/sharedfs/SharedFsUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/sharedfs/SharedFsUtils.java b/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/sharedfs/SharedFsUtils.java
index f25bad3..29a6a36 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/sharedfs/SharedFsUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/sharedfs/SharedFsUtils.java
@@ -63,7 +63,7 @@ final class SharedFsUtils {
         InputStream in = new FileInputStream(file);
 
         try {
-            return (SharedFsCheckpointData) MarshallerUtils.unmarshal(m, in, U.gridClassLoader(), igniteCfg.getGridName());
+            return (SharedFsCheckpointData) MarshallerUtils.unmarshal(igniteCfg.getGridName(), m, in, U.gridClassLoader());
         }
         finally {
             U.close(in, log);

http://git-wip-us.apache.org/repos/asf/ignite/blob/2cc423b2/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java
index 67e7798..60d4131 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java
@@ -887,8 +887,8 @@ class ClientImpl extends TcpDiscoveryImpl {
                         TcpDiscoveryAbstractMessage msg;
 
                         try {
-                            msg = MarshallerUtils.unmarshal(spi.marsh, in,
-                                U.resolveClassLoader(spi.ignite().configuration()), spi.ignite().configuration().getGridName());
+                            msg = MarshallerUtils.unmarshal(spi.ignite().configuration().getGridName(), spi.marsh, in,
+                                U.resolveClassLoader(spi.ignite().configuration()));
                         }
                         catch (IgniteCheckedException e) {
                             if (log.isDebugEnabled())
@@ -1213,8 +1213,8 @@ class ClientImpl extends TcpDiscoveryImpl {
                         List<TcpDiscoveryAbstractMessage> msgs = null;
 
                         while (!isInterrupted()) {
-                            TcpDiscoveryAbstractMessage msg = MarshallerUtils.unmarshal(spi.marsh, in,
-                                U.resolveClassLoader(spi.ignite().configuration()), spi.ignite().configuration().getGridName());
+                            TcpDiscoveryAbstractMessage msg = MarshallerUtils.unmarshal(spi.ignite().configuration().getGridName(), spi.marsh, in,
+                                U.resolveClassLoader(spi.ignite().configuration()));
 
                             if (msg instanceof TcpDiscoveryClientReconnectMessage) {
                                 TcpDiscoveryClientReconnectMessage res = (TcpDiscoveryClientReconnectMessage)msg;

http://git-wip-us.apache.org/repos/asf/ignite/blob/2cc423b2/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
index 97696cb..00657db 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
@@ -5437,8 +5437,8 @@ class ServerImpl extends TcpDiscoveryImpl {
 
                 while (!isInterrupted()) {
                     try {
-                        TcpDiscoveryAbstractMessage msg = MarshallerUtils.unmarshal(spi.marsh, in,
-                            U.resolveClassLoader(spi.ignite().configuration()), spi.ignite().configuration().getGridName());
+                        TcpDiscoveryAbstractMessage msg = MarshallerUtils.unmarshal(spi.ignite().configuration().getGridName(), spi.marsh, in,
+                            U.resolveClassLoader(spi.ignite().configuration()));
 
                         msg.senderNodeId(nodeId);
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/2cc423b2/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
index 9e4669a..368480f 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
@@ -1462,8 +1462,8 @@ public class TcpDiscoverySpi extends IgniteSpiAdapter implements DiscoverySpi, T
         try {
             sock.setSoTimeout((int)timeout);
 
-            return MarshallerUtils.unmarshal(marsh, in == null ? sock.getInputStream() : in,
-                U.resolveClassLoader(ignite.configuration()), ignite.configuration().getGridName());
+            return MarshallerUtils.unmarshal(ignite.configuration().getGridName(), marsh, in == null ? sock.getInputStream() : in,
+                U.resolveClassLoader(ignite.configuration()));
         }
         catch (IOException | IgniteCheckedException e) {
             if (X.hasCause(e, SocketTimeoutException.class))