Move checkDictZipInputStream

Introduce DictZipFiles.checkDictZipFile and
DictZipFiles.checkDictZipInputStream
Deprecate DictZipFileUtils.check* methods.

Signed-off-by: Hiroshi Miura <miurahr@linux.com>

diff --git a/dictzip-cli/src/main/java/org/dict/zip/cli/Main.java b/dictzip-cli/src/main/java/org/dict/zip/cli/Main.java
index 9daef7e..4acb07b 100644 (file)
--- a/dictzip-cli/src/main/java/org/dict/zip/cli/Main.java
+++ b/dictzip-cli/src/main/java/org/dict/zip/cli/Main.java
@@ -3,7 +3,7 @@
  *
  * This is a part of DictZip-java library.
  *
- * Copyright (C) 2016 Hiroshi Miura
+ * Copyright (C) 2016,2022 Hiroshi Miura
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -22,7 +22,7 @@
 
 package org.dict.zip.cli;
 
-import org.dict.zip.DictZipFileUtils;
+import org.dict.zip.DictZipFiles;
 import org.dict.zip.DictZipHeader.CompressionLevel;
 
 import java.io.File;
@@ -67,7 +67,7 @@ public final class Main {
                 } else if (commandLine.options.isTest()) {
                     boolean result = false;
                     try {
-                        result = DictZipFileUtils.checkDictZipInputStream(fName);
+                        result = DictZipFiles.checkDictZipFile(fName);
                     } catch (IOException e) {
                         System.err.println(e.getMessage());
                         System.exit(2);

diff --git a/dictzip-lib/src/main/java/org/dict/zip/DictZipFileUtils.java b/dictzip-lib/src/main/java/org/dict/zip/DictZipFileUtils.java
index edd7249..ba5141e 100644 (file)
--- a/dictzip-lib/src/main/java/org/dict/zip/DictZipFileUtils.java
+++ b/dictzip-lib/src/main/java/org/dict/zip/DictZipFileUtils.java
@@ -79,41 +79,26 @@ public final class DictZipFileUtils {
 
     /**
      * Check gzip member stream w/ CRC and length in trailer.
+     * @see DictZipFiles#checkDictZipFile
      * @param filename to be checked.
      * @return true if it is a valid dictzip file, otherwise false.
      * @throws IOException when CRC error or total length error.
      */
+    @Deprecated
     public static boolean checkDictZipInputStream(final String filename) throws IOException {
-        boolean result;
-        try (DictZipInputStream dzin = new DictZipInputStream(new
-                RandomAccessInputStream(filename, "r"))) {
-            result = checkDictZipInputStream(dzin);
-            dzin.close();
-        }
-        return result;
+        return DictZipFiles.checkDictZipFile(filename);
     }
 
     /**
      * Check gzip member stream w/ CRC and length in trailer.
+     * @see DictZipFiles#checkDictZipInputStream
      * @param in inputstream to be checked.
      * @return true if inputstream is a valid dictzip, otherwise false.
      * @throws IOException when CRC error or total length error.
      */
+    @Deprecated
     public static boolean checkDictZipInputStream(final DictZipInputStream in) throws IOException {
-        byte[] tmpBuf = new byte[CHECK_BUF_LEN];
-        in.seek(0);
-        long readLen = 0;
-        while (readLen < in.getLength()) {
-            int len = in.read(tmpBuf, 0, CHECK_BUF_LEN);
-            if (len < 0) {
-                break;
-            }
-            readLen += len;
-        }
-        if (readLen != in.getLength()) {
-            return false;
-        }
-        return true;
+        return DictZipFiles.checkDictZipInputStream(in);
     }
 
     private DictZipFileUtils() {