#302 clean up more

src/main/java/com/jcabi/aspects/aj/ImmutabilityChecker.java

@@ -34,6 +34,7 @@
 import com.jcabi.log.Logger;
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
+import java.util.Collection;
 import java.util.HashSet;
 import java.util.Set;
 import org.aspectj.lang.JoinPoint;
@@ -53,7 +54,7 @@ public final class ImmutabilityChecker {
     /**
      * Already checked immutable classes.
      */
-    private final transient Set<Class<?>> immutable = new HashSet<>();
+    private final transient Collection<Class<?>> immutable = new HashSet<>();
 
     /**
      * Catch instantiation and validate class.

src/main/java/com/jcabi/aspects/aj/MethodCacher.java

@@ -36,6 +36,7 @@
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
 import java.util.Arrays;
+import java.util.Map;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
@@ -270,9 +271,11 @@ private void flush(final JoinPoint point, final String when) {
      */
     private void clean() {
         synchronized (this.tunnels) {
-            for (final MethodCacher.Key key : this.tunnels.keySet()) {
-                if (this.tunnels.get(key).expired()
-                    && !this.tunnels.get(key).asyncUpdate()) {
+            for (final Map.Entry<MethodCacher.Key, MethodCacher.Tunnel> entry
+                : this.tunnels.entrySet()) {
+                final MethodCacher.Key key = entry.getKey();
+                if (entry.getValue().expired()
+                    && !entry.getValue().asyncUpdate()) {
                     final MethodCacher.Tunnel tunnel = this.tunnels.remove(key);
                     LogHelper.log(
                         key.getLevel(),
@@ -408,7 +411,7 @@ public synchronized Object through() throws Throwable {
                     suffix = "invalid immediately";
                 } else {
                     final long msec = annot.unit().toMillis(
-                        annot.lifetime()
+                        (long) annot.lifetime()
                     );
                     this.lifetime = start + msec;
                     suffix = Logger.format("valid for %[ms]s", msec);
@@ -516,7 +519,7 @@ public boolean equals(final Object obj) {
             if (this == obj) {
                 equals = true;
             } else if (obj instanceof MethodCacher.Key) {
-                final MethodCacher.Key key = (Key) obj;
+                final MethodCacher.Key key = (MethodCacher.Key) obj;
                 equals = key.method.equals(this.method)
                     && this.target.equals(key.target)
                     && Arrays.deepEquals(key.arguments, this.arguments);

src/main/java/com/jcabi/aspects/aj/MethodInterrupter.java

@@ -117,11 +117,9 @@ public Object wrap(final ProceedingJoinPoint point) throws Throwable {
      */
     private void interrupt() {
         synchronized (this.interrupter) {
-            for (final MethodInterrupter.Call call : this.calls) {
-                if (call.expired() && call.interrupted()) {
-                    this.calls.remove(call);
-                }
-            }
+            this.calls.removeIf(
+                call -> call.expired() && call.interrupted()
+            );
         }
     }
 
@@ -163,7 +161,9 @@ private static final class Call implements
             final Method method = ((MethodSignature) pnt.getSignature())
                 .getMethod();
             final Timeable annt = method.getAnnotation(Timeable.class);
-            this.deadline = this.start + annt.unit().toMillis(annt.limit());
+            this.deadline = this.start + annt.unit().toMillis(
+                (long) annt.limit()
+            );
         }
 
         @Override

src/main/java/com/jcabi/aspects/aj/MethodLogger.java

@@ -260,7 +260,9 @@ private Object wrap(final ProceedingJoinPoint point, final Method method,
      * @return Is over time limit.
      */
     private static boolean over(final Loggable annotation, final long nano) {
-        return nano > annotation.unit().toNanos(annotation.limit());
+        return nano > annotation.unit().toNanos(
+            (long) annotation.limit()
+        );
     }
 
     /**
@@ -275,7 +277,7 @@ private static boolean over(final Loggable annotation, final long nano) {
      */
     private static String message(final ProceedingJoinPoint point, final Method method,
         final Loggable annotation, final Object result, final long nano) {
-        final StringBuilder msg = new StringBuilder();
+        final StringBuilder msg = new StringBuilder(0);
         msg.append(
             Mnemos.toText(
                 point,
@@ -313,9 +315,9 @@ private static String message(final ProceedingJoinPoint point, final Method meth
      * @param name The Loggable annotation
      * @return The logger that will be used
      */
-    private static Object logger(final Method method, final String name) {
+    private static Object logger(final Method method, final CharSequence name) {
         final Object source;
-        if (name.isEmpty()) {
+        if (name.length() == 0) {
             source = method.getDeclaringClass();
         } else {
             source = name;
@@ -369,12 +371,12 @@ private static boolean instanceOf(final Class<?> child,
      * @return The text
      */
     private static String allText(final StackTraceElement... trace) {
-        final StringBuilder text = new StringBuilder();
-        for (int pos = 0; pos < trace.length; ++pos) {
+        final StringBuilder text = new StringBuilder(0);
+        for (final StackTraceElement element : trace) {
             if (text.length() > 0) {
                 text.append(", ");
             }
-            text.append(MethodLogger.oneText(trace[pos]));
+            text.append(MethodLogger.oneText(element));
         }
         return text.toString();
     }

src/main/java/com/jcabi/aspects/aj/MethodScheduler.java

@@ -94,7 +94,7 @@ public void instantiate(final JoinPoint point) {
         if (object instanceof Runnable) {
             runnable = new VerboseRunnable((Runnable) object, true);
         } else if (object instanceof Callable) {
-            runnable = new VerboseRunnable((Callable) object, true);
+            runnable = new VerboseRunnable((Callable<?>) object, true);
         } else {
             throw new IllegalStateException(
                 Logger.format(
@@ -120,11 +120,10 @@ public void instantiate(final JoinPoint point) {
      * it backward compatible.
      *
      * @param point Joint point
-     * @throws IOException If can't close
      * @checkstyle LineLength (2 lines)
      */
     @Before("execution(* (@com.jcabi.aspects.ScheduleWithFixedDelay *).close())")
-    public void close(final JoinPoint point) throws IOException {
+    public void close(final JoinPoint point) {
         final Object object = point.getTarget();
         this.services.get(object).close();
         this.services.remove(object);
@@ -187,15 +186,18 @@ protected Service(final Runnable runnable, final Object obj,
                 new VerboseThreads(this.object)
             );
             this.verbose = annt.verbose();
-            this.await = annt.awaitUnit().toMillis(annt.await());
-            this.attempts = annt.shutdownAttempts();
+            this.await = annt.awaitUnit().toMillis(
+                (long) annt.await()
+            );
+            this.attempts = (long) annt.shutdownAttempts();
             final Runnable job = () -> {
                 runnable.run();
                 this.counter.incrementAndGet();
             };
             for (int thread = 0; thread < annt.threads(); ++thread) {
                 this.executor.scheduleWithFixedDelay(
-                    job, annt.delay(), annt.delay(), annt.unit()
+                    job, (long) annt.delay(), (long) annt.delay(),
+                    annt.unit()
                 );
             }
             if (this.verbose) {

src/main/java/com/jcabi/aspects/aj/MethodValidator.java

@@ -197,7 +197,7 @@ private void checkForViolations(
      * @return The full text
      */
     private static String pack(
-        final Collection<ConstraintViolation<Object>> errs) {
+        final Iterable<ConstraintViolation<Object>> errs) {
         final StringBuilder text = new StringBuilder(0);
         for (final ConstraintViolation<?> violation : errs) {
             if (text.length() > 0) {

src/main/java/com/jcabi/aspects/aj/Parallelizer.java

@@ -84,7 +84,7 @@ public Object wrap(final ProceedingJoinPoint point)
         }
         final ExecutorService executor = Executors
             .newFixedThreadPool(total, new VerboseThreads());
-        final List<Future<Throwable>> futures =
+        final Collection<Future<Throwable>> futures =
             new ArrayList<>(total);
         for (final Callable<Throwable> callable : callables) {
             futures.add(executor.submit(callable));
@@ -128,7 +128,7 @@ private static void process(final Collection<Throwable> failures,
      */
     @SuppressWarnings("PMD.AvoidInstantiatingObjectsInLoops")
     private static Parallelizer.ParallelException exceptions(
-        final Collection<Throwable> failures) {
+        final Iterable<Throwable> failures) {
         Parallelizer.ParallelException current = null;
         for (final Throwable failure : failures) {
             current = new Parallelizer.ParallelException(failure, current);

src/main/java/com/jcabi/aspects/aj/Repeater.java

@@ -146,7 +146,7 @@ private void delay(final RetryOnFailure rof, final int attempt) throws
      * @return The message
      */
     private static String message(final Throwable exp) {
-        final StringBuilder text = new StringBuilder();
+        final StringBuilder text = new StringBuilder(0);
         text.append(exp.getMessage());
         if (exp.getCause() != null) {
             text.append("; ").append(Repeater.message(exp.getCause()));

src/main/java/com/jcabi/aspects/aj/SingleException.java

@@ -33,6 +33,7 @@
 import com.jcabi.aspects.UnitedThrow;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
+import java.util.Objects;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
@@ -100,7 +101,7 @@ private static boolean exists(final Class<? extends Throwable> clz) {
         boolean found = false;
         for (final Constructor<?> ctr : clz.getConstructors()) {
             if (ctr.getParameterTypes().length == 1
-                && ctr.getParameterTypes()[0] == Throwable.class) {
+                && Objects.equals(ctr.getParameterTypes()[0], Throwable.class)) {
                 found = true;
                 break;
             }
@@ -118,7 +119,7 @@ private static boolean exists(final Class<? extends Throwable> clz) {
     private static Class<? extends Throwable> clazz(final Method method,
         final UnitedThrow annot) {
         Class<? extends Throwable> clz = annot.value();
-        if (clz == UnitedThrow.None.class) {
+        if (Objects.equals(clz, UnitedThrow.None.class)) {
             if (method.getExceptionTypes().length == 0) {
                 clz = IllegalStateException.class;
             } else {

src/test/java/com/jcabi/aspects/aj/NamedThreadsTest.java

@@ -31,6 +31,7 @@
 
 import com.jcabi.aspects.version.Version;
 import java.io.StringWriter;
+import org.apache.log4j.Appender;
 import org.apache.log4j.Level;
 import org.apache.log4j.LogManager;
 import org.apache.log4j.Logger;
@@ -56,7 +57,7 @@ public void testVersion() {
         final Level level = root.getLevel();
         root.setLevel(Level.INFO);
         final StringWriter writer = new StringWriter();
-        final WriterAppender appender =
+        final Appender appender =
             new WriterAppender(new SimpleLayout(), writer);
         root.addAppender(appender);
         try {