Merge pull request #50448 from rsvoboda/cleanup-2025-10-07

gastaldi · web-flow · commit b1c03c79f1cf · 2025-10-08T15:28:48.000-03:00
Cleanup/simplification in core module
diff --git a/core/builder/src/main/java/io/quarkus/builder/Json.java b/core/builder/src/main/java/io/quarkus/builder/Json.java
@@ -4,9 +4,7 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.List;
-import java.util.ListIterator;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Objects;
@@ -230,8 +228,7 @@ String build() throws IOException {
         public void appendTo(Appendable appendable) throws IOException {
             appendable.append(ARRAY_START);
             int idx = 0;
-            for (ListIterator<Object> iterator = values.listIterator(); iterator.hasNext();) {
-                Object value = iterator.next();
+            for (Object value : values) {
                 if (isIgnored(value)) {
                     continue;
                 }
@@ -346,8 +343,7 @@ String build() throws IOException {
         public void appendTo(Appendable appendable) throws IOException {
             appendable.append(OBJECT_START);
             int idx = 0;
-            for (Iterator<Entry<String, Object>> iterator = properties.entrySet().iterator(); iterator.hasNext();) {
-                Entry<String, Object> entry = iterator.next();
+            for (Entry<String, Object> entry : properties.entrySet()) {
                 if (isIgnored(entry.getValue())) {
                     continue;
                 }
@@ -368,8 +364,7 @@ protected JsonObjectBuilder self() {
 
         @Override
         void add(JsonValue element) {
-            if (element instanceof JsonMember) {
-                final JsonMember member = (JsonMember) element;
+            if (element instanceof JsonMember member) {
                 final String attribute = member.attribute().value();
                 final JsonValue value = member.value();
                 if (value instanceof JsonString) {
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/ConstructorPropertiesProcessor.java b/core/deployment/src/main/java/io/quarkus/deployment/ConstructorPropertiesProcessor.java
@@ -29,8 +29,7 @@ void build(BuildProducer<ReflectiveClassBuildItem> reflectiveClass, CombinedInde
 
     private void registerInstance(BuildProducer<ReflectiveClassBuildItem> reflectiveClass, AnnotationInstance instance) {
         AnnotationTarget annotationTarget = instance.target();
-        if (annotationTarget instanceof MethodInfo) {
-            MethodInfo methodInfo = (MethodInfo) annotationTarget;
+        if (annotationTarget instanceof MethodInfo methodInfo) {
             String classname = methodInfo.declaringClass().toString();
             reflectiveClass.produce(asReflectiveClassBuildItem(classname));
         }
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/ExtensionLoader.java b/core/deployment/src/main/java/io/quarkus/deployment/ExtensionLoader.java
@@ -621,8 +621,7 @@ private static Consumer<BuildChainBuilder> loadStepsFromClass(Class<?> clazz,
                                 for (var type : ctor.getGenericParameterTypes()) {
                                     Class<?> theType;
                                     boolean isRuntimeValue = false;
-                                    if (type instanceof ParameterizedType) {
-                                        ParameterizedType pt = (ParameterizedType) type;
+                                    if (type instanceof ParameterizedType pt) {
                                         if (pt.getRawType().equals(RuntimeValue.class)) {
                                             theType = (Class<?>) pt.getActualTypeArguments()[0];
                                             isRuntimeValue = true;
@@ -853,8 +852,7 @@ public void execute(final BuildContext bc) {
                                                         return runTimeProxies.get(s);
                                                     }
                                                     // TODO - Remove once we disallow the injection of runtime objects in build steps
-                                                    if (s instanceof ParameterizedType) {
-                                                        ParameterizedType p = (ParameterizedType) s;
+                                                    if (s instanceof ParameterizedType p) {
                                                         if (p.getRawType() == RuntimeValue.class) {
                                                             Object object = runTimeProxies.get(p.getActualTypeArguments()[0]);
                                                             if (object == null) {
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/configuration/tracker/ConfigTrackingValueTransformer.java b/core/deployment/src/main/java/io/quarkus/deployment/configuration/tracker/ConfigTrackingValueTransformer.java
@@ -125,8 +125,8 @@ public static String sha512(String value) {
     public static String sha512(byte[] value) {
         final byte[] digest = getSHA512().digest(value);
         final StringBuilder sb = new StringBuilder(40);
-        for (int i = 0; i < digest.length; ++i) {
-            sb.append(Integer.toHexString((digest[i] & 0xFF) | 0x100).substring(1, 3));
+        for (byte b : digest) {
+            sb.append(Integer.toHexString((b & 0xFF) | 0x100).substring(1, 3));
         }
         return sb.toString();
     }
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/dev/testing/TestClassUsages.java b/core/deployment/src/main/java/io/quarkus/deployment/dev/testing/TestClassUsages.java
@@ -85,8 +85,7 @@ public FilterResult apply(TestDescriptor testDescriptor) {
                     } else {
                         return FilterResult.excluded("Has no tests");
                     }
-                } else if (source instanceof MethodSource) {
-                    MethodSource ms = (MethodSource) source;
+                } else if (source instanceof MethodSource ms) {
                     ClassAndMethod cm = new ClassAndMethod(ms.getClassName(), testDescriptor.getUniqueId());
                     if (!classNames.containsKey(cm)) {
                         return FilterResult.included("No test information");
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/steps/ConfigDescriptionBuildStep.java b/core/deployment/src/main/java/io/quarkus/deployment/steps/ConfigDescriptionBuildStep.java
@@ -57,17 +57,15 @@ private void processMappings(List<ConfigClass> mappings, List<ConfigDescriptionB
                 Method method = property.getMethod();
 
                 String defaultValue = null;
-                if (property instanceof PrimitiveProperty) {
-                    PrimitiveProperty primitiveProperty = (PrimitiveProperty) property;
+                if (property instanceof PrimitiveProperty primitiveProperty) {
                     if (primitiveProperty.hasDefaultValue()) {
                         defaultValue = primitiveProperty.getDefaultValue();
                     } else if (primitiveProperty.getPrimitiveType() == boolean.class) {
                         defaultValue = "false";
                     } else if (primitiveProperty.getPrimitiveType() != char.class) {
                         defaultValue = "0";
                     }
-                } else if (property instanceof LeafProperty) {
-                    LeafProperty leafProperty = (LeafProperty) property;
+                } else if (property instanceof LeafProperty leafProperty) {
                     if (leafProperty.hasDefaultValue()) {
                         defaultValue = leafProperty.getDefaultValue();
                     }
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/steps/ReflectiveHierarchyStep.java b/core/deployment/src/main/java/io/quarkus/deployment/steps/ReflectiveHierarchyStep.java
@@ -160,15 +160,14 @@ private void addReflectiveHierarchy(CombinedIndexBuildItem combinedIndexBuildIte
                     type.asArrayType().constituent(),
                     processedReflectiveHierarchies,
                     unindexedClasses, reflectiveClass, visits));
-        } else if (type instanceof ParameterizedType) {
+        } else if (type instanceof ParameterizedType parameterizedType) {
             if (!reflectiveHierarchyBuildItem.getIgnoreTypePredicate().test(type.name())) {
                 addClassTypeHierarchy(combinedIndexBuildItem, capabilities, reflectiveHierarchyBuildItem, newSource,
                         type.name(),
                         type.name(),
                         processedReflectiveHierarchies,
                         unindexedClasses, reflectiveClass, visits);
             }
-            final ParameterizedType parameterizedType = (ParameterizedType) type;
             for (Type typeArgument : parameterizedType.arguments()) {
                 visits.addLast(
                         () -> addReflectiveHierarchy(combinedIndexBuildItem, capabilities, reflectiveHierarchyBuildItem,
diff --git a/core/deployment/src/main/java/io/quarkus/runner/bootstrap/AugmentActionImpl.java b/core/deployment/src/main/java/io/quarkus/runner/bootstrap/AugmentActionImpl.java
@@ -3,7 +3,6 @@
 import java.io.File;
 import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
-import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.StandardOpenOption;
@@ -230,7 +229,7 @@ private void writeDebugSourceFile(BuildResult result) {
                         }
                         File sourceFile = new File(debugPath, i.getName() + ".zig");
                         sourceFile.getParentFile().mkdirs();
-                        Files.write(sourceFile.toPath(), i.getSource().getBytes(StandardCharsets.UTF_8),
+                        Files.writeString(sourceFile.toPath(), i.getSource(),
                                 StandardOpenOption.CREATE);
                         log.infof("Wrote source: %s", sourceFile.getAbsolutePath());
                     } else {
diff --git a/core/deployment/src/main/java/io/quarkus/runner/bootstrap/StartupActionImpl.java b/core/deployment/src/main/java/io/quarkus/runner/bootstrap/StartupActionImpl.java
@@ -8,7 +8,6 @@
 import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
-import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.StandardOpenOption;
 import java.util.ArrayList;
@@ -486,8 +485,7 @@ private static Map<String, byte[]> extractGeneratedResources(BuildResult buildRe
                             }
                             File sourceFile = new File(debugPath, i.internalName() + ".zig");
                             sourceFile.getParentFile().mkdirs();
-                            Files.write(sourceFile.toPath(), i.getSource().getBytes(StandardCharsets.UTF_8),
-                                    StandardOpenOption.CREATE);
+                            Files.writeString(sourceFile.toPath(), i.getSource(), StandardOpenOption.CREATE);
                             log.infof("Wrote source %s", sourceFile.getAbsolutePath());
                         } else {
                             log.infof("Source not available: %s", i.binaryName());
diff --git a/core/deployment/src/test/java/io/quarkus/deployment/pkg/steps/BannerProcessorTest.java b/core/deployment/src/test/java/io/quarkus/deployment/pkg/steps/BannerProcessorTest.java
@@ -4,7 +4,6 @@
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import java.nio.charset.StandardCharsets;
 import java.nio.file.FileSystem;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -43,7 +42,7 @@ public void checkQuarkusCoreBannerOnFilesystemWithSpecialCharacters(@TempDir Pat
             try (final FileSystem fs = ZipUtils.newFileSystem(zipPath)) {
                 Path classFile = fs.getPath(fromClassNameToResourceName(MyBannerProcessor.class.getName()));
                 Files.createDirectories(classFile.getParent());
-                Files.write(classFile, "".getBytes(StandardCharsets.UTF_8));
+                Files.writeString(classFile, "");
             }
 
             try (FileSystem fs = ZipUtils.newFileSystem(zipPath)) {
diff --git a/core/deployment/src/test/java/io/quarkus/deployment/recording/JobDetails.java b/core/deployment/src/test/java/io/quarkus/deployment/recording/JobDetails.java
@@ -71,9 +71,8 @@ public void setCacheable(boolean cacheable) {
     public boolean equals(Object o) {
         if (this == o)
             return true;
-        if (!(o instanceof JobDetails))
+        if (!(o instanceof JobDetails that))
             return false;
-        JobDetails that = (JobDetails) o;
         return Objects.equals(className, that.className)
                 && Objects.equals(staticFieldName, that.staticFieldName)
                 && Objects.equals(methodName, that.methodName)
diff --git a/core/deployment/src/test/java/io/quarkus/deployment/recording/JobParameter.java b/core/deployment/src/test/java/io/quarkus/deployment/recording/JobParameter.java
@@ -66,9 +66,8 @@ public Object getObject() {
     public boolean equals(Object o) {
         if (this == o)
             return true;
-        if (!(o instanceof JobParameter))
+        if (!(o instanceof JobParameter that))
             return false;
-        JobParameter that = (JobParameter) o;
         return Objects.equals(className, that.className)
                 && Objects.equals(actualClassName, that.actualClassName)
                 && Objects.equals(object, that.object);
diff --git a/core/processor/src/main/java/io/quarkus/annotation/processor/documentation/config/formatter/JavadocToAsciidocTransformer.java b/core/processor/src/main/java/io/quarkus/annotation/processor/documentation/config/formatter/JavadocToAsciidocTransformer.java
@@ -105,8 +105,7 @@ public static String toAsciidoc(String javadoc, JavadocFormat format, boolean in
         Map<Integer, String> inlineTagsReplacements = new TreeMap<>();
 
         for (JavadocDescriptionElement javadocDescriptionElement : parsedJavadoc.getDescription().getElements()) {
-            if (javadocDescriptionElement instanceof JavadocInlineTag) {
-                JavadocInlineTag inlineTag = (JavadocInlineTag) javadocDescriptionElement;
+            if (javadocDescriptionElement instanceof JavadocInlineTag inlineTag) {
                 String content = inlineTag.getContent().trim();
                 switch (inlineTag.getType()) {
                     case CODE:
diff --git a/core/processor/src/main/java/io/quarkus/annotation/processor/documentation/config/formatter/JavadocToMarkdownTransformer.java b/core/processor/src/main/java/io/quarkus/annotation/processor/documentation/config/formatter/JavadocToMarkdownTransformer.java
@@ -44,8 +44,7 @@ private static String simplifyJavadoc(JavadocDescription javadocDescription) {
         StringBuilder sb = new StringBuilder();
 
         for (JavadocDescriptionElement javadocDescriptionElement : javadocDescription.getElements()) {
-            if (javadocDescriptionElement instanceof JavadocInlineTag) {
-                JavadocInlineTag inlineTag = (JavadocInlineTag) javadocDescriptionElement;
+            if (javadocDescriptionElement instanceof JavadocInlineTag inlineTag) {
                 String content = inlineTag.getContent().trim();
                 switch (inlineTag.getType()) {
                     case CODE:
diff --git a/core/processor/src/main/java/io/quarkus/annotation/processor/documentation/config/resolver/ConfigResolver.java b/core/processor/src/main/java/io/quarkus/annotation/processor/documentation/config/resolver/ConfigResolver.java
@@ -243,8 +243,7 @@ public static String getDefaultValue(String defaultValue, String defaultValueFor
     }
 
     public static String getType(TypeMirror typeMirror) {
-        if (typeMirror instanceof DeclaredType) {
-            DeclaredType declaredType = (DeclaredType) typeMirror;
+        if (typeMirror instanceof DeclaredType declaredType) {
             TypeElement typeElement = (TypeElement) declaredType.asElement();
             return typeElement.getQualifiedName().toString();
         }
diff --git a/core/processor/src/main/java/io/quarkus/annotation/processor/util/AccessorGenerator.java b/core/processor/src/main/java/io/quarkus/annotation/processor/util/AccessorGenerator.java
@@ -60,8 +60,7 @@ public void generateAccessor(final TypeElement clazz) {
         final JSourceFile sourceFile = sources.createSourceFile(packageElement.getQualifiedName()
                 .toString(), className);
         JType clazzType = JTypes.typeOf(clazz.asType());
-        if (clazz.asType() instanceof DeclaredType) {
-            DeclaredType declaredType = ((DeclaredType) clazz.asType());
+        if (clazz.asType() instanceof DeclaredType declaredType) {
             TypeMirror enclosingType = declaredType.getEnclosingType();
             if (enclosingType != null && enclosingType.getKind() == TypeKind.DECLARED
                     && clazz.getModifiers()
@@ -91,8 +90,7 @@ public void generateAccessor(final TypeElement clazz) {
                 // 1) the field is public
                 // 2) the enclosing class is public
                 // 3) the class type of the field is public
-                if (fieldType instanceof DeclaredType) {
-                    final DeclaredType declaredType = (DeclaredType) fieldType;
+                if (fieldType instanceof DeclaredType declaredType) {
                     final TypeElement typeElement = (TypeElement) declaredType.asElement();
                     if (typeElement.getModifiers()
                             .contains(Modifier.PUBLIC)) {
diff --git a/core/runtime/src/main/java/io/quarkus/runtime/ApplicationLifecycleManager.java b/core/runtime/src/main/java/io/quarkus/runtime/ApplicationLifecycleManager.java
@@ -272,8 +272,7 @@ private static void ensureConsoleLogsDrained() {
      */
     private static void longLivedPostBootCleanup() {
         final ClassLoader cl = Thread.currentThread().getContextClassLoader();
-        if (cl instanceof RunnerClassLoader) {
-            RunnerClassLoader rcl = (RunnerClassLoader) cl;
+        if (cl instanceof RunnerClassLoader rcl) {
             rcl.resetInternalCaches();
         }
     }
diff --git a/core/runtime/src/main/java/io/quarkus/runtime/logging/DecorateStackUtil.java b/core/runtime/src/main/java/io/quarkus/runtime/logging/DecorateStackUtil.java
@@ -22,8 +22,7 @@ public static String getDecoratedString(final Throwable throwable, String srcMai
     public static String getDecoratedString(final Throwable throwable, Path srcMainJava, List<String> knowClasses) {
         if (knowClasses != null && !knowClasses.isEmpty() && throwable != null) {
             StackTraceElement[] stackTrace = throwable.getStackTrace();
-            for (int i = 0; i < stackTrace.length; ++i) {
-                StackTraceElement elem = stackTrace[i];
+            for (StackTraceElement elem : stackTrace) {
                 if (knowClasses.contains(elem.getClassName())) {
                     String decoratedString = DecorateStackUtil.getDecoratedString(srcMainJava, elem);
                     if (decoratedString != null) {
diff --git a/core/runtime/src/main/java/io/quarkus/runtime/logging/LogCleanupFilter.java b/core/runtime/src/main/java/io/quarkus/runtime/logging/LogCleanupFilter.java
@@ -31,8 +31,7 @@ public boolean isLoggable(LogRecord record) {
         //we also use this filter to add a warning about errors generated after shutdown
         if (record.getLevel().intValue() >= org.jboss.logmanager.Level.ERROR.intValue() && shutdownNotifier.shutdown) {
             if (!record.getMessage().endsWith(SHUTDOWN_MESSAGE)) {
-                if (record instanceof ExtLogRecord) {
-                    ExtLogRecord elr = (ExtLogRecord) record;
+                if (record instanceof ExtLogRecord elr) {
                     elr.setMessage(record.getMessage() + SHUTDOWN_MESSAGE, elr.getFormatStyle());
                 } else {
                     record.setMessage(record.getMessage() + SHUTDOWN_MESSAGE);
diff --git a/core/runtime/src/main/java/io/quarkus/runtime/types/GenericArrayTypeImpl.java b/core/runtime/src/main/java/io/quarkus/runtime/types/GenericArrayTypeImpl.java
@@ -31,8 +31,7 @@ public int hashCode() {
 
     @Override
     public boolean equals(Object obj) {
-        if (obj instanceof GenericArrayType) {
-            GenericArrayType that = (GenericArrayType) obj;
+        if (obj instanceof GenericArrayType that) {
             if (genericComponentType == null) {
                 return that.getGenericComponentType() == null;
             } else {
diff --git a/core/runtime/src/main/java/io/quarkus/runtime/util/HashUtil.java b/core/runtime/src/main/java/io/quarkus/runtime/util/HashUtil.java
@@ -15,8 +15,8 @@ private static MessageDigest getMessageDigest(String alg) {
     }
 
     private static void toHex(byte[] digest, StringBuilder sb) {
-        for (int i = 0; i < digest.length; ++i) {
-            sb.append(Integer.toHexString((digest[i] & 0xFF) | 0x100), 1, 3);
+        for (byte b : digest) {
+            sb.append(Integer.toHexString((b & 0xFF) | 0x100), 1, 3);
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -29,8 +29,7 @@ void build(BuildProducer<ReflectiveClassBuildItem> reflectiveClass, CombinedInde`
`29`	`29`
`30`	`30`	`private void registerInstance(BuildProducer<ReflectiveClassBuildItem> reflectiveClass, AnnotationInstance instance) {`
`31`	`31`	`AnnotationTarget annotationTarget = instance.target();`
`32`		`- if (annotationTarget instanceof MethodInfo) {`
`33`		`- MethodInfo methodInfo = (MethodInfo) annotationTarget;`
	`32`	`+ if (annotationTarget instanceof MethodInfo methodInfo) {`
`34`	`33`	`String classname = methodInfo.declaringClass().toString();`
`35`	`34`	`reflectiveClass.produce(asReflectiveClassBuildItem(classname));`
`36`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -125,8 +125,8 @@ public static String sha512(String value) {`
`125`	`125`	`public static String sha512(byte[] value) {`
`126`	`126`	`final byte[] digest = getSHA512().digest(value);`
`127`	`127`	`final StringBuilder sb = new StringBuilder(40);`
`128`		`- for (int i = 0; i < digest.length; ++i) {`
`129`		`- sb.append(Integer.toHexString((digest[i] & 0xFF) \| 0x100).substring(1, 3));`
	`128`	`+ for (byte b : digest) {`
	`129`	`+ sb.append(Integer.toHexString((b & 0xFF) \| 0x100).substring(1, 3));`
`130`	`130`	`}`
`131`	`131`	`return sb.toString();`
`132`	`132`	`}`