ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From voze...@apache.org
Subject [42/57] [abbrv] incubator-ignite git commit: # IGNITE-226: WIP (10)
Date Fri, 13 Feb 2015 10:54:52 GMT
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/639ff503/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsAbstractSelfTest.java
index 61892fd..3d93ff1 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsAbstractSelfTest.java
@@ -78,34 +78,34 @@ public abstract class IgfsAbstractSelfTest extends IgfsCommonAbstractTest {
     }};
 
     /** Directory. */
-    protected static final IgniteFsPath DIR = new IgniteFsPath("/dir");
+    protected static final IgfsPath DIR = new IgfsPath("/dir");
 
     /** Sub-directory. */
-    protected static final IgniteFsPath SUBDIR = new IgniteFsPath(DIR, "subdir");
+    protected static final IgfsPath SUBDIR = new IgfsPath(DIR, "subdir");
 
     /** Another sub-directory in the same directory. */
-    protected static final IgniteFsPath SUBDIR2 = new IgniteFsPath(DIR, "subdir2");
+    protected static final IgfsPath SUBDIR2 = new IgfsPath(DIR, "subdir2");
 
     /** Sub-directory of the sub-directory. */
-    protected static final IgniteFsPath SUBSUBDIR = new IgniteFsPath(SUBDIR, "subsubdir");
+    protected static final IgfsPath SUBSUBDIR = new IgfsPath(SUBDIR, "subsubdir");
 
     /** File. */
-    protected static final IgniteFsPath FILE = new IgniteFsPath(SUBDIR, "file");
+    protected static final IgfsPath FILE = new IgfsPath(SUBDIR, "file");
 
     /** Another file in the same directory. */
-    protected static final IgniteFsPath FILE2 = new IgniteFsPath(SUBDIR, "file2");
+    protected static final IgfsPath FILE2 = new IgfsPath(SUBDIR, "file2");
 
     /** Other directory. */
-    protected static final IgniteFsPath DIR_NEW = new IgniteFsPath("/dirNew");
+    protected static final IgfsPath DIR_NEW = new IgfsPath("/dirNew");
 
     /** Other subdirectory. */
-    protected static final IgniteFsPath SUBDIR_NEW = new IgniteFsPath(DIR_NEW, "subdirNew");
+    protected static final IgfsPath SUBDIR_NEW = new IgfsPath(DIR_NEW, "subdirNew");
 
     /** Other sub-directory of the sub-directory. */
-    protected static final IgniteFsPath SUBSUBDIR_NEW = new IgniteFsPath(SUBDIR_NEW, "subsubdirNew");
+    protected static final IgfsPath SUBSUBDIR_NEW = new IgfsPath(SUBDIR_NEW, "subsubdirNew");
 
     /** Other file. */
-    protected static final IgniteFsPath FILE_NEW = new IgniteFsPath(SUBDIR_NEW, "fileNew");
+    protected static final IgfsPath FILE_NEW = new IgfsPath(SUBDIR_NEW, "fileNew");
 
     /** Default data chunk (128 bytes). */
     protected static byte[] chunk;
