Pattern variable usage with instanceOf

rsvoboda · rsvoboda · commit 4661cdd2d049 · 2025-10-08T14:34:11.000+02:00
diff --git a/core/builder/src/main/java/io/quarkus/builder/Json.java b/core/builder/src/main/java/io/quarkus/builder/Json.java
@@ -364,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/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/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/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 {

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`	`}`