# ignite-164 : GridNodeAttributes -> IgniteNodeAttributes (auto-renam…

…ing)
apache · Feb 3, 2015 · d4c21ba · d4c21ba
1 parent aa74616
commit d4c21ba
Show file tree

Hide file tree

Showing 52 changed files with 83 additions and 84 deletions.
diff --git a/...nts/src/test/java/org/apache/ignite/client/integration/ClientTcpConnectivitySelfTest.java b/...nts/src/test/java/org/apache/ignite/client/integration/ClientTcpConnectivitySelfTest.java
@@ -55,17 +55,17 @@ public class ClientTcpConnectivitySelfTest extends ClientAbstractConnectivitySel
 
     /** {@inheritDoc} */
     @Override protected String restAddressAttributeName() {
-        return GridNodeAttributes.ATTR_REST_TCP_ADDRS;
+        return IgniteNodeAttributes.ATTR_REST_TCP_ADDRS;
     }
 
     /** {@inheritDoc} */
     @Override protected String restHostNameAttributeName() {
-        return GridNodeAttributes.ATTR_REST_TCP_HOST_NAMES;
+        return IgniteNodeAttributes.ATTR_REST_TCP_HOST_NAMES;
     }
 
     /** {@inheritDoc} */
     @Override protected String restPortAttributeName() {
-        return GridNodeAttributes.ATTR_REST_TCP_PORT;
+        return IgniteNodeAttributes.ATTR_REST_TCP_PORT;
     }
 
     /** {@inheritDoc} */

