LocationService: do not cache resolvers by scheme

We want the ability for multiple resolvers to handle the same scheme in
different scenarios. So we don't want to cache which resolver was used
based only on scheme. Therefore, the getResolver method becomes the same
as getHandler, doing the lookup every time. So we deprecate it.

Author: ctrueden

src/main/java/org/scijava/io/location/DefaultLocationService.java

@@ -33,8 +33,6 @@
 package org.scijava.io.location;
 
 import java.net.URI;
-import java.util.HashMap;
-import java.util.Map;
 
 import org.scijava.plugin.AbstractHandlerService;
 import org.scijava.plugin.Plugin;
@@ -50,11 +48,5 @@ public class DefaultLocationService extends
 	AbstractHandlerService<URI, LocationResolver> implements
 	LocationService
 {
-
-	private final Map<String, LocationResolver> resolvers = new HashMap<>();
-
-	@Override
-	public LocationResolver getResolver(final URI uri) {
-		return resolvers.computeIfAbsent(uri.getScheme(), u -> getHandler(uri));
-	}
+	// NB: No implementation needed.
 }

src/main/java/org/scijava/io/location/LocationService.java

@@ -86,16 +86,11 @@ default Location resolve(URI uri) throws URISyntaxException {
 		return resolver != null ? resolver.resolve(uri) : null;
 	}
 
-	/**
-	 * Returns a {@link LocationResolver} capable of resolving URL like the one
-	 * provided to this method. Allows faster repeated resolving of similar URIs
-	 * without going through this service.
-	 * 
-	 * @param uri the uri
-	 * @return the {@link LocationResolver} for this uri type, or
-	 *         <code>null</code> if no resolver could be found.
-	 */
-	LocationResolver getResolver(URI uri);
+	/** @deprecated Use {@link #getHandler(URI)} instead. */
+	@Deprecated
+	default LocationResolver getResolver(URI uri) {
+		return getHandler(uri);
+	}
 
 	// -- PTService methods --
 

src/test/java/org/scijava/io/location/LocationServiceTest.java

@@ -55,7 +55,7 @@ public void testResolve() throws URISyntaxException {
 		final LocationService loc = ctx.getService(LocationService.class);
 
 		final URI uri = new File(new File(".").getAbsolutePath()).toURI();
-		final LocationResolver res = loc.getResolver(uri);
+		final LocationResolver res = loc.getHandler(uri);
 
 		assertTrue(res instanceof FileLocationResolver);
 		assertEquals(uri, res.resolve(uri).getURI());