Use pattern matching for the instanceof operator

Author: jeantessier

src/com/jeantessier/classreader/InvokeDynamicPrinter.java

@@ -246,10 +246,10 @@ public void visitInstruction(Instruction helper) {
             raiseIndent();
             indent().append("pc=").append(helper.getStart()).append(" : ").append(helper.getMnemonic());
             var indexedEntry = helper.getIndexedConstantPoolEntry();
-            if (indexedEntry instanceof Dynamic_info) {
-                append(" ").append(((Dynamic_info) indexedEntry).getName());
-            } else if (indexedEntry instanceof InvokeDynamic_info) {
-                append(" ").append(((InvokeDynamic_info) indexedEntry).getName());
+            if (indexedEntry instanceof Dynamic_info dynamic_info) {
+                append(" ").append(dynamic_info.getName());
+            } else if (indexedEntry instanceof InvokeDynamic_info invokeDynamic_info) {
+                append(" ").append(invokeDynamic_info.getName());
             }
             // TODO: Replace with type pattern matching in switch expression in Java 21
             // switch (helper.getIndexedConstantPoolEntry()) {

src/com/jeantessier/classreader/MetricsGatherer.java

@@ -482,12 +482,12 @@ public void visitSynthetic_attribute(Synthetic_attribute attribute) {
 
         Object owner = attribute.getOwner();
 
-        if (owner instanceof Classfile) {
-            syntheticClasses.add((Classfile) owner);
-        } else if (owner instanceof Field_info) {
-            syntheticFields.add((Field_info) owner);
-        } else if (owner instanceof Method_info) {
-            syntheticMethods.add((Method_info) owner);
+        if (owner instanceof Classfile classfile) {
+            syntheticClasses.add(classfile);
+        } else if (owner instanceof Field_info field) {
+            syntheticFields.add(field);
+        } else if (owner instanceof Method_info method) {
+            syntheticMethods.add(method);
         } else {
             Logger.getLogger(getClass()).warn("Synthetic attribute on unknown Visitable: " + owner.getClass().getName());
         }

src/com/jeantessier/classreader/TextPrinter.java

@@ -322,10 +322,10 @@ private Printer appendIndexedConstantPoolEntry(Instruction instruction) {
                 break;
             case 0xba: // invokedynamic
                 var indexedEntry = instruction.getIndexedConstantPoolEntry();
-                if (indexedEntry instanceof Dynamic_info) {
-                    append(" ").append(((Dynamic_info) indexedEntry).getName());
-                } else if (indexedEntry instanceof InvokeDynamic_info) {
-                    append(" ").append(((InvokeDynamic_info) indexedEntry).getName());
+                if (indexedEntry instanceof Dynamic_info dynamic_info) {
+                    append(" ").append(dynamic_info.getName());
+                } else if (indexedEntry instanceof InvokeDynamic_info invokeDynamic_info) {
+                    append(" ").append(invokeDynamic_info.getName());
                 }
                 // TODO: Replace with type pattern matching in switch expression in Java 21
                 // switch (instruction.getIndexedConstantPoolEntry()) {

src/com/jeantessier/classreader/XMLPrinter.java

@@ -1044,10 +1044,10 @@ public void visitInstruction(Instruction instruction) {
                 append(" index=\"").append(instruction.getIndex()).append("\">");
                 append(instruction);
                 var indexedEntry = instruction.getIndexedConstantPoolEntry();
-                if (indexedEntry instanceof Dynamic_info) {
-                    append(" ").append(((Dynamic_info) indexedEntry).getName());
-                } else if (indexedEntry instanceof InvokeDynamic_info) {
-                    append(" ").append(((InvokeDynamic_info) indexedEntry).getName());
+                if (indexedEntry instanceof Dynamic_info dynamic_info) {
+                    append(" ").append(dynamic_info.getName());
+                } else if (indexedEntry instanceof InvokeDynamic_info invokeDynamic_info) {
+                    append(" ").append(invokeDynamic_info.getName());
                 }
                 // TODO: Replace with type pattern matching in switch expression in Java 21
                 // switch (instruction.getIndexedConstantPoolEntry()) {