# HG changeset patch
# User chegar
# Date 1548782743 0
# Node ID 64301e5a0da8f38d6ecf4c7e75801f3c7fdaf9fb
# Parent  7f1b415bfede84cdd5d8638572261942737f6d97
rsocket-branch: cleanup in selector provider and friends

diff -r 7f1b415bfede -r 64301e5a0da8 src/jdk.net/linux/classes/jdk/internal/net/rdma/RdmaPollSelectorProvider.java
--- a/src/jdk.net/linux/classes/jdk/internal/net/rdma/RdmaPollSelectorProvider.java	Mon Jan 28 14:50:53 2019 +0000
+++ b/src/jdk.net/linux/classes/jdk/internal/net/rdma/RdmaPollSelectorProvider.java	Tue Jan 29 17:25:43 2019 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, 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
@@ -33,7 +33,6 @@
 import java.nio.channels.SocketChannel;
 import java.nio.channels.spi.AbstractSelector;
 import java.nio.channels.spi.SelectorProvider;
-import sun.nio.ch.SelectorProviderImpl;
 import java.security.AccessController;
 import java.security.PrivilegedAction;
 
@@ -41,15 +40,15 @@
     extends SelectorProvider
 {
     private static final Object lock = new Object();
-    private static SelectorProvider provider = null;
+    private static RdmaPollSelectorProvider provider;
 
-    public static SelectorProvider provider() {
+    public static RdmaPollSelectorProvider provider() {
         synchronized (lock) {
             if (provider != null)
                 return provider;
             return AccessController.doPrivileged(
                 new PrivilegedAction<>() {
-                    public SelectorProvider run() {
+                    public RdmaPollSelectorProvider run() {
                             provider = new RdmaPollSelectorProvider();
                             return provider;
                         }
@@ -57,41 +56,45 @@
         }
     }
 
+    @Override
     public AbstractSelector openSelector() throws IOException {
         return new RdmaPollSelectorImpl(this);
     }
 
-    public SocketChannel openSocketChannel()
-            throws IOException {
+    @Override
+    public SocketChannel openSocketChannel() {
         throw new UnsupportedOperationException();
     }
 
     public SocketChannel openSocketChannel(ProtocolFamily family)
-            throws IOException {
+        throws IOException
+    {
         return new RdmaSocketChannelImpl(this, family);
     }
 
-    public ServerSocketChannel openServerSocketChannel()
-            throws IOException {
+    @Override
+    public ServerSocketChannel openServerSocketChannel() {
         throw new UnsupportedOperationException();
     }
 
     public ServerSocketChannel openServerSocketChannel(ProtocolFamily family)
-            throws IOException {
+        throws IOException
+    {
         return new RdmaServerSocketChannelImpl(this, family);
     }
 
-    public DatagramChannel openDatagramChannel()
-            throws IOException {
+    @Override
+    public DatagramChannel openDatagramChannel() {
         throw new UnsupportedOperationException();
     }
 
-    public DatagramChannel openDatagramChannel(ProtocolFamily family)
-            throws IOException {
+    @Override
+    public DatagramChannel openDatagramChannel(ProtocolFamily family) {
         throw new UnsupportedOperationException();
     }
 
-    public Pipe openPipe() throws IOException {
+    @Override
+    public Pipe openPipe() {
         throw new UnsupportedOperationException();
     }
 }
diff -r 7f1b415bfede -r 64301e5a0da8 src/jdk.net/share/classes/jdk/internal/net/rdma/RdmaPollSelectorProvider.java
--- a/src/jdk.net/share/classes/jdk/internal/net/rdma/RdmaPollSelectorProvider.java	Mon Jan 28 14:50:53 2019 +0000
+++ b/src/jdk.net/share/classes/jdk/internal/net/rdma/RdmaPollSelectorProvider.java	Tue Jan 29 17:25:43 2019 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, 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
@@ -25,7 +25,6 @@
 
 package jdk.internal.net.rdma;
 
-import java.io.IOException;
 import java.net.ProtocolFamily;
 import java.nio.channels.DatagramChannel;
 import java.nio.channels.Pipe;
@@ -33,50 +32,49 @@
 import java.nio.channels.SocketChannel;
 import java.nio.channels.spi.AbstractSelector;
 import java.nio.channels.spi.SelectorProvider;
-import sun.nio.ch.SelectorProviderImpl;
 
 public class RdmaPollSelectorProvider
     extends SelectorProvider
 {
-    public static SelectorProvider provider() {
-        throw new UnsupportedOperationException();
-    }
-
-    public AbstractSelector openSelector() throws IOException {
+    public static RdmaPollSelectorProvider provider() {
         throw new UnsupportedOperationException();
     }
 
-    public SocketChannel openSocketChannel()
-            throws IOException {
+    @Override
+    public AbstractSelector openSelector() {
         throw new UnsupportedOperationException();
     }
 
-    public SocketChannel openSocketChannel(ProtocolFamily family)
-            throws IOException {
+    @Override
+    public SocketChannel openSocketChannel() {
+        throw new UnsupportedOperationException();
+    }
+
+    public SocketChannel openSocketChannel(ProtocolFamily family) {
         throw new UnsupportedOperationException();
     }
 
-    public ServerSocketChannel openServerSocketChannel()
-            throws IOException {
+    @Override
+    public ServerSocketChannel openServerSocketChannel() {
         throw new UnsupportedOperationException();
     }
 
-    public ServerSocketChannel openServerSocketChannel(ProtocolFamily family)
-            throws IOException {
+    public ServerSocketChannel openServerSocketChannel(ProtocolFamily family) {
         throw new UnsupportedOperationException();
     }
 
-    public DatagramChannel openDatagramChannel()
-            throws IOException {
+    @Override
+    public DatagramChannel openDatagramChannel() {
         throw new UnsupportedOperationException();
     }
 
-    public DatagramChannel openDatagramChannel(ProtocolFamily family)
-            throws IOException {
+    @Override
+    public DatagramChannel openDatagramChannel(ProtocolFamily family) {
         throw new UnsupportedOperationException();
     }
 
-    public Pipe openPipe() throws IOException {
+    @Override
+    public Pipe openPipe() {
         throw new UnsupportedOperationException();
     }
 }
diff -r 7f1b415bfede -r 64301e5a0da8 src/jdk.net/share/classes/jdk/net/RdmaSockets.java
--- a/src/jdk.net/share/classes/jdk/net/RdmaSockets.java	Mon Jan 28 14:50:53 2019 +0000
+++ b/src/jdk.net/share/classes/jdk/net/RdmaSockets.java	Tue Jan 29 17:25:43 2019 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, 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
@@ -28,13 +28,9 @@
 import java.net.ProtocolFamily;
 import java.net.ServerSocket;
 import java.net.Socket;
-import java.net.SocketException;
-import java.net.SocketOption;
-import java.net.StandardSocketOptions;
 import java.nio.channels.Selector;
 import java.nio.channels.ServerSocketChannel;
 import java.nio.channels.SocketChannel;
-import java.nio.channels.spi.SelectorProvider;
 import java.io.IOException;
 import java.util.Objects;
 import jdk.internal.net.rdma.RdmaPollSelectorProvider;
@@ -159,8 +155,7 @@
     public static SocketChannel openSocketChannel(ProtocolFamily family)
             throws IOException {
         Objects.requireNonNull(family, "protocol family is null");
-        SelectorProvider provider = RdmaPollSelectorProvider.provider();
-        return ((RdmaPollSelectorProvider)provider).openSocketChannel(family);
+        return RdmaPollSelectorProvider.provider().openSocketChannel(family);
     }
 
     /**
@@ -189,9 +184,7 @@
     public static ServerSocketChannel openServerSocketChannel(
             ProtocolFamily family) throws IOException {
         Objects.requireNonNull(family, "protocol family is null");
-        SelectorProvider provider = RdmaPollSelectorProvider.provider();
-        return ((RdmaPollSelectorProvider)provider)
-                .openServerSocketChannel(family);
+        return RdmaPollSelectorProvider.provider().openServerSocketChannel(family);
     }
 
     /**
@@ -203,7 +196,6 @@
      *         If RDMA sockets are not supported on this platform
      */
     public static Selector openSelector() throws IOException {
-        SelectorProvider provider = RdmaPollSelectorProvider.provider();
-        return provider.openSelector();
+        return RdmaPollSelectorProvider.provider().openSelector();
     }
 }