fix #3 & #4, ResourcePackage has issues process level of path, and asserts has no effect.

Author: Eyre-S

gradle.properties

@@ -1,4 +1,4 @@
-version = 0.3.1
-snapshot = false
+version = 0.3.2
+snapshot = true
 
 archive_name = resource-tools

src/main/java/cc/sukazyo/restools/NoSuchResourceException.java

@@ -0,0 +1,14 @@
+package cc.sukazyo.restools;
+
+import javax.annotation.Nonnull;
+
+public class NoSuchResourceException extends RuntimeException {
+	
+	public NoSuchResourceException (@Nonnull ClassLoader classLoader, @Nonnull String identifierFilePath) {
+		super(String.format(
+				"Cannot find resource \"%s\"! Such path does not exists in the class loader %s.",
+				identifierFilePath, classLoader
+		));
+	}
+	
+}

src/main/java/cc/sukazyo/restools/ResourcePackage.java

@@ -2,6 +2,7 @@
 
 import cc.sukazyo.restools.impl.disk.DiskPackage;
 import cc.sukazyo.restools.impl.jar.JarPackage;
+import cc.sukazyo.restools.utils.PathsHelper;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -32,10 +33,13 @@ class UnsupportedPackageTypeException extends Exception {}
 	 * @return A {@link ResourcePackage} that contains the resource.
 	 * @throws UnsupportedPackageTypeException If the resource location cannot be read by any
 	 *                                         of the known implementations.
+	 * @throws NoSuchResourceException If the identifierFilePath is not exists (either directory
+	 *                                 or file) in classloader's all the classpath.
 	 *
 	 * @since 0.3.0
 	 */
