ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [06/32] incubator-ignite git commit: # Renaming
Date Fri, 05 Dec 2014 10:03:07 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/97b9e4e2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/97b9e4e2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/97b9e4e2

Branch: refs/heads/master
Commit: 97b9e4e2e3951966cb135aaed8f563cd193ba513
Parents: 45a6cab
Author: sboikov <sboikov@gridgain.com>
Authored: Fri Dec 5 12:38:31 2014 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Fri Dec 5 12:38:31 2014 +0300

----------------------------------------------------------------------
 .../configuration/GridAddressResolver.java      | 35 --------------------
 .../configuration/IgniteAddressResolver.java    | 35 ++++++++++++++++++++
 .../configuration/IgniteConfiguration.java      |  6 ++--
 .../resource/GridResourceProcessor.java         |  2 +-
 .../tcp/GridTcpCommunicationSpi.java            |  6 ++--
 .../spi/discovery/tcp/GridTcpDiscoverySpi.java  |  6 ++--
 .../java/org/gridgain/grid/util/GridUtils.java  |  2 +-
 .../grid/spi/GridTcpSpiForwardingSelfTest.java  |  2 +-
 8 files changed, 47 insertions(+), 47 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/97b9e4e2/modules/core/src/main/java/org/apache/ignite/configuration/GridAddressResolver.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/GridAddressResolver.java
