archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-26 22:34:27 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8263190: Update java.io, java.math, and java.text to use instanceof pattern variable

Browse source 
Reviewed-by: lancea, bpb, darcy, naoto, iris, dfuchs, smarks, redestad
This commit is contained in:
Patrick Concannon 2021-03-09 11:09:06 +00:00
parent 4f0a12ec87
commit 0f2402d0a2
15 changed files with 32 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/java.base/share/classes/java/io/DataInputStream.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 1994, 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1994, 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
@ -595,8 +595,7 @@ loop: while (true) {
int utflen = in.readUnsignedShort();
byte[] bytearr = null;
char[] chararr = null;
if (in instanceof DataInputStream) {
DataInputStream dis = (DataInputStream)in;
if (in instanceof DataInputStream dis) {
if (dis.bytearr.length < utflen){
dis.bytearr = new byte[utflen*2];
dis.chararr = new char[utflen*2];

5
src/java.base/share/classes/java/io/DataOutputStream.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 1994, 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1994, 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
@ -369,8 +369,7 @@ public class DataOutputStream extends FilterOutputStream implements DataOutput {
throw new UTFDataFormatException(tooLongMsg(str, utflen));
final byte[] bytearr;
if (out instanceof DataOutputStream) {
DataOutputStream dos = (DataOutputStream)out;
if (out instanceof DataOutputStream dos) {
if (dos.bytearr == null || (dos.bytearr.length < (utflen + 2)))
dos.bytearr = new byte[(utflen*2) + 2];
bytearr = dos.bytearr;

18
src/java.base/share/classes/java/io/FilePermission.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 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
@ -566,11 +566,9 @@ public final class FilePermission extends Permission implements Serializable {
*/
@Override
public boolean implies(Permission p) {
if (!(p instanceof FilePermission))
if (!(p instanceof FilePermission that))
return false;
FilePermission that = (FilePermission) p;
// we get the effective mask. i.e., the "and" of this and that.
// They must be equal to that.mask for implies to return true.
@ -791,11 +789,9 @@ public final class FilePermission extends Permission implements Serializable {
if (obj == this)
return true;
if (! (obj instanceof FilePermission))
if (! (obj instanceof FilePermission that))
return false;
FilePermission that = (FilePermission) obj;
if (this.invalid || that.invalid) {
return false;
}
@ -1150,15 +1146,13 @@ final class FilePermissionCollection extends PermissionCollection
*/
@Override
public void add(Permission permission) {
if (! (permission instanceof FilePermission))
if (! (permission instanceof FilePermission fp))
throw new IllegalArgumentException("invalid permission: "+
permission);
if (isReadOnly())
throw new SecurityException(
"attempt to add a Permission to a readonly PermissionCollection");
FilePermission fp = (FilePermission)permission;
// Add permission to map if it is absent, or replace with new
// permission if applicable.
perms.merge(fp.getName(), fp,
@ -1195,11 +1189,9 @@ final class FilePermissionCollection extends PermissionCollection
*/
@Override
public boolean implies(Permission permission) {
if (! (permission instanceof FilePermission))
if (! (permission instanceof FilePermission fperm))
return false;
FilePermission fperm = (FilePermission) permission;
int desired = fperm.getMask();
int effective = 0;
int needed = desired;

6
src/java.base/share/classes/java/io/ObjectStreamClass.java
View file

@ -2400,8 +2400,7 @@ public class ObjectStreamClass implements Serializable {
return true;
}
if (obj instanceof FieldReflectorKey) {
FieldReflectorKey other = (FieldReflectorKey) obj;
if (obj instanceof FieldReflectorKey other) {
Class<?> referent;
return (nullClass ? other.nullClass
: ((referent = get()) != null) &&
@ -2597,8 +2596,7 @@ public class ObjectStreamClass implements Serializable {
@Override
public final boolean equals(Object obj) {
if (!(obj instanceof Key)) return false;
Key other = (Key) obj;
if (!(obj instanceof Key other)) return false;
int n = length();
if (n != other.length()) return false;
for (int i = 0; i < n; i++) if (fieldType(i) != other.fieldType(i)) return false;

5
src/java.base/share/classes/java/io/PrintStream.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 1996, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1996, 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
@ -476,8 +476,7 @@ public class PrintStream extends FilterOutputStream
public boolean checkError() {
if (out != null)
flush();
if (out instanceof java.io.PrintStream) {
PrintStream ps = (PrintStream) out;
if (out instanceof PrintStream ps) {
return ps.checkError();
}
return trouble;

5
src/java.base/share/classes/java/io/PrintWriter.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 1996, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1996, 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
@ -432,8 +432,7 @@ public class PrintWriter extends Writer {
if (out != null) {
flush();
}
if (out instanceof java.io.PrintWriter) {
PrintWriter pw = (PrintWriter) out;
if (out instanceof PrintWriter pw) {
return pw.checkError();
} else if (psOut != null) {
return psOut.checkError();