修改异常名称

kaaass · kaaass · Jan 13, 2021 · Jan 1, 2021 · Jan 1, 2021 · Jan 1, 2021
commit ecbe27f6a972fa227ad662d381d266020e03acfc
diff --git a/src/main/java/net/kaaass/rumbase/dataitem/ItemManager.java b/src/main/java/net/kaaass/rumbase/dataitem/ItemManager.java
@@ -1,7 +1,7 @@
 package net.kaaass.rumbase.dataitem;
 
-import net.kaaass.rumbase.dataitem.exception.FileException;
 import net.kaaass.rumbase.dataitem.mock.MockItemStorage;
+import net.kaaass.rumbase.page.exception.FileException;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -22,16 +22,16 @@ public class ItemManager {
      * @param fileName 文件名
      * @return 数据项管理器，用于管理数据项
      */
-    public static IItemStorage fromFile(String fileName) throws FileException {
+    public static IItemStorage fromFile(String fileName) throws FileException{
         String errorFileName = "error.db";
         if (errorFileName.equals(fileName)) {
-            throw new FileException(2);
+            throw new FileException(1);
         }
 
         if (maps.containsKey(fileName)) {
             return maps.get(fileName);
         } else {
-            IItemStorage iItemStorage = MockItemStorage.ofFile(fileName);
+            IItemStorage iItemStorage = ItemStorage.ofFile(fileName);
             maps.put(fileName, iItemStorage);
             return iItemStorage;
         }
@@ -47,14 +47,9 @@ public static IItemStorage fromFile(String fileName) throws FileException {
      */
     public static IItemStorage createFile(String fileName, byte[] metadata) throws FileException {
         // 如果文件已经存在，那么就抛出文件已存在异常
-        if (maps.containsKey(fileName)) {
-            throw new FileException(1);
-        } else {
             // 若文件不存在，则创建文件。
             IItemStorage iItemStorage = MockItemStorage.ofNewFile(fileName, metadata);
             maps.put(fileName, iItemStorage);
             return iItemStorage;
-        }
-
     }
 }
diff --git a/...ase/dataitem/exception/FileException.java → ...ase/dataitem/exception/ItemException.java b/...ase/dataitem/exception/FileException.java → ...ase/dataitem/exception/ItemException.java
@@ -6,17 +6,17 @@
 import java.util.Map;
 
 /**
- * 在创建、打开数据库时
+ * 对数据库进行解析时出现的异常错误
  *
  * @author kaito
  */
-public class FileException extends RumbaseException {
+public class ItemException extends RumbaseException {
     public static final Map<Integer, String> REASONS = new HashMap<>() {{
         put(1, "要创建的文件已存在");
         put(2, "查找的文件不存在");
     }};
 
-    public FileException(int subID) {
+    public ItemException(int subID) {
         super(6001, subID, REASONS.get(subID));
     }
 }
diff --git a/src/test/java/net/kaaass/rumbase/dataitem/IItemStorageTest.java b/src/test/java/net/kaaass/rumbase/dataitem/IItemStorageTest.java
@@ -2,8 +2,8 @@
 
 import junit.framework.TestCase;
 import lombok.extern.slf4j.Slf4j;
-import net.kaaass.rumbase.dataitem.exception.FileException;
 import net.kaaass.rumbase.dataitem.exception.UUIDException;
+import net.kaaass.rumbase.page.exception.FileException;
 
 import java.util.ArrayList;
 import java.util.Comparator;
@@ -22,9 +22,13 @@ public class IItemStorageTest extends TestCase {
     /**
      * 测试能否从已有文件中解析得到数据项管理器
      */
-    public void testGetFromFile() throws FileException {
+    public void testGetFromFile()  {
         String fileName = "testGetFromFile.db";
-        var itemStorage = ItemManager.fromFile(fileName);
+        try {
+            var itemStorage = ItemManager.fromFile(fileName);
+        } catch (FileException e) {
+            e.printStackTrace();
+        }
 
         // 如果表中没有对应的文件，那么就抛出错误
         String failFileName = "error.db";