Merge 3.9.x, fix TCK test and document breakage

core-processor/src/main/java/io/micronaut/inject/beans/visitor/BeanIntrospectionWriter.java

@@ -128,13 +128,13 @@ final class BeanIntrospectionWriter extends AbstractAnnotationMetadataWriter {
      * @param beanAnnotationMetadata The bean annotation metadata
      * @param visitorContext          The visitor context
      */
-    BeanIntrospectionWriter(ClassElement classElement, AnnotationMetadata beanAnnotationMetadata,
+    BeanIntrospectionWriter(String targetPackage, ClassElement classElement, AnnotationMetadata beanAnnotationMetadata,
                             VisitorContext visitorContext) {
-        super(computeReferenceName(classElement.getName()), classElement, beanAnnotationMetadata, true, visitorContext);
+        super(computeReferenceName(targetPackage, classElement.getName()), classElement, beanAnnotationMetadata, true, visitorContext);
         final String name = classElement.getName();
         this.classElement = classElement;
         this.referenceWriter = new ClassWriter(ClassWriter.COMPUTE_MAXS);
-        this.introspectionName = computeIntrospectionName(name);
+        this.introspectionName = computeShortIntrospectionName(targetPackage, name);
         this.introspectionType = getTypeReferenceForName(introspectionName);
         this.beanType = getTypeReferenceForName(name);
         this.dispatchWriter = new DispatchWriter(introspectionType, Type.getType(AbstractInitializableBeanIntrospection.class));
@@ -151,17 +151,18 @@ final class BeanIntrospectionWriter extends AbstractAnnotationMetadataWriter {
      * @param visitorContext          The visitor context
      */
     BeanIntrospectionWriter(
+            String targetPackage,
             String generatingType,
             int index,
             ClassElement originatingElement,
             ClassElement classElement,
             AnnotationMetadata beanAnnotationMetadata,
             VisitorContext visitorContext) {
-        super(computeReferenceName(generatingType) + index, originatingElement, beanAnnotationMetadata, true, visitorContext);
+        super(computeReferenceName(targetPackage, generatingType) + index, originatingElement, beanAnnotationMetadata, true, visitorContext);
         final String className = classElement.getName();
         this.classElement = classElement;
         this.referenceWriter = new ClassWriter(ClassWriter.COMPUTE_MAXS);
-        this.introspectionName = computeIntrospectionName(generatingType, className);
+        this.introspectionName = computeIntrospectionName(targetPackage, className);
         this.introspectionType = getTypeReferenceForName(introspectionName);
         this.beanType = getTypeReferenceForName(className);
         this.dispatchWriter = new DispatchWriter(introspectionType);
@@ -949,22 +950,19 @@ private void pushAnnotationMetadata(ClassWriter classWriter, GeneratorAdapter st
     }
 
     @NonNull
-    private static String computeReferenceName(String className) {
-        String packageName = NameUtils.getPackageName(className);
+    private static String computeReferenceName(String packageName, String className) {
         final String shortName = NameUtils.getSimpleName(className);
         return packageName + ".$" + shortName + REFERENCE_SUFFIX;
     }
 
     @NonNull
-    private static String computeIntrospectionName(String className) {
-        String packageName = NameUtils.getPackageName(className);
+    private static String computeShortIntrospectionName(String packageName, String className) {
         final String shortName = NameUtils.getSimpleName(className);
         return packageName + ".$" + shortName + INTROSPECTION_SUFFIX;
     }
 
     @NonNull
-    private static String computeIntrospectionName(String generatingName, String className) {
-        final String packageName = NameUtils.getPackageName(generatingName);
+    private static String computeIntrospectionName(String packageName, String className) {
         return packageName + ".$" + className.replace('.', '_') + INTROSPECTION_SUFFIX;
     }
 

core-processor/src/main/java/io/micronaut/inject/beans/visitor/IntrospectedTypeElementVisitor.java

@@ -93,6 +93,7 @@ private void processIntrospected(ClassElement element, VisitorContext context, A
         final boolean metadata = introspected.booleanValue("annotationMetadata").orElse(true);
         final Set<String> includedAnnotations = CollectionUtils.setOf(introspected.stringValues("includedAnnotations"));
         final Set<AnnotationValue<Annotation>> indexedAnnotations = CollectionUtils.setOf(introspected.get("indexed", AnnotationValue[].class, new AnnotationValue[0]));
+        final String targetPackage = introspected.stringValue("targetPackage").orElse(element.getPackageName());
 
         if (!classes.isEmpty()) {
             AtomicInteger index = new AtomicInteger(0);
@@ -101,6 +102,7 @@ private void processIntrospected(ClassElement element, VisitorContext context, A
                     return;
                 }
                 final BeanIntrospectionWriter writer = new BeanIntrospectionWriter(
+                    targetPackage,
                     element.getName(),
                     index.getAndIncrement(),
                     element,
@@ -129,6 +131,7 @@ private void processIntrospected(ClassElement element, VisitorContext context, A
                             continue;
                         }
                         final BeanIntrospectionWriter writer = new BeanIntrospectionWriter(
+                            targetPackage,
                             element.getName(),
                             j++,
                             element,
@@ -147,6 +150,7 @@ private void processIntrospected(ClassElement element, VisitorContext context, A
             }
         } else {
             final BeanIntrospectionWriter writer = new BeanIntrospectionWriter(
+                targetPackage,
                 element,
                 metadata ? element.getAnnotationMetadata() : null,
                 context

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

@@ -178,6 +178,13 @@
      */
     String withPrefix() default "with";
 
+    /**
+     * @return The package to write introspections to. By default, uses the class package.
+     * @since 3.9.0
+     */
+    @Experimental
+    String targetPackage() default "";
+
     /**
      * Allow pre-computed indexes for property lookups based on an annotation and a member.
      *

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

@@ -20,7 +20,7 @@
 import io.micronaut.core.annotation.Nullable;
 
 /**
- * Abstraction to load resources from the the classpath.
+ * Abstraction to load resources from the classpath.
  *
  * @author James Kleeh
  * @author Graeme Rocher

gradle.properties

@@ -56,7 +56,7 @@ kotlin.stdlib.default.dependency=false
 
 # For the docs
 graalVersion=22.0.0.2
-micronautSecurityVersion=3.9.4
+micronautSecurityVersion=3.11.0
 
 org.gradle.caching=true
 org.gradle.parallel=true

http-server-netty/src/main/java/io/micronaut/http/server/netty/handler/accesslog/element/AccessLogFormatParser.java

@@ -33,7 +33,7 @@
 
 /**
  * The access log format parser.
- *
+ * <p>
  * The syntax is based on <a href="https://httpd.apache.org/docs/current/mod/mod_log_config.html">Apache httpd log format</a>.
  * Here are the supported directives:
  * <ul>
@@ -43,17 +43,17 @@
  * <li><b>%B</b> - Bytes sent, excluding HTTP headers</li>
  * <li><b>%h</b> - Remote host name</li>
  * <li><b>%H</b> - Request protocol</li>
- * <li><b>%{<header>}i</b> - Request header. If the argument is omitted (<b>%i</b>) all headers will be printed</li>
- * <li><b>%{<header>}o</b> - Response header. If the argument is omitted (<b>%o</b>) all headers will be printed</li>
- * <li><b>%{<cookie>}C</b> - Request cookie (COOKIE). If the argument is omitted (<b>%C</b>) all cookies will be printed</li>
- * <li><b>%{<cookie>}c</b> - Response cookie (SET_COOKIE). If the argument is omitted (<b>%c</b>) all cookies will be printed</li>
+ * <li><b>%{&lt;header&gt;}i</b> - Request header. If the argument is omitted (<b>%i</b>) all headers will be printed</li>
+ * <li><b>%{&lt;header&gt;}o</b> - Response header. If the argument is omitted (<b>%o</b>) all headers will be printed</li>
+ * <li><b>%{&lt;cookie&gt;}C</b> - Request cookie (COOKIE). If the argument is omitted (<b>%C</b>) all cookies will be printed</li>
+ * <li><b>%{&lt;cookie&gt;}c</b> - Response cookie (SET_COOKIE). If the argument is omitted (<b>%c</b>) all cookies will be printed</li>
  * <li><b>%l</b> - Remote logical username from identd (always returns '-')</li>
  * <li><b>%m</b> - Request method</li>
  * <li><b>%p</b> - Local port</li>
  * <li><b>%q</b> - Query string (excluding the '?' character)</li>
  * <li><b>%r</b> - First line of the request</li>
  * <li><b>%s</b> - HTTP status code of the response</li>
- * <li><b>%{<format>}t</b> - Date and time. If the argument is omitted the Common Log Format format is used ("'['dd/MMM/yyyy:HH:mm:ss Z']'").
+ * <li><b>%{&lt;format&gt;}t</b> - Date and time. If the argument is omitted the Common Log Format format is used ("'['dd/MMM/yyyy:HH:mm:ss Z']'").
  * If the format starts with begin: (default) the time is taken at the beginning of the request processing. If it starts with end: it is the time when the log entry gets written, close to the end of the request processing.
  * The format should follow the DateTimeFormatter syntax.</li>
  * <li><b>%u</b> - Remote user that was authenticated. Not implemented. Prints '-'.</li>
@@ -64,9 +64,9 @@
  * </ul>
  * <p>In addition, the following aliases for commonly utilized patterns:</p>
  * <ul>
- * <li><b>common</b> - <code>%h %l %u %t "%r" %s %b</code> Common Log Format (CLF)</li>
+ * <li><b>common</b> - {@code %h %l %u %t "%r" %s %b} Common Log Format (CLF)</li>
  * <li><b>combined</b> -
- * <code>%h %l %u %t "%r" %s %b "%{Referer}i" "%{User-Agent}i"</code> Combined Log Format</li>
+ * {@code %h %l %u %t "%r" %s %b "%{Referer}i" "%{User-Agent}i"} Combined Log Format</li>
  * </ul>
  *
  * @author croudet

http-server-tck/src/main/java/io/micronaut/http/server/tck/tests/ErrorHandlerStringTest.java

@@ -0,0 +1,82 @@
+/*
+ * Copyright 2017-2023 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.http.server.tck.tests;
+
+import io.micronaut.context.annotation.Requires;
+import io.micronaut.http.HttpHeaders;
+import io.micronaut.http.HttpRequest;
+import io.micronaut.http.HttpStatus;
+import io.micronaut.http.MediaType;
+import io.micronaut.http.annotation.Controller;
+import io.micronaut.http.annotation.Get;
+import io.micronaut.http.server.exceptions.ExceptionHandler;
+import io.micronaut.http.tck.AssertionUtils;
+import jakarta.inject.Singleton;
+import org.junit.jupiter.api.Test;
+
+import java.io.IOException;
+import java.util.Map;
+
+import static io.micronaut.http.tck.TestScenario.asserts;
+
+@SuppressWarnings({
+    "java:S5960", // We're allowed assertions, as these are used in tests only
+    "checkstyle:MissingJavadocType",
+    "checkstyle:DesignForExtension"
+})
+public class ErrorHandlerStringTest {
+    public static final String SPEC_NAME = "ErrorHandlerStringTest";
+
+    @Test
+    void testErrorHandlerWithStringReturn() throws IOException {
+        asserts(SPEC_NAME,
+            HttpRequest.GET("/exception/my").header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON),
+            (server, request) -> AssertionUtils.assertDoesNotThrow(
+                server,
+                request,
+                HttpStatus.OK,
+                "hello",
+                Map.of(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
+            )
+        );
+    }
+
+    @Requires(property = "spec.name", value = SPEC_NAME)
+    @Controller("/exception")
+    static class ExceptionController {
+
+        @Get("/my")
+        void throwsMy() {
+            throw new MyException("bad");
+        }
+    }
+
+    static class MyException extends RuntimeException {
+        public MyException(String badThings) {
+            super(badThings);
+        }
+    }
+
+    @Requires(property = "spec.name", value = SPEC_NAME)
+    @Singleton
+    static class MyExceptionHandler implements ExceptionHandler<MyException, String> {
+
+        @Override
+        public String handle(HttpRequest request, MyException exception) {
+            return "hello";
+        }
+    }
+}

http/src/main/java/io/micronaut/http/ssl/SslConfiguration.java

@@ -252,7 +252,7 @@ public void setProtocols(String[] protocols) {
      * @param protocol The protocol
      */
     public void setProtocol(String protocol) {
-        if (!StringUtils.isNotEmpty(protocol)) {
+        if (StringUtils.isNotEmpty(protocol)) {
             this.protocol = protocol;
         }
     }

http/src/test/groovy/io/micronaut/http/ssl/SslConfigurationSpec.groovy

@@ -0,0 +1,23 @@
+package io.micronaut.http.ssl
+
+import spock.lang.Specification
+
+class SslConfigurationSpec extends Specification {
+
+    void "setProtocol should override protocol"() {
+        given:
+        SslConfiguration configuration = new SslConfiguration()
+
+        expect:
+        configuration.protocol.isPresent()
+        "TLS" == configuration.protocol.get()
+
+        when:
+        configuration.protocol = "foo"
+
+        then:
+        configuration.protocol.isPresent()
+        "foo" == configuration.protocol.get()
+    }
+
+}

inject-java-test/src/test/groovy/io/micronaut/inject/visitor/beans/BeanIntrospectionSpec.groovy

@@ -208,6 +208,41 @@ class Test extends Auditable {
         bean.updatedAt != null
     }
 
+    void "test introspection can written to different package"() {
+        when:
+        def classLoader = buildClassLoader("test.Test", '''
+package test;
+
+import io.micronaut.core.annotation.Introspected;
+
+@Introspected(targetPackage = "test.introspections")
+public class Test {
+    private String name;
+    public Test(String name) {
+        this.name = name;
+    }
+    public String getName() {
+        return name;
+    }
+}
+
+''')
+        def introspectionName = 'test.introspections.$Test$Introspection'
+        def introspection = classLoader.loadClass(introspectionName).newInstance() as BeanIntrospection
+
+        then:
+        introspection != null
+        introspection.getProperty("name").isPresent()
+
+        when:
+        def introspectionRefName = 'test.introspections.$Test$IntrospectionRef'
+        def introspectionRef = classLoader.loadClass(introspectionRefName).newInstance() as BeanIntrospectionReference
+
+        then:
+        introspectionRef != null
+        introspectionRef.load() != null
+    }
+
     void "test generics in arrays don't stack overflow"() {
         given:
         def introspection = buildBeanIntrospection('arraygenerics.Test', '''
@@ -1161,6 +1196,37 @@ class Test {}
         applicationContext.close()
     }
 
+    void "test create bean introspection for external class with custom package"() {
+        given:
+        def classLoader = buildClassLoader('test.Test', '''
+package test;
+
+import io.micronaut.core.annotation.Introspected;
+import io.micronaut.inject.visitor.beans.OuterBean;
+
+@Introspected(classes=OuterBean.InnerBean.class, targetPackage="test.micronaut.intro")
+class Test {}
+''')
+
+        when:"the reference is loaded"
+        def reference = classLoader.loadClass('test.micronaut.intro.$Test$IntrospectionRef0').newInstance() as BeanIntrospectionReference
+
+        then:"the reference is valid"
+        notThrown(ClassNotFoundException)
+        reference.getBeanType() == OuterBean.InnerBean.class
+        reference.load() != null
+
+        print(classLoader)
+
+        when:"the introspection is loaded"
+        def introspectionName = 'test.micronaut.intro.$io_micronaut_inject_visitor_beans_OuterBean$InnerBean$Introspection'
+        def introspection = classLoader.loadClass(introspectionName).newInstance() as BeanIntrospection
+
+        then:"the introspection is valid"
+        notThrown(ClassNotFoundException)
+        introspection.getProperty("name").isPresent()
+    }
+
     void "test create bean introspection for interface"() {
         given:
         def context = buildContext('itfcetest.MyInterface','''