ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [10/11] incubator-ignite git commit: # Renaming
Date Fri, 05 Dec 2014 09:29:52 GMT
# Renaming


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

Branch: refs/heads/master
Commit: c59f1bb171d9719aac2c0592f7f77b7bcbe3809a
Parents: 503efc8
Author: sboikov <sboikov@gridgain.com>
Authored: Fri Dec 5 12:24:32 2014 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Fri Dec 5 12:24:32 2014 +0300

----------------------------------------------------------------------
 .../ClientConnectionConfiguration.java          |  8 ++---
 .../configuration/IgniteConfiguration.java      | 10 +++---
 .../gridgain/grid/ClientMessageInterceptor.java | 37 ++++++++++++++++++++
 .../grid/GridClientMessageInterceptor.java      | 37 --------------------
 .../processors/rest/GridRestProcessor.java      | 10 +++---
 .../grid/kernal/GridLifecycleAwareSelfTest.java |  2 +-
 6 files changed, 52 insertions(+), 52 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c59f1bb1/modules/core/src/main/java/org/apache/ignite/configuration/ClientConnectionConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/ClientConnectionConfiguration.java
b/modules/core/src/main/java/org/apache/ignite/configuration/ClientConnectionConfiguration.java
index 59c1ae4..30f53b0 100644
--- a/modules/core/src/main/java/org/apache/ignite/configuration/ClientConnectionConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/ClientConnectionConfiguration.java
@@ -102,7 +102,7 @@ public class ClientConnectionConfiguration {
     private boolean restSvcShutdown = true;
 
     /** Client message interceptor. */
-    private GridClientMessageInterceptor clientMsgInterceptor;
+    private ClientMessageInterceptor clientMsgInterceptor;
 
     /**
      * Creates client connection configuration with all default values.
@@ -547,10 +547,10 @@ public class ClientConnectionConfiguration {
      * <p>
      * Default value is {@code null}.
      *
-     * @see GridClientMessageInterceptor
+     * @see org.gridgain.grid.ClientMessageInterceptor
      * @return Interceptor.
      */
-    @Nullable public GridClientMessageInterceptor getClientMessageInterceptor() {
+    @Nullable public ClientMessageInterceptor getClientMessageInterceptor() {
         return clientMsgInterceptor;
     }
 
@@ -564,7 +564,7 @@ public class ClientConnectionConfiguration {
      *
      * @param interceptor Interceptor.
      */
-    public void setClientMessageInterceptor(GridClientMessageInterceptor interceptor) {
+    public void setClientMessageInterceptor(ClientMessageInterceptor interceptor) {
         clientMsgInterceptor = interceptor;
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c59f1bb1/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
index 7f5fab0..6b0c951 100644
--- a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
@@ -508,7 +508,7 @@ public class IgniteConfiguration {
     private IgniteFsConfiguration[] ggfsCfg;
 
     /** Client message interceptor. */
-    private GridClientMessageInterceptor clientMsgInterceptor;
+    private ClientMessageInterceptor clientMsgInterceptor;
 
     /** Streamer configuration. */
     private GridStreamerConfiguration[] streamerCfg;
@@ -2953,12 +2953,12 @@ public class IgniteConfiguration {
      * <p>
      * Default value is {@code null}.
      *
-     * @see GridClientMessageInterceptor
+     * @see org.gridgain.grid.ClientMessageInterceptor
      * @return Interceptor.
      * @deprecated Use {@link ClientConnectionConfiguration#getClientMessageInterceptor()}.
      */
     @Deprecated
-    public GridClientMessageInterceptor getClientMessageInterceptor() {
+    public ClientMessageInterceptor getClientMessageInterceptor() {
         return clientMsgInterceptor;
     }
 
@@ -2971,10 +2971,10 @@ public class IgniteConfiguration {
      * access them from java code directly.
      *
      * @param interceptor Interceptor.
-     * @deprecated Use {@link ClientConnectionConfiguration#setClientMessageInterceptor(GridClientMessageInterceptor)}.
+     * @deprecated Use {@link ClientConnectionConfiguration#setClientMessageInterceptor(org.gridgain.grid.ClientMessageInterceptor)}.
      */
     @Deprecated
-    public void setClientMessageInterceptor(GridClientMessageInterceptor interceptor) {
+    public void setClientMessageInterceptor(ClientMessageInterceptor interceptor) {
         clientMsgInterceptor = interceptor;
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c59f1bb1/modules/core/src/main/java/org/gridgain/grid/ClientMessageInterceptor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/ClientMessageInterceptor.java b/modules/core/src/main/java/org/gridgain/grid/ClientMessageInterceptor.java
new file mode 100644
index 0000000..9f86807
--- /dev/null
+++ b/modules/core/src/main/java/org/gridgain/grid/ClientMessageInterceptor.java
@@ -0,0 +1,37 @@
+/* @java.file.header */
+
+/*  _________        _____ __________________        _____
+ *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
+ *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
+ *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
+ *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
+ */
+
+package org.gridgain.grid;
+
+import org.jetbrains.annotations.*;
+
+/**
+ * Interface for user-defined object interceptors.
+ * <p>
+ * Interceptors allow user to transform objects send and received via REST protocols.
+ * For example they could be used for customized multi-language marshalling by
+ * converting binary object representation received from client to java object.
+ */
+public interface ClientMessageInterceptor {
+    /**
+     * Intercepts received objects.
+     *
+     * @param obj Original incoming object.
+     * @return Object which should replace original in later processing.
+     */
+    @Nullable public Object onReceive(@Nullable Object obj);
+
+    /**
+     * Intercepts received objects.
+     *
+     * @param obj Original incoming object.
+     * @return Object which should be send to remote client instead of original.
+     */
+    @Nullable public Object onSend(Object obj);
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c59f1bb1/modules/core/src/main/java/org/gridgain/grid/GridClientMessageInterceptor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/GridClientMessageInterceptor.java
b/modules/core/src/main/java/org/gridgain/grid/GridClientMessageInterceptor.java
deleted file mode 100644
index 065049d..0000000
--- a/modules/core/src/main/java/org/gridgain/grid/GridClientMessageInterceptor.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/* @java.file.header */
-
-/*  _________        _____ __________________        _____
- *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
- *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
- *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
- *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
- */
-
-package org.gridgain.grid;
-
-import org.jetbrains.annotations.*;
-
-/**
- * Interface for user-defined object interceptors.
- * <p>
- * Interceptors allow user to transform objects send and received via REST protocols.
- * For example they could be used for customized multi-language marshalling by
- * converting binary object representation received from client to java object.
- */
-public interface GridClientMessageInterceptor {
-    /**
-     * Intercepts received objects.
-     *
-     * @param obj Original incoming object.
-     * @return Object which should replace original in later processing.
-     */
-    @Nullable public Object onReceive(@Nullable Object obj);
-
-    /**
-     * Intercepts received objects.
-     *
-     * @param obj Original incoming object.
-     * @return Object which should be send to remote client instead of original.
-     */
-    @Nullable public Object onSend(Object obj);
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c59f1bb1/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/GridRestProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/GridRestProcessor.java
b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/GridRestProcessor.java
index d024d0a..7c9579a 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/GridRestProcessor.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/GridRestProcessor.java
@@ -321,14 +321,14 @@ public class GridRestProcessor extends GridProcessorAdapter {
     }
 
     /**
-     * Applies {@link GridClientMessageInterceptor}
+     * Applies {@link org.gridgain.grid.ClientMessageInterceptor}
      * from {@link org.apache.ignite.configuration.ClientConnectionConfiguration#getClientMessageInterceptor()}
      * to all user parameters in the request.
      *
      * @param req Client request.
      */
     private void interceptRequest(GridRestRequest req) {
-        GridClientMessageInterceptor interceptor = config().getClientMessageInterceptor();
+        ClientMessageInterceptor interceptor = config().getClientMessageInterceptor();
 
         if (interceptor == null)
             return;
@@ -368,7 +368,7 @@ public class GridRestProcessor extends GridProcessorAdapter {
     }
 
     /**
-     * Applies {@link GridClientMessageInterceptor} from
+     * Applies {@link org.gridgain.grid.ClientMessageInterceptor} from
      * {@link org.apache.ignite.configuration.ClientConnectionConfiguration#getClientMessageInterceptor()}
      * to all user objects in the response.
      *
@@ -376,7 +376,7 @@ public class GridRestProcessor extends GridProcessorAdapter {
      * @param req Request.
      */
     private void interceptResponse(GridRestResponse res, GridRestRequest req) {
-        GridClientMessageInterceptor interceptor = config().getClientMessageInterceptor();
+        ClientMessageInterceptor interceptor = config().getClientMessageInterceptor();
 
         if (interceptor != null && res.getResponse() != null) {
             switch (req.command()) {
@@ -420,7 +420,7 @@ public class GridRestProcessor extends GridProcessorAdapter {
      * @param interceptor Interceptor to apply.
      * @return Intercepted object.
      */
-    private static Object interceptSendObject(Object obj, GridClientMessageInterceptor interceptor)
{
+    private static Object interceptSendObject(Object obj, ClientMessageInterceptor interceptor)
{
         if (obj instanceof Map) {
             Map<Object, Object> original = (Map<Object, Object>)obj;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c59f1bb1/modules/core/src/test/java/org/gridgain/grid/kernal/GridLifecycleAwareSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridLifecycleAwareSelfTest.java
b/modules/core/src/test/java/org/gridgain/grid/kernal/GridLifecycleAwareSelfTest.java
index f6d78f0..8bde51f 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridLifecycleAwareSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridLifecycleAwareSelfTest.java
@@ -28,7 +28,7 @@ public class GridLifecycleAwareSelfTest extends GridAbstractLifecycleAwareSelfTe
     /**
      */
     private static class TestClientMessageInterceptor extends TestLifecycleAware
-        implements GridClientMessageInterceptor {
+        implements ClientMessageInterceptor {
         /**
          */
         TestClientMessageInterceptor() {


Mime
View raw message