Reorder scanning so classes to scan are loaded first (need to be on classpath before signatures)

Author: uschindler

src/main/java/de/thetaphi/forbiddenapis/cli/CliMain.java

@@ -267,43 +267,6 @@ public void run() throws ExitException {
         checker.addSuppressAnnotation(a);
       }
 
-      try {
-        final String[] bundledSignatures = cmd.getOptionValues(bundledsignaturesOpt.getLongOpt());
-        if (bundledSignatures != null) for (String bs : new LinkedHashSet<>(Arrays.asList(bundledSignatures))) {
-          checker.addBundledSignatures(bs, null);
-        }
-        
-        final String[] signaturesFiles = cmd.getOptionValues(signaturesfileOpt.getLongOpt());
-        if (signaturesFiles != null) for (String sf : new LinkedHashSet<>(Arrays.asList(signaturesFiles))) {
-          final File f = new File(sf).getAbsoluteFile();
-          checker.parseSignaturesFile(f);
-        }
-        final String[] signaturesWithSeverityWarn = cmd.getOptionValues(signatureswithseveritywarnOpt.getLongOpt());
-        if (signaturesWithSeverityWarn != null) {
-          checker.setSignaturesSeverity(Arrays.asList(signaturesWithSeverityWarn), Checker.ViolationSeverity.WARNING);
-        }
-        final String[] signaturesWithSeveritySuppress = cmd.getOptionValues(signatureswithseveritysuppressOpt.getLongOpt());
-        if (signaturesWithSeveritySuppress != null) {
-          checker.setSignaturesSeverity(Arrays.asList(signaturesWithSeveritySuppress), Checker.ViolationSeverity.SUPPRESS);
-        }
-      } catch (IOException ioe) {
-        throw new ExitException(EXIT_ERR_OTHER, "IO problem while reading files with API signatures: " + ioe);
-      } catch (ParseException pe) {
-        throw new ExitException(EXIT_ERR_OTHER, "Parsing signatures failed: " + pe.getMessage());
-      }
-
-      if (checker.hasNoSignatures()) {
-        if (checker.noSignaturesFilesParsed()) {
-          throw new ExitException(EXIT_ERR_CMDLINE, String.format(Locale.ENGLISH,
-            "No API signatures given as parameters; use '--%s' and/or '--%s' to specify those!",
-            bundledsignaturesOpt.getLongOpt(), signaturesfileOpt.getLongOpt()
-          ));
-      } else {
-          logger.info("Skipping execution because no API signatures are available.");
-          return;
-        }
-      }
-      
       logger.info("Scanning for classes to check...");
 
       String[] includes = cmd.getOptionValues(includesOpt.getLongOpt());
@@ -365,11 +328,47 @@ public void run() throws ExitException {
             "No classes found in jar/zip file %s (includes=%s, excludes=%s).",
             classesDirectory, Arrays.toString(includes), Arrays.toString(excludes)));
         }
-
       } else {
         throw new ExitException(EXIT_ERR_OTHER, "Classes directory parameter is neither a directory or a jar/zip file.");
       }
-      
+
+      try {
+        final String[] bundledSignatures = cmd.getOptionValues(bundledsignaturesOpt.getLongOpt());
+        if (bundledSignatures != null) for (String bs : new LinkedHashSet<>(Arrays.asList(bundledSignatures))) {
+          checker.addBundledSignatures(bs, null);
+        }
+        
+        final String[] signaturesFiles = cmd.getOptionValues(signaturesfileOpt.getLongOpt());
+        if (signaturesFiles != null) for (String sf : new LinkedHashSet<>(Arrays.asList(signaturesFiles))) {
+          final File f = new File(sf).getAbsoluteFile();
+          checker.parseSignaturesFile(f);
+        }
+        final String[] signaturesWithSeverityWarn = cmd.getOptionValues(signatureswithseveritywarnOpt.getLongOpt());
+        if (signaturesWithSeverityWarn != null) {
+          checker.setSignaturesSeverity(Arrays.asList(signaturesWithSeverityWarn), Checker.ViolationSeverity.WARNING);
+        }
+        final String[] signaturesWithSeveritySuppress = cmd.getOptionValues(signatureswithseveritysuppressOpt.getLongOpt());
+        if (signaturesWithSeveritySuppress != null) {
+          checker.setSignaturesSeverity(Arrays.asList(signaturesWithSeveritySuppress), Checker.ViolationSeverity.SUPPRESS);
+        }
+      } catch (IOException ioe) {
+        throw new ExitException(EXIT_ERR_OTHER, "IO problem while reading files with API signatures: " + ioe);
+      } catch (ParseException pe) {
+        throw new ExitException(EXIT_ERR_OTHER, "Parsing signatures failed: " + pe.getMessage());
+      }
+
+      if (checker.hasNoSignatures()) {
+        if (checker.noSignaturesFilesParsed()) {
+          throw new ExitException(EXIT_ERR_CMDLINE, String.format(Locale.ENGLISH,
+            "No API signatures given as parameters; use '--%s' and/or '--%s' to specify those!",
+            bundledsignaturesOpt.getLongOpt(), signaturesfileOpt.getLongOpt()
+          ));
+      } else {
+          logger.info("Skipping execution because no API signatures are available.");
+          return;
+        }
+      }
+            
       try {
         checker.run();
       } catch (ForbiddenApiException fae) {