FilePathCrypt > FilePathEncrypt

h2/src/main/org/h2/mvstore/FileStore.java

@@ -14,7 +14,7 @@ import java.nio.channels.OverlappingFileLockException;
 
 import org.h2.mvstore.cache.FilePathCache;
 import org.h2.store.fs.FilePath;
-import org.h2.store.fs.FilePathCrypt;
+import org.h2.store.fs.FilePathEncrypt;
 import org.h2.store.fs.FilePathNio;
 
 /**
@@ -130,9 +130,9 @@ public class FileStore {
         try {
             file = f.open(readOnly ? "r" : "rw");
             if (encryptionKey != null) {
-                byte[] key = FilePathCrypt.getPasswordBytes(encryptionKey);
+                byte[] key = FilePathEncrypt.getPasswordBytes(encryptionKey);
                 encryptedFile = file;
-                file = new FilePathCrypt.FileCrypt(fileName, key, file);
+                file = new FilePathEncrypt.FileEncrypt(fileName, key, file);
             }
             file = FilePathCache.wrap(file);
             fileSize = file.size();

h2/src/test/org/h2/test/unit/TestFileSystem.java

@@ -30,7 +30,7 @@ import org.h2.message.DbException;
 import org.h2.mvstore.DataUtils;
 import org.h2.mvstore.cache.FilePathCache;
 import org.h2.store.fs.FilePath;
-import org.h2.store.fs.FilePathCrypt;
+import org.h2.store.fs.FilePathEncrypt;
 import org.h2.store.fs.FileUtils;
 import org.h2.test.TestBase;
 import org.h2.test.utils.AssertThrows;
@@ -72,7 +72,7 @@ public class TestFileSystem extends TestBase {
         testMemFsDir();
         testClasspath();
         FilePathDebug.register().setTrace(true);
-        FilePathCrypt.register();
+        FilePathEncrypt.register();
         testSimpleExpandTruncateSize();
         testSplitDatabaseInZip();
         testDatabaseInMemFileSys();
@@ -90,8 +90,8 @@ public class TestFileSystem extends TestBase {
             testFileSystem("nio:" + getBaseDir() + "/fs");
             testFileSystem("cache:nio:" + getBaseDir() + "/fs");
             testFileSystem("nioMapped:" + getBaseDir() + "/fs");
-            testFileSystem("crypt:0007:" + getBaseDir() + "/fs");
-            testFileSystem("cache:crypt:0007:" + getBaseDir() + "/fs");
+            testFileSystem("encrypt:0007:" + getBaseDir() + "/fs");
+            testFileSystem("cache:encrypt:0007:" + getBaseDir() + "/fs");
             if (!config.splitFileSystem) {
                 testFileSystem("split:" + getBaseDir() + "/fs");
                 testFileSystem("split:nioMapped:" + getBaseDir() + "/fs");