8265901: Use pattern matching for instanceof at module jdk.compiler(part 3)

Reviewed-by: mcimadamore, jfranck

Author: lgxbslgx

src/jdk.compiler/share/classes/com/sun/tools/sjavac/Module.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -62,7 +62,7 @@ public Module(String n, String dn) {
 
     @Override
     public boolean equals(Object o) {
-        return (o instanceof Module) && name.equals(((Module)o).name);
+        return (o instanceof Module module) && name.equals(module.name);
     }
 
     @Override

src/jdk.compiler/share/classes/com/sun/tools/sjavac/Package.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -117,7 +117,7 @@ public Package(Module m, String n) {
 
     @Override
     public boolean equals(Object o) {
-        return (o instanceof Package) && name.equals(((Package)o).name);
+        return (o instanceof Package pac) && name.equals(pac.name);
     }
 
     @Override

src/jdk.compiler/share/classes/com/sun/tools/sjavac/Source.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -72,7 +72,7 @@ public class Source implements Comparable<Source> {
 
     @Override
     public boolean equals(Object o) {
-        return (o instanceof Source) && name.equals(((Source)o).name);
+        return (o instanceof Source source) && name.equals(source.name);
     }
 
     @Override

src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/JavaFileObjectWithLocation.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -60,9 +60,8 @@ public int hashCode() {
 
     @Override
     public boolean equals(Object obj) {
-        if (!(obj instanceof JavaFileObjectWithLocation))
-            return false;
-        JavaFileObjectWithLocation<?> other = (JavaFileObjectWithLocation<?>) obj;
-        return loc.equals(other.loc) && fileObject.equals(other.fileObject);
+        return (obj instanceof JavaFileObjectWithLocation<?> javaFileObjectWithLocation)
+                && loc.equals(javaFileObjectWithLocation.loc)
+                && fileObject.equals(javaFileObjectWithLocation.fileObject);
     }
 }

src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/PathAndPackageVerifier.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -138,8 +138,8 @@ public boolean hasNext() {
         @Override
         public String next() {
             Name name;
-            if (next instanceof JCIdent) {
-                name = ((JCIdent) next).name;
+            if (next instanceof JCIdent identNext) {
+                name = identNext.name;
                 next = null;
             } else {
                 JCFieldAccess fa = (JCFieldAccess) next;

src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/SjavacImpl.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -122,9 +122,9 @@ public Result compile(String[] args) {
 
             // Clean up
             JavaFileManager fileManager = context.get(JavaFileManager.class);
-            if (fileManager instanceof JavacFileManager) {
+            if (fileManager instanceof JavacFileManager javacFileManager) {
                 try {
-                    ((JavacFileManager) fileManager).close();
+                    javacFileManager.close();
                 } catch (IOException es) {
                     throw new UncheckedIOException(es);
                 }

src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/SmartFileManager.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -82,9 +82,9 @@ public void cleanArtifacts() {
      * Set whether or not to use ct.sym as an alternate to rt.jar.
      */
     public void setSymbolFileEnabled(boolean b) {
-        if (!(fileManager instanceof JavacFileManager))
+        if (!(fileManager instanceof JavacFileManager javacFileManager))
             throw new IllegalStateException();
-        ((JavacFileManager) fileManager).setSymbolFileEnabled(b);
+        javacFileManager.setSymbolFileEnabled(b);
     }
 
     @DefinedBy(Api.COMPILER)
@@ -175,12 +175,9 @@ public FileObject getFileForInput(Location location,
     }
 
     private boolean isModuleInfo(FileObject fo) {
-        if (fo instanceof JavaFileObject) {
-            JavaFileObject jfo = (JavaFileObject) fo;
-            return jfo.isNameCompatible("module-info", Kind.SOURCE)
-                || jfo.isNameCompatible("module-info", Kind.CLASS);
-        }
-        return false;
+        return (fo instanceof JavaFileObject javaFileObject)
+                && (javaFileObject.isNameCompatible("module-info", Kind.SOURCE)
+                    || javaFileObject.isNameCompatible("module-info", Kind.CLASS));
     }
 
     @Override @DefinedBy(Api.COMPILER)
@@ -243,8 +240,8 @@ public static JavaFileObject locWrap(JavaFileObject jfo, Location loc) {
     }
 
     private static FileObject locWrap(FileObject fo, Location loc) {
-        if (fo instanceof JavaFileObject)
-            return locWrap((JavaFileObject) fo, loc);
+        if (fo instanceof JavaFileObject javaFileObject)
+            return locWrap(javaFileObject, loc);
         return fo == null ? null : new FileObjectWithLocation<>(fo, loc);
     }
 
@@ -263,16 +260,16 @@ private static ListBuffer<JavaFileObject> locWrapMany(Iterable<JavaFileObject> j
     }
 
     private static FileObject locUnwrap(FileObject fo) {
-        if (fo instanceof FileObjectWithLocation<?>)
-            return ((FileObjectWithLocation<?>) fo).getDelegate();
-        if (fo instanceof JavaFileObjectWithLocation<?>)
-            return ((JavaFileObjectWithLocation<?>) fo).getDelegate();
+        if (fo instanceof FileObjectWithLocation<?> fileObjectWithLocation)
+            return fileObjectWithLocation.getDelegate();
+        if (fo instanceof JavaFileObjectWithLocation<?> javaFileObjectWithLocation)
+            return javaFileObjectWithLocation.getDelegate();
         return fo;
     }
 
     private static JavaFileObject locUnwrap(JavaFileObject fo) {
-        if (fo instanceof JavaFileObjectWithLocation<?>)
-            return ((JavaFileObjectWithLocation<?>) fo).getDelegate();
+        if (fo instanceof JavaFileObjectWithLocation<?> javaFileObjectWithLocation)
+            return javaFileObjectWithLocation.getDelegate();
         return fo;
     }
 }

src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/dependencies/NewDependencyCollector.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -111,8 +111,8 @@ private void collectPubApisOfDependencies(Context context,
 
     private Location getLocationOf(ClassSymbol cs) {
         JavaFileObject jfo = cs.outermostClass().classfile;
-        if (jfo instanceof JavaFileObjectWithLocation) {
-            return ((JavaFileObjectWithLocation<?>) jfo).getLocation();
+        if (jfo instanceof JavaFileObjectWithLocation<?> javaFileObjectWithLocation) {
+            return javaFileObjectWithLocation.getLocation();
         }
 
         // jfo is most likely on PLATFORM_CLASS_PATH.
@@ -177,14 +177,13 @@ public boolean isSymbolRelevant(boolean cp, ClassSymbol cs) {
     }
 
     private Set<ClassSymbol> allSupertypes(TypeSymbol t) {
-        if (t == null || !(t instanceof ClassSymbol)) {
+        if (t == null || !(t instanceof ClassSymbol classSymbol)) {
             return Collections.emptySet();
         }
         Set<ClassSymbol> result = new HashSet<>();
-        ClassSymbol cs = (ClassSymbol) t;
-        result.add(cs);
-        result.addAll(allSupertypes(cs.getSuperclass().tsym));
-        for (Type it : cs.getInterfaces()) {
+        result.add(classSymbol);
+        result.addAll(allSupertypes(classSymbol.getSuperclass().tsym));
+        for (Type it : classSymbol.getInterfaces()) {
             result.addAll(allSupertypes(it.tsym));
         }
         return result;

src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/dependencies/PublicApiCollector.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -90,8 +90,8 @@ public void finished(TaskEvent e) {
 
     private void collectClassSymbols(JCCompilationUnit cu) {
         for (Tree t : cu.getTypeDecls()) {
-            if (t instanceof JCClassDecl)  // Can also be a JCSkip
-                classSymbols.add(((JCClassDecl) t).sym);
+            if (t instanceof JCClassDecl classDecl)  // Can also be a JCSkip
+                classSymbols.add(classDecl.sym);
         }
     }