Normalization of bean definition class names for more correct logs

context/src/main/java/io/micronaut/scheduling/TaskExceptionHandler.java

@@ -18,6 +18,8 @@
 import io.micronaut.core.exceptions.BeanExceptionHandler;
 import io.micronaut.inject.BeanDefinition;
 
+import static io.micronaut.context.MessageUtils.getNormalizedTypeString;
+
 /**
  * An exception handler interface for task related exceptions.
  *
@@ -38,7 +40,7 @@ default void handleCreationFailure(BeanDefinition<T> beanType, E throwable) {
         if (DefaultTaskExceptionHandler.LOG.isErrorEnabled()) {
             StringBuilder message = new StringBuilder("Error creating scheduled task ");
             if (beanType != null) {
-                message.append("for bean [").append(beanType.asArgument()).append("] ");
+                message.append("for bean [").append(getNormalizedTypeString(beanType)).append("] ");
             }
             message.append(throwable.getMessage());
             DefaultTaskExceptionHandler.LOG.error(message.toString(), throwable);

http-client-jdk/src/main/java/io/micronaut/http/client/jdk/ReactiveByteBufferByteBody.java

@@ -183,6 +183,16 @@ public void close() {
             .map(bb -> AvailableByteArrayBody.create(ByteArrayBufferFactory.INSTANCE, ReactiveByteBufferByteBody.toByteArray(bb)));
     }
 
+    @Override
+    public @NonNull CloseableByteBody move() {
+        BufferConsumer.Upstream upstream = this.upstream;
+        if (upstream == null) {
+            BaseSharedBuffer.failClaim();
+        }
+        this.upstream = null;
+        return new ReactiveByteBufferByteBody(sharedBuffer, upstream);
+    }
+
     @Override
     public void close() {
         BufferConsumer.Upstream upstream = this.upstream;

http-netty/src/main/java/io/micronaut/http/netty/body/StreamingNettyByteBody.java

@@ -157,7 +157,7 @@ protected void release(ByteBuf item) {
     public @NonNull CloseableByteBody move() {
         BufferConsumer.Upstream upstream = this.upstream;
         if (upstream == null) {
-            failClaim();
+            BaseSharedBuffer.failClaim();
         }
         this.upstream = null;
         return new StreamingNettyByteBody(sharedBuffer, forceDelaySubscribe, upstream);

inject-java-test/src/test/groovy/io/micronaut/context/MessageUtilsSpec.groovy

@@ -0,0 +1,22 @@
+package io.micronaut.context
+
+import io.micronaut.annotation.processing.test.AbstractTypeElementSpec
+
+class MessageUtilsSpec extends AbstractTypeElementSpec {
+
+    void "test bean definition name normalization"() {
+
+        given:
+        def definition = buildBeanDefinition('test.Test', '''
+package test;
+
+@jakarta.inject.Singleton
+class Test {
+
+}
+''')
+
+        expect:
+        MessageUtils.getNormalizedTypeString(definition) == "Test"
+    }
+}

inject/src/main/java/io/micronaut/context/DefaultApplicationContext.java

@@ -65,6 +65,7 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
+import static io.micronaut.context.MessageUtils.getNormalizedTypeString;
 import static io.micronaut.core.util.StringUtils.EMPTY_STRING_ARRAY;
 
 /**
@@ -428,7 +429,7 @@ private <T> void appendEachPropertyMissingBeanMessage(String linePrefix,
             .append(lineSeparator)
             .append(linePrefix)
             .append("* [")
-            .append(definition.asArgument().getTypeString(true));
+            .append(getNormalizedTypeString(definition));
         if (!definition.getBeanType().equals(beanType.getType())) {
             messageBuilder.append("] a candidate of [")
                 .append(beanType.getTypeString(true));

inject/src/main/java/io/micronaut/context/DefaultBeanContext.java

@@ -147,6 +147,7 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import static io.micronaut.context.MessageUtils.getNormalizedTypeString;
 import static io.micronaut.core.util.StringUtils.EMPTY_STRING_ARRAY;
 
 /**
@@ -2875,7 +2876,7 @@ final <T> void resolveDisabledBeanMessage(String linePrefix,
                 messageBuilder
                     .append(lineSeparator)
                     .append(linePrefix)
-                    .append("* [").append(beanDefinition.asArgument().getTypeString(true));
+                    .append("* [").append(getNormalizedTypeString(beanDefinition));
                 if (!beanDefinition.getBeanType().equals(beanType.getType())) {
                     messageBuilder.append("] a candidate of [")
                         .append(beanType.getTypeString(true));

inject/src/main/java/io/micronaut/context/MessageUtils.java

@@ -0,0 +1,47 @@
+/*
+ * Copyright 2017-2024 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.context;
+
+import io.micronaut.core.annotation.NonNull;
+import io.micronaut.inject.BeanDefinition;
+import io.micronaut.inject.ProxyBeanDefinition;
+
+/**
+ * Some helper method for log / exception messages.
+ *
+ * @since 4.8.0
+ */
+public final class MessageUtils {
+
+    private MessageUtils() {
+    }
+
+    /**
+     * Return BeanDefinition type string or target type class name for ProxyBeanDefinition.
+     *
+     * @param beanDefinition bean definition
+     *
+     * @return normalized bean definition name
+     */
+    public static String getNormalizedTypeString(@NonNull BeanDefinition<?> beanDefinition) {
+
+        if (beanDefinition instanceof ProxyBeanDefinition<?> proxyBeanDefinition) {
+            return proxyBeanDefinition.getTargetType().getSimpleName();
+        } else {
+            return beanDefinition.asArgument().getTypeString(true);
+        }
+    }
+}