You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2023/05/31 21:56:22 UTC

[commons-io] branch master updated (2365a1ed -> f4b22d54)

This is an automated email from the ASF dual-hosted git repository.

ggregory pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/commons-io.git


    from 2365a1ed Javadoc
     new 4cb3d299 Reuse RandomAccessFiles
     new f4b22d54 Javadoc

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../io/filefilter/MagicNumberFileFilter.java       | 26 +++++++++-------------
 1 file changed, 10 insertions(+), 16 deletions(-)


[commons-io] 01/02: Reuse RandomAccessFiles

Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-io.git

commit 4cb3d2999e573cac5d41792e18a45cd2e0b2a9c7
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Wed May 31 17:55:27 2023 -0400

    Reuse RandomAccessFiles
---
 .../commons/io/filefilter/MagicNumberFileFilter.java   | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/src/main/java/org/apache/commons/io/filefilter/MagicNumberFileFilter.java b/src/main/java/org/apache/commons/io/filefilter/MagicNumberFileFilter.java
index 68824a40..ae10c623 100644
--- a/src/main/java/org/apache/commons/io/filefilter/MagicNumberFileFilter.java
+++ b/src/main/java/org/apache/commons/io/filefilter/MagicNumberFileFilter.java
@@ -30,8 +30,8 @@ import java.nio.file.attribute.BasicFileAttributes;
 import java.util.Arrays;
 import java.util.Objects;
 
-import org.apache.commons.io.IOUtils;
 import org.apache.commons.io.RandomAccessFileMode;
+import org.apache.commons.io.RandomAccessFiles;
 
 /**
  * <p>
@@ -258,22 +258,12 @@ public class MagicNumberFileFilter extends AbstractFileFilter implements
     @Override
     public boolean accept(final File file) {
         if (file != null && file.isFile() && file.canRead()) {
-            try {
-                try (RandomAccessFile randomAccessFile = RandomAccessFileMode.READ_ONLY.create(file)) {
-                    final byte[] fileBytes = IOUtils.byteArray(this.magicNumbers.length);
-                    randomAccessFile.seek(byteOffset);
-                    final int read = randomAccessFile.read(fileBytes);
-                    if (read != magicNumbers.length) {
-                        return false;
-                    }
-                    return Arrays.equals(this.magicNumbers, fileBytes);
-                }
-            }
-            catch (final IOException ignored) {
+            try (RandomAccessFile randomAccessFile = RandomAccessFileMode.READ_ONLY.create(file)) {
+                return Arrays.equals(magicNumbers, RandomAccessFiles.read(randomAccessFile, byteOffset, magicNumbers.length));
+            } catch (final IOException ignored) {
                 // Do nothing, fall through and do not accept file
             }
         }
-
         return false;
     }
 


[commons-io] 02/02: Javadoc

Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-io.git

commit f4b22d54fc20cf5f7202725493b68a5f978d043e
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Wed May 31 17:56:16 2023 -0400

    Javadoc
    
    Document deprecation of serialization
---
 .../org/apache/commons/io/filefilter/MagicNumberFileFilter.java   | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/apache/commons/io/filefilter/MagicNumberFileFilter.java b/src/main/java/org/apache/commons/io/filefilter/MagicNumberFileFilter.java
index ae10c623..e7743408 100644
--- a/src/main/java/org/apache/commons/io/filefilter/MagicNumberFileFilter.java
+++ b/src/main/java/org/apache/commons/io/filefilter/MagicNumberFileFilter.java
@@ -90,14 +90,18 @@ import org.apache.commons.io.RandomAccessFiles;
  * <em>Serialization is deprecated and will be removed in 3.0.</em>
  * </p>
  *
+ * <h2>Deprecating Serialization</h2>
+ * <p>
+ * <em>Serialization is deprecated and will be removed in 3.0.</em>
+ * </p>
+ *
  * @since 2.0
  * @see FileFilterUtils#magicNumberFileFilter(byte[])
  * @see FileFilterUtils#magicNumberFileFilter(String)
  * @see FileFilterUtils#magicNumberFileFilter(byte[], long)
  * @see FileFilterUtils#magicNumberFileFilter(String, long)
  */
-public class MagicNumberFileFilter extends AbstractFileFilter implements
-        Serializable {
+public class MagicNumberFileFilter extends AbstractFileFilter implements Serializable {
 
     /**
      * The serialization version unique identifier.