From d63569d0250ea60ac9fc75955d24afffed0e166a Mon Sep 17 00:00:00 2001
From: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Date: Wed, 15 Jun 2022 13:01:48 -0500
Subject: [PATCH] Migrate code from jetty-util Logger to slf4j Logger (#8162)

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
---
 .../java/org/eclipse/jetty/http/pathmap/RegexPathSpec.java  | 6 +++---
 .../eclipse/jetty/server/MultiPartInputStreamParser.java    | 6 +++---
 .../eclipse/jetty/websocket/tests/proxy/WebSocketProxy.java | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/jetty-http/src/main/java/org/eclipse/jetty/http/pathmap/RegexPathSpec.java b/jetty-http/src/main/java/org/eclipse/jetty/http/pathmap/RegexPathSpec.java
index 5fe2db237c9e..b65601d738c2 100644
--- a/jetty-http/src/main/java/org/eclipse/jetty/http/pathmap/RegexPathSpec.java
+++ b/jetty-http/src/main/java/org/eclipse/jetty/http/pathmap/RegexPathSpec.java
@@ -18,12 +18,12 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.eclipse.jetty.util.log.Log;
-import org.eclipse.jetty.util.log.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class RegexPathSpec extends AbstractPathSpec
 {
-    private static final Logger LOG = Log.getLogger(UriTemplatePathSpec.class);
+    private static final Logger LOG = LoggerFactory.getLogger(UriTemplatePathSpec.class);
 
     private static final Map<Character, String> FORBIDDEN_ESCAPED = new HashMap<>();
 
diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/MultiPartInputStreamParser.java b/jetty-server/src/main/java/org/eclipse/jetty/server/MultiPartInputStreamParser.java
index a5331f0bc727..acbd940ce2c0 100644
--- a/jetty-server/src/main/java/org/eclipse/jetty/server/MultiPartInputStreamParser.java
+++ b/jetty-server/src/main/java/org/eclipse/jetty/server/MultiPartInputStreamParser.java
@@ -48,8 +48,8 @@
 import org.eclipse.jetty.util.QuotedStringTokenizer;
 import org.eclipse.jetty.util.ReadLineInputStream;
 import org.eclipse.jetty.util.ReadLineInputStream.Termination;
-import org.eclipse.jetty.util.log.Log;
-import org.eclipse.jetty.util.log.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * MultiPartInputStream
@@ -65,7 +65,7 @@
 @Deprecated
 public class MultiPartInputStreamParser
 {
-    private static final Logger LOG = Log.getLogger(MultiPartInputStreamParser.class);
+    private static final Logger LOG = LoggerFactory.getLogger(MultiPartInputStreamParser.class);
     public static final MultipartConfigElement __DEFAULT_MULTIPART_CONFIG = new MultipartConfigElement(System.getProperty("java.io.tmpdir"));
     public static final MultiMap<Part> EMPTY_MAP = new MultiMap(Collections.emptyMap());
     protected InputStream _in;
diff --git a/jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/proxy/WebSocketProxy.java b/jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/proxy/WebSocketProxy.java
index a1054e2922dc..15ef00ef3a0c 100644
--- a/jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/proxy/WebSocketProxy.java
+++ b/jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/proxy/WebSocketProxy.java
@@ -21,8 +21,6 @@
 
 import org.eclipse.jetty.util.BufferUtil;
 import org.eclipse.jetty.util.StringUtil;
-import org.eclipse.jetty.util.log.Log;
-import org.eclipse.jetty.util.log.Logger;
 import org.eclipse.jetty.websocket.api.Session;
 import org.eclipse.jetty.websocket.api.StatusCode;
 import org.eclipse.jetty.websocket.api.WebSocketConnectionListener;
@@ -31,10 +29,12 @@
 import org.eclipse.jetty.websocket.api.exceptions.WebSocketException;
 import org.eclipse.jetty.websocket.client.ClientUpgradeRequest;
 import org.eclipse.jetty.websocket.client.WebSocketClient;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class WebSocketProxy
 {
-    private static final Logger LOG = Log.getLogger(WebSocketProxy.class);
+    private static final Logger LOG = LoggerFactory.getLogger(WebSocketProxy.class);
 
     private final WebSocketClient client;
     private final URI serverUri;