Issue #7109 - Deprecate UnixSocket JNR support.

Deprecated for removal classes and JPMS modules. Signed-off-by: Simone Bordet <[email protected]>
jetty · Nov 12, 2021 · d90922c · d90922c
1 parent 6aedf4a
commit d90922c
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 1 deletion.
diff --git a/jetty-unixsocket/jetty-unixsocket-client/src/main/java/module-info.java b/jetty-unixsocket/jetty-unixsocket-client/src/main/java/module-info.java
@@ -11,6 +11,7 @@
 // ========================================================================
 //
 
+@Deprecated(forRemoval = true)
 module org.eclipse.jetty.unixsocket.client
 {
     requires org.eclipse.jetty.unixsocket.common;

diff --git a/...src/main/java/org/eclipse/jetty/unixsocket/client/HttpClientTransportOverUnixSockets.java b/...src/main/java/org/eclipse/jetty/unixsocket/client/HttpClientTransportOverUnixSockets.java
@@ -22,6 +22,7 @@
 import java.nio.channels.SelectionKey;
 import java.nio.channels.Selector;
 import java.nio.channels.SocketChannel;
+import java.nio.file.Path;
 import java.util.Map;
 import java.util.concurrent.Executor;
 
@@ -32,6 +33,7 @@
 import org.eclipse.jetty.client.DuplexConnectionPool;
 import org.eclipse.jetty.client.DuplexHttpDestination;
 import org.eclipse.jetty.client.HttpClient;
+import org.eclipse.jetty.client.HttpClientTransport;
 import org.eclipse.jetty.client.HttpDestination;
 import org.eclipse.jetty.client.HttpRequest;
 import org.eclipse.jetty.client.Origin;
@@ -47,7 +49,10 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-// TODO: this class needs a thorough review.
+/**
+ * @deprecated use any {@link HttpClientTransport} with {@link ClientConnector#forUnixDomain(Path)} instead (requires Java 16 or later)
+ */
+@Deprecated(forRemoval = true)
 public class HttpClientTransportOverUnixSockets extends AbstractConnectorHttpClientTransport
 {
     private static final Logger LOG = LoggerFactory.getLogger(HttpClientTransportOverUnixSockets.class);

diff --git a/jetty-unixsocket/jetty-unixsocket-common/src/main/java/module-info.java b/jetty-unixsocket/jetty-unixsocket-common/src/main/java/module-info.java
@@ -11,6 +11,7 @@
 // ========================================================================
 //
 
+@Deprecated(forRemoval = true)
 module org.eclipse.jetty.unixsocket.common
 {
     requires org.slf4j;

diff --git a/...ixsocket-common/src/main/java/org/eclipse/jetty/unixsocket/common/UnixSocketEndPoint.java b/...ixsocket-common/src/main/java/org/eclipse/jetty/unixsocket/common/UnixSocketEndPoint.java
@@ -23,6 +23,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+@Deprecated(forRemoval = true)
 public class UnixSocketEndPoint extends SocketChannelEndPoint
 {
     private static final Logger LOG = LoggerFactory.getLogger(UnixSocketEndPoint.class);

diff --git a/jetty-unixsocket/jetty-unixsocket-server/src/main/java/module-info.java b/jetty-unixsocket/jetty-unixsocket-server/src/main/java/module-info.java
@@ -11,6 +11,7 @@
 // ========================================================================
 //
 
+@Deprecated(forRemoval = true)
 module org.eclipse.jetty.unixsocket.server
 {
     requires org.slf4j;

diff --git a/...xsocket-server/src/main/java/org/eclipse/jetty/unixsocket/server/UnixSocketConnector.java b/...xsocket-server/src/main/java/org/eclipse/jetty/unixsocket/server/UnixSocketConnector.java
@@ -50,7 +50,10 @@
 
 /**
  * <p>A server-side connector for UNIX sockets.</p>
+ *
+ * @deprecated Use UnixDomainServerConnector from the jetty-unixdomain-server module instead (requires Java 16 or later).
  */
+@Deprecated(forRemoval = true)
 @ManagedObject("Connector using UNIX Socket")
 public class UnixSocketConnector extends AbstractConnector
 {