--- old/src/java.base/share/classes/java/lang/ClassLoader.java 2016-09-07 21:36:11.432251519 +0000 +++ new/src/java.base/share/classes/java/lang/ClassLoader.java 2016-09-07 21:36:11.075249204 +0000 @@ -27,6 +27,7 @@ import java.io.InputStream; import java.io.IOException; +import java.io.UncheckedIOException; import java.io.File; import java.lang.reflect.Constructor; import java.lang.reflect.Field; @@ -46,12 +47,16 @@ import java.util.Map; import java.util.Objects; import java.util.Set; +import java.util.Spliterator; +import java.util.Spliterators; import java.util.Stack; import java.util.NoSuchElementException; import java.util.Vector; import java.util.WeakHashMap; import java.util.concurrent.ConcurrentHashMap; +import java.util.function.Supplier; import java.util.stream.Stream; +import java.util.stream.StreamSupport; import jdk.internal.perf.PerfCounter; import jdk.internal.module.ServicesCatalog; @@ -1354,6 +1359,57 @@ } /** + * Returns a stream that loads the resources with the given name. A + * resource is some data (images, audio, text, etc) that can be accessed by + * class code in a way that is independent of the location of the code. + * + * Resources in a named module are private to that module. This method does + * not find resources in named modules. + * + *

The name of a resource is a {@code /}-separated path name that + * identifies the resource. + * + *

The search order is described in the documentation for {@link + * #getResource(String)}. + * + *

The loading of resources will occur when the returned stream is + * evaluated. If the loading of resources results in an {@code IOException} + * then the I/O exception is wrapped in an {@link UncheckedIOException} + * that is then thrown. + * + * @apiNote When overriding this method it is recommended that an + * implementation ensures that any delegation is consistent with the {@link + * #getResource(java.lang.String) getResource(String)} method. This should + * ensure that the first element returned by the stream is the same + * resource that the {@code getResource(String)} method would return. + * + * @param name + * The resource name + * + * @return A stream of resource {@link java.net.URL URL} objects. If no + * resources could be found, the stream will be empty. Resources + * that the class loader doesn't have access to will not be in the + * stream. + * + * @see #findResources(String) + * + * @since 9 + */ + public Stream resources(String name) { + Supplier> si = () -> { + try { + return Spliterators.spliteratorUnknownSize( + getResources(name).asIterator(), RESOURCE_CHARACTERISTICS); + } catch (IOException e) { + throw new UncheckedIOException(e); + } + }; + return StreamSupport.stream(si, RESOURCE_CHARACTERISTICS, false); + } + + private static final int RESOURCE_CHARACTERISTICS = Spliterator.NONNULL | Spliterator.IMMUTABLE; + + /** * Finds the resource with the given name. Class loader implementations * should override this method to specify where to find resources. *