Backups/TwelveMonkeys
2
0
Fork 0
mirror of https://github.com/haraldk/TwelveMonkeys.git synced 2025-08-04 20:15:28 -04:00
Code Issues Projects Releases Wiki Activity

Minor servlet clean-up.

Browse Source 
(cherry picked from commit c28963ae4904ccee61c8aa849b548a2191a0dada)
This commit is contained in:
Harald Kuhr 2021-09-21 14:23:59 +02:00
parent 18c1edf0e5
commit aca8b1256a
2 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
servlet/src/main/java/com/twelvemonkeys/servlet/image/IIOProviderContextListener.java
View File

@ -30,14 +30,15 @@
package com.twelvemonkeys.servlet.image; package com.twelvemonkeys.servlet.image;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import javax.imageio.ImageIO; import javax.imageio.ImageIO;
import javax.imageio.spi.IIORegistry; import javax.imageio.spi.IIORegistry;
import javax.imageio.spi.ServiceRegistry; import javax.imageio.spi.ServiceRegistry;
import javax.servlet.ServletContextEvent; import javax.servlet.ServletContextEvent;
import javax.servlet.ServletContextListener; 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. * 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); Iterator<?> providers = registry.getServiceProviders(category, localFilter, false);
// Copy the providers, as de-registering while iterating over providers will lead to ConcurrentModificationExceptions. // 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()) { while (providers.hasNext()) {
providersCopy.add(providers.next()); providersCopy.add(providers.next());
} }

18
servlet/src/test/java/com/twelvemonkeys/servlet/image/IIOProviderContextListenerTest.java
View File

@ -30,7 +30,12 @@
package com.twelvemonkeys.servlet.image; 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.ImageReader;
import javax.imageio.spi.IIORegistry; import javax.imageio.spi.IIORegistry;
@ -38,13 +43,8 @@ import javax.imageio.spi.ImageReaderSpi;
import javax.servlet.ServletContext; import javax.servlet.ServletContext;
import javax.servlet.ServletContextEvent; import javax.servlet.ServletContextEvent;
import javax.servlet.ServletContextListener; import javax.servlet.ServletContextListener;
import java.io.IOException;
import java.util.Locale;
import static org.junit.Assert.assertFalse; import org.junit.Test;
import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
/** /**
* IIOProviderContextListenerTest * IIOProviderContextListenerTest
@ -99,12 +99,12 @@ public class IIOProviderContextListenerTest {
private static abstract class MockImageReaderSpiBase extends ImageReaderSpi { private static abstract class MockImageReaderSpiBase extends ImageReaderSpi {
@Override @Override
public boolean canDecodeInput(Object source) throws IOException { public boolean canDecodeInput(Object source) {
return false; return false;
} }
@Override @Override
public ImageReader createReaderInstance(Object extension) throws IOException { public ImageReader createReaderInstance(Object extension) {
return null; return null;
} }