-	static ResourcePackage get (@Nonnull ClassLoader classLoader, @Nonnull String... identifierFilePath) throws UnsupportedPackageTypeException {
+	static ResourcePackage get (@Nonnull ClassLoader classLoader, @Nonnull String... identifierFilePath)
+	throws UnsupportedPackageTypeException, NoSuchResourceException {
 
 		try { return new DiskPackage(classLoader, identifierFilePath); } catch (UnsupportedPackageTypeException ignored) {}
 		try { return new JarPackage(classLoader, identifierFilePath); } catch (UnsupportedPackageTypeException ignored) {}
@@ -44,6 +48,28 @@ static ResourcePackage get (@Nonnull ClassLoader classLoader, @Nonnull String...
 
 	}
 
+	/**
+	 * Get a resource package.
+	 * <p>
+	 * Different with the v0.2.x and older, the ResourcePackage always locates in the root of the
+	 * classpath, instead of the old behavior of the v0.2.x, which locates in the given path.
+	 *
+	 * @param classLoader the {@link ClassLoader} that is used to load the resource.
+	 * @param identifierFilePath Path of a resource, used to locate a resource package. The path
+	 *                           will be parsed to an array using {@link PathsHelper#parseString(String)}.
+	 * @return A {@link ResourcePackage} that contains the resource.
+	 * @throws UnsupportedPackageTypeException If the resource location cannot be read by any
+	 *                                         of the known implementations.
+	 * @throws NoSuchResourceException If the identifierFilePath is not exists (either directory
+	 *                                 or file) in classloader's all the classpath.
+	 *
+	 * @since 0.3.0
+	 */
+	static ResourcePackage get (@Nonnull ClassLoader classLoader, @Nonnull String identifierFilePath)
+	throws UnsupportedPackageTypeException, NoSuchResourceException {
+		return get(classLoader, PathsHelper.parseString(identifierFilePath));
+	}
+	
 	/**
 	 * Get the resource package using the current thread's {@link ClassLoader}.
 	 * <p>
@@ -54,10 +80,26 @@ static ResourcePackage get (@Nonnull ClassLoader classLoader, @Nonnull String...
 	 *
 	 * @since 0.3.0
 	 */
-	static ResourcePackage get (@Nonnull String... identifierFilePath) throws UnsupportedPackageTypeException {
+	static ResourcePackage get (@Nonnull String... identifierFilePath)
+	throws UnsupportedPackageTypeException, NoSuchResourceException {
 		return get(Thread.currentThread().getContextClassLoader(), identifierFilePath);
 	}
 
+	/**
+	 * Get the resource package using the current thread's {@link ClassLoader}.
+	 * <p>
+	 * This is an alias of {@link #get(ClassLoader, String)}, in most cases where there's no
+	 * custom classloader, this method is enough to work.
+	 *
+	 * @see #get(ClassLoader, String)
+	 *
+	 * @since 0.3.0
+	 */
+	static ResourcePackage get (@Nonnull String identifierFilePath)
+	throws UnsupportedPackageTypeException, NoSuchResourceException {
+		return get(PathsHelper.parseString(identifierFilePath));
+	}
+	
 	/**
 	 * Get the associated {@link ResourcePackage} that contains this {@link ResourceDirectory}.
 	 * <p>

src/main/java/cc/sukazyo/restools/impl/disk/DiskPackage.java

@@ -1,5 +1,6 @@
 package cc.sukazyo.restools.impl.disk;
 
+import cc.sukazyo.restools.NoSuchResourceException;
 import cc.sukazyo.restools.ResourcePackage;
 import cc.sukazyo.restools.utils.PathsHelper;
 
@@ -16,12 +17,13 @@ public class DiskPackage implements ResourcePackage, IDiskDirectory, IDiskEntry
 	public final Path packageRoot;
 
 	public DiskPackage (@Nonnull ClassLoader classLoader, @Nonnull String[] identifierFilePath)
-	throws UnsupportedPackageTypeException {
+	throws UnsupportedPackageTypeException, NoSuchResourceException {
 
 		final String resPath = PathsHelper.compile(identifierFilePath);
 		final int resLevel = identifierFilePath.length;
 		final URL resURL = classLoader.getResource(resPath);
-		assert resURL != null : "Cannot find resource: " + resPath;
+		if (resURL == null)
+			throw new NoSuchResourceException(classLoader, resPath);
 
 		if (!"file".equals(resURL.getProtocol()))
 			throw new UnsupportedPackageTypeException();
@@ -32,6 +34,7 @@ public DiskPackage (@Nonnull ClassLoader classLoader, @Nonnull String[] identifi
 		} catch (URISyntaxException e) {
 			throw new IllegalStateException("Cannot get the root dir of the required resource " + resPath + ".", e);
 		}
+		
 		this.packageRoot = PathsHelper.getParent(identifierRealPath, resLevel);
 
 	}

src/main/java/cc/sukazyo/restools/impl/jar/JarPackage.java

@@ -1,5 +1,6 @@
 package cc.sukazyo.restools.impl.jar;
 
+import cc.sukazyo.restools.NoSuchResourceException;
 import cc.sukazyo.restools.ResourcePackage;
 import cc.sukazyo.restools.impl.jar.tree.IBranchNode;
 import cc.sukazyo.restools.impl.jar.tree.NodeRoot;
@@ -21,11 +22,13 @@ public class JarPackage implements IJarDirectory, ResourcePackage {
 	public final NodeRoot jarNodeRoot;
 
 	public JarPackage (@Nonnull ClassLoader classLoader, @Nonnull String[] identifierFilePath)
-	throws UnsupportedPackageTypeException {
+	throws UnsupportedPackageTypeException, NoSuchResourceException {
 
 		final String identifierStringPath = PathsHelper.compile(identifierFilePath);
 		final URL identifierUrl = classLoader.getResource(identifierStringPath);
-		assert identifierUrl != null : "Cannot find resource: " + PathsHelper.compile(identifierFilePath);
+		if (identifierUrl == null)
+			throw new NoSuchResourceException(classLoader, identifierStringPath);
+		
 		if (!Objects.equals(identifierUrl.getProtocol(), "jar")) throw new UnsupportedPackageTypeException();
 
 		try {