Add ImageFormats

Reuse ArrayUtils

Author: garydgregory

src/main/java/org/apache/commons/imaging/AbstractImageParser.java

@@ -52,6 +52,7 @@
 import org.apache.commons.imaging.formats.webp.WebPImageParser;
 import org.apache.commons.imaging.formats.xbm.XbmImageParser;
 import org.apache.commons.imaging.formats.xpm.XpmImageParser;
+import org.apache.commons.lang3.ArrayUtils;
 
 /**
  * Provides the abstract base class for all image reading and writing utilities. ImageParser implementations are expected to extend this class providing logic
@@ -135,32 +136,23 @@ public final boolean canAcceptExtension(final String fileName) {
         if (extensions == null) {
             return true;
         }
-
         final int index = fileName.lastIndexOf('.');
         if (index >= 0) {
-            final String fileNameExtension = fileName.substring(index + 1).toLowerCase(Locale.ROOT);
-            for (final String extension : extensions) {
-                if (extension.equals(fileNameExtension)) {
-                    return true;
-                }
+            if (ArrayUtils.contains(extensions, fileName.substring(index + 1).toLowerCase(Locale.ROOT))) {
+                return true;
             }
         }
         return false;
     }
 
     /**
-     * Indicates whether the ImageParser implementation can accept the specified format
+     * Tests whether the ImageParser implementation can accept the specified format.
      *
-     * @param type An instance of ImageFormat.
+     * @param imageFormat An instance of ImageFormat.
      * @return If the parser can accept the format, true; otherwise, false.
      */
-    public boolean canAcceptType(final ImageFormat type) {
-        for (final ImageFormat format : getAcceptedTypes()) {
-            if (format.equals(type)) {
-                return true;
-            }
-        }
-        return false;
+    public boolean canAcceptType(final ImageFormat imageFormat) {
+        return ArrayUtils.contains(getAcceptedTypes(), imageFormat);
     }
 
     /**

src/main/java/org/apache/commons/imaging/ImageFormats.java

@@ -16,19 +16,21 @@
  */
 package org.apache.commons.imaging;
 
+import java.util.Objects;
+
 /**
  * Enumerates known image formats.
  */
 public enum ImageFormats implements ImageFormat {
 
     // @formatter:off
-    UNKNOWN(),
+    UNKNOWN("bin"),
     BMP("bmp", "dib"),
     DCX("dcx"),
     GIF("gif"),
     ICNS("icns"),
     ICO("ico"),
-    JBIG2(),
+    JBIG2("jbig2"),
     JPEG("jpg", "jpeg"),
     PAM("pam"),
     PSD("psd"),
@@ -39,7 +41,7 @@ public enum ImageFormats implements ImageFormat {
     PCX("pcx", "pcc"),
     PNG("png"),
     RGBE("hdr", "pic"),
-    TGA(),
+    TGA("tga"),
     TIFF("tif", "tiff"),
     WBMP("wbmp"),
     WEBP("webp"),
@@ -50,12 +52,12 @@ public enum ImageFormats implements ImageFormat {
     private final String[] extensions;
 
     ImageFormats(final String... extensions) {
-        this.extensions = extensions;
+        this.extensions = Objects.requireNonNull(extensions);
     }
 
     @Override
     public String getDefaultExtension() {
-        return this.extensions != null ? this.extensions[0] : null;
+        return extensions[0];
     }
 
     @Override

src/test/java/org/apache/commons/imaging/ImageFormatsTest.java

@@ -0,0 +1,52 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.commons.imaging;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.EnumSource;
+
+/**
+ * Tests {@link ImageFormats}.
+ */
+public class ImageFormatsTest {
+
+    @ParameterizedTest
+    @EnumSource(ImageFormats.class)
+    public void testDefaultExtension(final ImageFormats imageFormats) {
+        assertNotNull(imageFormats.getDefaultExtension());
+        assertFalse(imageFormats.getDefaultExtension().isEmpty());
+    }
+
+    @ParameterizedTest
+    @EnumSource(ImageFormats.class)
+    public void testExtensions(final ImageFormats imageFormats) {
+        assertNotNull(imageFormats.getExtensions());
+        assertNotEquals(0, imageFormats.getExtensions().length);
+    }
+
+    @ParameterizedTest
+    @EnumSource(ImageFormats.class)
+    public void testName(final ImageFormats imageFormats) {
+        assertNotNull(imageFormats.getName());
+        assertFalse(imageFormats.getName().isEmpty());
+    }
+}