Upgrade Netty to 4.1.73.Final

context/src/main/java/io/micronaut/runtime/server/watch/event/FileWatchRestartListener.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2020 original authors
+ * Copyright 2017-2022 original authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,7 +18,7 @@
 import io.micronaut.context.annotation.Requires;
 import io.micronaut.context.event.ApplicationEventListener;
 import io.micronaut.core.util.StringUtils;
-import io.micronaut.runtime.server.EmbeddedServer;
+import io.micronaut.runtime.EmbeddedApplication;
 import io.micronaut.scheduling.io.watch.FileWatchConfiguration;
 import io.micronaut.scheduling.io.watch.event.FileChangedEvent;
 import jakarta.inject.Singleton;
@@ -34,25 +34,25 @@
  * @since 1.1.0
  */
 @Singleton
-@Requires(beans = EmbeddedServer.class)
+@Requires(beans = EmbeddedApplication.class)
 @Requires(property = FileWatchConfiguration.RESTART, value = StringUtils.TRUE, defaultValue = StringUtils.FALSE)
 public class FileWatchRestartListener implements ApplicationEventListener<FileChangedEvent> {
 
     private static final Logger LOG = LoggerFactory.getLogger(FileWatchRestartListener.class);
 
-    private final EmbeddedServer embeddedServer;
+    private final EmbeddedApplication<?> embeddedApplication;
 
     /**
      * Default constructor.
-     * @param embeddedServer The embedded server
+     * @param embeddedApplication The embedded application
      */
-    public FileWatchRestartListener(EmbeddedServer embeddedServer) {
-        this.embeddedServer = embeddedServer;
+    public FileWatchRestartListener(EmbeddedApplication<?> embeddedApplication) {
+        this.embeddedApplication = embeddedApplication;
     }
 
     @Override
     public void onApplicationEvent(FileChangedEvent event) {
-        embeddedServer.stop();
+        embeddedApplication.stop();
         if (LOG.isInfoEnabled()) {
             LOG.info("Shutting down server following file change.");
         }

core/src/main/java/io/micronaut/core/annotation/AccessorsStyle.java

@@ -0,0 +1,92 @@
+/*
+ * Copyright 2017-2021 original authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.micronaut.core.annotation;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+/**
+ * Annotate a class (typically a Java Bean) to make it explicit the style of its accessors when not using the standard
+ * getter and setters:
+ *
+ * <pre class="code">
+ * &#064;AccessorsStyle(readPrefixes = {""}, writePrefixes = {""})
+ * public class Person {
+ *
+ *     private String name;
+ *     private int age;
+ *
+ *     public Person(String name, int age) {
+ *         this.name = name;
+ *         this.age = age;
+ *     }
+ *
+ *     public String name() {
+ *         return this.name;
+ *     }
+ *
+ *     public void name(String name) {
+ *         this.name = name;
+ *     }
+ *
+ *     public int age() {
+ *         return this.age;
+ *     }
+ *
+ *     public void age(int age) {
+ *         this.age = age;
+ *     }
+ * }</pre>
+ * <p>
+ * Defining the {@code readPrefixes} and {@code writePrefixes} as empty strings makes Micronaut aware of those accessors.
+ *
+ * It is also possible to annotate fields with this annotation but the usage is only limited when using it with @ConfigurationBuilder.
+ *
+ * @author Iván López
+ * @since 3.3.0
+ */
+@Documented
+@Retention(RUNTIME)
+@Target({ElementType.TYPE, ElementType.ANNOTATION_TYPE, ElementType.FIELD})
+@Inherited
+@Experimental
+public @interface AccessorsStyle {
+
+    /**
+     * The default read prefix.
+     */
+    String DEFAULT_READ_PREFIX = "get";
+
+    /**
+     * The default write prefix.
+     */
+    String DEFAULT_WRITE_PREFIX = "set";
+
+    /**
+     * @return The valid read prefixes.
+     */
+    String[] readPrefixes() default {DEFAULT_READ_PREFIX};
+
+    /**
+     * @return The valid write prefixes.
+     */
+    String[] writePrefixes() default {DEFAULT_WRITE_PREFIX};
+}

core/src/main/java/io/micronaut/core/annotation/AnnotatedElement.java

@@ -29,27 +29,27 @@ public interface AnnotatedElement extends AnnotationMetadataProvider, Named {
      * @return Whether the element is nullable.
      */
     default boolean isDeclaredNullable() {
-        return getAnnotationMetadata().hasDeclaredAnnotation(AnnotationUtil.NULLABLE);
+        return getAnnotationMetadata().hasDeclaredStereotype(AnnotationUtil.NULLABLE);
     }
 
     /**
      * @return Whether the element is nullable.
      */
     default boolean isNullable() {
-        return getAnnotationMetadata().hasAnnotation(AnnotationUtil.NULLABLE);
+        return getAnnotationMetadata().hasStereotype(AnnotationUtil.NULLABLE);
     }
 
     /**
      * @return Whether the element is declared as not being null
      */
     default boolean isNonNull() {
-        return getAnnotationMetadata().hasAnnotation(AnnotationUtil.NON_NULL);
+        return getAnnotationMetadata().hasStereotype(AnnotationUtil.NON_NULL);
     }
 
     /**
      * @return Whether the element is declared as not being null
      */
     default boolean isDeclaredNonNull() {
-        return getAnnotationMetadata().hasDeclaredAnnotation(AnnotationUtil.NON_NULL);
+        return getAnnotationMetadata().hasDeclaredStereotype(AnnotationUtil.NON_NULL);
     }
 }