diff --git a/...ain/java/org/apache/ignite/cache/affinity/rendezvous/CacheRendezvousAffinityFunction.java b/...ain/java/org/apache/ignite/cache/affinity/rendezvous/CacheRendezvousAffinityFunction.java
@@ -446,7 +446,7 @@ private Map<UUID, Collection<ClusterNode>> neighbors(Collection<ClusterNode> top
 
         // Group by mac addresses.
         for (ClusterNode node : topSnapshot) {
-            String macs = node.attribute(GridNodeAttributes.ATTR_MACS);
+            String macs = node.attribute(IgniteNodeAttributes.ATTR_MACS);
 
             Collection<ClusterNode> nodes = macMap.get(macs);
 

diff --git a/modules/core/src/main/java/org/apache/ignite/client/impl/GridClientComputeImpl.java b/modules/core/src/main/java/org/apache/ignite/client/impl/GridClientComputeImpl.java
@@ -26,7 +26,7 @@
 import java.util.*;
 
 import static org.apache.ignite.client.util.GridClientUtils.*;
-import static org.apache.ignite.internal.GridNodeAttributes.*;
+import static org.apache.ignite.internal.IgniteNodeAttributes.*;
 
 /**
  * Compute projection implementation.

diff --git a/modules/core/src/main/java/org/apache/ignite/client/impl/GridClientImpl.java b/modules/core/src/main/java/org/apache/ignite/client/impl/GridClientImpl.java
@@ -34,7 +34,7 @@
 import java.util.concurrent.atomic.*;
 import java.util.logging.*;
 
-import static org.apache.ignite.internal.GridNodeAttributes.*;
+import static org.apache.ignite.internal.IgniteNodeAttributes.*;
 
 /**
  * Client implementation.

diff --git a/...ain/java/org/apache/ignite/client/impl/connection/GridClientConnectionManagerAdapter.java b/...ain/java/org/apache/ignite/client/impl/connection/GridClientConnectionManagerAdapter.java
@@ -41,7 +41,7 @@
 
 import static java.util.logging.Level.*;
 import static org.apache.ignite.client.impl.connection.GridClientConnectionCloseReason.*;
-import static org.apache.ignite.internal.GridNodeAttributes.*;
+import static org.apache.ignite.internal.IgniteNodeAttributes.*;
 
 /**
  * Cached connections manager.

diff --git a/modules/core/src/main/java/org/apache/ignite/client/impl/connection/GridClientTopology.java b/modules/core/src/main/java/org/apache/ignite/client/impl/connection/GridClientTopology.java
@@ -29,7 +29,7 @@
 import java.util.concurrent.locks.*;
 import java.util.logging.*;
 
-import static org.apache.ignite.internal.GridNodeAttributes.*;
+import static org.apache.ignite.internal.IgniteNodeAttributes.*;
 
 /**
  * Client topology cache.

diff --git a/modules/core/src/main/java/org/apache/ignite/cluster/ClusterNode.java b/modules/core/src/main/java/org/apache/ignite/cluster/ClusterNode.java
@@ -18,7 +18,6 @@
 package org.apache.ignite.cluster;
 
 import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
 import org.apache.ignite.lang.*;
 import org.jetbrains.annotations.*;
 
@@ -130,7 +129,7 @@ public interface ClusterNode {
      * <ul>
      * <li>{@code {@link System#getProperties()}} - All system properties.</li>
      * <li>{@code {@link System#getenv(String)}} - All environment properties.</li>
-     * <li>All attributes defined in {@link GridNodeAttributes}</li>
+     * <li>All attributes defined in {@link org.apache.ignite.internal.IgniteNodeAttributes}</li>
      * </ul>
      * <p>
      * Note that attributes cannot be changed at runtime.
@@ -165,7 +164,7 @@ public interface ClusterNode {
      * <ul>
      * <li>{@code {@link System#getProperties()}} - All system properties.</li>
      * <li>{@code {@link System#getenv(String)}} - All environment properties.</li>
-     * <li>All attributes defined in {@link GridNodeAttributes}</li>
+     * <li>All attributes defined in {@link org.apache.ignite.internal.IgniteNodeAttributes}</li>
      * </ul>
      * <p>
      * Note that attributes cannot be changed at runtime.

diff --git a/modules/core/src/main/java/org/apache/ignite/internal/ClusterGroupAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/ClusterGroupAdapter.java
@@ -31,7 +31,7 @@
 import java.util.*;
 import java.util.concurrent.*;
 
-import static org.apache.ignite.internal.GridNodeAttributes.*;
+import static org.apache.ignite.internal.IgniteNodeAttributes.*;
 
 /**
  *

diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridKillTask.java b/modules/core/src/main/java/org/apache/ignite/internal/GridKillTask.java
@@ -25,7 +25,7 @@
 
 import java.util.*;
 
-import static org.apache.ignite.internal.GridNodeAttributes.*;
+import static org.apache.ignite.internal.IgniteNodeAttributes.*;
 
 /**
  * Special kill task that never fails over jobs.

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
@@ -93,7 +93,7 @@
 
 import static org.apache.ignite.IgniteSystemProperties.*;
 import static org.apache.ignite.internal.GridKernalState.*;
-import static org.apache.ignite.internal.GridNodeAttributes.*;
+import static org.apache.ignite.internal.IgniteNodeAttributes.*;
 import static org.apache.ignite.internal.GridProductImpl.*;
 import static org.apache.ignite.internal.IgniteComponentType.*;
 import static org.apache.ignite.internal.processors.license.GridLicenseSubsystem.*;

diff --git a/...e/ignite/internal/GridNodeAttributes.java → ...ignite/internal/IgniteNodeAttributes.java b/...e/ignite/internal/GridNodeAttributes.java → ...ignite/internal/IgniteNodeAttributes.java
@@ -20,7 +20,7 @@
 /**
  * This class defines constants (NOT enums) for <b>internally-used</b> node attributes.
  */
-public final class GridNodeAttributes {
+public final class IgniteNodeAttributes {
     /** Prefix for internally reserved attribute names. */
     public static final String ATTR_PREFIX = "org.gridgain";
 
@@ -139,7 +139,7 @@ public final class GridNodeAttributes {
     /**
      * Enforces singleton.
      */
-    private GridNodeAttributes() {
+    private IgniteNodeAttributes() {
         /* No-op. */
     }
 }
diff --git a/...ore/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java b/...ore/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
@@ -53,7 +53,7 @@
 
 import static java.util.concurrent.TimeUnit.*;
 import static org.apache.ignite.events.IgniteEventType.*;
-import static org.apache.ignite.internal.GridNodeAttributes.*;
+import static org.apache.ignite.internal.IgniteNodeAttributes.*;
 import static org.apache.ignite.plugin.segmentation.GridSegmentationPolicy.*;
 
 /**
@@ -207,7 +207,7 @@ public void setNodeAttributes(Map<String, Object> attrs, IgniteProductVersion ve
             // No-op.
         }
 
-        attrs.put(GridNodeAttributes.ATTR_PHY_RAM, totSysMemory);
+        attrs.put(IgniteNodeAttributes.ATTR_PHY_RAM, totSysMemory);
 
         getSpi().setNodeAttributes(attrs, ver);
     }

diff --git a/...es/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java b/...es/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
@@ -63,7 +63,7 @@
 import static org.apache.ignite.cache.CachePreloadMode.*;
 import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
 import static org.apache.ignite.configuration.IgniteDeploymentMode.*;
-import static org.apache.ignite.internal.GridNodeAttributes.*;
+import static org.apache.ignite.internal.IgniteNodeAttributes.*;
 import static org.apache.ignite.internal.IgniteComponentType.*;
 import static org.apache.ignite.internal.processors.cache.GridCacheUtils.*;
 import static org.apache.ignite.transactions.IgniteTxIsolation.*;
@@ -1067,7 +1067,7 @@ private void checkCache(ClusterNode rmt) throws IgniteCheckedException {
             return;
 
         IgniteDeploymentMode locDepMode = ctx.config().getDeploymentMode();
-        IgniteDeploymentMode rmtDepMode = rmt.attribute(GridNodeAttributes.ATTR_DEPLOYMENT_MODE);
+        IgniteDeploymentMode rmtDepMode = rmt.attribute(IgniteNodeAttributes.ATTR_DEPLOYMENT_MODE);
 
         for (GridCacheAttributes rmtAttr : rmtAttrs) {
             for (GridCacheAttributes locAttr : locAttrs) {

diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
@@ -50,7 +50,7 @@
 import static org.apache.ignite.cache.CachePreloadMode.*;
 import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
 import static org.apache.ignite.cache.GridCachePeekMode.*;
-import static org.apache.ignite.internal.GridNodeAttributes.*;
+import static org.apache.ignite.internal.IgniteNodeAttributes.*;
 import static org.apache.ignite.internal.GridTopic.*;
 import static org.apache.ignite.internal.processors.cache.GridCacheOperation.*;
 

diff --git a/...ore/src/main/java/org/apache/ignite/internal/processors/clock/GridClockSyncProcessor.java b/...ore/src/main/java/org/apache/ignite/internal/processors/clock/GridClockSyncProcessor.java
@@ -34,7 +34,7 @@
 import java.util.*;
 
 import static org.apache.ignite.events.IgniteEventType.*;
-import static org.apache.ignite.internal.GridNodeAttributes.*;
+import static org.apache.ignite.internal.IgniteNodeAttributes.*;
 import static org.apache.ignite.internal.GridTopic.*;
 import static org.apache.ignite.internal.managers.communication.GridIoPolicy.*;
 

diff --git a/...re/src/main/java/org/apache/ignite/internal/processors/dataload/IgniteDataLoaderImpl.java b/...re/src/main/java/org/apache/ignite/internal/processors/dataload/IgniteDataLoaderImpl.java
@@ -46,7 +46,7 @@
 import java.util.concurrent.atomic.*;
 
 import static org.apache.ignite.events.IgniteEventType.*;
-import static org.apache.ignite.internal.GridNodeAttributes.*;
+import static org.apache.ignite.internal.IgniteNodeAttributes.*;
 import static org.apache.ignite.internal.GridTopic.*;
 import static org.apache.ignite.internal.managers.communication.GridIoPolicy.*;
 

diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsContext.java
@@ -27,7 +27,7 @@
 
 import java.util.*;
 
-import static org.apache.ignite.internal.GridNodeAttributes.*;
+import static org.apache.ignite.internal.IgniteNodeAttributes.*;
 
 /**
  * GGFS context holding all required components for GGFS instance.

diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsImpl.java
@@ -47,7 +47,7 @@
 
 import static org.apache.ignite.events.IgniteEventType.*;
 import static org.apache.ignite.fs.IgniteFsMode.*;
-import static org.apache.ignite.internal.GridNodeAttributes.*;
+import static org.apache.ignite.internal.IgniteNodeAttributes.*;
 import static org.apache.ignite.internal.GridTopic.*;
 import static org.apache.ignite.internal.processors.fs.GridGgfsFileInfo.*;
 

diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgniteFsProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgniteFsProcessor.java
@@ -43,7 +43,7 @@
 import static org.apache.ignite.cache.CacheMemoryMode.*;
 import static org.apache.ignite.cache.CacheMode.*;
 import static org.apache.ignite.fs.IgniteFsMode.*;
-import static org.apache.ignite.internal.GridNodeAttributes.*;
+import static org.apache.ignite.internal.IgniteNodeAttributes.*;
 import static org.apache.ignite.internal.processors.license.GridLicenseSubsystem.*;
 
 /**
@@ -390,8 +390,8 @@ else if (offHeapSize > 0 && maxSpaceSize > maxHeapSize + offHeapSize)
      * @throws IgniteCheckedException If check failed.
      */
     private void checkGgfsOnRemoteNode(ClusterNode rmtNode) throws IgniteCheckedException {
-        GridGgfsAttributes[] locAttrs = ctx.discovery().localNode().attribute(GridNodeAttributes.ATTR_GGFS);
-        GridGgfsAttributes[] rmtAttrs = rmtNode.attribute(GridNodeAttributes.ATTR_GGFS);
+        GridGgfsAttributes[] locAttrs = ctx.discovery().localNode().attribute(IgniteNodeAttributes.ATTR_GGFS);
+        GridGgfsAttributes[] rmtAttrs = rmtNode.attribute(IgniteNodeAttributes.ATTR_GGFS);
 
         if (F.isEmpty(locAttrs) || F.isEmpty(rmtAttrs))
             return;

diff --git a/...a/org/apache/ignite/internal/processors/rest/handlers/top/GridTopologyCommandHandler.java b/...a/org/apache/ignite/internal/processors/rest/handlers/top/GridTopologyCommandHandler.java
@@ -35,7 +35,7 @@
 import java.net.*;
 import java.util.*;
 
-import static org.apache.ignite.internal.GridNodeAttributes.*;
+import static org.apache.ignite.internal.IgniteNodeAttributes.*;
 import static org.apache.ignite.internal.processors.rest.GridRestCommand.*;
 
 /**

diff --git a/...in/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestProtocol.java b/...in/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestProtocol.java
@@ -320,16 +320,16 @@ private boolean startTcpServer(InetAddress hostAddr, int port, GridNioServerList
 
     /** {@inheritDoc} */
     @Override protected String getAddressPropertyName() {
-        return GridNodeAttributes.ATTR_REST_TCP_ADDRS;
+        return IgniteNodeAttributes.ATTR_REST_TCP_ADDRS;
     }
 
     /** {@inheritDoc} */
     @Override protected String getHostNamePropertyName() {
-        return GridNodeAttributes.ATTR_REST_TCP_HOST_NAMES;
+        return IgniteNodeAttributes.ATTR_REST_TCP_HOST_NAMES;
     }
 
     /** {@inheritDoc} */
     @Override protected String getPortPropertyName() {
-        return GridNodeAttributes.ATTR_REST_TCP_PORT;
+        return IgniteNodeAttributes.ATTR_REST_TCP_PORT;
     }
 }
diff --git a/...ore/src/main/java/org/apache/ignite/internal/processors/streamer/GridStreamProcessor.java b/...ore/src/main/java/org/apache/ignite/internal/processors/streamer/GridStreamProcessor.java
@@ -33,7 +33,7 @@
 import java.util.*;
 
 import static org.apache.ignite.IgniteSystemProperties.*;
-import static org.apache.ignite.internal.GridNodeAttributes.*;
+import static org.apache.ignite.internal.IgniteNodeAttributes.*;
 import static org.apache.ignite.internal.processors.license.GridLicenseSubsystem.*;
 
 /**

diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
@@ -80,7 +80,7 @@
 
 import static org.apache.ignite.IgniteSystemProperties.*;
 import static org.apache.ignite.events.IgniteEventType.*;
-import static org.apache.ignite.internal.GridNodeAttributes.*;
+import static org.apache.ignite.internal.IgniteNodeAttributes.*;
 
 /**
  * Collection of utility methods used throughout the system.
@@ -1718,8 +1718,8 @@ public static boolean sameMacs(ClusterNode loc, ClusterNode rmt) {
         assert loc != null;
         assert rmt != null;
 
-        String locMacs = loc.attribute(GridNodeAttributes.ATTR_MACS);
-        String rmtMacs = rmt.attribute(GridNodeAttributes.ATTR_MACS);
+        String locMacs = loc.attribute(IgniteNodeAttributes.ATTR_MACS);
+        String rmtMacs = rmt.attribute(IgniteNodeAttributes.ATTR_MACS);
 
         return locMacs != null && locMacs.equals(rmtMacs);
     }

diff --git a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java
@@ -424,7 +424,7 @@ private void checkConfigurationConsistency(IgniteSpiContext spiCtx, ClusterNode
         if (!enabled)
             return;
 
-        String clsAttr = createSpiAttributeName(GridNodeAttributes.ATTR_SPI_CLASS);
+        String clsAttr = createSpiAttributeName(IgniteNodeAttributes.ATTR_SPI_CLASS);
 
         String name = getName();
 

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
@@ -46,7 +46,7 @@
 import java.util.concurrent.*;
 
 import static org.apache.ignite.events.IgniteEventType.*;
-import static org.apache.ignite.internal.GridNodeAttributes.*;
+import static org.apache.ignite.internal.IgniteNodeAttributes.*;
 import static org.apache.ignite.spi.IgnitePortProtocol.*;
 import static org.apache.ignite.spi.discovery.tcp.internal.TcpDiscoverySpiState.*;
 import static org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryHeartbeatMessage.*;
@@ -1259,7 +1259,7 @@ private void joinTopology() throws IgniteSpiException {
         }
 
         GridSecurityCredentials locCred = (GridSecurityCredentials)locNode.getAttributes()
-            .get(GridNodeAttributes.ATTR_SECURITY_CREDENTIALS);
+            .get(IgniteNodeAttributes.ATTR_SECURITY_CREDENTIALS);
 
         // Marshal credentials for backward compatibility and security.
         marshalCredentials(locNode);
@@ -1278,9 +1278,9 @@ private void joinTopology() throws IgniteSpiException {
 
                     Map<String, Object> attrs = new HashMap<>(locNode.attributes());
 
-                    attrs.put(GridNodeAttributes.ATTR_SECURITY_SUBJECT,
+                    attrs.put(IgniteNodeAttributes.ATTR_SECURITY_SUBJECT,
                         ignite.configuration().getMarshaller().marshal(subj));
-                    attrs.remove(GridNodeAttributes.ATTR_SECURITY_CREDENTIALS);
+                    attrs.remove(IgniteNodeAttributes.ATTR_SECURITY_CREDENTIALS);
 
                     locNode.setAttributes(attrs);
                 }
@@ -1666,8 +1666,8 @@ private void marshalCredentials(TcpDiscoveryNode node) throws IgniteSpiException
             // Use security-unsafe getter.
             Map<String, Object> attrs = new HashMap<>(node.getAttributes());
 
-            attrs.put(GridNodeAttributes.ATTR_SECURITY_CREDENTIALS,
-                marsh.marshal(attrs.get(GridNodeAttributes.ATTR_SECURITY_CREDENTIALS)));
+            attrs.put(IgniteNodeAttributes.ATTR_SECURITY_CREDENTIALS,
+                marsh.marshal(attrs.get(IgniteNodeAttributes.ATTR_SECURITY_CREDENTIALS)));
 
             node.setAttributes(attrs);
         }
@@ -1685,7 +1685,7 @@ private void marshalCredentials(TcpDiscoveryNode node) throws IgniteSpiException
      */
     private GridSecurityCredentials unmarshalCredentials(TcpDiscoveryNode node) throws IgniteSpiException {
         try {
-            byte[] credBytes = (byte[])node.getAttributes().get(GridNodeAttributes.ATTR_SECURITY_CREDENTIALS);
+            byte[] credBytes = (byte[])node.getAttributes().get(IgniteNodeAttributes.ATTR_SECURITY_CREDENTIALS);
 
             if (credBytes == null)
                 return null;
@@ -3149,7 +3149,7 @@ private void processJoinRequestMessage(TcpDiscoveryJoinRequestMessage msg) {
                         // Stick in authentication subject to node (use security-safe attributes for copy).
                         Map<String, Object> attrs = new HashMap<>(node.getAttributes());
 
-                        attrs.put(GridNodeAttributes.ATTR_SECURITY_SUBJECT,
+                        attrs.put(IgniteNodeAttributes.ATTR_SECURITY_SUBJECT,
                             ignite.configuration().getMarshaller().marshal(subj));
 
                         node.setAttributes(attrs);
@@ -3590,7 +3590,7 @@ private void processNodeAddedMessage(TcpDiscoveryNodeAddedMessage msg) {
                             GridSecurityContext subj = nodeAuth.authenticateNode(node, cred);
 
                             GridSecurityContext coordSubj = ignite.configuration().getMarshaller().unmarshal(
-                                node.<byte[]>attribute(GridNodeAttributes.ATTR_SECURITY_SUBJECT), U.gridClassLoader());
+                                node.<byte[]>attribute(IgniteNodeAttributes.ATTR_SECURITY_SUBJECT), U.gridClassLoader());
 
                             if (!permissionsEqual(coordSubj.subject().permissions(), subj.subject().permissions())) {
                                 // Node has not pass authentication.

diff --git a/...les/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoveryNode.java b/...les/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoveryNode.java
@@ -31,7 +31,7 @@
 import java.net.*;
 import java.util.*;
 
-import static org.apache.ignite.internal.GridNodeAttributes.*;
+import static org.apache.ignite.internal.IgniteNodeAttributes.*;
 
 /**
  * Node for {@link org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi}.
@@ -156,7 +156,7 @@ public TcpDiscoveryNode(UUID id, Collection<String> addrs, Collection<String> ho
     @SuppressWarnings("unchecked")
     @Override public <T> T attribute(String name) {
         // Even though discovery SPI removes this attribute after authentication, keep this check for safety.
-        if (GridNodeAttributes.ATTR_SECURITY_CREDENTIALS.equals(name))
+        if (IgniteNodeAttributes.ATTR_SECURITY_CREDENTIALS.equals(name))
             return null;
 
         return (T)attrs.get(name);
@@ -167,7 +167,7 @@ public TcpDiscoveryNode(UUID id, Collection<String> addrs, Collection<String> ho
         // Even though discovery SPI removes this attribute after authentication, keep this check for safety.
         return F.view(attrs, new IgnitePredicate<String>() {
             @Override public boolean apply(String s) {
-                return !GridNodeAttributes.ATTR_SECURITY_CREDENTIALS.equals(s);
+                return !IgniteNodeAttributes.ATTR_SECURITY_CREDENTIALS.equals(s);
             }
         });
     }