Fixes for #253:

- Java 7 compatibility
- Clean up imports / indent

Author: uschindler

src/main/java/de/thetaphi/forbiddenapis/Checker.java

@@ -46,8 +46,6 @@
 import org.objectweb.asm.ClassReader;
 import org.objectweb.asm.Type;
 
-import de.thetaphi.forbiddenapis.Checker.ViolationSeverity;
-
 /**
  * Forbidden APIs checker class.
  */

src/main/java/de/thetaphi/forbiddenapis/Signatures.java

@@ -448,16 +448,17 @@ public ViolationResult checkField(String internalClassName, String field) {
   }
 
   private ViolationSeverity getSeverityForKey(String key) {
-    return severityPerSignature.getOrDefault(key, failOnViolation ? ViolationSeverity.ERROR : ViolationSeverity.WARNING);
+    final ViolationSeverity severity = severityPerSignature.get(key);
+    return (severity != null) ? severity : (failOnViolation ? ViolationSeverity.ERROR : ViolationSeverity.WARNING);
   }
 
   private ViolationSeverity getSeverityForClassName(String className) {
-      for (final Map.Entry<Pattern, ViolationSeverity> e : severityPerClassPattern.entrySet()) {
-          if (e.getKey().matcher(className).matches()) {
-              return e.getValue();
-          }
+    for (final Map.Entry<Pattern, ViolationSeverity> e : severityPerClassPattern.entrySet()) {
+      if (e.getKey().matcher(className).matches()) {
+        return e.getValue();
       }
-      return failOnViolation ? ViolationSeverity.ERROR : ViolationSeverity.WARNING;
+    }
+    return failOnViolation ? ViolationSeverity.ERROR : ViolationSeverity.WARNING;
   }
 
   public static String fixTargetVersion(String name) throws ParseException {

src/main/java/de/thetaphi/forbiddenapis/ant/AntTask.java

@@ -20,15 +20,22 @@
 
 import static de.thetaphi.forbiddenapis.Checker.Option.*;
 
-import org.apache.maven.plugins.annotations.Parameter;
+import java.io.File;
+import java.io.IOException;
+import java.util.Collection;
+import java.util.EnumSet;
+import java.util.Iterator;
+import java.util.LinkedHashSet;
+import java.util.Locale;
+
 import org.apache.tools.ant.AntClassLoader;
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.ProjectComponent;
 import org.apache.tools.ant.Task;
-import org.apache.tools.ant.types.Path;
 import org.apache.tools.ant.types.FileList;
 import org.apache.tools.ant.types.FileSet;
+import org.apache.tools.ant.types.Path;
 import org.apache.tools.ant.types.Reference;
 import org.apache.tools.ant.types.Resource;
 import org.apache.tools.ant.types.ResourceCollection;
@@ -42,15 +49,6 @@
 import de.thetaphi.forbiddenapis.Logger;
 import de.thetaphi.forbiddenapis.ParseException;
 
-import java.io.IOException;
-import java.io.File;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.EnumSet;
-import java.util.Iterator;
-import java.util.LinkedHashSet;
-import java.util.Locale;
-
 /**
  * Task to check if a set of class files contains calls to forbidden APIs
  * from a given classpath and list of API signatures (either inline or as pointer to files).

src/main/java/de/thetaphi/forbiddenapis/gradle/CheckForbiddenApis.java

@@ -25,15 +25,13 @@
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.URLClassLoader;
-import java.util.Arrays;
 import java.util.EnumSet;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Locale;
 import java.util.Objects;
 import java.util.Set;
 
-import org.apache.maven.plugins.annotations.Parameter;
 import org.gradle.api.DefaultTask;
 import org.gradle.api.GradleException;
 import org.gradle.api.InvalidUserDataException;