From 73e4eb8627ab832a15f2eb87036e81bc64ca83a0 Mon Sep 17 00:00:00 2001
From: Harald Kuhr <harald.kuhr@gmail.com>
Date: Tue, 19 Dec 2017 19:52:25 +0100
Subject: [PATCH] #360 JPEG-LOSSLESS/jpeg-lossless now part of format names.

---
 .../plugins/jpeg/JPEGImageReaderSpi.java        | 15 ---------------
 .../plugins/jpeg/JPEGImageWriterSpi.java        | 11 +----------
 .../imageio/plugins/jpeg/JPEGProviderInfo.java  |  2 +-
 .../plugins/jpeg/JPEGImageReaderTest.java       | 17 +++++------------
 4 files changed, 7 insertions(+), 38 deletions(-)

diff --git a/imageio/imageio-jpeg/src/main/java/com/twelvemonkeys/imageio/plugins/jpeg/JPEGImageReaderSpi.java b/imageio/imageio-jpeg/src/main/java/com/twelvemonkeys/imageio/plugins/jpeg/JPEGImageReaderSpi.java
index 43612892..1b8e1c2b 100644
--- a/imageio/imageio-jpeg/src/main/java/com/twelvemonkeys/imageio/plugins/jpeg/JPEGImageReaderSpi.java
+++ b/imageio/imageio-jpeg/src/main/java/com/twelvemonkeys/imageio/plugins/jpeg/JPEGImageReaderSpi.java
@@ -113,21 +113,6 @@ public final class JPEGImageReaderSpi extends ImageReaderSpiBase {
         return delegateProvider.canDecodeInput(source);
     }
 
-    @Override
-    public String[] getFormatNames() {
-        return delegateProvider.getFormatNames();
-    }
-
-    @Override
-    public String[] getFileSuffixes() {
-        return delegateProvider.getFileSuffixes();
-    }
-
-    @Override
-    public String[] getMIMETypes() {
-        return delegateProvider.getMIMETypes();
-    }
-
     @Override
     public boolean isStandardStreamMetadataFormatSupported() {
         return delegateProvider.isStandardStreamMetadataFormatSupported();
diff --git a/imageio/imageio-jpeg/src/main/java/com/twelvemonkeys/imageio/plugins/jpeg/JPEGImageWriterSpi.java b/imageio/imageio-jpeg/src/main/java/com/twelvemonkeys/imageio/plugins/jpeg/JPEGImageWriterSpi.java
index 41fd953e..5c2d484b 100644
--- a/imageio/imageio-jpeg/src/main/java/com/twelvemonkeys/imageio/plugins/jpeg/JPEGImageWriterSpi.java
+++ b/imageio/imageio-jpeg/src/main/java/com/twelvemonkeys/imageio/plugins/jpeg/JPEGImageWriterSpi.java
@@ -107,19 +107,10 @@ public class JPEGImageWriterSpi extends ImageWriterSpiBase {
 
     @Override
     public String[] getFormatNames() {
+        // NOTE: Can't use super.getFormatNames() which includes JPEG-Lossless
         return delegateProvider.getFormatNames();
     }
 
-    @Override
-    public String[] getFileSuffixes() {
-        return delegateProvider.getFileSuffixes();
-    }
-
-    @Override
-    public String[] getMIMETypes() {
-        return delegateProvider.getMIMETypes();
-    }
-
     @Override
     public boolean isStandardStreamMetadataFormatSupported() {
         return delegateProvider.isStandardStreamMetadataFormatSupported();
diff --git a/imageio/imageio-jpeg/src/main/java/com/twelvemonkeys/imageio/plugins/jpeg/JPEGProviderInfo.java b/imageio/imageio-jpeg/src/main/java/com/twelvemonkeys/imageio/plugins/jpeg/JPEGProviderInfo.java
index b571071a..2d576197 100644
--- a/imageio/imageio-jpeg/src/main/java/com/twelvemonkeys/imageio/plugins/jpeg/JPEGProviderInfo.java
+++ b/imageio/imageio-jpeg/src/main/java/com/twelvemonkeys/imageio/plugins/jpeg/JPEGProviderInfo.java
@@ -41,7 +41,7 @@ final class JPEGProviderInfo extends ReaderWriterProviderInfo {
     JPEGProviderInfo() {
         super(
                 JPEGProviderInfo.class,
-                new String[] {"JPEG", "jpeg", "JPG", "jpg"},
+                new String[] {"JPEG", "jpeg", "JPG", "jpg", "JPEG-LOSSLESS", "jpeg-lossless"},
                 new String[] {"jpg", "jpeg"},
                 new String[] {"image/jpeg"},
                 "com.twelvemonkeys.imageio.plugins.jpeg.JPEGImageReader",
diff --git a/imageio/imageio-jpeg/src/test/java/com/twelvemonkeys/imageio/plugins/jpeg/JPEGImageReaderTest.java b/imageio/imageio-jpeg/src/test/java/com/twelvemonkeys/imageio/plugins/jpeg/JPEGImageReaderTest.java
index e9f2eb88..e6cc6933 100644
--- a/imageio/imageio-jpeg/src/test/java/com/twelvemonkeys/imageio/plugins/jpeg/JPEGImageReaderTest.java
+++ b/imageio/imageio-jpeg/src/test/java/com/twelvemonkeys/imageio/plugins/jpeg/JPEGImageReaderTest.java
@@ -150,7 +150,8 @@ public class JPEGImageReaderTest extends ImageReaderAbstractTest<JPEGImageReader
 
     @Override
     protected List<String> getFormatNames() {
-        return Arrays.asList("JPEG", "jpeg", "JPG", "jpg");
+        return Arrays.asList("JPEG", "jpeg", "JPG", "jpg",
+                "jpeg-lossless", "JPEG-LOSSLESS");
     }
 
     @Override
@@ -1206,9 +1207,8 @@ public class JPEGImageReaderTest extends ImageReaderAbstractTest<JPEGImageReader
         for (String resource : resources) {
             // Just test that we can read the metadata without exceptions
             JPEGImageReader reader = createReader();
-            ImageInputStream stream = ImageIO.createImageInputStream(getClassLoaderResource(resource));
 
-            try {
+            try (ImageInputStream stream = ImageIO.createImageInputStream(getClassLoaderResource(resource))) {
                 reader.setInput(stream);
                 IIOMetadata metadata = reader.getImageMetadata(0);
                 assertNotNull(String.format("%s: null metadata", resource), metadata);
@@ -1219,12 +1219,7 @@ public class JPEGImageReaderTest extends ImageReaderAbstractTest<JPEGImageReader
 
             }
             catch (IIOException e) {
-                AssertionError fail = new AssertionError(String.format("Reading metadata failed for %ss: %s", resource, e.getMessage()));
-                fail.initCause(e);
-                throw fail;
-            }
-            finally {
-                stream.close();
+                throw new AssertionError(String.format("Reading metadata failed for %ss: %s", resource, e.getMessage()), e);
             }
         }
     }
@@ -1256,9 +1251,7 @@ public class JPEGImageReaderTest extends ImageReaderAbstractTest<JPEGImageReader
                         }
                     }
                     catch (IIOException e) {
-                        AssertionError fail = new AssertionError(String.format("Reading metadata failed for %s image %s: %s", testData, i, e.getMessage()));
-                        fail.initCause(e);
-                        throw fail;
+                        throw new AssertionError(String.format("Reading metadata failed for %s image %s: %s", testData, i, e.getMessage()), e);
                     }
                 }
                 catch (IIOException ignore) {