Add missing Override annotations and (micronaut-projects#3604)

other code clean-up.

core/src/main/java/io/micronaut/core/async/publisher/AsyncSingleResultPublisher.java

@@ -88,6 +88,7 @@ static class ExecutorServiceSubscription<S> implements Subscription {
          * Request execution.
          * @param n request number
          */
+        @Override
         public synchronized void request(long n) {
             if (n != 0 && !completed) {
                 completed = true;
@@ -113,6 +114,7 @@ public synchronized void request(long n) {
         /**
          * Cancel.
          */
+        @Override
         public synchronized void cancel() {
             completed = true;
             if (future != null) {

core/src/main/java/io/micronaut/core/async/publisher/CompletableFuturePublisher.java

@@ -66,6 +66,7 @@ class CompletableFutureSubscription implements Subscription {
         /**
          * @param n Number of elements to request to the upstream
          */
+        @Override
         public synchronized void request(long n) {
             if (n != 0 && !completed.get()) {
                 if (n < 0) {
@@ -101,6 +102,7 @@ public synchronized void request(long n) {
         /**
          * Request the publisher to stop sending data and clean up resources.
          */
+        @Override
         public synchronized void cancel() {
             if (completed.compareAndSet(false, true)) {
                 if (future != null) {

core/src/main/java/io/micronaut/core/convert/value/MutableConvertibleMultiValues.java

@@ -47,5 +47,6 @@ public interface MutableConvertibleMultiValues<V> extends ConvertibleMultiValues
      *
      * @return This instance
      */
+    @Override
     MutableConvertibleMultiValues<V> clear();
 }

core/src/main/java/io/micronaut/core/exceptions/BeanExceptionHandler.java

@@ -42,6 +42,7 @@ public interface BeanExceptionHandler<T, E extends Throwable> extends BiConsumer
      * @param bean The bean
      * @param throwable The error
      */
+    @Override
     default void accept(@Nullable T bean, @NonNull E throwable) {
         handle(bean, throwable);
     }

core/src/main/java/io/micronaut/core/io/file/DefaultFileSystemResourceLoader.java

@@ -98,6 +98,7 @@ public Stream<URL> getResources(String name) {
      * @param basePath The path to load resources
      * @return The resource loader
      */
+    @Override
     public ResourceLoader forBase(String basePath) {
         return new DefaultFileSystemResourceLoader(basePath);
     }

core/src/main/java/io/micronaut/core/io/file/FileSystemResourceLoader.java

@@ -36,6 +36,7 @@ static FileSystemResourceLoader defaultLoader() {
      *             appended by a colon. Ex (classpath:, file:)
      * @return boolean
      */
+    @Override
     default boolean supportsPrefix(String path) {
         return path.startsWith("file:");
     }

core/src/main/java/io/micronaut/core/io/scan/DefaultClassPathResourceLoader.java

@@ -72,6 +72,7 @@ public DefaultClassPathResourceLoader(ClassLoader classLoader, String basePath)
      * @param path The path
      * @return An optional resource
      */
+    @Override
     public Optional<InputStream> getResourceAsStream(String path) {
         if (!isDirectory(path)) {
             return Optional.ofNullable(classLoader.getResourceAsStream(prefixPath(path)));
@@ -85,6 +86,7 @@ public Optional<InputStream> getResourceAsStream(String path) {
      * @param path The path
      * @return An optional resource
      */
+    @Override
     public Optional<URL> getResource(String path) {
         boolean isDirectory = isDirectory(path);
 
@@ -101,6 +103,7 @@ public Optional<URL> getResource(String path) {
      * @param path The path
      * @return A resource stream
      */
+    @Override
     public Stream<URL> getResources(String path) {
         Enumeration<URL> all;
         try {
@@ -119,6 +122,7 @@ public Stream<URL> getResources(String path) {
     /**
      * @return The class loader used to retrieve resources
      */
+    @Override
     public ClassLoader getClassLoader() {
         return classLoader;
     }
@@ -127,6 +131,7 @@ public ClassLoader getClassLoader() {
      * @param basePath The path to load resources
      * @return The resouce loader
      */
+    @Override
     public ResourceLoader forBase(String basePath) {
         return new DefaultClassPathResourceLoader(classLoader, basePath);
     }

core/src/main/java/io/micronaut/core/type/Argument.java

@@ -122,6 +122,7 @@ public interface Argument<T> extends TypeVariableResolver, AnnotatedElement, Typ
     /**
      * @return The name of the argument
      */
+    @Override
     @NonNull String getName();
 
     @Override

discovery-client/src/main/java/io/micronaut/discovery/consul/client/v1/AbstractConsulClient.java

@@ -25,8 +25,6 @@
 import io.micronaut.discovery.consul.ConsulServiceInstance;
 import io.micronaut.http.client.annotation.Client;
 import org.reactivestreams.Publisher;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import javax.inject.Inject;
 import java.util.ArrayList;
@@ -52,8 +50,6 @@ public abstract class AbstractConsulClient implements ConsulClient {
     static final String EXPR_CONSUL_CONFIG_RETRY_COUNT = "${" + ConsulConfiguration.ConsulConfigDiscoveryConfiguration.PREFIX + ".retry-count:3}";
     static final String EXPR_CONSUL_CONFIG_RETRY_DELAY = "${" + ConsulConfiguration.ConsulConfigDiscoveryConfiguration.PREFIX + ".retry-delay:1s}";
 
-    private static final Logger LOG = LoggerFactory.getLogger(AbstractConsulClient.class);
-
     private ConsulConfiguration consulConfiguration = new ConsulConfiguration();
 
     /**

discovery-client/src/main/java/io/micronaut/discovery/consul/client/v1/ServiceEntry.java

@@ -58,6 +58,7 @@ public ServiceEntry(AbstractServiceEntry entry) {
      *
      * @return The name of the service
      */
+    @Override
     public String getName() {
         return name;
     }

discovery-client/src/main/java/io/micronaut/discovery/eureka/client/v2/AmazonInfo.java

@@ -373,7 +373,6 @@ public AmazonInfo autoBuild(EurekaConfiguration config) {
                             } catch (InterruptedException e1) {
 
                             }
-                            continue;
                         }
                     }
                 }

discovery-client/src/main/java/io/micronaut/discovery/oraclecloud/vault/config/OracleCloudVaultConfigurationClient.java

@@ -160,7 +160,7 @@ public Publisher<PropertySource> getPropertySources(Environment environment) {
 
             for (ListSecretsResponse response : responses) {
                 retrieved += response.getItems().size();
-                response.getItems().forEach((summary) -> {
+                response.getItems().forEach(summary -> {
                     String secretValue = getSecretValue(summary.getId());
                     secrets.put(
                             summary.getSecretName(),

function-web/src/main/java/io/micronaut/function/web/AnnotatedFunctionRouteBuilder.java

@@ -140,26 +140,24 @@ public void process(BeanDefinition<?> beanDefinition, ExecutableMethod<?, ?> met
                 routes.add(GET(functionPath, beanDefinition, method));
                 routes.add(HEAD(functionPath, beanDefinition, method));
             } else {
-                if (StringUtils.isNotEmpty(functionMethod)) {
-                    if (functionMethod.equals(methodName)) {
-                        Argument[] argumentTypes = method.getArguments();
-                        int argCount = argumentTypes.length;
-                        if (argCount < 3) {
-                            String functionPath = resolveFunctionPath(methodName, declaringType, functionName);
-                            if (argCount == 0) {
-                                routes.add(GET(functionPath, beanDefinition, method));
-                                routes.add(HEAD(functionPath, beanDefinition, method));
-                            } else {
-                                UriRoute route = POST(functionPath, beanDefinition, method);
-                                routes.add(route);
-                                if (argCount == 2 || !ClassUtils.isJavaLangType(argumentTypes[0].getType())) {
-                                    if (consumes == null) {
-                                        consumes = new MediaType[] {MediaType.APPLICATION_JSON_TYPE};
-                                    }
-                                } else {
-                                    route.body(method.getArgumentNames()[0])
-                                            .consumesAll();
+                if (StringUtils.isNotEmpty(functionMethod) && functionMethod.equals(methodName)) {
+                    Argument[] argumentTypes = method.getArguments();
+                    int argCount = argumentTypes.length;
+                    if (argCount < 3) {
+                        String functionPath = resolveFunctionPath(methodName, declaringType, functionName);
+                        if (argCount == 0) {
+                            routes.add(GET(functionPath, beanDefinition, method));
+                            routes.add(HEAD(functionPath, beanDefinition, method));
+                        } else {
+                            UriRoute route = POST(functionPath, beanDefinition, method);
+                            routes.add(route);
+                            if (argCount == 2 || !ClassUtils.isJavaLangType(argumentTypes[0].getType())) {
+                                if (consumes == null) {
+                                    consumes = new MediaType[] {MediaType.APPLICATION_JSON_TYPE};
                                 }
+                            } else {
+                                route.body(method.getArgumentNames()[0])
+                                        .consumesAll();
                             }
                         }
                     }

http-client-core/src/main/java/io/micronaut/http/client/exceptions/HttpClientResponseException.java

@@ -76,6 +76,7 @@ public String getMessage() {
     /**
      * @return The {@link HttpResponse}
      */
+    @Override
     public HttpResponse<?> getResponse() {
         return response;
     }

http-client/src/test/groovy/io/micronaut/http/client/ClientRedirectSpec.groovy

@@ -79,6 +79,7 @@ class ClientRedirectSpec extends Specification {
                 Publishers.just(ServiceInstance.of(url.getHost(), url))
             }
 
+            @Override
             Optional<String> getContextPath() {
                 Optional.of("/test")
             }
@@ -105,6 +106,7 @@ class ClientRedirectSpec extends Specification {
                 Publishers.just(ServiceInstance.of(url.getHost(), url))
             }
 
+            @Override
             Optional<String> getContextPath() {
                 Optional.of("test")
             }
@@ -130,6 +132,7 @@ class ClientRedirectSpec extends Specification {
                 Publishers.just(ServiceInstance.of(url.getHost(), url))
             }
 
+            @Override
             Optional<String> getContextPath() {
                 Optional.of("/test")
             }

http-netty/src/main/java/io/micronaut/http/netty/stream/HttpStreamsClientHandler.java

@@ -165,9 +165,11 @@ public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception
                 awaiting100ContinueMessage.subscribe(new CancelledSubscriber<>());
                 awaiting100ContinueMessage = null;
                 awaiting100Continue.onSubscribe(new Subscription() {
+                    @Override
                     public void request(long n) {
                     }
 
+                    @Override
                     public void cancel() {
                     }
                 });

http-server-netty/src/test/groovy/io/micronaut/http/server/netty/RequestCertificateSpec.groovy

@@ -20,6 +20,7 @@ class RequestCertificateSpec extends AbstractMicronautSpec {
         response.body() == "O=Test CA,ST=Some-State,C=US"
     }
 
+    @Override
     Map<String, Object> getConfiguration() {
         super.getConfiguration() << [
                 'micronaut.ssl.enabled': true,

http-server-netty/src/test/groovy/io/micronaut/http/server/netty/binding/HttpResponseSpec.groovy

@@ -213,6 +213,7 @@ class HttpResponseSpec extends AbstractMicronautSpec {
         Integer age
     }
 
+    @Override
     Map<String, Object> getConfiguration() {
         super.getConfiguration() << ['micronaut.server.dateHeader': false]
     }

http-server-netty/src/test/groovy/io/micronaut/http/server/netty/cors/NettyCorsSpec.groovy

@@ -267,6 +267,7 @@ class NettyCorsSpec extends AbstractMicronautSpec {
         ex.response.header(VARY) == ORIGIN
     }
 
+    @Override
     Map<String, Object> getConfiguration() {
         ['micronaut.server.cors.enabled': true,
         'micronaut.server.cors.configurations.foo.allowedOrigins': ['foo.com'],

http-server-netty/src/test/groovy/io/micronaut/http/server/netty/interceptor/HttpFilterContextPathSpec.groovy

@@ -9,6 +9,7 @@ import io.micronaut.http.server.netty.AbstractMicronautSpec
 
 class HttpFilterContextPathSpec extends AbstractMicronautSpec {
 
+    @Override
     Map<String, Object> getConfiguration() {
         super.getConfiguration() << ['micronaut.server.context-path': '/context/path']
     }

http-server-netty/src/test/groovy/io/micronaut/http/server/netty/resources/StaticResourceResolutionSpec.groovy

@@ -43,10 +43,12 @@ class StaticResourceResolutionSpec extends AbstractMicronautSpec {
         tempFile
     }
 
+    @Override
     Map<String, Object> getConfiguration() {
         ['micronaut.router.static-resources.default.paths': ['classpath:public', 'file:' + tempFile.parent]]
     }
 
+    @Override
     void cleanupSpec() {
         tempFile.delete()
     }

http-server-netty/src/test/groovy/io/micronaut/http/server/netty/types/SslFileTypeHandlerSpec.groovy

@@ -40,6 +40,7 @@ class SslFileTypeHandlerSpec extends AbstractMicronautSpec {
         response.body() == "<html><head></head><body>HTML Page</body></html>"
     }
 
+    @Override
     Map<String, Object> getConfiguration() {
         super.getConfiguration() << ['micronaut.ssl.enabled': true, 'micronaut.ssl.buildSelfSigned': true]
     }

http/src/main/java/io/micronaut/http/filter/ServerFilterChain.java

@@ -34,5 +34,6 @@ public interface ServerFilterChain extends FilterChain {
      * @param request The current request
      * @return A {@link Publisher} for the Http response
      */
+    @Override
     Publisher<MutableHttpResponse<?>> proceed(HttpRequest<?> request);
 }

inject-groovy/src/main/groovy/io/micronaut/ast/groovy/visitor/LoadedVisitor.groovy

@@ -81,6 +81,7 @@ class LoadedVisitor implements Ordered {
         return getVisitor().getOrder()
     }
 
+    @Override
     boolean equals(o) {
         if (this.is(o)) return true
         if (getClass() != o.class) return false
@@ -92,6 +93,7 @@ class LoadedVisitor implements Ordered {
         return true
     }
 
+    @Override
     int hashCode() {
         return visitor.getClass().hashCode()
     }

inject-groovy/src/test/groovy/io/micronaut/docs/qualifiers/annotation/V6Engine.groovy

@@ -26,6 +26,7 @@ import javax.inject.Singleton
 class V6Engine implements Engine { // <2>
     int cylinders = 6
 
+    @Override
     String start() {
         "Starting V6"
     }

inject-groovy/src/test/groovy/io/micronaut/docs/qualifiers/annotation/V8Engine.groovy

@@ -26,6 +26,7 @@ import javax.inject.Singleton
 class V8Engine implements Engine { // <3>
     int cylinders = 8
 
+    @Override
     String start() {
         "Starting V8"
     }

inject-groovy/src/test/groovy/io/micronaut/inject/lifecyle/BeanWithPreDestroySpec.groovy

@@ -97,6 +97,7 @@ class BeanWithPreDestroySpec extends Specification{
             return a
         }
 
+        @Override
         @PreDestroy
         void close() {
             noArgsDestroyCalled = true

inject-groovy/src/test/groovy/io/micronaut/javax/inject/tck/GasEngine.groovy

@@ -19,10 +19,12 @@ import javax.inject.Inject
 
 abstract class GasEngine extends Engine {
 
+    @Override
     void injectTwiceOverriddenWithOmissionInMiddle() {
         overriddenTwiceWithOmissionInMiddleInjected = true
     }
 
+    @Override
     @Inject
     void injectTwiceOverriddenWithOmissionInSubclass() {
         overriddenTwiceWithOmissionInSubclassInjected = true

inject-groovy/src/test/groovy/io/micronaut/javax/inject/tck/V8Engine.groovy

@@ -27,6 +27,7 @@ class V8Engine extends GasEngine {
         publicNoArgsConstructorInjected = true
     }
 
+    @Override
     @Inject @PackageScope void injectPackagePrivateMethod() {
         if (subPackagePrivateMethodInjected) {
             overriddenPackagePrivateMethodInjectedTwice = true
@@ -37,6 +38,7 @@ class V8Engine extends GasEngine {
     /**
      * Qualifiers are swapped from how they appear in the superclass.
      */
+    @Override
     void injectQualifiers(Seat seatA, @Drivers Seat seatB,
                                  Tire tireA, @Named("spare") Tire tireB) {
         if ((seatA instanceof DriversSeat)
@@ -47,15 +49,18 @@ class V8Engine extends GasEngine {
         }
     }
 
+    @Override
     @PackageScope void injectPackagePrivateMethodForOverride() {
         subPackagePrivateMethodForOverrideInjected = true
     }
 
+    @Override
     @Inject
     void injectTwiceOverriddenWithOmissionInMiddle() {
         overriddenTwiceWithOmissionInMiddleInjected = true
     }
 
+    @Override
     void injectTwiceOverriddenWithOmissionInSubclass() {
         overriddenTwiceWithOmissionInSubclassInjected = true
     }