8235139: Updated @deprecated text for setSocketFactory methods in Soc…

…ket and ServerSocket
openjdk · Feb 4, 2021 · e36f91d · e36f91d
1 parent aca32fc
commit e36f91d
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 5 deletions.
diff --git a/src/java.base/share/classes/java/net/ServerSocket.java b/src/java.base/share/classes/java/net/ServerSocket.java
@@ -924,8 +924,15 @@ public String toString() {
      *             {@code checkSetFactory} method doesn't allow the operation.
      * @see        java.net.SocketImplFactory#createSocketImpl()
      * @see        SecurityManager#checkSetFactory
-     * @deprecated Use a {@link javax.net.ServerSocketFactory} and subclass
-     *             {@code ServerSocket} directly.
+     * @deprecated Use {@link ServerSocketChannel}, or subclass {@code ServerSocket}
+     *    directly.
+     *    <br> This method provided a way in early JDK releases to replace the
+     *    system wide implementation of {@code ServerSocket}. It has been mostly
+     *    obsolete since Java 1.4. If required, a {@code ServerSocket} can be
+     *    created to use a custom implementation by extending {@code ServerSocket}
+     *    and using the {@linkplain #ServerSocket(SocketImpl) protected
+     *    constructor} that takes an {@linkplain SocketImpl implementation}
+     *    as a parameter.
      */
     @Deprecated(since = "17")
     public static synchronized void setSocketFactory(SocketImplFactory fac) throws IOException {

diff --git a/src/java.base/share/classes/java/net/Socket.java b/src/java.base/share/classes/java/net/Socket.java
@@ -541,8 +541,8 @@ void setImpl(SocketImpl si) {
      * Sets impl to the system-default type of SocketImpl.
      * @since 1.4
      */
-    @SuppressWarnings("deprecation")
     void setImpl() {
+        @SuppressWarnings("deprecation")
         SocketImplFactory factory = Socket.factory;
         if (factory != null) {
             impl = factory.createSocketImpl();
@@ -1751,8 +1751,15 @@ static SocketImplFactory socketImplFactory() {
      *             {@code checkSetFactory} method doesn't allow the operation.
      * @see        java.net.SocketImplFactory#createSocketImpl()
      * @see        SecurityManager#checkSetFactory
-     * @deprecated Use a {@link javax.net.SocketFactory} and subclass
-     *             {@code Socket} directly.
+     * @deprecated Use {@link SocketChannel}, or subclass {@code Socket}
+     *    directly.
+     *    <br> This method provided a way in early JDK releases to replace the
+     *    system wide implementation of {@code Socket}. It has been mostly
+     *    obsolete since Java 1.4. If required, a {@code Socket} can be
+     *    created to use a custom implementation by extending {@code Socket}
+     *    and using the {@linkplain #Socket(SocketImpl) protected
+     *    constructor} that takes an {@linkplain SocketImpl implementation}
+     *    as a parameter.
      */
     @Deprecated(since = "17")
     public static synchronized void setSocketImplFactory(SocketImplFactory fac)