Fix some stuff.

Author: Shintaro Katafuchi

permissionsdispatcher-processor/src/main/java/permissions/dispatcher/processor/Utils.java

@@ -1,13 +1,24 @@
 package permissions.dispatcher.processor;
 
-import permissions.dispatcher.*;
+import java.lang.annotation.Annotation;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Objects;
+import java.util.Set;
 
 import javax.annotation.processing.RoundEnvironment;
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ExecutableElement;
 import javax.lang.model.element.TypeElement;
-import java.lang.annotation.Annotation;
-import java.util.*;
+
+import permissions.dispatcher.DeniedPermission;
+import permissions.dispatcher.DeniedPermissions;
+import permissions.dispatcher.NeedsPermission;
+import permissions.dispatcher.NeedsPermissions;
+import permissions.dispatcher.RuntimePermissions;
+import permissions.dispatcher.ShowsRationale;
+import permissions.dispatcher.ShowsRationales;
 
 import static java.util.Arrays.asList;
 import static java.util.Arrays.deepEquals;
@@ -18,6 +29,9 @@
 
 final class Utils {
 
+    private Utils() {
+    }
+
     static List<RuntimePermissionsAnnotatedElement> getAnnotatedClasses(RoundEnvironment env) {
         List<RuntimePermissionsAnnotatedElement> models = new ArrayList<>();
         Set<? extends Element> elements = env.getElementsAnnotatedWith(RuntimePermissions.class);
@@ -79,9 +93,7 @@ static ExecutableElement findDeniedPermissionFromValue(String[] value, List<Exec
     }
 
     static <A extends Annotation> List<String> getValueFromAnnotation(ExecutableElement element, Class<A> clazz) {
-        if (element.getAnnotation(clazz) == null) {
-            return emptyList();
-        } else if (Objects.equals(clazz, NeedsPermission.class)) {
+        if (Objects.equals(clazz, NeedsPermission.class)) {
             return singletonList(element.getAnnotation(NeedsPermission.class).value());
         } else if (Objects.equals(clazz, NeedsPermissions.class)) {
             return asList(element.getAnnotation(NeedsPermissions.class).value());
@@ -99,7 +111,7 @@ static <A extends Annotation> List<String> getValueFromAnnotation(ExecutableElem
     }
 
     static ExecutableElement findDeniedPermissionFromElement(RuntimePermissionsAnnotatedElement element, ExecutableElement method) {
-        ExecutableElement deniedPermission = null;
+        ExecutableElement deniedPermission;
         // Check presence of @NeedsPermission first
         List<String> annotationValues = Utils.getValueFromAnnotation(method, NeedsPermission.class);
         if (!annotationValues.isEmpty()) {
@@ -133,8 +145,9 @@ static boolean isEmpty(Collection collection) {
     }
 
     static String toString(String... array) {
-        if (array == null)
+        if (array == null) {
             return null;
+        }
         int max = array.length - 1;
         StringBuilder b = new StringBuilder();
         b.append('{');

permissionsdispatcher-processor/src/main/java/permissions/dispatcher/processor/Validator.java

@@ -1,23 +1,27 @@
 package permissions.dispatcher.processor;
 
-import permissions.dispatcher.processor.exceptions.DuplicatedValueException;
-import permissions.dispatcher.processor.exceptions.MatchedValueMissingException;
-import permissions.dispatcher.processor.exceptions.NotDefinedException;
-import permissions.dispatcher.processor.exceptions.WrongClassException;
-
-import javax.lang.model.element.ExecutableElement;
-import javax.lang.model.element.Modifier;
 import java.lang.annotation.Annotation;
 import java.lang.invoke.WrongMethodTypeException;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
+import javax.lang.model.element.ExecutableElement;
+import javax.lang.model.element.Modifier;
+
+import permissions.dispatcher.processor.exceptions.DuplicatedValueException;
+import permissions.dispatcher.processor.exceptions.MatchedValueMissingException;
+import permissions.dispatcher.processor.exceptions.NotDefinedException;
+import permissions.dispatcher.processor.exceptions.WrongClassException;
+
 import static permissions.dispatcher.processor.Utils.getValueFromAnnotation;
 import static permissions.dispatcher.processor.Utils.isEmpty;
 
 final class Validator {
 
+    private Validator() {
+    }
+
     static void checkNeedsPermissionsSize(List<ExecutableElement> permission, List<ExecutableElement> permissions) {
         if (isEmpty(permission) && isEmpty(permissions)) {
             throw new NotDefinedException("@NeedsPermission or @NeedsPermissions are not defined");