Repository: logging-log4j-tools Updated Branches: refs/heads/master 88fe407f0 -> 2c6fc5a73
[LOG4J2-2493] Remove deprecated code. Still a bit more to do. Project: http://git-wip-us.apache.org/repos/asf/logging-log4j-tools/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j-tools/commit/2c6fc5a7 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j-tools/tree/2c6fc5a7 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j-tools/diff/2c6fc5a7 Branch: refs/heads/master Commit: 2c6fc5a733799897ed6833265dbef7cda3a98c54 Parents: 88fe407 Author: Gary Gregory <[email protected]> Authored: Mon Oct 29 17:45:20 2018 -0600 Committer: Gary Gregory <[email protected]> Committed: Mon Oct 29 17:45:20 2018 -0600 ---------------------------------------------------------------------- .../logging/log4j/server/TcpSocketServer.java | 61 -------------------- .../logging/log4j/server/UdpSocketServer.java | 30 ---------- 2 files changed, 91 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j-tools/blob/2c6fc5a7/log4j-server/src/main/java/org/apache/logging/log4j/server/TcpSocketServer.java ---------------------------------------------------------------------- diff --git a/log4j-server/src/main/java/org/apache/logging/log4j/server/TcpSocketServer.java b/log4j-server/src/main/java/org/apache/logging/log4j/server/TcpSocketServer.java index 71e89e1..c3f5ae7 100644 --- a/log4j-server/src/main/java/org/apache/logging/log4j/server/TcpSocketServer.java +++ b/log4j-server/src/main/java/org/apache/logging/log4j/server/TcpSocketServer.java @@ -153,67 +153,6 @@ public class TcpSocketServer<T extends InputStream> extends AbstractSocketServer } /** - * Creates a socket server that reads serialized log events. - * - * @param port - * The port number, or 0 to automatically allocate a port number. - * @return a new a socket server - * @throws IOException - * if an I/O error occurs when opening the socket. - */ - @Deprecated - public static TcpSocketServer<ObjectInputStream> createSerializedSocketServer(final int port) throws IOException { - LOGGER.entry(port); - final TcpSocketServer<ObjectInputStream> socketServer = new TcpSocketServer<>(port, new ObjectInputStreamLogEventBridge()); - return LOGGER.exit(socketServer); - } - - /** - * Creates a socket server that reads serialized log events. - * - * @param port - * The port number, or 0 to automatically allocate a port number. - * @param backlog - * The server socket backlog. - * @param localBindAddress - * The local InetAddress the server will bind to - * @return a new a socket server - * @throws IOException - * if an I/O error occurs when opening the socket. - * @since 2.7 - */ - @Deprecated - public static TcpSocketServer<ObjectInputStream> createSerializedSocketServer(final int port, final int backlog, - final InetAddress localBindAddress) throws IOException { - return createSerializedSocketServer(port, backlog, localBindAddress, Collections.<String>emptyList()); - } - - /** - * Creates a socket server that reads serialized log events. - * - * @param port - * The port number, or 0 to automatically allocate a port number. - * @param backlog - * The server socket backlog. - * @param localBindAddress - * The local InetAddress the server will bind to - * @param allowedClasses additional class names to allow for deserialization - * @return a new a socket server - * @throws IOException - * if an I/O error occurs when opening the socket. - * @since 2.8.2 - */ - @Deprecated - public static TcpSocketServer<ObjectInputStream> createSerializedSocketServer( - final int port, final int backlog, final InetAddress localBindAddress, final List<String> allowedClasses - ) throws IOException { - LOGGER.entry(port); - final TcpSocketServer<ObjectInputStream> socketServer = new TcpSocketServer<>(port, backlog, localBindAddress, - new ObjectInputStreamLogEventBridge(allowedClasses)); - return LOGGER.exit(socketServer); - } - - /** * Creates a socket server that reads XML log events. * * @param port http://git-wip-us.apache.org/repos/asf/logging-log4j-tools/blob/2c6fc5a7/log4j-server/src/main/java/org/apache/logging/log4j/server/UdpSocketServer.java ---------------------------------------------------------------------- diff --git a/log4j-server/src/main/java/org/apache/logging/log4j/server/UdpSocketServer.java b/log4j-server/src/main/java/org/apache/logging/log4j/server/UdpSocketServer.java index 17a7cdd..6148ad8 100644 --- a/log4j-server/src/main/java/org/apache/logging/log4j/server/UdpSocketServer.java +++ b/log4j-server/src/main/java/org/apache/logging/log4j/server/UdpSocketServer.java @@ -53,36 +53,6 @@ public class UdpSocketServer<T extends InputStream> extends AbstractSocketServer } /** - * Creates a socket server that reads serialized log events. - * - * @param port - * the port to listen - * @return a new a socket server - * @throws IOException - * if an I/O error occurs when opening the socket. - */ - @Deprecated - public static UdpSocketServer<ObjectInputStream> createSerializedSocketServer(final int port) throws IOException { - return new UdpSocketServer<>(port, new ObjectInputStreamLogEventBridge()); - } - - /** - * Creates a socket server that reads serialized log events. - * - * @param port the port to listen - * @param allowedClasses additional classes to allow for deserialization - * @return a new a socket server - * @throws IOException if an I/O error occurs when opening the socket. - * @since 2.8.2 - */ - @Deprecated - public static UdpSocketServer<ObjectInputStream> createSerializedSocketServer(final int port, - final List<String> allowedClasses) - throws IOException { - return new UdpSocketServer<>(port, new ObjectInputStreamLogEventBridge(allowedClasses)); - } - - /** * Creates a socket server that reads XML log events. * * @param port
