#302 clean up

jcabi · Jul 12, 2022 · fe56bd6 · fe56bd6
1 parent 7bde2d2
commit fe56bd6
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 54 deletions.
diff --git a/src/main/java/com/jcabi/aspects/aj/MethodAsyncRunner.java b/src/main/java/com/jcabi/aspects/aj/MethodAsyncRunner.java
@@ -92,27 +92,24 @@ public Object wrap(final ProceedingJoinPoint point) {
         }
         final Future<?> result = this.executor.submit(
             // @checkstyle AnonInnerLength (23 lines)
-            new Callable<Object>() {
-                @Override
-                public Object call() {
-                    Object returned = null;
-                    try {
-                        final Object result = point.proceed();
-                        if (result instanceof Future) {
-                            returned = ((Future<?>) result).get();
-                        }
-                    // @checkstyle IllegalCatch (1 line)
-                    } catch (final Throwable ex) {
-                        throw new IllegalStateException(
-                            String.format(
-                                "%s: Exception thrown",
-                                Mnemos.toText(point, true, true)
-                            ),
-                            ex
-                        );
+            () -> {
+                Object returned1 = null;
+                try {
+                    final Object result1 = point.proceed();
+                    if (result1 instanceof Future) {
+                        returned1 = ((Future<?>) result1).get();
                     }
-                    return returned;
+                // @checkstyle IllegalCatch (1 line)
+                } catch (final Throwable ex) {
+                    throw new IllegalStateException(
+                        String.format(
+                            "%s: Exception thrown",
+                            Mnemos.toText(point, true, true)
+                        ),
+                        ex
+                    );
                 }
+                return returned1;
             }
         );
         Object res = null;

diff --git a/src/main/java/com/jcabi/aspects/aj/MethodCacher.java b/src/main/java/com/jcabi/aspects/aj/MethodCacher.java
@@ -110,23 +110,13 @@ public final class MethodCacher {
     public MethodCacher() {
         this.cleaner.scheduleWithFixedDelay(
             new VerboseRunnable(
-                new Runnable() {
-                    @Override
-                    public void run() {
-                        MethodCacher.this.clean();
-                    }
-                }
+                this::clean
             ),
             1L, 1L, TimeUnit.SECONDS
         );
         this.updater.schedule(
             new VerboseRunnable(
-                new Runnable() {
-                    @Override
-                    public void run() {
-                        MethodCacher.this.update();
-                    }
-                }
+                this::update
             ),
             0L, TimeUnit.SECONDS
         );

diff --git a/src/main/java/com/jcabi/aspects/aj/MethodInterrupter.java b/src/main/java/com/jcabi/aspects/aj/MethodInterrupter.java
@@ -81,12 +81,7 @@ public MethodInterrupter() {
         );
         this.interrupter.scheduleWithFixedDelay(
             new VerboseRunnable(
-                new Runnable() {
-                    @Override
-                    public void run() {
-                        MethodInterrupter.this.interrupt();
-                    }
-                }
+                this::interrupt
             ),
             1, 1, TimeUnit.SECONDS
         );

diff --git a/src/main/java/com/jcabi/aspects/aj/MethodLogger.java b/src/main/java/com/jcabi/aspects/aj/MethodLogger.java
@@ -87,13 +87,10 @@ public MethodLogger() {
         monitor.scheduleWithFixedDelay(
             new FutureTask<Void>(
                 new VerboseRunnable(
-                    new Runnable() {
-                        @Override
-                        public void run() {
-                            for (final MethodLogger.Marker marker
-                                : MethodLogger.this.running) {
-                                marker.monitor();
-                            }
+                    () -> {
+                        for (final Marker marker
+                            : this.running) {
+                            marker.monitor();
                         }
                     }
                 ), null

diff --git a/src/main/java/com/jcabi/aspects/aj/MethodScheduler.java b/src/main/java/com/jcabi/aspects/aj/MethodScheduler.java
@@ -189,12 +189,9 @@ protected Service(final Runnable runnable, final Object obj,
             this.verbose = annt.verbose();
             this.await = annt.awaitUnit().toMillis(annt.await());
             this.attempts = annt.shutdownAttempts();
-            final Runnable job = new Runnable() {
-                @Override
-                public void run() {
-                    runnable.run();
-                    MethodScheduler.Service.this.counter.incrementAndGet();
-                }
+            final Runnable job = () -> {
+                runnable.run();
+                this.counter.incrementAndGet();
             };
             for (int thread = 0; thread < annt.threads(); ++thread) {
                 this.executor.scheduleWithFixedDelay(

diff --git a/src/test/java/com/jcabi/aspects/ImmutableTest.java b/src/test/java/com/jcabi/aspects/ImmutableTest.java
@@ -59,7 +59,7 @@ public final class ImmutableTest {
     public void catchedMutableTypes() {
         Assertions.assertThrows(
             IllegalStateException.class,
-            () -> new Mutable()
+            Mutable::new
         );
     }
 
@@ -70,7 +70,7 @@ public void catchedMutableTypes() {
     public void catchedMutableTypesWithArrays() {
         Assertions.assertThrows(
             IllegalStateException.class,
-            () -> new MutableWithArray()
+            MutableWithArray::new
         );
     }
 
@@ -99,7 +99,7 @@ public void passesImmutableObjectsWithNonPrivateFields() {
     public void catchesTypesMutableByClassInheritance() {
         Assertions.assertThrows(
             IllegalStateException.class,
-            () -> new MutableByInheritance()
+            MutableByInheritance::new
         );
     }
 

diff --git a/src/test/java/com/jcabi/aspects/TimeableTest.java b/src/test/java/com/jcabi/aspects/TimeableTest.java
@@ -47,7 +47,7 @@ public final class TimeableTest {
     public void interruptsLongRunningMethod() {
         Assertions.assertThrows(
             InterruptedException.class,
-            () -> this.slow()
+            this::slow
         );
     }