8263233: Update java.net and java.nio to use instanceof pattern variable

Reviewed-by: dfuchs, bpb, chegar, michaelm

Author: pconcannon

src/java.base/share/classes/java/net/HttpConnectSocketImpl.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 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
@@ -80,10 +80,9 @@ public Void run() {
         super(delegate);
         this.socket = socket;
         SocketAddress a = proxy.address();
-        if ( !(a instanceof InetSocketAddress) )
+        if ( !(a instanceof InetSocketAddress ad) )
             throw new IllegalArgumentException("Unsupported address type");
 
-        InetSocketAddress ad = (InetSocketAddress) a;
         server = ad.getHostString();
         port = ad.getPort();
     }

src/java.base/share/classes/java/net/HttpCookie.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 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
@@ -715,9 +715,8 @@ public String toString() {
     public boolean equals(Object obj) {
         if (obj == this)
             return true;
-        if (!(obj instanceof HttpCookie))
+        if (!(obj instanceof HttpCookie other))
             return false;
-        HttpCookie other = (HttpCookie)obj;
 
         // One http cookie is equal to another cookie (RFC 2965 sec. 3.3.3) if:
         //   1. they come from same domain (case-insensitive),

src/java.base/share/classes/java/net/Inet6Address.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 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
@@ -262,10 +262,9 @@ String getHostAddress() {
         }
 
         public boolean equals(Object o) {
-            if (! (o instanceof Inet6AddressHolder)) {
+            if (!(o instanceof Inet6AddressHolder that)) {
                 return false;
             }
-            Inet6AddressHolder that = (Inet6AddressHolder)o;
 
             return Arrays.equals(this.ipaddress, that.ipaddress);
         }
@@ -525,10 +524,9 @@ private static int deriveNumericScope (byte[] thisAddr, NetworkInterface ifc) th
         Enumeration<InetAddress> addresses = ifc.getInetAddresses();
         while (addresses.hasMoreElements()) {
             InetAddress addr = addresses.nextElement();
-            if (!(addr instanceof Inet6Address)) {
+            if (!(addr instanceof Inet6Address ia6_addr)) {
                 continue;
             }
-            Inet6Address ia6_addr = (Inet6Address)addr;
             /* check if site or link local prefixes match */
             if (!isDifferentLocalAddressType(thisAddr, ia6_addr.getAddress())){
                 /* type not the same, so carry on searching */

src/java.base/share/classes/java/net/InterfaceAddress.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 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
@@ -101,17 +101,10 @@ public short getNetworkPrefixLength() {
      * @see     java.net.InterfaceAddress#hashCode()
      */
     public boolean equals(Object obj) {
-        if (obj instanceof InterfaceAddress) {
-            InterfaceAddress cmp = (InterfaceAddress) obj;
-
-            if (Objects.equals(address, cmp.address) &&
+        return obj instanceof InterfaceAddress cmp &&
+                Objects.equals(address, cmp.address) &&
                 Objects.equals(broadcast, cmp.broadcast) &&
-                maskLength == cmp.maskLength)
-            {
-                return true;
-            }
-        }
-        return false;
+                maskLength == cmp.maskLength;
     }
 
     /**

src/java.base/share/classes/java/net/NetMulticastSocket.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 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
@@ -216,9 +216,8 @@ public synchronized void bind(SocketAddress addr) throws SocketException {
             throw new SocketException("already bound");
         if (addr == null)
             addr = new InetSocketAddress(0);
-        if (!(addr instanceof InetSocketAddress))
+        if (!(addr instanceof InetSocketAddress epoint))
             throw new IllegalArgumentException("Unsupported address type!");
-        InetSocketAddress epoint = (InetSocketAddress) addr;
         if (epoint.isUnresolved())
             throw new SocketException("Unresolved address");
         InetAddress iaddr = epoint.getAddress();
@@ -259,9 +258,8 @@ public void connect(InetAddress address, int port) {
     public void connect(SocketAddress addr) throws SocketException {
         if (addr == null)
             throw new IllegalArgumentException("Address can't be null");
-        if (!(addr instanceof InetSocketAddress))
+        if (!(addr instanceof InetSocketAddress epoint))
             throw new IllegalArgumentException("Unsupported address type");
-        InetSocketAddress epoint = (InetSocketAddress) addr;
         if (epoint.isUnresolved())
             throw new SocketException("Unresolved address");
         connectInternal(epoint.getAddress(), epoint.getPort());

src/java.base/share/classes/java/net/NetworkInterface.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 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
@@ -590,10 +590,9 @@ public boolean isVirtual() {
      * @see     java.net.InetAddress#getAddress()
      */
     public boolean equals(Object obj) {
-        if (!(obj instanceof NetworkInterface)) {
+        if (!(obj instanceof NetworkInterface that)) {
             return false;
         }
-        NetworkInterface that = (NetworkInterface)obj;
         if (this.name != null ) {
             if (!this.name.equals(that.name)) {
                 return false;

src/java.base/share/classes/java/net/ServerSocket.java

@@ -373,9 +373,8 @@ public void bind(SocketAddress endpoint, int backlog) throws IOException {
             throw new SocketException("Already bound");
         if (endpoint == null)
             endpoint = new InetSocketAddress(0);
-        if (!(endpoint instanceof InetSocketAddress))
+        if (!(endpoint instanceof InetSocketAddress epoint))
             throw new IllegalArgumentException("Unsupported address type");
-        InetSocketAddress epoint = (InetSocketAddress) endpoint;
         if (epoint.isUnresolved())
             throw new SocketException("Unresolved address");
         if (backlog < 1)

src/java.base/share/classes/java/net/Socket.java

@@ -611,10 +611,9 @@ public void connect(SocketAddress endpoint, int timeout) throws IOException {
         if (isConnected())
             throw new SocketException("already connected");
 
-        if (!(endpoint instanceof InetSocketAddress))
+        if (!(endpoint instanceof InetSocketAddress epoint))
             throw new IllegalArgumentException("Unsupported address type");
 
-        InetSocketAddress epoint = (InetSocketAddress) endpoint;
         InetAddress addr = epoint.getAddress ();
         int port = epoint.getPort();
         checkAddress(addr, "connect");

src/java.base/share/classes/java/net/SocketPermission.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2019, 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
@@ -860,14 +860,12 @@ void getIP()
     public boolean implies(Permission p) {
         int i,j;
 
-        if (!(p instanceof SocketPermission))
+        if (!(p instanceof SocketPermission that))
             return false;
 
         if (p == this)
             return true;
 
-        SocketPermission that = (SocketPermission) p;
-
         return ((this.mask & that.mask) == that.mask) &&
                                         impliesIgnoreMask(that);
     }
@@ -1040,11 +1038,9 @@ public boolean equals(Object obj) {
         if (obj == this)
             return true;
 
-        if (! (obj instanceof SocketPermission))
+        if (! (obj instanceof SocketPermission that))
             return false;
 
-        SocketPermission that = (SocketPermission) obj;
-
         //this is (overly?) complex!!!
 
         // check the mask first
@@ -1379,15 +1375,13 @@ public SocketPermissionCollection() {
      */
     @Override
     public void add(Permission permission) {
-        if (! (permission instanceof SocketPermission))
+        if (! (permission instanceof SocketPermission sp))
             throw new IllegalArgumentException("invalid permission: "+
                                                permission);
         if (isReadOnly())
             throw new SecurityException(
                 "attempt to add a Permission to a readonly PermissionCollection");
 
-        SocketPermission sp = (SocketPermission)permission;
-
         // Add permission to map if it is absent, or replace with new
         // permission if applicable. NOTE: cannot use lambda for
         // remappingFunction parameter until JDK-8076596 is fixed.
@@ -1426,11 +1420,9 @@ public SocketPermission apply(SocketPermission existingVal,
     @Override
     public boolean implies(Permission permission)
     {
-        if (! (permission instanceof SocketPermission))
+        if (! (permission instanceof SocketPermission np))
                 return false;
 
-        SocketPermission np = (SocketPermission) permission;
-
         int desired = np.getMask();
         int effective = 0;
         int needed = desired;

src/java.base/share/classes/java/net/SocksSocketImpl.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 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
@@ -57,8 +57,7 @@ class SocksSocketImpl extends DelegatingSocketImpl implements SocksConsts {
     SocksSocketImpl(Proxy proxy, SocketImpl delegate) {
         super(delegate);
         SocketAddress a = proxy.address();
-        if (a instanceof InetSocketAddress) {
-            InetSocketAddress ad = (InetSocketAddress) a;
+        if (a instanceof InetSocketAddress ad) {
             // Use getHostString() to avoid reverse lookups
             server = ad.getHostString();
             serverPort = ad.getPort();