# ignite-164 : rename resolveGridGainPath, resolveGridGainUrl util me…

…thods

modules/clients/src/test/java/org/apache/ignite/client/ClientAbstractMultiThreadedSelfTest.java

@@ -93,7 +93,7 @@ public abstract class ClientAbstractMultiThreadedSelfTest extends GridCommonAbst
     public static final int REST_TCP_PORT_BASE = 12345;
 
     static {
-        System.setProperty("CLIENTS_MODULE_PATH", U.resolveGridGainPath("modules/clients").getAbsolutePath());
+        System.setProperty("CLIENTS_MODULE_PATH", U.resolveIgnitePath("modules/clients").getAbsolutePath());
     }
 
     /** Client instance for each test. */

modules/clients/src/test/java/org/apache/ignite/client/ClientSslNodeStartup.java

@@ -50,7 +50,7 @@ public class ClientSslNodeStartup {
      * @throws IgniteCheckedException In case of any exception.
      */
     public static void main(String[] args) throws IgniteCheckedException {
-        System.setProperty("CLIENTS_MODULE_PATH", U.resolveGridGainPath("modules/clients").getAbsolutePath());
+        System.setProperty("CLIENTS_MODULE_PATH", U.resolveIgnitePath("modules/clients").getAbsolutePath());
 
         try (Ignite g = G.start("modules/clients/src/test/resources/spring-server-ssl-node.xml")) {
             U.sleep(Long.MAX_VALUE);

modules/clients/src/test/java/org/apache/ignite/client/ClientStartNodeTask.java

@@ -102,7 +102,7 @@ static IgniteConfiguration getConfig(String type) {
         if (path == null)
             throw new IllegalArgumentException("Unsupported node type: " + type);
 
-        URL url = U.resolveGridGainUrl(path);
+        URL url = U.resolveIgniteUrl(path);
 
         BeanFactory ctx = new FileSystemXmlApplicationContext(url.toString());
 

modules/clients/src/test/java/org/apache/ignite/client/impl/ClientPropertiesConfigurationSelfTest.java

@@ -50,9 +50,9 @@ public class ClientPropertiesConfigurationSelfTest extends GridCommonAbstractTes
      */
     static {
         GRID_CLIENT_SPRING_CONFIG =
-            U.resolveGridGainUrl("/modules/clients/config/grid-client-spring-config.xml");
+            U.resolveIgniteUrl("/modules/clients/config/grid-client-spring-config.xml");
 
-        GRID_CLIENT_CONFIG = U.resolveGridGainUrl("/modules/clients/config/grid-client-config.properties");
+        GRID_CLIENT_CONFIG = U.resolveIgniteUrl("/modules/clients/config/grid-client-config.properties");
     }
 
     /**

modules/clients/src/test/java/org/apache/ignite/client/integration/ClientAbstractSelfTest.java

@@ -199,7 +199,7 @@ protected Object getTaskArgument() {
 
         clientCfg.setRestAccessibleFolders(
             U.getIgniteHome() + "/work/log",
-            U.resolveGridGainPath("modules/core/src/test/resources/log").getAbsolutePath());
+            U.resolveIgnitePath("modules/core/src/test/resources/log").getAbsolutePath());
 
         if (useSsl()) {
             clientCfg.setRestTcpSslEnabled(true);

modules/core/src/main/java/org/apache/ignite/IgniteLogger.java

@@ -32,7 +32,7 @@
  * <pre name="code" class="java">
  *      GridConfiguration cfg = new GridConfiguration();
  *      ...
- *      URL xml = U.resolveGridGainUrl("config/custom-log4j.xml");
+ *      URL xml = U.resolveIgniteUrl("config/custom-log4j.xml");
  *      GridLogger log = new GridLog4jLogger(xml);
  *      ...
  *      cfg.setGridLogger(log);

modules/core/src/main/java/org/apache/ignite/cache/CachingProvider.java

@@ -40,7 +40,7 @@ public class CachingProvider implements javax.cache.spi.CachingProvider {
         URI uri = null;
 
         try {
-            URL dfltCfgURL = U.resolveGridGainUrl(IgnitionEx.DFLT_CFG);
+            URL dfltCfgURL = U.resolveIgniteUrl(IgnitionEx.DFLT_CFG);
 
             if (dfltCfgURL != null)
                 uri = dfltCfgURL.toURI();

modules/core/src/main/java/org/apache/ignite/client/router/impl/GridRouterCommandLineStartup.java

@@ -118,7 +118,7 @@ public static void main(String[] args) throws IgniteCheckedException {
 
         String cfgPath = args[0];
 
-        URL cfgUrl = U.resolveGridGainUrl(cfgPath);
+        URL cfgUrl = U.resolveIgniteUrl(cfgPath);
 
         if (cfgUrl == null) {
             X.error("Spring XML file not found (is IGNITE_HOME set?): " + cfgPath);

modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java

@@ -426,7 +426,7 @@ public static Ignite start() throws IgniteCheckedException {
      *      also if default grid has already been started.
      */
     public static Ignite start(@Nullable GridSpringResourceContext springCtx) throws IgniteCheckedException {
-        URL url = U.resolveGridGainUrl(DFLT_CFG);
+        URL url = U.resolveIgniteUrl(DFLT_CFG);
 
         if (url != null)
             return start(DFLT_CFG, null, springCtx);
@@ -577,7 +577,7 @@ public static Ignite startInterop(@Nullable String springCfgPath, @Nullable Stri
             url = new URL(springCfgPath);
         }
         catch (MalformedURLException e) {
-            url = U.resolveGridGainUrl(springCfgPath);
+            url = U.resolveIgniteUrl(springCfgPath);
 
             if (url == null)
                 throw new IgniteCheckedException("Spring XML configuration path is invalid: " + springCfgPath +
@@ -810,7 +810,7 @@ private static URL resolveSpringUrl(String springCfgPath) throws IgniteCheckedEx
             url = new URL(springCfgPath);
         }
         catch (MalformedURLException e) {
-            url = U.resolveGridGainUrl(springCfgPath);
+            url = U.resolveIgniteUrl(springCfgPath);
 
             if (url == null)
                 throw new IgniteCheckedException("Spring XML configuration path is invalid: " + springCfgPath +
@@ -2018,7 +2018,7 @@ private IgniteLogger initLogger(@Nullable IgniteLogger cfgLog, UUID nodeId) thro
 
                     if (log4jCls != null) {
                         try {
-                            URL url = U.resolveGridGainUrl("config/ignite-log4j.xml");
+                            URL url = U.resolveIgniteUrl("config/ignite-log4j.xml");
 
                             if (url == null) {
                                 File cfgFile = new File("config/ignite-log4j.xml");

modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/log/GridLogCommandHandler.java

@@ -118,7 +118,7 @@ else if (log.isDebugEnabled())
      * @throws IOException If file couldn't be accessed or read failed.
      */
     private List<String> readLog(String path, int from, int to) throws IgniteCheckedException, IOException {
-        URL url = U.resolveGridGainUrl(path);
+        URL url = U.resolveIgniteUrl(path);
 
         if (url == null)
             throw new IgniteCheckedException("Log file not found: " + path);

modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java

@@ -2548,7 +2548,7 @@ public static void setIgniteHome(@Nullable String path) {
      * @param path Path to resolve.
      * @return Resolved path as file, or {@code null} if path cannot be resolved.
      */
-    @Nullable public static File resolveGridGainPath(String path) {
+    @Nullable public static File resolveIgnitePath(String path) {
         assert path != null;
 
         /*
@@ -2596,8 +2596,8 @@ public static void setIgniteHome(@Nullable String path) {
      * @return Resolved path as URL, or {@code null} if path cannot be resolved.
      * @see #getIgniteHome()
      */
-    @Nullable public static URL resolveGridGainUrl(String path) {
-        return resolveGridGainUrl(path, true);
+    @Nullable public static URL resolveIgniteUrl(String path) {
+        return resolveIgniteUrl(path, true);
     }
 
     /**
@@ -2615,11 +2615,11 @@ public static void setIgniteHome(@Nullable String path) {
      * @see #getIgniteHome()
      */
     @SuppressWarnings({"UnusedCatchParameter"})
-    @Nullable public static URL resolveGridGainUrl(String path, boolean metaInf) {
-        File f = resolveGridGainPath(path);
+    @Nullable public static URL resolveIgniteUrl(String path, boolean metaInf) {
+        File f = resolveIgnitePath(path);
 
         if (f == null)
-            f = resolveGridGainPath("os/" + path);
+            f = resolveIgnitePath("os/" + path);
 
         if (f != null) {
             try {

modules/core/src/main/java/org/apache/ignite/internal/visor/file/VisorFileBlockTask.java

@@ -100,7 +100,7 @@ private VisorFileBlockJob(VisorFileBlockArg arg, boolean debug) {
         /** {@inheritDoc} */
         @Override protected IgniteBiTuple<? extends IOException, VisorFileBlock> run(VisorFileBlockArg arg) {
             try {
-                URL url = U.resolveGridGainUrl(arg.path);
+                URL url = U.resolveIgniteUrl(arg.path);
 
                 if (url == null)
                     return new IgniteBiTuple<>(new NoSuchFileException("File path not found: " + arg.path), null);

modules/core/src/main/java/org/apache/ignite/internal/visor/file/VisorLatestTextFilesTask.java

@@ -66,7 +66,7 @@ private VisorLatestTextFilesJob(IgniteBiTuple<String, String> arg, boolean debug
             assert path != null;
             assert regexp != null;
 
-            URL url = U.resolveGridGainUrl(path);
+            URL url = U.resolveIgniteUrl(path);
 
             if (url == null)
                 return null;

modules/core/src/main/java/org/apache/ignite/internal/visor/log/VisorLogSearchTask.java

@@ -210,7 +210,7 @@ private List<GridTuple3<String[], Integer, Integer>> searchInFile(File f, Charse
 
         /** {@inheritDoc} */
         @Override protected  Collection<VisorLogSearchResult> run(VisorLogSearchArg arg) {
-            URL url = U.resolveGridGainUrl(arg.folder);
+            URL url = U.resolveIgniteUrl(arg.folder);
 
             if (url == null)
                 throw U.convertException(new GridInternalException(new FileNotFoundException("Log folder not found: " + arg.folder)));

modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorTaskUtils.java

@@ -622,7 +622,7 @@ else if (ggfs == null)
         else
             throw new IgniteCheckedException("Failed to get profiler log folder (unexpected GGFS instance type)");
 
-        URL logsDirUrl = U.resolveGridGainUrl(logsDir != null ? logsDir : DFLT_GGFS_LOG_DIR);
+        URL logsDirUrl = U.resolveIgniteUrl(logsDir != null ? logsDir : DFLT_GGFS_LOG_DIR);
 
         return logsDirUrl != null ? new File(logsDirUrl.getPath()).toPath() : null;
     }

modules/core/src/main/java/org/apache/ignite/logger/java/IgniteJavaLogger.java

@@ -127,7 +127,7 @@ public static boolean isConfigured() {
      * Reads default JUL configuration.
      */
     private void defaultConfiguration() {
-        final URL cfgUrl = U.resolveGridGainUrl(DFLT_CONFIG_PATH);
+        final URL cfgUrl = U.resolveIgniteUrl(DFLT_CONFIG_PATH);
 
         if (cfgUrl == null) {
             error("Failed to resolve default logging config file: " + DFLT_CONFIG_PATH);

modules/core/src/main/java/org/apache/ignite/marshaller/optimized/IgniteOptimizedMarshaller.java

@@ -183,7 +183,7 @@ public void setClassNamesPath(@Nullable String path) throws IgniteCheckedExcepti
         if (path == null)
             return;
 
-        URL url = IgniteUtils.resolveGridGainUrl(path, false);
+        URL url = IgniteUtils.resolveIgniteUrl(path, false);
 
         if (url == null)
             throw new IgniteCheckedException("Failed to find resource for name: " + path);

modules/core/src/test/java/org/apache/ignite/loadtests/discovery/GridGcTimeoutTest.java

@@ -39,7 +39,7 @@ public class GridGcTimeoutTest {
      */
     @SuppressWarnings("InfiniteLoopStatement")
     public static void main(String[] args) throws IgniteCheckedException {
-        Ignite g = G.start(U.resolveGridGainUrl(CFG_PATH));
+        Ignite g = G.start(U.resolveIgniteUrl(CFG_PATH));
 
         IgniteDataLoader<Long, String> ldr = g.dataLoader(null);
 

modules/core/src/test/java/org/apache/ignite/loadtests/job/GridJobLoadTest.java

@@ -41,7 +41,7 @@ public class GridJobLoadTest implements Runnable {
      */
     static {
         try {
-            TEST_CONF_DIR = new File(U.resolveGridGainUrl("/modules/core/src/test/config/job-loadtest").toURI());
+            TEST_CONF_DIR = new File(U.resolveIgniteUrl("/modules/core/src/test/config/job-loadtest").toURI());
         }
         catch (URISyntaxException e) {
             throw new RuntimeException("Failed to initialize directory.", e);

modules/core/src/test/java/org/apache/ignite/loadtests/nio/GridNioBenchmarkTest.java

@@ -78,7 +78,7 @@ public void run() throws UnknownHostException, IgniteCheckedException {
             }
         };
 
-        IgniteLogger log  = new GridTestLog4jLogger(U.resolveGridGainUrl("config/ignite-log4j.xml"));
+        IgniteLogger log  = new GridTestLog4jLogger(U.resolveIgniteUrl("config/ignite-log4j.xml"));
 
         GridNioServer.<ByteBuffer>builder()
             .address(InetAddress.getByName("localhost"))

modules/core/src/test/java/org/apache/ignite/loadtests/streamer/GridStreamerBenchmark.java

@@ -121,7 +121,7 @@ private static Collection<GridStreamerLoad> loads(String cfgPath) throws Excepti
             cfgUrl = new URL(cfgPath);
         }
         catch (MalformedURLException ignore) {
-            cfgUrl = U.resolveGridGainUrl(cfgPath);
+            cfgUrl = U.resolveIgniteUrl(cfgPath);
         }
 
         if (cfgUrl == null)

modules/core/src/test/java/org/apache/ignite/startup/GridRandomCommandLineLoader.java

@@ -341,7 +341,7 @@ private static IgniteConfiguration getConfiguration(String springCfgPath, @Nulla
         assert cfg != null;
 
         if (logCfgPath != null)
-            cfg.setGridLogger(new GridTestLog4jLogger(U.resolveGridGainUrl(logCfgPath)));
+            cfg.setGridLogger(new GridTestLog4jLogger(U.resolveIgniteUrl(logCfgPath)));
 
         return cfg;
     }

modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java

@@ -1323,7 +1323,7 @@ public static SSLContext sslContext() throws GeneralSecurityException, IOExcepti
 
         KeyStore keyStore = KeyStore.getInstance("JKS");
 
-        keyStore.load(new FileInputStream(U.resolveGridGainPath(GridTestProperties.getProperty("ssl.keystore.path"))),
+        keyStore.load(new FileInputStream(U.resolveIgnitePath(GridTestProperties.getProperty("ssl.keystore.path"))),
             storePass);
 
         keyMgrFactory.init(keyStore, storePass);
@@ -1343,7 +1343,7 @@ public static GridSslContextFactory sslContextFactory() {
         GridSslBasicContextFactory factory = new GridSslBasicContextFactory();
 
         factory.setKeyStoreFilePath(
-            U.resolveGridGainPath(GridTestProperties.getProperty("ssl.keystore.path")).getAbsolutePath());
+            U.resolveIgnitePath(GridTestProperties.getProperty("ssl.keystore.path")).getAbsolutePath());
         factory.setKeyStorePassword(GridTestProperties.getProperty("ssl.keystore.password").toCharArray());
 
         factory.setTrustManagers(GridSslBasicContextFactory.getDisabledTrustManager());

modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java

@@ -864,7 +864,7 @@ protected Ignite startGrid(String gridName, IgniteConfiguration cfg) throws Exce
      */
     @SuppressWarnings("deprecation")
     protected IgniteConfiguration loadConfiguration(String springCfgPath) throws IgniteCheckedException {
-        URL cfgLocation = U.resolveGridGainUrl(springCfgPath);
+        URL cfgLocation = U.resolveIgniteUrl(springCfgPath);
 
         assert cfgLocation != null;
 

modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridAbstractExamplesTest.java

@@ -57,7 +57,7 @@ protected final void startRemoteNodes() throws Exception {
         if (rmtCfgs.isEmpty()) {
             info("Loading remote configs properties from file: " + RMT_NODE_CFGS);
 
-            try (FileReader reader = new FileReader(U.resolveGridGainPath(RMT_NODE_CFGS))) {
+            try (FileReader reader = new FileReader(U.resolveIgnitePath(RMT_NODE_CFGS))) {
                 rmtCfgs.load(reader);
             }
         }

modules/core/src/test/java/org/apache/ignite/testframework/junits/logger/GridTestLog4jLogger.java

@@ -164,7 +164,7 @@ public GridTestLog4jLogger(String path) throws IgniteCheckedException {
 
         this.path = path;
 
-        final URL cfgUrl = U.resolveGridGainUrl(path);
+        final URL cfgUrl = U.resolveIgniteUrl(path);
 
         if (cfgUrl == null)
             throw new IgniteCheckedException("Log4j configuration path was not found: " + path);

modules/hadoop/src/main/java/org/apache/ignite/fs/hadoop/v1/GridGgfsHadoopFileSystem.java

@@ -238,7 +238,7 @@ public void colocateFileWrites(boolean colocateFileWrites) {
             // Get log directory.
             String logDirCfg = parameter(cfg, PARAM_GGFS_LOG_DIR, uriAuthority, DFLT_GGFS_LOG_DIR);
 
-            File logDirFile = U.resolveGridGainPath(logDirCfg);
+            File logDirFile = U.resolveIgnitePath(logDirCfg);
 
             String logDir = logDirFile != null ? logDirFile.getAbsolutePath() : null;
 
@@ -295,7 +295,7 @@ public void colocateFileWrites(boolean colocateFileWrites) {
                 try {
                     secondaryUri = new URI(secUri);
 
-                    URL secondaryCfgUrl = U.resolveGridGainUrl(secConfPath);
+                    URL secondaryCfgUrl = U.resolveIgniteUrl(secConfPath);
 
                     Configuration conf = new Configuration();
 

modules/hadoop/src/main/java/org/apache/ignite/fs/hadoop/v2/GridGgfsHadoopFileSystem.java

@@ -234,7 +234,7 @@ private void initialize(URI name, Configuration cfg) throws IOException {
             // Get log directory.
             String logDirCfg = parameter(cfg, PARAM_GGFS_LOG_DIR, uriAuthority, DFLT_GGFS_LOG_DIR);
 
-            File logDirFile = U.resolveGridGainPath(logDirCfg);
+            File logDirFile = U.resolveIgnitePath(logDirCfg);
 
             String logDir = logDirFile != null ? logDirFile.getAbsolutePath() : null;
 
@@ -298,7 +298,7 @@ private void initialize(URI name, Configuration cfg) throws IOException {
                 try {
                     secondaryUri = new URI(secUri);
 
-                    URL secondaryCfgUrl = U.resolveGridGainUrl(secConfPath);
+                    URL secondaryCfgUrl = U.resolveIgniteUrl(secConfPath);
 
                     if (secondaryCfgUrl == null)
                         throw new IOException("Failed to resolve secondary file system config URL: " + secConfPath);

modules/hadoop/src/main/java/org/apache/ignite/internal/fs/hadoop/GridGgfsHadoopFileSystemWrapper.java

@@ -60,7 +60,7 @@ public GridGgfsHadoopFileSystemWrapper(@Nullable String uri, @Nullable String cf
         Configuration cfg = new Configuration();
 
         if (cfgPath != null)
-            cfg.addResource(U.resolveGridGainUrl(cfgPath));
+            cfg.addResource(U.resolveIgniteUrl(cfgPath));
 
         try {
             fileSys = uri == null ? FileSystem.get(cfg) : FileSystem.get(new URI(uri), cfg);

modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/child/GridHadoopExternalProcessStarter.java

@@ -147,7 +147,7 @@ private File outputDirectory() throws IOException {
      * @return Logger.
      */
     private IgniteLogger logger(final File outputDir) {
-        final URL url = U.resolveGridGainUrl(DFLT_LOG4J_CONFIG);
+        final URL url = U.resolveIgniteUrl(DFLT_LOG4J_CONFIG);
 
         IgniteLog4jLogger logger;
 

modules/hadoop/src/test/java/org/apache/ignite/fs/GridFileSystemLoad.java

@@ -232,7 +232,7 @@ public static void main(String[] args) throws Exception {
         if (startNode) {
             X.println("Starting node using configuration: " + nodeCfg);
 
-            ignite = G.start(U.resolveGridGainUrl(nodeCfg));
+            ignite = G.start(U.resolveIgniteUrl(nodeCfg));
         }
 
         try {
@@ -269,7 +269,7 @@ public void runLoad(String url, String hadoopCfg, final boolean primaryOnly, int
 
         Configuration cfg = new Configuration(true);
 
-        cfg.addResource(U.resolveGridGainUrl(hadoopCfg));
+        cfg.addResource(U.resolveIgniteUrl(hadoopCfg));
 
         final FileSystem fs = FileSystem.get(fsPath.toUri(), cfg);
 

modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoop20FileSystemAbstractSelfTest.java

@@ -293,7 +293,7 @@ private CommunicationSpi communicationSpi() {
 
         primaryFsCfg = new Configuration();
 
-        primaryFsCfg.addResource(U.resolveGridGainUrl(primaryFileSystemConfigPath()));
+        primaryFsCfg.addResource(U.resolveIgniteUrl(primaryFileSystemConfigPath()));
 
         fs = AbstractFileSystem.get(primaryFsUri, primaryFsCfg);
 

modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopDualAbstractSelfTest.java

@@ -240,7 +240,7 @@ public void testOpenPrefetchOverride() throws Exception {
         // Instantiate file system with overridden "seq reads before prefetch" property.
         Configuration cfg = new Configuration();
 
-        cfg.addResource(U.resolveGridGainUrl(PRIMARY_CFG));
+        cfg.addResource(U.resolveIgniteUrl(PRIMARY_CFG));
 
         int seqReads = SEQ_READS_BEFORE_PREFETCH + 1;
 

modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopFileSystemAbstractSelfTest.java

@@ -2102,7 +2102,7 @@ private void checkConsistency(int createBufSize, int writeCntsInCreate, int open
     private FileSystem local(Path home) throws IOException {
         Configuration cfg = new Configuration();
 
-        cfg.addResource(U.resolveGridGainUrl(HADOOP_FS_CFG));
+        cfg.addResource(U.resolveIgniteUrl(HADOOP_FS_CFG));
 
         return FileSystem.get(home.toUri(), cfg);
     }