More cleanup (add method to generate resource name from binary class …

…name)
policeman-tools · Sep 19, 2015 · f7dce21 · f7dce21
1 parent 635aa19
commit f7dce21
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/src/main/java/de/thetaphi/forbiddenapis/AsmUtils.java b/src/main/java/de/thetaphi/forbiddenapis/AsmUtils.java
@@ -54,6 +54,11 @@ public static String binaryToInternal(String clazz) {
     return clazz.replace('.', '/');
   }
 
+  /** Converts a binary class name to a &quot;{@code .class}&quot; file resource name. */
+  public static String getClassResourceName(String clazz) {
+    return binaryToInternal(clazz).concat(".class");
+  }
+
   /** Returns true is a string is a glob pattern */
   public static boolean isGlob(String s) {
     return s.indexOf('*') >= 0 || s.indexOf('?') >= 0;

diff --git a/src/main/java/de/thetaphi/forbiddenapis/Checker.java b/src/main/java/de/thetaphi/forbiddenapis/Checker.java
@@ -129,7 +129,7 @@ public Checker(Logger logger, ClassLoader loader, EnumSet<Option> options) {
     // fall back to legacy behavior:
     if (!isSupportedJDK) {
       try {
-        final URL objectClassURL = loader.getResource("java/lang/Object.class");
+        final URL objectClassURL = loader.getResource(AsmUtils.getClassResourceName(Object.class.getName()));
         if (objectClassURL != null && "jrt".equalsIgnoreCase(objectClassURL.getProtocol())) {
           // this is Java 9 with modules!
           isSupportedJDK = true;
@@ -191,7 +191,7 @@ private InputStream getBytecodeFromJigsaw(String classname) {
     try {
       final Class<?> clazz = Class.forName(classname, false, loader);
       final Object module = method_Class_getModule.invoke(clazz);
-      return (InputStream) method_Module_getResourceAsStream.invoke(module, AsmUtils.binaryToInternal(classname).concat(".class"));
+      return (InputStream) method_Module_getResourceAsStream.invoke(module, AsmUtils.getClassResourceName(classname));
     } catch (Exception e) {
       return null; // not found
     }
@@ -238,7 +238,7 @@ private ClassSignature getClassFromClassLoader(final String clazz) throws ClassN
       return c;
     } else {
       try {
-        final URL url = loader.getResource(AsmUtils.binaryToInternal(clazz).concat(".class"));
+        final URL url = loader.getResource(AsmUtils.getClassResourceName(clazz));
         if (url != null) {
           final URLConnection conn = url.openConnection();
           final boolean isRuntimeClass = isRuntimeClass(conn);

diff --git a/src/main/java/de/thetaphi/forbiddenapis/cli/CliMain.java b/src/main/java/de/thetaphi/forbiddenapis/cli/CliMain.java
@@ -40,6 +40,7 @@
 import org.apache.commons.cli.PosixParser;
 import org.codehaus.plexus.util.DirectoryScanner;
 
+import de.thetaphi.forbiddenapis.AsmUtils;
 import de.thetaphi.forbiddenapis.Checker;
 import de.thetaphi.forbiddenapis.ForbiddenApiException;
 import de.thetaphi.forbiddenapis.Logger;
@@ -165,9 +166,10 @@ private void printVersion() {
 
   private void printHelp(Options options) {
     final HelpFormatter formatter = new HelpFormatter();
-    String cmdline = "java " + getClass().getName();
+    String clazzName = getClass().getName();
+    String cmdline = "java " + clazzName;
     try {
-      final URLConnection conn = getClass().getResource(getClass().getSimpleName() + ".class").openConnection();
+      final URLConnection conn = getClass().getClassLoader().getResource(AsmUtils.getClassResourceName(clazzName)).openConnection();
       if (conn instanceof JarURLConnection) {
         final URL jarUrl = ((JarURLConnection) conn).getJarFileURL();
         if ("file".equalsIgnoreCase(jarUrl.getProtocol())) {