From aca8b1256af5b708012925b129828ef5e329444b Mon Sep 17 00:00:00 2001
From: Harald Kuhr <harald.kuhr@gmail.com>
Date: Tue, 21 Sep 2021 14:23:59 +0200
Subject: [PATCH] Minor servlet clean-up.

(cherry picked from commit c28963ae4904ccee61c8aa849b548a2191a0dada)
---
 .../image/IIOProviderContextListener.java      |  9 +++++----
 .../image/IIOProviderContextListenerTest.java  | 18 +++++++++---------
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/servlet/src/main/java/com/twelvemonkeys/servlet/image/IIOProviderContextListener.java b/servlet/src/main/java/com/twelvemonkeys/servlet/image/IIOProviderContextListener.java
index 83d887f6..9dde9c09 100644
--- a/servlet/src/main/java/com/twelvemonkeys/servlet/image/IIOProviderContextListener.java
+++ b/servlet/src/main/java/com/twelvemonkeys/servlet/image/IIOProviderContextListener.java
@@ -30,14 +30,15 @@
 
 package com.twelvemonkeys.servlet.image;
 
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
 import javax.imageio.ImageIO;
 import javax.imageio.spi.IIORegistry;
 import javax.imageio.spi.ServiceRegistry;
 import javax.servlet.ServletContextEvent;
 import javax.servlet.ServletContextListener;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
 
 /**
  * Takes care of registering and de-registering local ImageIO plugins (service providers) for the servlet context.
@@ -72,7 +73,7 @@ public final class IIOProviderContextListener implements ServletContextListener
             Iterator<?> providers = registry.getServiceProviders(category, localFilter, false);
 
             // Copy the providers, as de-registering while iterating over providers will lead to ConcurrentModificationExceptions.
-            List<Object> providersCopy = new ArrayList<Object>();
+            List<Object> providersCopy = new ArrayList<>();
             while (providers.hasNext()) {
                 providersCopy.add(providers.next());
             }
diff --git a/servlet/src/test/java/com/twelvemonkeys/servlet/image/IIOProviderContextListenerTest.java b/servlet/src/test/java/com/twelvemonkeys/servlet/image/IIOProviderContextListenerTest.java
index 99b25123..06b8c447 100644
--- a/servlet/src/test/java/com/twelvemonkeys/servlet/image/IIOProviderContextListenerTest.java
+++ b/servlet/src/test/java/com/twelvemonkeys/servlet/image/IIOProviderContextListenerTest.java
@@ -30,7 +30,12 @@
 
 package com.twelvemonkeys.servlet.image;
 
-import org.junit.Test;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import java.util.Locale;
 
 import javax.imageio.ImageReader;
 import javax.imageio.spi.IIORegistry;
@@ -38,13 +43,8 @@ import javax.imageio.spi.ImageReaderSpi;
 import javax.servlet.ServletContext;
 import javax.servlet.ServletContextEvent;
 import javax.servlet.ServletContextListener;
-import java.io.IOException;
-import java.util.Locale;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+import org.junit.Test;
 
 /**
  * IIOProviderContextListenerTest
@@ -99,12 +99,12 @@ public class IIOProviderContextListenerTest {
 
     private static abstract class MockImageReaderSpiBase extends ImageReaderSpi {
         @Override
-        public boolean canDecodeInput(Object source) throws IOException {
+        public boolean canDecodeInput(Object source) {
             return false;
         }
 
         @Override
-        public ImageReader createReaderInstance(Object extension) throws IOException {
+        public ImageReader createReaderInstance(Object extension) {
             return null;
         }