@@ -181,7 +181,7 @@ public abstract class IgfsAbstractSelfTest extends IgfsCommonAbstractTest {
      * @throws Exception If failed.
      */
     protected Ignite startGridWithGgfs(String gridName, String ggfsName, IgniteFsMode mode,
-        @Nullable IgniteFsFileSystem secondaryFs, @Nullable Map<String, String> restCfg) throws Exception {
+        @Nullable Igfs secondaryFs, @Nullable Map<String, String> restCfg) throws Exception {
         IgniteFsConfiguration ggfsCfg = new IgniteFsConfiguration();
 
         ggfsCfg.setDataCacheName("dataCache");
@@ -370,8 +370,8 @@ public abstract class IgfsAbstractSelfTest extends IgfsCommonAbstractTest {
      * @throws Exception If failed.
      */
     public void testRenameFileParentRoot() throws Exception {
-        IgniteFsPath file1 = new IgniteFsPath("/file1");
-        IgniteFsPath file2 = new IgniteFsPath("/file2");
+        IgfsPath file1 = new IgfsPath("/file1");
+        IgfsPath file2 = new IgfsPath("/file2");
 
         create(ggfs, null, paths(file1));
 
@@ -402,8 +402,8 @@ public abstract class IgfsAbstractSelfTest extends IgfsCommonAbstractTest {
      * @throws Exception If failed.
      */
     public void testRenameDirectoryParentRoot() throws Exception {
-        IgniteFsPath dir1 = new IgniteFsPath("/dir1");
-        IgniteFsPath dir2 = new IgniteFsPath("/dir2");
+        IgfsPath dir1 = new IgfsPath("/dir1");
+        IgfsPath dir2 = new IgfsPath("/dir2");
 
         create(ggfs, paths(dir1), null);
 
@@ -424,7 +424,7 @@ public abstract class IgfsAbstractSelfTest extends IgfsCommonAbstractTest {
 
         ggfs.rename(FILE, SUBDIR_NEW);
 
-        checkExist(ggfs, ggfsSecondary, new IgniteFsPath(SUBDIR_NEW, FILE.name()));
+        checkExist(ggfs, ggfsSecondary, new IgfsPath(SUBDIR_NEW, FILE.name()));
         checkNotExist(ggfs, ggfsSecondary, FILE);
     }
 
@@ -436,9 +436,9 @@ public abstract class IgfsAbstractSelfTest extends IgfsCommonAbstractTest {
     public void testMoveFileDestinationRoot() throws Exception {
         create(ggfs, paths(DIR, SUBDIR), paths(FILE));
 
-        ggfs.rename(FILE, new IgniteFsPath());
+        ggfs.rename(FILE, new IgfsPath());
 
-        checkExist(ggfs, ggfsSecondary, new IgniteFsPath("/" + FILE.name()));
+        checkExist(ggfs, ggfsSecondary, new IgfsPath("/" + FILE.name()));
         checkNotExist(ggfs, ggfsSecondary, FILE);
     }
 
@@ -448,13 +448,13 @@ public abstract class IgfsAbstractSelfTest extends IgfsCommonAbstractTest {
      * @throws Exception If failed.
      */
     public void testMoveFileSourceParentRoot() throws Exception {
-        IgniteFsPath file = new IgniteFsPath("/" + FILE.name());
+        IgfsPath file = new IgfsPath("/" + FILE.name());
 
         create(ggfs, paths(DIR_NEW, SUBDIR_NEW), paths(file));
 
         ggfs.rename(file, SUBDIR_NEW);
 
-        checkExist(ggfs, ggfsSecondary, new IgniteFsPath(SUBDIR_NEW, FILE.name()));
+        checkExist(ggfs, ggfsSecondary, new IgfsPath(SUBDIR_NEW, FILE.name()));
         checkNotExist(ggfs, ggfsSecondary, file);
     }
 
@@ -479,7 +479,7 @@ public abstract class IgfsAbstractSelfTest extends IgfsCommonAbstractTest {
      * @throws Exception If failed.
      */
     public void testMoveRenameFileDestinationRoot() throws Exception {
-        IgniteFsPath file = new IgniteFsPath("/" + FILE.name());
+        IgfsPath file = new IgfsPath("/" + FILE.name());
 
         create(ggfs, paths(DIR, SUBDIR), paths(FILE));
 
@@ -495,7 +495,7 @@ public abstract class IgfsAbstractSelfTest extends IgfsCommonAbstractTest {
      * @throws Exception If failed.
      */
     public void testMoveRenameFileSourceParentRoot() throws Exception {
-        IgniteFsPath file = new IgniteFsPath("/" + FILE_NEW.name());
+        IgfsPath file = new IgfsPath("/" + FILE_NEW.name());
 
         create(ggfs, paths(DIR_NEW, SUBDIR_NEW), paths(file));
 
@@ -516,7 +516,7 @@ public abstract class IgfsAbstractSelfTest extends IgfsCommonAbstractTest {
 
         ggfs.rename(SUBSUBDIR, SUBDIR_NEW);
 
-        checkExist(ggfs, ggfsSecondary, new IgniteFsPath(SUBDIR_NEW, SUBSUBDIR.name()));
+        checkExist(ggfs, ggfsSecondary, new IgfsPath(SUBDIR_NEW, SUBSUBDIR.name()));
         checkNotExist(ggfs, ggfsSecondary, SUBSUBDIR);
     }
 
@@ -528,9 +528,9 @@ public abstract class IgfsAbstractSelfTest extends IgfsCommonAbstractTest {
     public void testMoveDirectoryDestinationRoot() throws Exception {
         create(ggfs, paths(DIR, SUBDIR, SUBSUBDIR), null);
 
-        ggfs.rename(SUBSUBDIR, new IgniteFsPath());
+        ggfs.rename(SUBSUBDIR, new IgfsPath());
 
-        checkExist(ggfs, ggfsSecondary, new IgniteFsPath("/" + SUBSUBDIR.name()));
+        checkExist(ggfs, ggfsSecondary, new IgfsPath("/" + SUBSUBDIR.name()));
         checkNotExist(ggfs, ggfsSecondary, SUBSUBDIR);
     }
 
@@ -540,13 +540,13 @@ public abstract class IgfsAbstractSelfTest extends IgfsCommonAbstractTest {
      * @throws Exception If failed.
      */
     public void testMoveDirectorySourceParentRoot() throws Exception {
-        IgniteFsPath dir = new IgniteFsPath("/" + SUBSUBDIR.name());
+        IgfsPath dir = new IgfsPath("/" + SUBSUBDIR.name());
 
         create(ggfs, paths(DIR_NEW, SUBDIR_NEW, dir), null);
 
         ggfs.rename(dir, SUBDIR_NEW);
 
-        checkExist(ggfs, ggfsSecondary, new IgniteFsPath(SUBDIR_NEW, SUBSUBDIR.name()));
+        checkExist(ggfs, ggfsSecondary, new IgfsPath(SUBDIR_NEW, SUBSUBDIR.name()));
         checkNotExist(ggfs, ggfsSecondary, dir);
     }
 
@@ -571,7 +571,7 @@ public abstract class IgfsAbstractSelfTest extends IgfsCommonAbstractTest {
      * @throws Exception If failed.
      */
     public void testMoveRenameDirectoryDestinationRoot() throws Exception {
-        IgniteFsPath dir = new IgniteFsPath("/" + SUBSUBDIR.name());
+        IgfsPath dir = new IgfsPath("/" + SUBSUBDIR.name());
 
         create(ggfs, paths(DIR, SUBDIR, SUBSUBDIR), null);
 
@@ -587,7 +587,7 @@ public abstract class IgfsAbstractSelfTest extends IgfsCommonAbstractTest {
      * @throws Exception If failed.
      */
     public void testMoveRenameDirectorySourceParentRoot() throws Exception {
-        IgniteFsPath dir = new IgniteFsPath("/" + SUBSUBDIR_NEW.name());
+        IgfsPath dir = new IgfsPath("/" + SUBSUBDIR_NEW.name());
 
         create(ggfs, paths(DIR_NEW, SUBDIR_NEW, dir), null);
 
@@ -866,7 +866,7 @@ public abstract class IgfsAbstractSelfTest extends IgfsCommonAbstractTest {
 
         GridTestUtils.assertThrows(log(), new Callable<Object>() {
             @Override public Object call() throws Exception {
-                IgniteFsInputStream is = null;
+                IgfsInputStream is = null;
 
                 try {
                     is = ggfs.open(FILE);
@@ -877,7 +877,7 @@ public abstract class IgfsAbstractSelfTest extends IgfsCommonAbstractTest {
 
                 return null;
             }
-        }, IgniteFsFileNotFoundException.class, "File not found: " + FILE);
+        }, IgfsFileNotFoundException.class, "File not found: " + FILE);
     }
 
     /**
@@ -899,7 +899,7 @@ public abstract class IgfsAbstractSelfTest extends IgfsCommonAbstractTest {
      * @throws Exception If failed.
      */
     public void testCreateParentRoot() throws Exception {
-        IgniteFsPath file = new IgniteFsPath("/" + FILE.name());
+        IgfsPath file = new IgfsPath("/" + FILE.name());
 
         createFile(ggfs, file, true, chunk);
 
@@ -1079,7 +1079,7 @@ public abstract class IgfsAbstractSelfTest extends IgfsCommonAbstractTest {
             @Override public void run() {
                 int idx = ctr.incrementAndGet();
 
-                IgniteFsPath path = new IgniteFsPath("/file" + idx);
+                IgfsPath path = new IgfsPath("/file" + idx);
 
                 try {
                     for (int i = 0; i < REPEAT_CNT; i++) {
@@ -1195,7 +1195,7 @@ public abstract class IgfsAbstractSelfTest extends IgfsCommonAbstractTest {
      * @throws Exception If failed.
      */
     public void testAppendParentRoot() throws Exception {
-        IgniteFsPath file = new IgniteFsPath("/" + FILE.name());
+        IgfsPath file = new IgfsPath("/" + FILE.name());
 
         createFile(ggfs, file, true, BLOCK_SIZE, chunk);
 
@@ -1388,13 +1388,13 @@ public abstract class IgfsAbstractSelfTest extends IgfsCommonAbstractTest {
         int threadCnt = 10;
 
         for (int i = 0; i < threadCnt; i++)
-            createFile(ggfs, new IgniteFsPath("/file" + i), false);
+            createFile(ggfs, new IgfsPath("/file" + i), false);
 
         multithreaded(new Runnable() {
             @Override public void run() {
                 int idx = ctr.getAndIncrement();
 
-                IgniteFsPath path = new IgniteFsPath("/file" + idx);
+                IgfsPath path = new IgfsPath("/file" + idx);
 
                 try {
                     byte[][] chunks = new byte[REPEAT_CNT][];
@@ -1916,15 +1916,15 @@ public abstract class IgfsAbstractSelfTest extends IgfsCommonAbstractTest {
         assert childrenDirPerLvl > 0;
 
         // First define file system structure.
-        final Map<Integer, List<IgniteFsPath>> dirPaths = new HashMap<>();
-        final Map<Integer, List<IgniteFsPath>> filePaths = new HashMap<>();
+        final Map<Integer, List<IgfsPath>> dirPaths = new HashMap<>();
+        final Map<Integer, List<IgfsPath>> filePaths = new HashMap<>();
 
-        Queue<IgniteBiTuple<Integer, IgniteFsPath>> queue = new ArrayDeque<>();
+        Queue<IgniteBiTuple<Integer, IgfsPath>> queue = new ArrayDeque<>();
 
-        queue.add(F.t(0, new IgniteFsPath())); // Add root directory.
+        queue.add(F.t(0, new IgfsPath())); // Add root directory.
 
         while (!queue.isEmpty()) {
-            IgniteBiTuple<Integer, IgniteFsPath> entry = queue.poll();
+            IgniteBiTuple<Integer, IgfsPath> entry = queue.poll();
 
             int lvl = entry.getKey();
 
@@ -1932,21 +1932,21 @@ public abstract class IgfsAbstractSelfTest extends IgfsCommonAbstractTest {
                 int newLvl = lvl + 1;
 
                 for (int i = 0; i < childrenDirPerLvl; i++) {
-                    IgniteFsPath path = new IgniteFsPath(entry.getValue(), "dir-" + newLvl + "-" + i);
+                    IgfsPath path = new IgfsPath(entry.getValue(), "dir-" + newLvl + "-" + i);
 
                     queue.add(F.t(newLvl, path));
 
                     if (!dirPaths.containsKey(newLvl))
-                        dirPaths.put(newLvl, new ArrayList<IgniteFsPath>());
+                        dirPaths.put(newLvl, new ArrayList<IgfsPath>());
 
                     dirPaths.get(newLvl).add(path);
                 }
 
                 for (int i = 0; i < childrenFilePerLvl; i++) {
-                    IgniteFsPath path = new IgniteFsPath(entry.getValue(), "file-" + newLvl + "-" + i);
+                    IgfsPath path = new IgfsPath(entry.getValue(), "file-" + newLvl + "-" + i);
 
                     if (!filePaths.containsKey(newLvl))
-                        filePaths.put(newLvl, new ArrayList<IgniteFsPath>());
+                        filePaths.put(newLvl, new ArrayList<IgfsPath>());
 
                     filePaths.get(newLvl).add(path);
                 }
@@ -1970,8 +1970,8 @@ public abstract class IgfsAbstractSelfTest extends IgfsCommonAbstractTest {
                         int fromLvl = rand.nextInt(lvlCnt) + 1;
                         int toLvl = rand.nextInt(lvlCnt) + 1;
 
-                        List<IgniteFsPath> fromPaths;
-                        List<IgniteFsPath> toPaths;
+                        List<IgfsPath> fromPaths;
+                        List<IgfsPath> toPaths;
 
                         if (rand.nextInt(childrenDirPerLvl + childrenFilePerLvl) < childrenDirPerLvl) {
                             // Rename directories.
@@ -1984,8 +1984,8 @@ public abstract class IgfsAbstractSelfTest extends IgfsCommonAbstractTest {
                             toPaths = filePaths.get(toLvl);
                         }
 
-                        IgniteFsPath fromPath = fromPaths.get(rand.nextInt(fromPaths.size()));
-                        IgniteFsPath toPath = toPaths.get(rand.nextInt(toPaths.size()));
+                        IgfsPath fromPath = fromPaths.get(rand.nextInt(fromPaths.size()));
+                        IgfsPath toPath = toPaths.get(rand.nextInt(toPaths.size()));
 
                         U.awaitQuiet(barrier);
 
@@ -2007,7 +2007,7 @@ public abstract class IgfsAbstractSelfTest extends IgfsCommonAbstractTest {
                     try {
                         int lvl = rand.nextInt(lvlCnt) + 1;
 
-                        IgniteFsPath path = rand.nextInt(childrenDirPerLvl + childrenFilePerLvl) < childrenDirPerLvl ?
+                        IgfsPath path = rand.nextInt(childrenDirPerLvl + childrenFilePerLvl) < childrenDirPerLvl ?
                             dirPaths.get(lvl).get(rand.nextInt(dirPaths.get(lvl).size())) :
                             filePaths.get(lvl).get(rand.nextInt(filePaths.get(lvl).size()));
 
@@ -2031,7 +2031,7 @@ public abstract class IgfsAbstractSelfTest extends IgfsCommonAbstractTest {
                     try {
                         int lvl = rand.nextInt(lvlCnt) + 1;
 
-                        IgniteFsPath path = rand.nextInt(childrenDirPerLvl + childrenFilePerLvl) < childrenDirPerLvl ?
+                        IgfsPath path = rand.nextInt(childrenDirPerLvl + childrenFilePerLvl) < childrenDirPerLvl ?
                             dirPaths.get(lvl).get(rand.nextInt(dirPaths.get(lvl).size())) :
                             filePaths.get(lvl).get(rand.nextInt(filePaths.get(lvl).size()));
 
@@ -2057,9 +2057,9 @@ public abstract class IgfsAbstractSelfTest extends IgfsCommonAbstractTest {
                     try {
                         int lvl = rand.nextInt(lvlCnt) + 1;
 
-                        IgniteFsPath parentPath = dirPaths.get(lvl).get(rand.nextInt(dirPaths.get(lvl).size()));
+                        IgfsPath parentPath = dirPaths.get(lvl).get(rand.nextInt(dirPaths.get(lvl).size()));
 
-                        IgniteFsPath path = new IgniteFsPath(parentPath, "newDir-" + dirCtr.incrementAndGet());
+                        IgfsPath path = new IgfsPath(parentPath, "newDir-" + dirCtr.incrementAndGet());
 
                         U.awaitQuiet(barrier);
 
@@ -2084,9 +2084,9 @@ public abstract class IgfsAbstractSelfTest extends IgfsCommonAbstractTest {
                     try {
                         int lvl = rand.nextInt(lvlCnt) + 1;
 
-                        IgniteFsPath parentPath = dirPaths.get(lvl).get(rand.nextInt(dirPaths.get(lvl).size()));
+                        IgfsPath parentPath = dirPaths.get(lvl).get(rand.nextInt(dirPaths.get(lvl).size()));
 
-                        IgniteFsPath path = new IgniteFsPath(parentPath, "newFile-" + fileCtr.incrementAndGet());
+                        IgfsPath path = new IgfsPath(parentPath, "newFile-" + fileCtr.incrementAndGet());
 
                         U.awaitQuiet(barrier);
 
@@ -2116,8 +2116,8 @@ public abstract class IgfsAbstractSelfTest extends IgfsCommonAbstractTest {
 
             IgfsImpl targetGgfs = dual ? lvl <= primaryLvlCnt ? ggfs : ggfsSecondary : ggfs;
 
-            IgniteFsPath[] dirs = dirPaths.get(lvl).toArray(new IgniteFsPath[dirPaths.get(lvl).size()]);
-            IgniteFsPath[] files = filePaths.get(lvl).toArray(new IgniteFsPath[filePaths.get(lvl).size()]);
+            IgfsPath[] dirs = dirPaths.get(lvl).toArray(new IgfsPath[dirPaths.get(lvl).size()]);
+            IgfsPath[] files = filePaths.get(lvl).toArray(new IgfsPath[filePaths.get(lvl).size()]);
 
             create(targetGgfs, dirs, files);
         }
@@ -2137,15 +2137,15 @@ public abstract class IgfsAbstractSelfTest extends IgfsCommonAbstractTest {
      * @param files Files.
      * @throws Exception If failed.
      */
-    public static void create(IgniteFsFileSystem ggfs, @Nullable IgniteFsPath[] dirs, @Nullable IgniteFsPath[] files)
+    public static void create(Igfs ggfs, @Nullable IgfsPath[] dirs, @Nullable IgfsPath[] files)
         throws Exception {
         if (dirs != null) {
-            for (IgniteFsPath dir : dirs)
+            for (IgfsPath dir : dirs)
                 ggfs.mkdirs(dir);
         }
 
         if (files != null) {
-            for (IgniteFsPath file : files) {
+            for (IgfsPath file : files) {
                 OutputStream os = ggfs.create(file, true);
 
                 os.close();
@@ -2163,7 +2163,7 @@ public abstract class IgfsAbstractSelfTest extends IgfsCommonAbstractTest {
      * @throws IOException In case of IO exception.
      * @throws IgniteCheckedException In case of Grid exception.
      */
-    protected static void createFile(IgniteFsFileSystem ggfs, IgniteFsPath file, boolean overwrite,
+    protected static void createFile(Igfs ggfs, IgfsPath file, boolean overwrite,
         @Nullable byte[]... chunks) throws IOException, IgniteCheckedException {
         OutputStream os = null;
 
@@ -2189,7 +2189,7 @@ public abstract class IgfsAbstractSelfTest extends IgfsCommonAbstractTest {
      * @param chunks Data chunks.
      * @throws Exception If failed.
      */
-    protected void createFile(IgniteFs ggfs, IgniteFsPath file, boolean overwrite, long blockSize,
+    protected void createFile(IgniteFs ggfs, IgfsPath file, boolean overwrite, long blockSize,
         @Nullable byte[]... chunks) throws Exception {
         IgniteFsOutputStream os = null;
 
@@ -2213,7 +2213,7 @@ public abstract class IgfsAbstractSelfTest extends IgfsCommonAbstractTest {
      * @param chunks Data chunks.
      * @throws Exception If failed.
      */
-    protected void appendFile(IgniteFs ggfs, IgniteFsPath file, @Nullable byte[]... chunks)
+    protected void appendFile(IgniteFs ggfs, IgfsPath file, @Nullable byte[]... chunks)
         throws Exception {
         IgniteFsOutputStream os = null;
 
@@ -2249,7 +2249,7 @@ public abstract class IgfsAbstractSelfTest extends IgfsCommonAbstractTest {
      * @param ggfs GGFS.
      * @param file File.
      */
-    public static void awaitFileClose(IgniteFsFileSystem ggfs, IgniteFsPath file) {
+    public static void awaitFileClose(Igfs ggfs, IgfsPath file) {
         try {
             ggfs.update(file, Collections.singletonMap("prop", "val"));
         }
@@ -2266,7 +2266,7 @@ public abstract class IgfsAbstractSelfTest extends IgfsCommonAbstractTest {
      * @param paths Paths.
      * @throws Exception If failed.
      */
-    protected void checkExist(IgfsImpl ggfs, IgfsImpl ggfsSecondary, IgniteFsPath... paths) throws Exception {
+    protected void checkExist(IgfsImpl ggfs, IgfsImpl ggfsSecondary, IgfsPath... paths) throws Exception {
         checkExist(ggfs, paths);
 
         if (dual)
@@ -2280,8 +2280,8 @@ public abstract class IgfsAbstractSelfTest extends IgfsCommonAbstractTest {
      * @param paths Paths.
      * @throws IgniteCheckedException If failed.
      */
-    protected void checkExist(IgfsImpl ggfs, IgniteFsPath... paths) throws IgniteCheckedException {
-        for (IgniteFsPath path : paths) {
+    protected void checkExist(IgfsImpl ggfs, IgfsPath... paths) throws IgniteCheckedException {
+        for (IgfsPath path : paths) {
             assert ggfs.context().meta().fileId(path) != null : "Path doesn't exist [ggfs=" + ggfs.name() +
                 ", path=" + path + ']';
             assert ggfs.exists(path) : "Path doesn't exist [ggfs=" + ggfs.name() + ", path=" + path + ']';
@@ -2296,7 +2296,7 @@ public abstract class IgfsAbstractSelfTest extends IgfsCommonAbstractTest {
      * @param paths Paths.
      * @throws Exception If failed.
      */
-    protected void checkNotExist(IgfsImpl ggfs, IgfsImpl ggfsSecondary, IgniteFsPath... paths)
+    protected void checkNotExist(IgfsImpl ggfs, IgfsImpl ggfsSecondary, IgfsPath... paths)
         throws Exception {
         checkNotExist(ggfs, paths);
 
@@ -2311,8 +2311,8 @@ public abstract class IgfsAbstractSelfTest extends IgfsCommonAbstractTest {
      * @param paths Paths.
      * @throws Exception If failed.
      */
-    protected void checkNotExist(IgfsImpl ggfs, IgniteFsPath... paths) throws Exception {
-        for (IgniteFsPath path : paths) {
+    protected void checkNotExist(IgfsImpl ggfs, IgfsPath... paths) throws Exception {
+        for (IgfsPath path : paths) {
             assert ggfs.context().meta().fileId(path) == null : "Path exists [ggfs=" + ggfs.name() + ", path=" +
                 path + ']';
             assert !ggfs.exists(path) : "Path exists [ggfs=" + ggfs.name() + ", path=" + path + ']';
@@ -2329,7 +2329,7 @@ public abstract class IgfsAbstractSelfTest extends IgfsCommonAbstractTest {
      * @param chunks Expected data.
      * @throws Exception If failed.
      */
-    protected void checkFile(IgfsImpl ggfs, IgfsImpl ggfsSecondary, IgniteFsPath file,
+    protected void checkFile(IgfsImpl ggfs, IgfsImpl ggfsSecondary, IgfsPath file,
         @Nullable byte[]... chunks) throws Exception {
         checkExist(ggfs, file);
         checkFileContent(ggfs, file, chunks);
@@ -2349,10 +2349,10 @@ public abstract class IgfsAbstractSelfTest extends IgfsCommonAbstractTest {
      * @throws IOException In case of IO exception.
      * @throws IgniteCheckedException In case of Grid exception.
      */
-    protected void checkFileContent(IgfsImpl ggfs, IgniteFsPath file, @Nullable byte[]... chunks)
+    protected void checkFileContent(IgfsImpl ggfs, IgfsPath file, @Nullable byte[]... chunks)
         throws IOException, IgniteCheckedException {
         if (chunks != null && chunks.length > 0) {
-            IgniteFsInputStream is = null;
+            IgfsInputStream is = null;
 
             try {
                 is = ggfs.open(file);
@@ -2408,7 +2408,7 @@ public abstract class IgfsAbstractSelfTest extends IgfsCommonAbstractTest {
      * @param paths Paths to group.
      * @return Paths as array.
      */
-    protected IgniteFsPath[] paths(IgniteFsPath... paths) {
+    protected IgfsPath[] paths(IgfsPath... paths) {
         return paths;
     }
 
@@ -2438,10 +2438,10 @@ public abstract class IgfsAbstractSelfTest extends IgfsCommonAbstractTest {
         workerMapFld.setAccessible(true);
 
         // Wait for all workers to finish.
-        Map<IgniteFsPath, IgfsFileWorker> workerMap =
-            (Map<IgniteFsPath, IgfsFileWorker>)workerMapFld.get(ggfs);
+        Map<IgfsPath, IgfsFileWorker> workerMap =
+            (Map<IgfsPath, IgfsFileWorker>)workerMapFld.get(ggfs);
 
-        for (Map.Entry<IgniteFsPath, IgfsFileWorker> entry : workerMap.entrySet()) {
+        for (Map.Entry<IgfsPath, IgfsFileWorker> entry : workerMap.entrySet()) {
             entry.getValue().cancel();
 
             U.join(entry.getValue());

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/639ff503/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsDataManagerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsDataManagerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsDataManagerSelfTest.java
index b21cc11..8506893 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsDataManagerSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsDataManagerSelfTest.java
@@ -158,7 +158,7 @@ public class IgfsDataManagerSelfTest extends IgfsCommonAbstractTest {
     @SuppressWarnings("ConstantConditions")
     public void testDataStoring() throws Exception {
         for (int i = 0; i < 10; i++) {
-            IgniteFsPath path = new IgniteFsPath();
+            IgfsPath path = new IgfsPath();
             IgfsFileInfo info = new IgfsFileInfo(200, null, false, null);
 
             assertNull(mgr.dataBlock(info, path, 0, null).get());
@@ -239,7 +239,7 @@ public class IgfsDataManagerSelfTest extends IgfsCommonAbstractTest {
         final int blockSize = GGFS_BLOCK_SIZE;
 
         for (int i = 0; i < 10; i++) {
-            IgniteFsPath path = new IgniteFsPath();
+            IgfsPath path = new IgfsPath();
             IgfsFileInfo info = new IgfsFileInfo(blockSize, null, false, null);
 
             assertNull(mgr.dataBlock(info, path, 0, null).get());
@@ -326,7 +326,7 @@ public class IgfsDataManagerSelfTest extends IgfsCommonAbstractTest {
         final int writesCnt = 64;
 
         for (int i = 0; i < 10; i++) {
-            IgniteFsPath path = new IgniteFsPath();
+            IgfsPath path = new IgfsPath();
             IgfsFileInfo info = new IgfsFileInfo(blockSize, null, false, null);
 
             IgfsFileAffinityRange range = new IgfsFileAffinityRange();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/639ff503/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsDualAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsDualAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsDualAbstractSelfTest.java
index 4619f55..4181b4c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsDualAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsDualAbstractSelfTest.java
@@ -50,13 +50,13 @@ public abstract class IgfsDualAbstractSelfTest extends IgfsAbstractSelfTest {
      * @throws Exception If failed.
      */
     public void testDefaultDirectories() throws Exception {
-        IgniteFsPath gg = new IgniteFsPath("/ignite");
-        IgniteFsPath[] paths = paths(
-            gg, new IgniteFsPath(gg, "sync"), new IgniteFsPath(gg, "async"), new IgniteFsPath(gg, "primary"));
+        IgfsPath gg = new IgfsPath("/ignite");
+        IgfsPath[] paths = paths(
+            gg, new IgfsPath(gg, "sync"), new IgfsPath(gg, "async"), new IgfsPath(gg, "primary"));
 
         create(ggfs, paths, null);
 
-        for (IgniteFsPath p : paths)
+        for (IgfsPath p : paths)
             assert ggfs.exists(p);
 
         assert ggfs.listFiles(gg).size() == 3;
@@ -150,8 +150,8 @@ public abstract class IgfsDualAbstractSelfTest extends IgfsAbstractSelfTest {
      * @throws Exception If failed.
      */
     public void testRenameFileParentRootSourceMissing() throws Exception {
-        IgniteFsPath file1 = new IgniteFsPath("/file1");
-        IgniteFsPath file2 = new IgniteFsPath("/file2");
+        IgfsPath file1 = new IgfsPath("/file1");
+        IgfsPath file2 = new IgfsPath("/file2");
 
         create(ggfsSecondary, null, paths(file1));
         create(ggfs, null, null);
@@ -199,8 +199,8 @@ public abstract class IgfsDualAbstractSelfTest extends IgfsAbstractSelfTest {
      * @throws Exception If failed.
      */
     public void testRenameDirectoryParentRootSourceMissing() throws Exception {
-        IgniteFsPath dir1 = new IgniteFsPath("/dir1");
-        IgniteFsPath dir2 = new IgniteFsPath("/dir2");
+        IgfsPath dir1 = new IgfsPath("/dir1");
+        IgfsPath dir2 = new IgfsPath("/dir2");
 
         create(ggfsSecondary, paths(dir1), null);
         create(ggfs, null, null);
@@ -223,7 +223,7 @@ public abstract class IgfsDualAbstractSelfTest extends IgfsAbstractSelfTest {
         ggfs.rename(FILE, SUBDIR_NEW);
 
         checkExist(ggfs, SUBDIR);
-        checkExist(ggfs, ggfsSecondary, new IgniteFsPath(SUBDIR_NEW, FILE.name()));
+        checkExist(ggfs, ggfsSecondary, new IgfsPath(SUBDIR_NEW, FILE.name()));
         checkNotExist(ggfs, ggfsSecondary, FILE);
     }
 
@@ -239,7 +239,7 @@ public abstract class IgfsDualAbstractSelfTest extends IgfsAbstractSelfTest {
         ggfs.rename(FILE, SUBDIR_NEW);
 
         checkExist(ggfs, DIR, SUBDIR);
-        checkExist(ggfs, ggfsSecondary, new IgniteFsPath(SUBDIR_NEW, FILE.name()));
+        checkExist(ggfs, ggfsSecondary, new IgfsPath(SUBDIR_NEW, FILE.name()));
         checkNotExist(ggfs, ggfsSecondary, FILE);
     }
 
@@ -255,7 +255,7 @@ public abstract class IgfsDualAbstractSelfTest extends IgfsAbstractSelfTest {
         ggfs.rename(FILE, SUBDIR_NEW);
 
         checkExist(ggfs, SUBDIR_NEW);
-        checkExist(ggfs, ggfsSecondary, new IgniteFsPath(SUBDIR_NEW, FILE.name()));
+        checkExist(ggfs, ggfsSecondary, new IgfsPath(SUBDIR_NEW, FILE.name()));
         checkNotExist(ggfs, ggfsSecondary, FILE);
     }
 
@@ -271,7 +271,7 @@ public abstract class IgfsDualAbstractSelfTest extends IgfsAbstractSelfTest {
         ggfs.rename(FILE, SUBDIR_NEW);
 
         checkExist(ggfs, DIR_NEW, SUBDIR_NEW);
-        checkExist(ggfs, ggfsSecondary, new IgniteFsPath(SUBDIR_NEW, FILE.name()));
+        checkExist(ggfs, ggfsSecondary, new IgfsPath(SUBDIR_NEW, FILE.name()));
         checkNotExist(ggfs, ggfsSecondary, FILE);
     }
 
@@ -287,7 +287,7 @@ public abstract class IgfsDualAbstractSelfTest extends IgfsAbstractSelfTest {
         ggfs.rename(FILE, SUBDIR_NEW);
 
         checkExist(ggfs, SUBDIR, SUBDIR_NEW);
-        checkExist(ggfs, ggfsSecondary, new IgniteFsPath(SUBDIR_NEW, FILE.name()));
+        checkExist(ggfs, ggfsSecondary, new IgfsPath(SUBDIR_NEW, FILE.name()));
         checkNotExist(ggfs, ggfsSecondary, FILE);
     }
 
@@ -303,7 +303,7 @@ public abstract class IgfsDualAbstractSelfTest extends IgfsAbstractSelfTest {
         ggfs.rename(FILE, SUBDIR_NEW);
 
         checkExist(ggfs, DIR, SUBDIR, DIR_NEW, SUBDIR_NEW);
-        checkExist(ggfs, ggfsSecondary, new IgniteFsPath(SUBDIR_NEW, FILE.name()));
+        checkExist(ggfs, ggfsSecondary, new IgfsPath(SUBDIR_NEW, FILE.name()));
         checkNotExist(ggfs, ggfsSecondary, FILE);
     }
 
@@ -316,10 +316,10 @@ public abstract class IgfsDualAbstractSelfTest extends IgfsAbstractSelfTest {
         create(ggfsSecondary, paths(DIR, SUBDIR), paths(FILE));
         create(ggfs, paths(DIR), null);
 
-        ggfs.rename(FILE, new IgniteFsPath());
+        ggfs.rename(FILE, new IgfsPath());
 
         checkExist(ggfs, SUBDIR);
-        checkExist(ggfs, ggfsSecondary, new IgniteFsPath("/" + FILE.name()));
+        checkExist(ggfs, ggfsSecondary, new IgfsPath("/" + FILE.name()));
         checkNotExist(ggfs, ggfsSecondary, FILE);
     }
 
@@ -332,10 +332,10 @@ public abstract class IgfsDualAbstractSelfTest extends IgfsAbstractSelfTest {
         create(ggfsSecondary, paths(DIR, SUBDIR), paths(FILE));
         create(ggfs, null, null);
 
-        ggfs.rename(FILE, new IgniteFsPath());
+        ggfs.rename(FILE, new IgfsPath());
 
         checkExist(ggfs, DIR, SUBDIR);
-        checkExist(ggfs, ggfsSecondary, new IgniteFsPath("/" + FILE.name()));
+        checkExist(ggfs, ggfsSecondary, new IgfsPath("/" + FILE.name()));
         checkNotExist(ggfs, ggfsSecondary, FILE);
     }
 
@@ -345,14 +345,14 @@ public abstract class IgfsDualAbstractSelfTest extends IgfsAbstractSelfTest {
      * @throws Exception If failed.
      */
     public void testMoveFileSourceParentRootSourceMissing() throws Exception {
-        IgniteFsPath file = new IgniteFsPath("/" + FILE.name());
+        IgfsPath file = new IgfsPath("/" + FILE.name());
 
         create(ggfsSecondary, paths(DIR_NEW, SUBDIR_NEW), paths(file));
         create(ggfs, paths(DIR_NEW, SUBDIR_NEW), null);
 
         ggfs.rename(file, SUBDIR_NEW);
 
-        checkExist(ggfs, ggfsSecondary, new IgniteFsPath(SUBDIR_NEW, FILE.name()));
+        checkExist(ggfs, ggfsSecondary, new IgfsPath(SUBDIR_NEW, FILE.name()));
         checkNotExist(ggfs, ggfsSecondary, file);
     }
 
@@ -362,7 +362,7 @@ public abstract class IgfsDualAbstractSelfTest extends IgfsAbstractSelfTest {
      * @throws Exception If failed.
      */
     public void testMoveFileSourceParentRootDestinationMissingPartially() throws Exception {
-        IgniteFsPath file = new IgniteFsPath("/" + FILE.name());
+        IgfsPath file = new IgfsPath("/" + FILE.name());
 
         create(ggfsSecondary, paths(DIR_NEW, SUBDIR_NEW), paths(file));
         create(ggfs, paths(DIR_NEW), null);
@@ -370,7 +370,7 @@ public abstract class IgfsDualAbstractSelfTest extends IgfsAbstractSelfTest {
         ggfs.rename(file, SUBDIR_NEW);
 
         checkExist(ggfs, SUBDIR_NEW);
-        checkExist(ggfs, ggfsSecondary, new IgniteFsPath(SUBDIR_NEW, FILE.name()));
+        checkExist(ggfs, ggfsSecondary, new IgfsPath(SUBDIR_NEW, FILE.name()));
         checkNotExist(ggfs, ggfsSecondary, file);
     }
 
@@ -380,7 +380,7 @@ public abstract class IgfsDualAbstractSelfTest extends IgfsAbstractSelfTest {
      * @throws Exception If failed.
      */
     public void testMoveFileSourceParentRootDestinationMissing() throws Exception {
-        IgniteFsPath file = new IgniteFsPath("/" + FILE.name());
+        IgfsPath file = new IgfsPath("/" + FILE.name());
 
         create(ggfsSecondary, paths(DIR_NEW, SUBDIR_NEW), paths(file));
         create(ggfs, null, null);
@@ -388,7 +388,7 @@ public abstract class IgfsDualAbstractSelfTest extends IgfsAbstractSelfTest {
         ggfs.rename(file, SUBDIR_NEW);
 
         checkExist(ggfs, DIR_NEW, SUBDIR_NEW);
-        checkExist(ggfs, ggfsSecondary, new IgniteFsPath(SUBDIR_NEW, FILE.name()));
+        checkExist(ggfs, ggfsSecondary, new IgfsPath(SUBDIR_NEW, FILE.name()));
         checkNotExist(ggfs, ggfsSecondary, file);
     }
 
@@ -494,7 +494,7 @@ public abstract class IgfsDualAbstractSelfTest extends IgfsAbstractSelfTest {
      * @throws Exception If failed.
      */
     public void testMoveRenameFileDestinationRootSourceMissingPartially() throws Exception {
-        IgniteFsPath file = new IgniteFsPath("/" + FILE.name());
+        IgfsPath file = new IgfsPath("/" + FILE.name());
 
         create(ggfsSecondary, paths(DIR, SUBDIR), paths(FILE));
         create(ggfs, paths(DIR), null);
@@ -512,7 +512,7 @@ public abstract class IgfsDualAbstractSelfTest extends IgfsAbstractSelfTest {
      * @throws Exception If failed.
      */
     public void testMoveRenameFileDestinationRootSourceMissing() throws Exception {
-        IgniteFsPath file = new IgniteFsPath("/" + FILE.name());
+        IgfsPath file = new IgfsPath("/" + FILE.name());
 
         create(ggfsSecondary, paths(DIR, SUBDIR), paths(FILE));
         create(ggfs, null, null);
@@ -530,7 +530,7 @@ public abstract class IgfsDualAbstractSelfTest extends IgfsAbstractSelfTest {
      * @throws Exception If failed.
      */
     public void testMoveRenameFileSourceParentRootSourceMissing() throws Exception {
-        IgniteFsPath file = new IgniteFsPath("/" + FILE_NEW.name());
+        IgfsPath file = new IgfsPath("/" + FILE_NEW.name());
 
         create(ggfsSecondary, paths(DIR_NEW, SUBDIR_NEW), paths(file));
         create(ggfs, paths(DIR_NEW, SUBDIR_NEW), null);
@@ -547,7 +547,7 @@ public abstract class IgfsDualAbstractSelfTest extends IgfsAbstractSelfTest {
      * @throws Exception If failed.
      */
     public void testMoveRenameFileSourceParentRootDestinationMissingPartially() throws Exception {
-        IgniteFsPath file = new IgniteFsPath("/" + FILE_NEW.name());
+        IgfsPath file = new IgfsPath("/" + FILE_NEW.name());
 
         create(ggfsSecondary, paths(DIR_NEW, SUBDIR_NEW), paths(file));
         create(ggfs, paths(DIR_NEW), null);
@@ -565,7 +565,7 @@ public abstract class IgfsDualAbstractSelfTest extends IgfsAbstractSelfTest {
      * @throws Exception If failed.
      */
     public void testMoveRenameFileSourceParentRootDestinationMissing() throws Exception {
-        IgniteFsPath file = new IgniteFsPath("/" + FILE_NEW.name());
+        IgfsPath file = new IgfsPath("/" + FILE_NEW.name());
 
         create(ggfsSecondary, paths(DIR_NEW, SUBDIR_NEW), paths(file));
         create(ggfs, null, null);
@@ -589,7 +589,7 @@ public abstract class IgfsDualAbstractSelfTest extends IgfsAbstractSelfTest {
         ggfs.rename(SUBSUBDIR, SUBDIR_NEW);
 
         checkExist(ggfs, SUBDIR);
-        checkExist(ggfs, ggfsSecondary, new IgniteFsPath(SUBDIR_NEW, SUBSUBDIR.name()));
+        checkExist(ggfs, ggfsSecondary, new IgfsPath(SUBDIR_NEW, SUBSUBDIR.name()));
         checkNotExist(ggfs, ggfsSecondary, SUBSUBDIR);
     }
 
@@ -606,7 +606,7 @@ public abstract class IgfsDualAbstractSelfTest extends IgfsAbstractSelfTest {
 
         checkExist(ggfs, DIR);
         checkExist(ggfs, SUBDIR);
-        checkExist(ggfs, ggfsSecondary, new IgniteFsPath(SUBDIR_NEW, SUBSUBDIR.name()));
+        checkExist(ggfs, ggfsSecondary, new IgfsPath(SUBDIR_NEW, SUBSUBDIR.name()));
         checkNotExist(ggfs, ggfsSecondary, SUBSUBDIR);
     }
 
@@ -622,7 +622,7 @@ public abstract class IgfsDualAbstractSelfTest extends IgfsAbstractSelfTest {
         ggfs.rename(SUBSUBDIR, SUBDIR_NEW);
 
         checkExist(ggfs, SUBDIR_NEW);
-        checkExist(ggfs, ggfsSecondary, new IgniteFsPath(SUBDIR_NEW, SUBSUBDIR.name()));
+        checkExist(ggfs, ggfsSecondary, new IgfsPath(SUBDIR_NEW, SUBSUBDIR.name()));
         checkNotExist(ggfs, ggfsSecondary, SUBSUBDIR);
     }
 
@@ -638,7 +638,7 @@ public abstract class IgfsDualAbstractSelfTest extends IgfsAbstractSelfTest {
         ggfs.rename(SUBSUBDIR, SUBDIR_NEW);
 
         checkExist(ggfs, DIR_NEW, SUBDIR_NEW);
-        checkExist(ggfs, ggfsSecondary, new IgniteFsPath(SUBDIR_NEW, SUBSUBDIR.name()));
+        checkExist(ggfs, ggfsSecondary, new IgfsPath(SUBDIR_NEW, SUBSUBDIR.name()));
         checkNotExist(ggfs, ggfsSecondary, SUBSUBDIR);
     }
 
@@ -654,7 +654,7 @@ public abstract class IgfsDualAbstractSelfTest extends IgfsAbstractSelfTest {
         ggfs.rename(SUBSUBDIR, SUBDIR_NEW);
 
         checkExist(ggfs, SUBDIR, SUBDIR_NEW);
-        checkExist(ggfs, ggfsSecondary, new IgniteFsPath(SUBDIR_NEW, SUBSUBDIR.name()));
+        checkExist(ggfs, ggfsSecondary, new IgfsPath(SUBDIR_NEW, SUBSUBDIR.name()));
         checkNotExist(ggfs, ggfsSecondary, SUBSUBDIR);
     }
 
@@ -670,7 +670,7 @@ public abstract class IgfsDualAbstractSelfTest extends IgfsAbstractSelfTest {
         ggfs.rename(SUBSUBDIR, SUBDIR_NEW);
 
         checkExist(ggfs, DIR, SUBDIR, DIR_NEW, SUBDIR_NEW);
-        checkExist(ggfs, ggfsSecondary, new IgniteFsPath(SUBDIR_NEW, SUBSUBDIR.name()));
+        checkExist(ggfs, ggfsSecondary, new IgfsPath(SUBDIR_NEW, SUBSUBDIR.name()));
         checkNotExist(ggfs, ggfsSecondary, SUBSUBDIR);
     }
 
@@ -683,10 +683,10 @@ public abstract class IgfsDualAbstractSelfTest extends IgfsAbstractSelfTest {
         create(ggfsSecondary, paths(DIR, SUBDIR, SUBSUBDIR), null);
         create(ggfs, paths(DIR), null);
 
-        ggfs.rename(SUBSUBDIR, new IgniteFsPath());
+        ggfs.rename(SUBSUBDIR, new IgfsPath());
 
         checkExist(ggfs, SUBDIR);
-        checkExist(ggfs, ggfsSecondary, new IgniteFsPath("/" + SUBSUBDIR.name()));
+        checkExist(ggfs, ggfsSecondary, new IgfsPath("/" + SUBSUBDIR.name()));
         checkNotExist(ggfs, ggfsSecondary, SUBSUBDIR);
     }
 
@@ -699,10 +699,10 @@ public abstract class IgfsDualAbstractSelfTest extends IgfsAbstractSelfTest {
         create(ggfsSecondary, paths(DIR, SUBDIR, SUBSUBDIR), null);
         create(ggfs, null, null);
 
-        ggfs.rename(SUBSUBDIR, new IgniteFsPath());
+        ggfs.rename(SUBSUBDIR, new IgfsPath());
 
         checkExist(ggfs, DIR, SUBDIR);
-        checkExist(ggfs, ggfsSecondary, new IgniteFsPath("/" + SUBSUBDIR.name()));
+        checkExist(ggfs, ggfsSecondary, new IgfsPath("/" + SUBSUBDIR.name()));
         checkNotExist(ggfs, ggfsSecondary, SUBSUBDIR);
     }
 
@@ -712,14 +712,14 @@ public abstract class IgfsDualAbstractSelfTest extends IgfsAbstractSelfTest {
      * @throws Exception If failed.
      */
     public void testMoveDirectorySourceParentRootSourceMissing() throws Exception {
-        IgniteFsPath dir = new IgniteFsPath("/" + SUBSUBDIR.name());
+        IgfsPath dir = new IgfsPath("/" + SUBSUBDIR.name());
 
         create(ggfsSecondary, paths(DIR_NEW, SUBDIR_NEW, dir), null);
         create(ggfs, paths(DIR_NEW, SUBDIR_NEW), null);
 
         ggfs.rename(dir, SUBDIR_NEW);
 
-        checkExist(ggfs, ggfsSecondary, new IgniteFsPath(SUBDIR_NEW, SUBSUBDIR.name()));
+        checkExist(ggfs, ggfsSecondary, new IgfsPath(SUBDIR_NEW, SUBSUBDIR.name()));
         checkNotExist(ggfs, ggfsSecondary, dir);
     }
 
@@ -729,7 +729,7 @@ public abstract class IgfsDualAbstractSelfTest extends IgfsAbstractSelfTest {
      * @throws Exception If failed.
      */
     public void testMoveDirectorySourceParentRootDestinationMissingPartially() throws Exception {
-        IgniteFsPath dir = new IgniteFsPath("/" + SUBSUBDIR.name());
+        IgfsPath dir = new IgfsPath("/" + SUBSUBDIR.name());
 
         create(ggfsSecondary, paths(DIR_NEW, SUBDIR_NEW, dir), null);
         create(ggfs, paths(DIR_NEW), null);
@@ -737,7 +737,7 @@ public abstract class IgfsDualAbstractSelfTest extends IgfsAbstractSelfTest {
         ggfs.rename(dir, SUBDIR_NEW);
 
         checkExist(ggfs, SUBDIR_NEW);
-        checkExist(ggfs, ggfsSecondary, new IgniteFsPath(SUBDIR_NEW, SUBSUBDIR.name()));
+        checkExist(ggfs, ggfsSecondary, new IgfsPath(SUBDIR_NEW, SUBSUBDIR.name()));
         checkNotExist(ggfs, ggfsSecondary, dir);
     }
 
@@ -747,7 +747,7 @@ public abstract class IgfsDualAbstractSelfTest extends IgfsAbstractSelfTest {
      * @throws Exception If failed.
      */
     public void testMoveDirectorySourceParentRootDestinationMissing() throws Exception {
-        IgniteFsPath dir = new IgniteFsPath("/" + SUBSUBDIR.name());
+        IgfsPath dir = new IgfsPath("/" + SUBSUBDIR.name());
 
         create(ggfsSecondary, paths(DIR_NEW, SUBDIR_NEW, dir), null);
         create(ggfs, null, null);
@@ -755,7 +755,7 @@ public abstract class IgfsDualAbstractSelfTest extends IgfsAbstractSelfTest {
         ggfs.rename(dir, SUBDIR_NEW);
 
         checkExist(ggfs, DIR_NEW, SUBDIR_NEW);
-        checkExist(ggfs, ggfsSecondary, new IgniteFsPath(SUBDIR_NEW, SUBSUBDIR.name()));
+        checkExist(ggfs, ggfsSecondary, new IgfsPath(SUBDIR_NEW, SUBSUBDIR.name()));
         checkNotExist(ggfs, ggfsSecondary, dir);
     }
 
@@ -862,7 +862,7 @@ public abstract class IgfsDualAbstractSelfTest extends IgfsAbstractSelfTest {
      * @throws Exception If failed.
      */
     public void testMoveRenameDirectoryDestinationRootSourceMissingPartially() throws Exception {
-        IgniteFsPath dir = new IgniteFsPath("/" + SUBSUBDIR.name());
+        IgfsPath dir = new IgfsPath("/" + SUBSUBDIR.name());
 
         create(ggfsSecondary, paths(DIR, SUBDIR, SUBSUBDIR), null);
         create(ggfs, paths(DIR), null);
@@ -880,7 +880,7 @@ public abstract class IgfsDualAbstractSelfTest extends IgfsAbstractSelfTest {
      * @throws Exception If failed.
      */
     public void testMoveRenameDirectoryDestinationRootSourceMissing() throws Exception {
-        IgniteFsPath dir = new IgniteFsPath("/" + SUBSUBDIR.name());
+        IgfsPath dir = new IgfsPath("/" + SUBSUBDIR.name());
 
         create(ggfsSecondary, paths(DIR, SUBDIR, SUBSUBDIR), null);
         create(ggfs, null, null);
@@ -898,7 +898,7 @@ public abstract class IgfsDualAbstractSelfTest extends IgfsAbstractSelfTest {
      * @throws Exception If failed.
      */
     public void testMoveRenameDirectorySourceParentRootSourceMissing() throws Exception {
-        IgniteFsPath dir = new IgniteFsPath("/" + SUBSUBDIR_NEW.name());
+        IgfsPath dir = new IgfsPath("/" + SUBSUBDIR_NEW.name());
 
         create(ggfsSecondary, paths(DIR_NEW, SUBDIR_NEW, dir), null);
         create(ggfs, paths(DIR_NEW, SUBDIR_NEW), null);
@@ -915,7 +915,7 @@ public abstract class IgfsDualAbstractSelfTest extends IgfsAbstractSelfTest {
      * @throws Exception If failed.
      */
     public void testMoveRenameDirectorySourceParentRootDestinationMissingPartially() throws Exception {
-        IgniteFsPath dir = new IgniteFsPath("/" + SUBSUBDIR_NEW.name());
+        IgfsPath dir = new IgfsPath("/" + SUBSUBDIR_NEW.name());
 
         create(ggfsSecondary, paths(DIR_NEW, SUBDIR_NEW, dir), null);
         create(ggfs, paths(DIR_NEW), null);
@@ -933,7 +933,7 @@ public abstract class IgfsDualAbstractSelfTest extends IgfsAbstractSelfTest {
      * @throws Exception If failed.
      */
     public void testMoveRenameDirectorySourceParentRootDestinationMissing() throws Exception {
-        IgniteFsPath dir = new IgniteFsPath("/" + SUBSUBDIR_NEW.name());
+        IgfsPath dir = new IgfsPath("/" + SUBSUBDIR_NEW.name());
 
         create(ggfsSecondary, paths(DIR_NEW, SUBDIR_NEW, dir), null);
         create(ggfs, null, null);
@@ -1153,7 +1153,7 @@ public abstract class IgfsDualAbstractSelfTest extends IgfsAbstractSelfTest {
         // Read the first block.
         int totalRead = 0;
 
-        IgniteFsInputStream in = ggfs.open(FILE, blockSize);
+        IgfsInputStream in = ggfs.open(FILE, blockSize);
 
         final byte[] readBuf = new byte[1024];
 
@@ -1184,7 +1184,7 @@ public abstract class IgfsDualAbstractSelfTest extends IgfsAbstractSelfTest {
         // Let's wait for file will be deleted.
         U.sleep(300);
 
-        final IgniteFsInputStream in0 = in;
+        final IgfsInputStream in0 = in;
 
         // Try reading the second block. Should fail.
         GridTestUtils.assertThrows(log, new Callable<Object>() {
@@ -1232,7 +1232,7 @@ public abstract class IgfsDualAbstractSelfTest extends IgfsAbstractSelfTest {
         // Read the first two blocks.
         int totalRead = 0;
 
-        IgniteFsInputStream in = ggfs.open(FILE, blockSize);
+        IgfsInputStream in = ggfs.open(FILE, blockSize);
 
         final byte[] readBuf = new byte[1024];
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/639ff503/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsMetaManagerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsMetaManagerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsMetaManagerSelfTest.java
index 64aab8f..ecc670f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsMetaManagerSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsMetaManagerSelfTest.java
@@ -184,8 +184,8 @@ public class IgfsMetaManagerSelfTest extends IgfsCommonAbstractTest {
             assertNull(mgr.updateProperties(ROOT_ID, fileId, "not_exists", F.<String, String>asMap(key2, null)));
         }
 
-        mgr.removeIfEmpty(ROOT_ID, "dir", dir.id(), new IgniteFsPath("/dir"), true);
-        mgr.removeIfEmpty(ROOT_ID, "file", file.id(), new IgniteFsPath("/file"), true);
+        mgr.removeIfEmpty(ROOT_ID, "dir", dir.id(), new IgfsPath("/dir"), true);
+        mgr.removeIfEmpty(ROOT_ID, "file", file.id(), new IgfsPath("/file"), true);
 
         assertNull(mgr.updateProperties(ROOT_ID, dir.id(), "dir", F.asMap("p", "7")));
         assertNull(mgr.updateProperties(ROOT_ID, file.id(), "file", F.asMap("q", "8")));
@@ -239,15 +239,15 @@ public class IgfsMetaManagerSelfTest extends IgfsCommonAbstractTest {
         }
 
         // Validate 'file ID' operations.
-        assertEquals(ROOT_ID, mgr.fileId(new IgniteFsPath("/")));
-        assertEquals(a.id(), mgr.fileId(new IgniteFsPath("/a")));
-        assertEquals(b.id(), mgr.fileId(new IgniteFsPath("/a/b")));
-        assertEquals(f1.id(), mgr.fileId(new IgniteFsPath("/f1")));
-        assertEquals(f2.id(), mgr.fileId(new IgniteFsPath("/a/f2")));
-        assertEquals(f3.id(), mgr.fileId(new IgniteFsPath("/a/b/f3")));
-        assertNull(mgr.fileId(new IgniteFsPath("/f4")));
-        assertNull(mgr.fileId(new IgniteFsPath("/a/f5")));
-        assertNull(mgr.fileId(new IgniteFsPath("/a/b/f6")));
+        assertEquals(ROOT_ID, mgr.fileId(new IgfsPath("/")));
+        assertEquals(a.id(), mgr.fileId(new IgfsPath("/a")));
+        assertEquals(b.id(), mgr.fileId(new IgfsPath("/a/b")));
+        assertEquals(f1.id(), mgr.fileId(new IgfsPath("/f1")));
+        assertEquals(f2.id(), mgr.fileId(new IgfsPath("/a/f2")));
+        assertEquals(f3.id(), mgr.fileId(new IgfsPath("/a/b/f3")));
+        assertNull(mgr.fileId(new IgfsPath("/f4")));
+        assertNull(mgr.fileId(new IgfsPath("/a/f5")));
+        assertNull(mgr.fileId(new IgfsPath("/a/b/f6")));
 
         assertEquals(a.id(), mgr.fileId(ROOT_ID, "a"));
         assertEquals(b.id(), mgr.fileId(a.id(), "b"));
@@ -258,16 +258,16 @@ public class IgfsMetaManagerSelfTest extends IgfsCommonAbstractTest {
         assertNull(mgr.fileId(a.id(), "f5"));
         assertNull(mgr.fileId(b.id(), "f6"));
 
-        assertEquals(Arrays.asList(ROOT_ID), mgr.fileIds(new IgniteFsPath("/")));
-        assertEquals(Arrays.asList(ROOT_ID, a.id()), mgr.fileIds(new IgniteFsPath("/a")));
-        assertEquals(Arrays.asList(ROOT_ID, a.id(), b.id()), mgr.fileIds(new IgniteFsPath("/a/b")));
-        assertEquals(Arrays.asList(ROOT_ID, f1.id()), mgr.fileIds(new IgniteFsPath("/f1")));
-        assertEquals(Arrays.asList(ROOT_ID, a.id(), f2.id()), mgr.fileIds(new IgniteFsPath("/a/f2")));
-        assertEquals(Arrays.asList(ROOT_ID, a.id(), b.id(), f3.id()), mgr.fileIds(new IgniteFsPath("/a/b/f3")));
-        assertEquals(Arrays.asList(ROOT_ID, null), mgr.fileIds(new IgniteFsPath("/f4")));
-        assertEquals(Arrays.asList(ROOT_ID, a.id(), null), mgr.fileIds(new IgniteFsPath("/a/f5")));
-        assertEquals(Arrays.asList(ROOT_ID, a.id(), b.id(), null), mgr.fileIds(new IgniteFsPath("/a/b/f6")));
-        assertEquals(Arrays.asList(ROOT_ID, null, null, null, null), mgr.fileIds(new IgniteFsPath("/f7/a/b/f6")));
+        assertEquals(Arrays.asList(ROOT_ID), mgr.fileIds(new IgfsPath("/")));
+        assertEquals(Arrays.asList(ROOT_ID, a.id()), mgr.fileIds(new IgfsPath("/a")));
+        assertEquals(Arrays.asList(ROOT_ID, a.id(), b.id()), mgr.fileIds(new IgfsPath("/a/b")));
+        assertEquals(Arrays.asList(ROOT_ID, f1.id()), mgr.fileIds(new IgfsPath("/f1")));
+        assertEquals(Arrays.asList(ROOT_ID, a.id(), f2.id()), mgr.fileIds(new IgfsPath("/a/f2")));
+        assertEquals(Arrays.asList(ROOT_ID, a.id(), b.id(), f3.id()), mgr.fileIds(new IgfsPath("/a/b/f3")));
+        assertEquals(Arrays.asList(ROOT_ID, null), mgr.fileIds(new IgfsPath("/f4")));
+        assertEquals(Arrays.asList(ROOT_ID, a.id(), null), mgr.fileIds(new IgfsPath("/a/f5")));
+        assertEquals(Arrays.asList(ROOT_ID, a.id(), b.id(), null), mgr.fileIds(new IgfsPath("/a/b/f6")));
+        assertEquals(Arrays.asList(ROOT_ID, null, null, null, null), mgr.fileIds(new IgfsPath("/f7/a/b/f6")));
 
         // Validate 'rename' operation.
         final IgniteUuid rndId = IgniteUuid.randomUuid();
@@ -318,19 +318,19 @@ public class IgfsMetaManagerSelfTest extends IgfsCommonAbstractTest {
         // Validate 'remove' operation.
         for (int i = 0; i < 100; i++) {
             // One of participants doesn't exist.
-            assertNull(mgr.removeIfEmpty(ROOT_ID, "a", IgniteUuid.randomUuid(), new IgniteFsPath("/a"), true));
+            assertNull(mgr.removeIfEmpty(ROOT_ID, "a", IgniteUuid.randomUuid(), new IgfsPath("/a"), true));
             assertNull(mgr.removeIfEmpty(IgniteUuid.randomUuid(), "a", IgniteUuid.randomUuid(),
-                new IgniteFsPath("/" + IgniteUuid.randomUuid() + "/a"), true));
+                new IgfsPath("/" + IgniteUuid.randomUuid() + "/a"), true));
         }
 
-        expectsRemoveFail(ROOT_ID, "a", a.id(), new IgniteFsPath("/a"),
+        expectsRemoveFail(ROOT_ID, "a", a.id(), new IgfsPath("/a"),
             "Failed to remove file (directory is not empty)");
-        expectsRemoveFail(a.id(), "b", b.id(), new IgniteFsPath("/a/b"),
+        expectsRemoveFail(a.id(), "b", b.id(), new IgfsPath("/a/b"),
             "Failed to remove file (directory is not empty)");
-        assertNull(mgr.removeIfEmpty(ROOT_ID, "a", f1.id(), new IgniteFsPath("/a"), true));
-        assertNull(mgr.removeIfEmpty(a.id(), "b", f1.id(), new IgniteFsPath("/a/b"), true));
+        assertNull(mgr.removeIfEmpty(ROOT_ID, "a", f1.id(), new IgfsPath("/a"), true));
+        assertNull(mgr.removeIfEmpty(a.id(), "b", f1.id(), new IgfsPath("/a/b"), true));
 
-        assertEquals(f3, mgr.removeIfEmpty(b.id(), "f3", f3.id(), new IgniteFsPath("/a/b/f3"), true));
+        assertEquals(f3, mgr.removeIfEmpty(b.id(), "f3", f3.id(), new IgfsPath("/a/b/f3"), true));
 
         assertEquals(F.asMap("a", new IgfsListingEntry(a), "f1", new IgfsListingEntry(f1)),
             mgr.directoryListing(ROOT_ID));
@@ -340,7 +340,7 @@ public class IgfsMetaManagerSelfTest extends IgfsCommonAbstractTest {
 
         assertEmpty(mgr.directoryListing(b.id()));
 
-        assertEquals(b, mgr.removeIfEmpty(a.id(), "b", b.id(), new IgniteFsPath("/a/b"), true));
+        assertEquals(b, mgr.removeIfEmpty(a.id(), "b", b.id(), new IgfsPath("/a/b"), true));
 
         assertEquals(F.asMap("a", new IgfsListingEntry(a), "f1", new IgfsListingEntry(f1)),
             mgr.directoryListing(ROOT_ID));
@@ -360,7 +360,7 @@ public class IgfsMetaManagerSelfTest extends IgfsCommonAbstractTest {
         assertEquals(f2.id(), newF2.id());
         assertNotSame(f2, newF2);
 
-        assertEquals(newF2, mgr.removeIfEmpty(a.id(), "f2", f2.id(), new IgniteFsPath("/a/f2"), true));
+        assertEquals(newF2, mgr.removeIfEmpty(a.id(), "f2", f2.id(), new IgfsPath("/a/f2"), true));
 
         assertEquals(F.asMap("a", new IgfsListingEntry(a), "f1", new IgfsListingEntry(f1)),
             mgr.directoryListing(ROOT_ID));
@@ -368,14 +368,14 @@ public class IgfsMetaManagerSelfTest extends IgfsCommonAbstractTest {
         assertEmpty(mgr.directoryListing(a.id()));
         assertEmpty(mgr.directoryListing(b.id()));
 
-        assertEquals(f1, mgr.removeIfEmpty(ROOT_ID, "f1", f1.id(), new IgniteFsPath("/f1"), true));
+        assertEquals(f1, mgr.removeIfEmpty(ROOT_ID, "f1", f1.id(), new IgfsPath("/f1"), true));
 
         assertEquals(F.asMap("a", new IgfsListingEntry(a)), mgr.directoryListing(ROOT_ID));
 
         assertEmpty(mgr.directoryListing(a.id()));
         assertEmpty(mgr.directoryListing(b.id()));
 
-        assertEquals(a, mgr.removeIfEmpty(ROOT_ID, "a", a.id(), new IgniteFsPath("/a"), true));
+        assertEquals(a, mgr.removeIfEmpty(ROOT_ID, "a", a.id(), new IgfsPath("/a"), true));
 
         assertEmpty(mgr.directoryListing(ROOT_ID));
         assertEmpty(mgr.directoryListing(a.id()));
@@ -461,7 +461,7 @@ public class IgfsMetaManagerSelfTest extends IgfsCommonAbstractTest {
      * @param msg Failure message if expected exception was not thrown.
      */
     private void expectsRemoveFail(final IgniteUuid parentId, final String fileName, final IgniteUuid fileId,
-        final IgniteFsPath path, @Nullable String msg) {
+        final IgfsPath path, @Nullable String msg) {
         Throwable err = assertThrows(log, new Callable() {
             @Nullable @Override public Object call() throws Exception {
                 mgr.removeIfEmpty(parentId, fileName, fileId, path, true);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/639ff503/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsMetricsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsMetricsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsMetricsSelfTest.java
index 87a7760..49a9c05 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsMetricsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsMetricsSelfTest.java
@@ -221,7 +221,7 @@ public class IgfsMetricsSelfTest extends IgfsCommonAbstractTest {
         assertEquals(0, m.filesOpenedForRead());
         assertEquals(0, m.filesOpenedForWrite());
 
-        fs.mkdirs(new IgniteFsPath("/dir1"));
+        fs.mkdirs(new IgfsPath("/dir1"));
 
         m = fs.metrics();
 
@@ -231,8 +231,8 @@ public class IgfsMetricsSelfTest extends IgfsCommonAbstractTest {
         assertEquals(0, m.filesOpenedForRead());
         assertEquals(0, m.filesOpenedForWrite());
 
-        fs.mkdirs(new IgniteFsPath("/dir1/dir2/dir3"));
-        fs.mkdirs(new IgniteFsPath("/dir4"));
+        fs.mkdirs(new IgfsPath("/dir1/dir2/dir3"));
+        fs.mkdirs(new IgfsPath("/dir4"));
 
         m = fs.metrics();
 
@@ -242,9 +242,9 @@ public class IgfsMetricsSelfTest extends IgfsCommonAbstractTest {
         assertEquals(0, m.filesOpenedForRead());
         assertEquals(0, m.filesOpenedForWrite());
 
-        IgniteFsOutputStream out1 = fs.create(new IgniteFsPath("/dir1/file1"), false);
-        IgniteFsOutputStream out2 = fs.create(new IgniteFsPath("/dir1/file2"), false);
-        IgniteFsOutputStream out3 = fs.create(new IgniteFsPath("/dir1/dir2/file"), false);
+        IgniteFsOutputStream out1 = fs.create(new IgfsPath("/dir1/file1"), false);
+        IgniteFsOutputStream out2 = fs.create(new IgfsPath("/dir1/file2"), false);
+        IgniteFsOutputStream out3 = fs.create(new IgfsPath("/dir1/dir2/file"), false);
 
         m = fs.metrics();
 
@@ -279,7 +279,7 @@ public class IgfsMetricsSelfTest extends IgfsCommonAbstractTest {
         assertEquals(0, m.filesOpenedForRead());
         assertEquals(0, m.filesOpenedForWrite());
 
-        IgniteFsOutputStream out = fs.append(new IgniteFsPath("/dir1/file1"), false);
+        IgniteFsOutputStream out = fs.append(new IgfsPath("/dir1/file1"), false);
 
         out.write(new byte[20]);
 
@@ -303,8 +303,8 @@ public class IgfsMetricsSelfTest extends IgfsCommonAbstractTest {
         assertEquals(0, m.filesOpenedForRead());
         assertEquals(0, m.filesOpenedForWrite());
 
-        IgniteFsInputStream in1 = fs.open(new IgniteFsPath("/dir1/file1"));
-        IgniteFsInputStream in2 = fs.open(new IgniteFsPath("/dir1/file2"));
+        IgfsInputStream in1 = fs.open(new IgfsPath("/dir1/file1"));
+        IgfsInputStream in2 = fs.open(new IgfsPath("/dir1/file2"));
 
         m = fs.metrics();
 
@@ -325,8 +325,8 @@ public class IgfsMetricsSelfTest extends IgfsCommonAbstractTest {
         assertEquals(0, m.filesOpenedForRead());
         assertEquals(0, m.filesOpenedForWrite());
 
-        fs.delete(new IgniteFsPath("/dir1/file1"), false);
-        fs.delete(new IgniteFsPath("/dir1/dir2"), true);
+        fs.delete(new IgfsPath("/dir1/file1"), false);
+        fs.delete(new IgfsPath("/dir1/dir2"), true);
 
         m = fs.metrics();
 
@@ -336,7 +336,7 @@ public class IgfsMetricsSelfTest extends IgfsCommonAbstractTest {
         assertEquals(0, m.filesOpenedForRead());
         assertEquals(0, m.filesOpenedForWrite());
 
-        fs.delete(new IgniteFsPath("/"), true);
+        fs.delete(new IgfsPath("/"), true);
 
         m = fs.metrics();
 
@@ -351,12 +351,12 @@ public class IgfsMetricsSelfTest extends IgfsCommonAbstractTest {
     public void testMultipleClose() throws Exception {
         IgniteFs fs = ggfsPrimary[0];
 
-        IgniteFsOutputStream out = fs.create(new IgniteFsPath("/file"), false);
+        IgniteFsOutputStream out = fs.create(new IgfsPath("/file"), false);
 
         out.close();
         out.close();
 
-        IgniteFsInputStream in = fs.open(new IgniteFsPath("/file"));
+        IgfsInputStream in = fs.open(new IgfsPath("/file"));
 
         in.close();
         in.close();
@@ -375,9 +375,9 @@ public class IgfsMetricsSelfTest extends IgfsCommonAbstractTest {
     public void testBlockMetrics() throws Exception {
         IgfsEx ggfs = (IgfsEx)ggfsPrimary[0];
 
-        IgniteFsPath fileRemote = new IgniteFsPath("/fileRemote");
-        IgniteFsPath file1 = new IgniteFsPath("/file1");
-        IgniteFsPath file2 = new IgniteFsPath("/file2");
+        IgfsPath fileRemote = new IgfsPath("/fileRemote");
+        IgfsPath file1 = new IgfsPath("/file1");
+        IgfsPath file2 = new IgfsPath("/file2");
 
         // Create remote file and write some data to it.
         IgniteFsOutputStream out = ggfsSecondary.create(fileRemote, 256, true, null, 1, 256, null);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/639ff503/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsModeResolverSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsModeResolverSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsModeResolverSelfTest.java
index 6689a07..b27c76a 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsModeResolverSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsModeResolverSelfTest.java
@@ -35,22 +35,22 @@ public class IgfsModeResolverSelfTest extends TestCase {
     /** {@inheritDoc} */
     @Override protected void setUp() throws Exception {
         resolver = new IgfsModeResolver(DUAL_SYNC, Arrays.asList(
-            new T2<>(new IgniteFsPath("/a/b/"), PRIMARY),
-            new T2<>(new IgniteFsPath("/a/b/c/d"), PROXY)));
+            new T2<>(new IgfsPath("/a/b/"), PRIMARY),
+            new T2<>(new IgfsPath("/a/b/c/d"), PROXY)));
     }
 
     /**
      * @throws Exception If failed.
      */
     public void testResolve() throws Exception {
-        assertEquals(DUAL_SYNC, resolver.resolveMode(new IgniteFsPath("/")));
-        assertEquals(DUAL_SYNC, resolver.resolveMode(new IgniteFsPath("/a")));
-        assertEquals(DUAL_SYNC, resolver.resolveMode(new IgniteFsPath("/a/1")));
-        assertEquals(PRIMARY, resolver.resolveMode(new IgniteFsPath("/a/b")));
-        assertEquals(PRIMARY, resolver.resolveMode(new IgniteFsPath("/a/b/c")));
-        assertEquals(PRIMARY, resolver.resolveMode(new IgniteFsPath("/a/b/c/2")));
-        assertEquals(PROXY, resolver.resolveMode(new IgniteFsPath("/a/b/c/d")));
-        assertEquals(PROXY, resolver.resolveMode(new IgniteFsPath("/a/b/c/d/e")));
+        assertEquals(DUAL_SYNC, resolver.resolveMode(new IgfsPath("/")));
+        assertEquals(DUAL_SYNC, resolver.resolveMode(new IgfsPath("/a")));
+        assertEquals(DUAL_SYNC, resolver.resolveMode(new IgfsPath("/a/1")));
+        assertEquals(PRIMARY, resolver.resolveMode(new IgfsPath("/a/b")));
+        assertEquals(PRIMARY, resolver.resolveMode(new IgfsPath("/a/b/c")));
+        assertEquals(PRIMARY, resolver.resolveMode(new IgfsPath("/a/b/c/2")));
+        assertEquals(PROXY, resolver.resolveMode(new IgfsPath("/a/b/c/d")));
+        assertEquals(PROXY, resolver.resolveMode(new IgfsPath("/a/b/c/d/e")));
     }
 
     /**
@@ -58,20 +58,20 @@ public class IgfsModeResolverSelfTest extends TestCase {
      */
     public void testResolveChildren() throws Exception {
         assertEquals(new HashSet<IgniteFsMode>(){{add(DUAL_SYNC); add(PRIMARY); add(PROXY);}},
-            resolver.resolveChildrenModes(new IgniteFsPath("/")));
+            resolver.resolveChildrenModes(new IgfsPath("/")));
         assertEquals(new HashSet<IgniteFsMode>(){{add(DUAL_SYNC); add(PRIMARY); add(PROXY);}},
-            resolver.resolveChildrenModes(new IgniteFsPath("/a")));
+            resolver.resolveChildrenModes(new IgfsPath("/a")));
         assertEquals(new HashSet<IgniteFsMode>(){{add(DUAL_SYNC);}},
-            resolver.resolveChildrenModes(new IgniteFsPath("/a/1")));
+            resolver.resolveChildrenModes(new IgfsPath("/a/1")));
         assertEquals(new HashSet<IgniteFsMode>(){{add(PRIMARY); add(PROXY);}},
-            resolver.resolveChildrenModes(new IgniteFsPath("/a/b")));
+            resolver.resolveChildrenModes(new IgfsPath("/a/b")));
         assertEquals(new HashSet<IgniteFsMode>(){{add(PRIMARY); add(PROXY);}},
-            resolver.resolveChildrenModes(new IgniteFsPath("/a/b/c")));
+            resolver.resolveChildrenModes(new IgfsPath("/a/b/c")));
         assertEquals(new HashSet<IgniteFsMode>(){{add(PRIMARY);}},
-            resolver.resolveChildrenModes(new IgniteFsPath("/a/b/c/2")));
+            resolver.resolveChildrenModes(new IgfsPath("/a/b/c/2")));
         assertEquals(new HashSet<IgniteFsMode>(){{add(PROXY);}},
-            resolver.resolveChildrenModes(new IgniteFsPath("/a/b/c/d")));
+            resolver.resolveChildrenModes(new IgfsPath("/a/b/c/d")));
         assertEquals(new HashSet<IgniteFsMode>(){{add(PROXY);}},
-            resolver.resolveChildrenModes(new IgniteFsPath("/a/b/c/d/e")));
+            resolver.resolveChildrenModes(new IgfsPath("/a/b/c/d/e")));
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/639ff503/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsModesSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsModesSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsModesSelfTest.java
index 72e2d34..0d86f5e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsModesSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsModesSelfTest.java
@@ -490,7 +490,7 @@ public class IgfsModesSelfTest extends IgfsCommonAbstractTest {
     private void checkMode(String pathStr, IgniteFsMode expMode) throws Exception {
         assert ggfs != null;
 
-        IgniteFsPath path = new IgniteFsPath(pathStr);
+        IgfsPath path = new IgfsPath(pathStr);
 
         IgfsModeResolver rslvr = ggfs.modeResolver();
 
@@ -518,8 +518,8 @@ public class IgfsModesSelfTest extends IgfsCommonAbstractTest {
         boolean primaryNotUsed = mode == PROXY;
         boolean secondaryUsed = mode != PRIMARY;
 
-        IgniteFsPath dir = new IgniteFsPath("/dir");
-        IgniteFsPath file = new IgniteFsPath("/dir/file");
+        IgfsPath dir = new IgfsPath("/dir");
+        IgfsPath file = new IgfsPath("/dir/file");
 
         // Create new directory.
         ggfs.mkdirs(dir);
@@ -539,7 +539,7 @@ public class IgfsModesSelfTest extends IgfsCommonAbstractTest {
         os.close();
 
         // Check file content.
-        IgniteFsInputStream is = ggfs.open(file);
+        IgfsInputStream is = ggfs.open(file);
 
         assertEquals(testData.length, is.length());
 
@@ -557,7 +557,7 @@ public class IgfsModesSelfTest extends IgfsCommonAbstractTest {
 
             // In ASYNC mode we wait at most 2 seconds for background writer to finish.
             for (int i = 0; i < 20; i++) {
-                IgniteFsInputStream isSecondary = null;
+                IgfsInputStream isSecondary = null;
 
                 try {
                     isSecondary = ggfsSecondary.open(file);
@@ -572,7 +572,7 @@ public class IgfsModesSelfTest extends IgfsCommonAbstractTest {
                 }
             }
 
-            IgniteFsInputStream isSecondary = ggfsSecondary.open(file);
+            IgfsInputStream isSecondary = ggfsSecondary.open(file);
 
             assertEquals(testData.length, isSecondary.length());
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/639ff503/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsProcessorSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsProcessorSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsProcessorSelfTest.java
index da8a343..9a87a86 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsProcessorSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsProcessorSelfTest.java
@@ -168,7 +168,7 @@ public class IgfsProcessorSelfTest extends IgfsCommonAbstractTest {
      * @throws Exception If failed.
      */
     public void testUpdateProperties() throws Exception {
-        IgniteFsPath p = path("/tmp/my");
+        IgfsPath p = path("/tmp/my");
 
         ggfs.mkdirs(p);
 
@@ -201,7 +201,7 @@ public class IgfsProcessorSelfTest extends IgfsCommonAbstractTest {
 
     /** @throws Exception If failed. */
     public void testCreate() throws Exception {
-        IgniteFsPath path = path("/file");
+        IgfsPath path = path("/file");
 
         try (IgniteFsOutputStream os = ggfs.create(path, false)) {
             assert os != null;
@@ -358,7 +358,7 @@ public class IgfsProcessorSelfTest extends IgfsCommonAbstractTest {
         assert ggfs.exists(path("/A/B1/C1"));
 
         // List items.
-        Collection<IgniteFsPath> paths = ggfs.listPaths(path("/"));
+        Collection<IgfsPath> paths = ggfs.listPaths(path("/"));
 
         assert paths.size() == 3 : "Unexpected paths: " + paths;
 
@@ -388,12 +388,12 @@ public class IgfsProcessorSelfTest extends IgfsCommonAbstractTest {
         ggfs.delete(path("/A1/B1/C3"), false);
         assertNull(ggfs.info(path("/A1/B1/C3")));
 
-        assertEquals(Collections.<IgniteFsPath>emptyList(), ggfs.listPaths(path("/A1/B1")));
+        assertEquals(Collections.<IgfsPath>emptyList(), ggfs.listPaths(path("/A1/B1")));
 
         ggfs.delete(path("/A2/B2"), true);
         assertNull(ggfs.info(path("/A2/B2")));
 
-        assertEquals(Collections.<IgniteFsPath>emptyList(), ggfs.listPaths(path("/A2")));
+        assertEquals(Collections.<IgfsPath>emptyList(), ggfs.listPaths(path("/A2")));
 
         assertEquals(Arrays.asList(path("/A"), path("/A1"), path("/A2")), sorted(ggfs.listPaths(path("/"))));
 
@@ -407,10 +407,10 @@ public class IgfsProcessorSelfTest extends IgfsCommonAbstractTest {
         assertEquals(Arrays.asList(path("/A"), path("/A1"), path("/A2")), sorted(ggfs.listPaths(path("/"))));
 
         ggfs.delete(path("/"), true);
-        assertEquals(Collections.<IgniteFsPath>emptyList(), ggfs.listPaths(path("/")));
+        assertEquals(Collections.<IgfsPath>emptyList(), ggfs.listPaths(path("/")));
 
         ggfs.delete(path("/"), false);
-        assertEquals(Collections.<IgniteFsPath>emptyList(), ggfs.listPaths(path("/")));
+        assertEquals(Collections.<IgfsPath>emptyList(), ggfs.listPaths(path("/")));
 
         for (Cache.Entry<Object, Object> e : metaCache)
             info("Entry in cache [key=" + e.getKey() + ", val=" + e.getValue() + ']');
@@ -422,13 +422,13 @@ public class IgfsProcessorSelfTest extends IgfsCommonAbstractTest {
      * @throws Exception If failed.
      */
     public void testSize() throws Exception {
-        IgniteFsPath dir1 = path("/dir1");
-        IgniteFsPath subDir1 = path("/dir1/subdir1");
-        IgniteFsPath dir2 = path("/dir2");
+        IgfsPath dir1 = path("/dir1");
+        IgfsPath subDir1 = path("/dir1/subdir1");
+        IgfsPath dir2 = path("/dir2");
 
-        IgniteFsPath fileDir1 = path("/dir1/file");
-        IgniteFsPath fileSubdir1 = path("/dir1/subdir1/file");
-        IgniteFsPath fileDir2 = path("/dir2/file");
+        IgfsPath fileDir1 = path("/dir1/file");
+        IgfsPath fileSubdir1 = path("/dir1/subdir1/file");
+        IgfsPath fileDir2 = path("/dir2/file");
 
         IgniteFsOutputStream os = ggfs.create(fileDir1, false);
         os.write(new byte[1000]);
@@ -520,11 +520,11 @@ public class IgfsProcessorSelfTest extends IgfsCommonAbstractTest {
             F.t("/C1", "/A/B1")
         );
 
-        final IgniteFsPath root = path("/");
+        final IgfsPath root = path("/");
 
         for (IgniteBiTuple<String, String> e : chain) {
-            final IgniteFsPath p1 = path(e.get1());
-            final IgniteFsPath p2 = path(e.get2());
+            final IgfsPath p1 = path(e.get1());
+            final IgfsPath p2 = path(e.get2());
 
             assertTrue("Entry: " + e, ggfs.exists(p1));
             ggfs.rename(p1, p2);
@@ -577,7 +577,7 @@ public class IgfsProcessorSelfTest extends IgfsCommonAbstractTest {
 
         // Validate renamed during reading.
 
-        try (IgniteFsInputStream in0 = ggfs.open(path("/A/a"))) {
+        try (IgfsInputStream in0 = ggfs.open(path("/A/a"))) {
             // Rename file.
             ggfs.rename(path("/A/a"), path("/b"));
 
@@ -591,24 +591,24 @@ public class IgfsProcessorSelfTest extends IgfsCommonAbstractTest {
         // Cleanup.
         ggfs.delete(root, true);
 
-        assertEquals(Collections.<IgniteFsPath>emptyList(), ggfs.listPaths(root));
+        assertEquals(Collections.<IgfsPath>emptyList(), ggfs.listPaths(root));
     }
 
     /**
      * @param path Path.
      * @return GGFS path.
      */
-    private IgniteFsPath path(String path) {
+    private IgfsPath path(String path) {
         assert path != null;
 
-        return new IgniteFsPath(path);
+        return new IgfsPath(path);
     }
 
     /**
      * @param i Path index.
      * @return GGFS path.
      */
-    private IgniteFsPath path(long i) {
+    private IgfsPath path(long i) {
         //return path(String.format("/%d", i));
         return path(String.format("/%d/q/%d/%d", i % 10, (i / 10) % 10, i));
     }
@@ -675,7 +675,7 @@ public class IgfsProcessorSelfTest extends IgfsCommonAbstractTest {
     /** @throws Exception If failed. */
     @SuppressWarnings("BusyWait")
     public void testDeleteCacheConsistency() throws Exception {
-        IgniteFsPath path = new IgniteFsPath("/someFile");
+        IgfsPath path = new IgfsPath("/someFile");
 
         try (IgniteFsOutputStream out = ggfs.create(path, true)) {
             out.write(new byte[10 * 1024 * 1024]);
@@ -787,7 +787,7 @@ public class IgfsProcessorSelfTest extends IgfsCommonAbstractTest {
      * @throws Exception If failed.
      */
     private void checkCreateAppendLongData(int chunkSize, int bufSize, int cnt) throws Exception {
-        IgniteFsPath path = new IgniteFsPath("/someFile");
+        IgfsPath path = new IgfsPath("/someFile");
 
         byte[] buf = new byte[chunkSize];
 
@@ -820,7 +820,7 @@ public class IgfsProcessorSelfTest extends IgfsCommonAbstractTest {
 
         byte[] readBuf = new byte[chunkSize];
 
-        try (IgniteFsInputStream in = ggfs.open(path)) {
+        try (IgfsInputStream in = ggfs.open(path)) {
             long pos = 0;
 
             for (int k = 0; k < 2 * cnt; k++) {
@@ -883,7 +883,7 @@ public class IgfsProcessorSelfTest extends IgfsCommonAbstractTest {
      */
     private String read(String path) throws Exception {
 
-        try (IgniteFsInputStream in = ggfs.open(path(path))) {
+        try (IgfsInputStream in = ggfs.open(path(path))) {
             return IOUtils.toString(in, UTF_8);
         }
     }
@@ -895,7 +895,7 @@ public class IgfsProcessorSelfTest extends IgfsCommonAbstractTest {
      * @param props File properties to set.
      * @param msg Failure message if expected exception was not thrown.
      */
-    private void assertUpdatePropertiesFails(@Nullable final IgniteFsPath path,
+    private void assertUpdatePropertiesFails(@Nullable final IgfsPath path,
         @Nullable final Map<String, String> props,
         Class<? extends Throwable> cls, @Nullable String msg) {
         GridTestUtils.assertThrows(log, new Callable() {
@@ -963,7 +963,7 @@ public class IgfsProcessorSelfTest extends IgfsCommonAbstractTest {
      * @throws IgniteCheckedException If failed.
      */
     private void assertListDir(String path, String... item) throws IgniteCheckedException {
-        Collection<IgniteFsFile> files = ggfs.listFiles(new IgniteFsPath(path));
+        Collection<IgniteFsFile> files = ggfs.listFiles(new IgfsPath(path));
 
         List<String> names = new ArrayList<>(item.length);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/639ff503/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsSizeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsSizeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsSizeSelfTest.java
index 880163d..1cba9b4 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsSizeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsSizeSelfTest.java
@@ -350,7 +350,7 @@ public class IgfsSizeSelfTest extends IgfsCommonAbstractTest {
             for (int i = 0; i < GRID_CNT; i++) {
                 int total = 0;
 
-                IgniteFsInputStream is = ggfs(i).open(file.path());
+                IgfsInputStream is = ggfs(i).open(file.path());
 
                 while (true) {
                     int read = is.read(buf);
@@ -427,7 +427,7 @@ public class IgfsSizeSelfTest extends IgfsCommonAbstractTest {
 
         startUp();
 
-        final IgniteFsPath path = new IgniteFsPath("/file");
+        final IgfsPath path = new IgfsPath("/file");
 
         // This write is expected to be successful.
         IgniteFsOutputStream os = ggfs(0).create(path, false);
@@ -481,8 +481,8 @@ public class IgfsSizeSelfTest extends IgfsCommonAbstractTest {
 
         IgfsImpl ggfs = ggfs(0);
 
-        final IgniteFsPath path = new IgniteFsPath("/file");
-        final IgniteFsPath otherPath = new IgniteFsPath("/fileOther");
+        final IgfsPath path = new IgfsPath("/file");
+        final IgfsPath otherPath = new IgfsPath("/fileOther");
 
         // Fill cache with data up to it's limit.
         IgniteFsOutputStream os = ggfs.create(path, false);
@@ -673,7 +673,7 @@ public class IgfsSizeSelfTest extends IgfsCommonAbstractTest {
      * @return Block key.
      * @throws Exception If failed.
      */
-    private IgfsBlockKey blockKey(IgniteFsPath path, long blockId) throws Exception {
+    private IgfsBlockKey blockKey(IgfsPath path, long blockId) throws Exception {
         IgfsEx ggfs0 = (IgfsEx)grid(0).fileSystem(GGFS_NAME);
 
         IgniteUuid fileId = ggfs0.context().meta().fileId(path);
@@ -763,7 +763,7 @@ public class IgfsSizeSelfTest extends IgfsCommonAbstractTest {
 
         for (int i = 0; i < FILES_CNT; i++) {
             // Create empty file locally.
-            IgniteFsPath path = new IgniteFsPath("/file-" + i);
+            IgfsPath path = new IgfsPath("/file-" + i);
 
             ggfs(0).create(path, false).close();
 
@@ -806,7 +806,7 @@ public class IgfsSizeSelfTest extends IgfsCommonAbstractTest {
     /** A file written to the file system. */
     private static class IgfsFile {
         /** Path to the file, */
-        private final IgniteFsPath path;
+        private final IgfsPath path;
 
         /** File length. */
         private final int len;
@@ -821,14 +821,14 @@ public class IgfsSizeSelfTest extends IgfsCommonAbstractTest {
          * @param len Length.
          * @param blocks Blocks.
          */
-        private IgfsFile(IgniteFsPath path, int len, Collection<IgfsBlock> blocks) {
+        private IgfsFile(IgfsPath path, int len, Collection<IgfsBlock> blocks) {
             this.path = path;
             this.len = len;
             this.blocks = blocks;
         }
 
         /** @return Path. */
-        IgniteFsPath path() {
+        IgfsPath path() {
             return path;
         }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/639ff503/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsStreamsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsStreamsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsStreamsSelfTest.java
index 07cadf6..934919e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsStreamsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsStreamsSelfTest.java
@@ -170,13 +170,13 @@ public class IgfsStreamsSelfTest extends IgfsCommonAbstractTest {
      * @throws Exception In case of exception.
      */
     public void testCreateFile() throws Exception {
-        IgniteFsPath root = new IgniteFsPath("/");
-        IgniteFsPath path = new IgniteFsPath("/asdf");
+        IgfsPath root = new IgfsPath("/");
+        IgfsPath path = new IgfsPath("/asdf");
 
         long max = 100L * CFG_BLOCK_SIZE / WRITING_THREADS_CNT;
 
         for (long size = 0; size <= max; size = size * 15 / 10 + 1) {
-            assertEquals(Collections.<IgniteFsPath>emptyList(), fs.listPaths(root));
+            assertEquals(Collections.<IgfsPath>emptyList(), fs.listPaths(root));
 
             testCreateFile(path, size, new Random().nextInt());
         }
@@ -184,7 +184,7 @@ public class IgfsStreamsSelfTest extends IgfsCommonAbstractTest {
 
     /** @throws Exception If failed. */
     public void testCreateFileColocated() throws Exception {
-        IgniteFsPath path = new IgniteFsPath("/colocated");
+        IgfsPath path = new IgfsPath("/colocated");
 
         UUID uuid = UUID.randomUUID();
 
@@ -226,7 +226,7 @@ public class IgfsStreamsSelfTest extends IgfsCommonAbstractTest {
 
         GridTestUtils.setFieldValue(fragmentizer, "fragmentizerEnabled", false);
 
-        IgniteFsPath path = new IgniteFsPath("/file");
+        IgfsPath path = new IgfsPath("/file");
 
         try {
             IgniteFs fs0 = grid(0).fileSystem("ggfs");
@@ -272,7 +272,7 @@ public class IgfsStreamsSelfTest extends IgfsCommonAbstractTest {
             assertTrue(ranges.get(1).endOffset() == 3 * CFG_BLOCK_SIZE - 1);
 
             // Validate data read after colocated writes.
-            try (IgniteFsInputStream in = fs2.open(path)) {
+            try (IgfsInputStream in = fs2.open(path)) {
                 // Validate first part of file.
                 for (int i = 0; i < CFG_BLOCK_SIZE * 3 / 2; i++)
                     assertEquals((byte)1, in.read());
@@ -313,17 +313,17 @@ public class IgfsStreamsSelfTest extends IgfsCommonAbstractTest {
      * @param salt Salt for file content generation.
      * @throws Exception In case of any exception.
      */
-    private void testCreateFile(final IgniteFsPath path, final long size, final int salt) throws Exception {
+    private void testCreateFile(final IgfsPath path, final long size, final int salt) throws Exception {
         info("Create file [path=" + path + ", size=" + size + ", salt=" + salt + ']');
 
         final AtomicInteger cnt = new AtomicInteger(0);
-        final Collection<IgniteFsPath> cleanUp = new ConcurrentLinkedQueue<>();
+        final Collection<IgfsPath> cleanUp = new ConcurrentLinkedQueue<>();
 
         long time = runMultiThreaded(new Callable<Object>() {
             @Override public Object call() throws Exception {
                 int id = cnt.incrementAndGet();
 
-                IgniteFsPath f = new IgniteFsPath(path.parent(), "asdf" + (id > 1 ? "-" + id : ""));
+                IgfsPath f = new IgfsPath(path.parent(), "asdf" + (id > 1 ? "-" + id : ""));
 
                 try (IgniteFsOutputStream out = fs.create(f, 0, true, null, 0, 1024, null)) {
                     assertNotNull(out);
@@ -347,7 +347,7 @@ public class IgfsStreamsSelfTest extends IgfsCommonAbstractTest {
         info("Read and validate saved file: " + path);
 
         final InputStream expIn = new IgfsTestInputStream(size, salt);
-        final IgniteFsInputStream actIn = fs.open(path, CFG_BLOCK_SIZE * READING_THREADS_CNT * 11 / 10);
+        final IgfsInputStream actIn = fs.open(path, CFG_BLOCK_SIZE * READING_THREADS_CNT * 11 / 10);
 
         // Validate continuous reading of whole file.
         assertEqualStreams(expIn, actIn, size, null);
@@ -395,7 +395,7 @@ public class IgfsStreamsSelfTest extends IgfsCommonAbstractTest {
 
         info("Cleanup files: " + cleanUp);
 
-        for (IgniteFsPath f : cleanUp) {
+        for (IgfsPath f : cleanUp) {
             fs.delete(f, true);
             assertNull(fs.info(f));
         }
@@ -410,7 +410,7 @@ public class IgfsStreamsSelfTest extends IgfsCommonAbstractTest {
      * @param seek Seek to use async position-based reading or {@code null} to use simple continuous reading.
      * @throws IOException In case of any IO exception.
      */
-    private void assertEqualStreams(InputStream expIn, IgniteFsInputStream actIn,
+    private void assertEqualStreams(InputStream expIn, IgfsInputStream actIn,
         @Nullable Long expSize, @Nullable Long seek) throws IOException {
         if (seek != null)
             expIn.skip(seek);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/639ff503/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsTaskSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsTaskSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsTaskSelfTest.java
index 601ab05..29ddc13 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsTaskSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsTaskSelfTest.java
@@ -50,7 +50,7 @@ public class IgfsTaskSelfTest extends IgfsCommonAbstractTest {
         "word6", "word7"};
 
     /** File path. */
-    private static final IgniteFsPath FILE = new IgniteFsPath("/file");
+    private static final IgfsPath FILE = new IgfsPath("/file");
 
     /** Shared IP finder. */
     private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true);
@@ -232,7 +232,7 @@ public class IgfsTaskSelfTest extends IgfsCommonAbstractTest {
      */
     private static class Task extends IgfsTask<String, IgniteBiTuple<Long, Integer>> {
         /** {@inheritDoc} */
-        @Override public IgfsJob createJob(IgniteFsPath path, IgfsFileRange range,
+        @Override public IgfsJob createJob(IgfsPath path, IgfsFileRange range,
             IgfsTaskArgs<String> args) {
             return new Job();
         }
@@ -269,7 +269,7 @@ public class IgfsTaskSelfTest extends IgfsCommonAbstractTest {
         private ComputeJobContext ctx;
 
         /** {@inheritDoc} */
-        @Override public Object execute(IgniteFs ggfs, IgfsFileRange range, IgniteFsInputStream in)
+        @Override public Object execute(IgniteFs ggfs, IgfsFileRange range, IgfsInputStream in)
             throws IOException {
             assert ignite != null;
             assert ses != null;


Mime
View raw message