b/modules/core/src/main/java/org/apache/ignite/configuration/GridAddressResolver.java
deleted file mode 100644
index 1e6cb41..0000000
--- a/modules/core/src/main/java/org/apache/ignite/configuration/GridAddressResolver.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/* @java.file.header */
-
-/*  _________        _____ __________________        _____
- *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
- *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
- *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
- *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
- */
-
-package org.apache.ignite.configuration;
-
-import org.gridgain.grid.*;
-
-import java.net.*;
-import java.util.*;
-
-/**
- * Provides resolution between external and internal addresses. In some cases
- * network routers are configured to perform address mapping between external
- * and internal networks and the same mapping must be available to SPIs
- * in GridGain that perform communication over IP protocols.
- */
-public interface GridAddressResolver {
-    /**
-     * Maps internal address to a collection of external addresses.
-     *
-     * @param addr Internal (local) address.
-     * @return Collection of addresses that this local address is "known" outside.
-     *      Note that if there are more than one external network the local address
-     *      can be mapped differently to each and therefore may need to return
-     *      multiple external addresses.
-     * @throws org.gridgain.grid.GridException Thrown if any exception occurs.
-     */
-    public Collection<InetSocketAddress> getExternalAddresses(InetSocketAddress addr)
throws GridException;
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/97b9e4e2/modules/core/src/main/java/org/apache/ignite/configuration/IgniteAddressResolver.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteAddressResolver.java
b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteAddressResolver.java
new file mode 100644
index 0000000..99d308a
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteAddressResolver.java
@@ -0,0 +1,35 @@
+/* @java.file.header */
+
+/*  _________        _____ __________________        _____
+ *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
+ *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
+ *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
+ *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
+ */
+
+package org.apache.ignite.configuration;
+
+import org.gridgain.grid.*;
+
+import java.net.*;
+import java.util.*;
+
+/**
+ * Provides resolution between external and internal addresses. In some cases
+ * network routers are configured to perform address mapping between external
+ * and internal networks and the same mapping must be available to SPIs
+ * in GridGain that perform communication over IP protocols.
+ */
+public interface IgniteAddressResolver {
+    /**
+     * Maps internal address to a collection of external addresses.
+     *
+     * @param addr Internal (local) address.
+     * @return Collection of addresses that this local address is "known" outside.
+     *      Note that if there are more than one external network the local address
+     *      can be mapped differently to each and therefore may need to return
+     *      multiple external addresses.
+     * @throws org.gridgain.grid.GridException Thrown if any exception occurs.
+     */
+    public Collection<InetSocketAddress> getExternalAddresses(InetSocketAddress addr)
throws GridException;
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/97b9e4e2/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 81bfc48..cfcf524 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
@@ -387,7 +387,7 @@ public class IgniteConfiguration {
     private GridIndexingSpi[] indexingSpi;
 
     /** Address resolver. */
-    private GridAddressResolver addrRslvr;
+    private IgniteAddressResolver addrRslvr;
 
     /** Cache configurations. */
     private GridCacheConfiguration[] cacheCfg;
@@ -2202,7 +2202,7 @@ public class IgniteConfiguration {
      *
      * @return Address resolver.
      */
-    public GridAddressResolver getAddressResolver() {
+    public IgniteAddressResolver getAddressResolver() {
         return addrRslvr;
     }
 
@@ -2211,7 +2211,7 @@ public class IgniteConfiguration {
      *
      * @param addrRslvr Address resolver.
      */
-    public void setAddressResolver(GridAddressResolver addrRslvr) {
+    public void setAddressResolver(IgniteAddressResolver addrRslvr) {
         this.addrRslvr = addrRslvr;
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/97b9e4e2/modules/core/src/main/java/org/gridgain/grid/kernal/processors/resource/GridResourceProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/resource/GridResourceProcessor.java
b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/resource/GridResourceProcessor.java
index 8ae3de5..d96d326 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/resource/GridResourceProcessor.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/resource/GridResourceProcessor.java
@@ -106,7 +106,7 @@ public class GridResourceProcessor extends GridProcessorAdapter {
     private GridResourceBasicInjector<Collection<ManagedService>> srvcInjector;
 
     /** Address resolver injector. */
-    private GridResourceBasicInjector<GridAddressResolver> addrsRslvrInjector;
+    private GridResourceBasicInjector<IgniteAddressResolver> addrsRslvrInjector;
 
     /** Spring bean resources injector. */
     private GridResourceInjector springBeanInjector;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/97b9e4e2/modules/core/src/main/java/org/gridgain/grid/spi/communication/tcp/GridTcpCommunicationSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/communication/tcp/GridTcpCommunicationSpi.java
b/modules/core/src/main/java/org/gridgain/grid/spi/communication/tcp/GridTcpCommunicationSpi.java
index 2990953..bec2b6d 100644
--- a/modules/core/src/main/java/org/gridgain/grid/spi/communication/tcp/GridTcpCommunicationSpi.java
+++ b/modules/core/src/main/java/org/gridgain/grid/spi/communication/tcp/GridTcpCommunicationSpi.java
@@ -448,7 +448,7 @@ public class GridTcpCommunicationSpi extends GridSpiAdapter
     private int selectorsCnt = DFLT_SELECTORS_CNT;
 
     /** Address resolver. */
-    private GridAddressResolver addrRslvr;
+    private IgniteAddressResolver addrRslvr;
 
     /** Local node ID message. */
     private NodeIdMessage nodeIdMsg;
@@ -580,7 +580,7 @@ public class GridTcpCommunicationSpi extends GridSpiAdapter
      */
     @GridSpiConfiguration(optional = true)
     @IgniteAddressResolverResource
-    public void setAddressResolver(GridAddressResolver addrRslvr) {
+    public void setAddressResolver(IgniteAddressResolver addrRslvr) {
         // Injection should not override value already set by Spring or user.
         if (this.addrRslvr == null)
             this.addrRslvr = addrRslvr;
@@ -591,7 +591,7 @@ public class GridTcpCommunicationSpi extends GridSpiAdapter
      *
      * @return Address resolver.
      */
-    public GridAddressResolver getAddressResolver() {
+    public IgniteAddressResolver getAddressResolver() {
         return addrRslvr;
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/97b9e4e2/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoverySpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoverySpi.java
b/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoverySpi.java
index f2c8574..6bdd66c 100644
--- a/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoverySpi.java
+++ b/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoverySpi.java
@@ -168,7 +168,7 @@ public class GridTcpDiscoverySpi extends GridTcpDiscoverySpiAdapter implements
G
     public static final String ATTR_EXT_ADDRS = "disc.tcp.ext-addrs";
 
     /** Address resolver. */
-    private GridAddressResolver addrRslvr;
+    private IgniteAddressResolver addrRslvr;
 
     /** Local port which node uses. */
     private int locPort = DFLT_PORT;
@@ -290,7 +290,7 @@ public class GridTcpDiscoverySpi extends GridTcpDiscoverySpiAdapter implements
G
      */
     @GridSpiConfiguration(optional = true)
     @IgniteAddressResolverResource
-    public void setAddressResolver(GridAddressResolver addrRslvr) {
+    public void setAddressResolver(IgniteAddressResolver addrRslvr) {
         // Injection should not override value already set by Spring or user.
         if (this.addrRslvr == null)
             this.addrRslvr = addrRslvr;
@@ -301,7 +301,7 @@ public class GridTcpDiscoverySpi extends GridTcpDiscoverySpiAdapter implements
G
      *
      * @return Address resolver.
      */
-    public GridAddressResolver getAddressResolver() {
+    public IgniteAddressResolver getAddressResolver() {
         return addrRslvr;
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/97b9e4e2/modules/core/src/main/java/org/gridgain/grid/util/GridUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/util/GridUtils.java b/modules/core/src/main/java/org/gridgain/grid/util/GridUtils.java
index a4c5a71..fb891df 100644
--- a/modules/core/src/main/java/org/gridgain/grid/util/GridUtils.java
+++ b/modules/core/src/main/java/org/gridgain/grid/util/GridUtils.java
@@ -8303,7 +8303,7 @@ public abstract class GridUtils {
      * @throws GridException If failed.
      */
     public static Collection<InetSocketAddress> resolveAddresses(
-        GridAddressResolver addrRslvr,
+        IgniteAddressResolver addrRslvr,
         Iterable<String> addrs,
         int port
     ) throws GridException {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/97b9e4e2/modules/core/src/test/java/org/gridgain/grid/spi/GridTcpSpiForwardingSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/spi/GridTcpSpiForwardingSelfTest.java
b/modules/core/src/test/java/org/gridgain/grid/spi/GridTcpSpiForwardingSelfTest.java
index 4375eea..4e43634 100644
--- a/modules/core/src/test/java/org/gridgain/grid/spi/GridTcpSpiForwardingSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/spi/GridTcpSpiForwardingSelfTest.java
@@ -116,7 +116,7 @@ public class GridTcpSpiForwardingSelfTest extends GridCommonAbstractTest
{
             new InetSocketAddress("127.0.0.1", commLocPort), F.asList(new InetSocketAddress("127.0.0.1",
commExtPort))
         );
 
-        cfg.setAddressResolver(new GridAddressResolver() {
+        cfg.setAddressResolver(new IgniteAddressResolver() {
             @Override public Collection<InetSocketAddress> getExternalAddresses(InetSocketAddress
addr) {
                 return mp.get(addr);
             }


Mime
View raw message