You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2014/12/05 10:29:53 UTC
[11/11] incubator-ignite git commit: # Renaming
# 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/76094f00
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/76094f00
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/76094f00
Branch: refs/heads/master
Commit: 76094f009213dc390bb1b32a2b45305c4ca6abde
Parents: c59f1bb
Author: sboikov <sb...@gridgain.com>
Authored: Fri Dec 5 12:29:30 2014 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Fri Dec 5 12:29:30 2014 +0300
----------------------------------------------------------------------
.../ClientConnectionConfiguration.java | 3 +-
.../configuration/ClientMessageInterceptor.java | 37 ++++++++++++++++++++
.../configuration/IgniteConfiguration.java | 4 +--
.../gridgain/grid/ClientMessageInterceptor.java | 37 --------------------
.../processors/rest/GridRestProcessor.java | 4 +--
5 files changed, 42 insertions(+), 43 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/76094f00/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 30f53b0..3a0d9c3 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
@@ -10,7 +10,6 @@
package org.apache.ignite.configuration;
import org.gridgain.client.ssl.*;
-import org.gridgain.grid.*;
import org.jetbrains.annotations.*;
import java.net.*;
@@ -547,7 +546,7 @@ public class ClientConnectionConfiguration {
* <p>
* Default value is {@code null}.
*
- * @see org.gridgain.grid.ClientMessageInterceptor
+ * @see ClientMessageInterceptor
* @return Interceptor.
*/
@Nullable public ClientMessageInterceptor getClientMessageInterceptor() {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/76094f00/modules/core/src/main/java/org/apache/ignite/configuration/ClientMessageInterceptor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/ClientMessageInterceptor.java b/modules/core/src/main/java/org/apache/ignite/configuration/ClientMessageInterceptor.java
new file mode 100644
index 0000000..137d872
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/ClientMessageInterceptor.java
@@ -0,0 +1,37 @@
+/* @java.file.header */
+
+/* _________ _____ __________________ _____
+ * __ ____/___________(_)______ /__ ____/______ ____(_)_______
+ * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \
+ * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / /
+ * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/
+ */
+
+package org.apache.ignite.configuration;
+
+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/76094f00/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 6b0c951..81bfc48 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
@@ -2953,7 +2953,7 @@ public class IgniteConfiguration {
* <p>
* Default value is {@code null}.
*
- * @see org.gridgain.grid.ClientMessageInterceptor
+ * @see ClientMessageInterceptor
* @return Interceptor.
* @deprecated Use {@link ClientConnectionConfiguration#getClientMessageInterceptor()}.
*/
@@ -2971,7 +2971,7 @@ public class IgniteConfiguration {
* access them from java code directly.
*
* @param interceptor Interceptor.
- * @deprecated Use {@link ClientConnectionConfiguration#setClientMessageInterceptor(org.gridgain.grid.ClientMessageInterceptor)}.
+ * @deprecated Use {@link ClientConnectionConfiguration#setClientMessageInterceptor(ClientMessageInterceptor)}.
*/
@Deprecated
public void setClientMessageInterceptor(ClientMessageInterceptor interceptor) {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/76094f00/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
deleted file mode 100644
index 9f86807..0000000
--- a/modules/core/src/main/java/org/gridgain/grid/ClientMessageInterceptor.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 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/76094f00/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 7c9579a..764ca67 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,7 +321,7 @@ public class GridRestProcessor extends GridProcessorAdapter {
}
/**
- * Applies {@link org.gridgain.grid.ClientMessageInterceptor}
+ * Applies {@link org.apache.ignite.configuration.ClientMessageInterceptor}
* from {@link org.apache.ignite.configuration.ClientConnectionConfiguration#getClientMessageInterceptor()}
* to all user parameters in the request.
*
@@ -368,7 +368,7 @@ public class GridRestProcessor extends GridProcessorAdapter {
}
/**
- * Applies {@link org.gridgain.grid.ClientMessageInterceptor} from
+ * Applies {@link org.apache.ignite.configuration.ClientMessageInterceptor} from
* {@link org.apache.ignite.configuration.ClientConnectionConfiguration#getClientMessageInterceptor()}
* to all user objects in the response.
*