This is an automated email from the ASF dual-hosted git repository.
zhangzicheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shenyu.git
The following commit(s) were added to refs/heads/master by this push:
new 23000664a [type:refactor] refactor system.out.println change to log
info (#3778)
23000664a is described below
commit 23000664a08c6332de0b4f42cb5f591dbf3fe619
Author: zhengpeng <[email protected]>
AuthorDate: Sun Jul 31 23:54:27 2022 +0800
[type:refactor] refactor system.out.println change to log info (#3778)
* [type:refactor] refactor system.out.println to log info
---
.../examples/http/controller/ShenyuClientPathController.java | 10 +++++++---
.../shenyu/examples/http/router/ShenyuTestHttpRouter.java | 11 ++++++-----
.../shenyu/examples/websocket/ws/WsServerEndpoint.java | 10 +++++-----
.../shenyu/examples/websocket/handler/HttpAuthHandler.java | 8 +++++---
.../examples/websocket/interceptor/WebSocketInterceptor.java | 12 ++++++++----
5 files changed, 31 insertions(+), 20 deletions(-)
diff --git
a/shenyu-examples/shenyu-examples-http/src/main/java/org/apache/shenyu/examples/http/controller/ShenyuClientPathController.java
b/shenyu-examples/shenyu-examples-http/src/main/java/org/apache/shenyu/examples/http/controller/ShenyuClientPathController.java
index e69da14d6..9c255abf5 100644
---
a/shenyu-examples/shenyu-examples-http/src/main/java/org/apache/shenyu/examples/http/controller/ShenyuClientPathController.java
+++
b/shenyu-examples/shenyu-examples-http/src/main/java/org/apache/shenyu/examples/http/controller/ShenyuClientPathController.java
@@ -18,6 +18,8 @@
package org.apache.shenyu.examples.http.controller;
import org.apache.shenyu.client.springmvc.annotation.ShenyuSpringMvcClient;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -27,9 +29,11 @@ import
org.springframework.web.bind.annotation.RestController;
*/
@RestController
public class ShenyuClientPathController {
-
+
+ private static final Logger LOG =
LoggerFactory.getLogger(ShenyuClientPathController.class);
+
private static final String HELLO_SUFFIX = "I'm Shenyu-Gateway System.
Welcome!";
-
+
/**
* hello.
*
@@ -49,7 +53,7 @@ public class ShenyuClientPathController {
@RequestMapping("shenyu/client/timeout")
@ShenyuSpringMvcClient("shenyu/client/timeout")
public String timeout() {
- System.out.println("timeout");
+ LOG.info("timeout");
try {
Thread.sleep(10000);
} catch (InterruptedException ignored) {
diff --git
a/shenyu-examples/shenyu-examples-http/src/main/java/org/apache/shenyu/examples/http/router/ShenyuTestHttpRouter.java
b/shenyu-examples/shenyu-examples-http/src/main/java/org/apache/shenyu/examples/http/router/ShenyuTestHttpRouter.java
index 60c8ffb22..b9607ec05 100644
---
a/shenyu-examples/shenyu-examples-http/src/main/java/org/apache/shenyu/examples/http/router/ShenyuTestHttpRouter.java
+++
b/shenyu-examples/shenyu-examples-http/src/main/java/org/apache/shenyu/examples/http/router/ShenyuTestHttpRouter.java
@@ -18,6 +18,8 @@
package org.apache.shenyu.examples.http.router;
import org.apache.shenyu.examples.http.result.ResultBean;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.lang.NonNull;
import org.springframework.stereotype.Component;
import org.springframework.web.reactive.function.server.RouterFunction;
@@ -28,10 +30,7 @@ import reactor.core.publisher.Mono;
import java.util.concurrent.atomic.AtomicInteger;
import static org.springframework.http.MediaType.APPLICATION_JSON;
-import static
org.springframework.web.reactive.function.server.RequestPredicates.GET;
-import static
org.springframework.web.reactive.function.server.RequestPredicates.POST;
-import static
org.springframework.web.reactive.function.server.RequestPredicates.accept;
-import static
org.springframework.web.reactive.function.server.RequestPredicates.path;
+import static
org.springframework.web.reactive.function.server.RequestPredicates.*;
import static
org.springframework.web.reactive.function.server.RouterFunctions.nest;
import static
org.springframework.web.reactive.function.server.RouterFunctions.route;
import static
org.springframework.web.reactive.function.server.ServerResponse.ok;
@@ -42,6 +41,8 @@ import static
org.springframework.web.reactive.function.server.ServerResponse.ok
@Component
public class ShenyuTestHttpRouter {
+ private static final Logger LOG =
LoggerFactory.getLogger(ShenyuTestHttpRouter.class);
+
private static final AtomicInteger ATOMIC_INTEGER = new AtomicInteger(1);
/**
@@ -61,7 +62,7 @@ public class ShenyuTestHttpRouter {
@NonNull
private Mono<ServerResponse> testRetry(final ServerRequest req) {
int i = ATOMIC_INTEGER.incrementAndGet();
- System.out.println("Retry count: " + i);
+ LOG.info("Retry count: " + i);
ResultBean resultBean = new ResultBean(1, "msg", "this is retry hello
world");
return ok().body(Mono.just(resultBean), ResultBean.class);
}
diff --git
a/shenyu-examples/shenyu-examples-websocket/shenyu-example-spring-annotation-websocket/src/main/java/org/apache/shenyu/examples/websocket/ws/WsServerEndpoint.java
b/shenyu-examples/shenyu-examples-websocket/shenyu-example-spring-annotation-websocket/src/main/java/org/apache/shenyu/examples/websocket/ws/WsServerEndpoint.java
index 68248a590..67270a5ee 100644
---
a/shenyu-examples/shenyu-examples-websocket/shenyu-example-spring-annotation-websocket/src/main/java/org/apache/shenyu/examples/websocket/ws/WsServerEndpoint.java
+++
b/shenyu-examples/shenyu-examples-websocket/shenyu-example-spring-annotation-websocket/src/main/java/org/apache/shenyu/examples/websocket/ws/WsServerEndpoint.java
@@ -18,6 +18,8 @@
package org.apache.shenyu.examples.websocket.ws;
import
org.apache.shenyu.client.spring.websocket.annotation.ShenyuSpringWebSocketClient;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Component;
import javax.websocket.OnClose;
@@ -26,8 +28,6 @@ import javax.websocket.OnOpen;
import javax.websocket.Session;
import javax.websocket.server.ServerEndpoint;
import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
/**
* WsServerEndpoint
@@ -37,7 +37,7 @@ import java.util.Map;
@Component
public class WsServerEndpoint {
- private static Map<String, Session> onlineUserCache = new HashMap<>();
+ private static final Logger LOG =
LoggerFactory.getLogger(WsServerEndpoint.class);
/**
* connect successful.
@@ -46,7 +46,7 @@ public class WsServerEndpoint {
*/
@OnOpen
public void onOpen(Session session) {
- System.out.println("connect successful");
+ LOG.info("connect successful");
}
/**
@@ -56,7 +56,7 @@ public class WsServerEndpoint {
*/
@OnClose
public void onClose(Session session) {
- System.out.println("connect closed");
+ LOG.info("connect closed");
}
/**
diff --git
a/shenyu-examples/shenyu-examples-websocket/shenyu-example-spring-native-websocket/src/main/java/org/apache/shenyu/examples/websocket/handler/HttpAuthHandler.java
b/shenyu-examples/shenyu-examples-websocket/shenyu-example-spring-native-websocket/src/main/java/org/apache/shenyu/examples/websocket/handler/HttpAuthHandler.java
index c71e7b61b..4b40c9d04 100644
---
a/shenyu-examples/shenyu-examples-websocket/shenyu-example-spring-native-websocket/src/main/java/org/apache/shenyu/examples/websocket/handler/HttpAuthHandler.java
+++
b/shenyu-examples/shenyu-examples-websocket/shenyu-example-spring-native-websocket/src/main/java/org/apache/shenyu/examples/websocket/handler/HttpAuthHandler.java
@@ -18,20 +18,22 @@
package org.apache.shenyu.examples.websocket.handler;
import org.apache.shenyu.examples.websocket.config.WsSessionManager;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Component;
import org.springframework.web.socket.CloseStatus;
import org.springframework.web.socket.TextMessage;
import org.springframework.web.socket.WebSocketSession;
import org.springframework.web.socket.handler.TextWebSocketHandler;
-import java.time.LocalDateTime;
-
/**
* HttpAuthHandler.
*/
@Component
public class HttpAuthHandler extends TextWebSocketHandler {
+ private static final Logger LOG =
LoggerFactory.getLogger(HttpAuthHandler.class);
+
/**
* socket create a success event.
*
@@ -61,7 +63,7 @@ public class HttpAuthHandler extends TextWebSocketHandler {
// Get the message from the client.
String payload = message.getPayload();
Object token = session.getAttributes().get("token");
- System.out.println("server received " + token + " sent " + payload);
+ LOG.info("server received " + token + " sent " + payload);
session.sendMessage(new TextMessage("apache shenyu server send to " +
token + " message : -> " + payload));
}
diff --git
a/shenyu-examples/shenyu-examples-websocket/shenyu-example-spring-native-websocket/src/main/java/org/apache/shenyu/examples/websocket/interceptor/WebSocketInterceptor.java
b/shenyu-examples/shenyu-examples-websocket/shenyu-example-spring-native-websocket/src/main/java/org/apache/shenyu/examples/websocket/interceptor/WebSocketInterceptor.java
index d56c4504b..a20e8c4c4 100644
---
a/shenyu-examples/shenyu-examples-websocket/shenyu-example-spring-native-websocket/src/main/java/org/apache/shenyu/examples/websocket/interceptor/WebSocketInterceptor.java
+++
b/shenyu-examples/shenyu-examples-websocket/shenyu-example-spring-native-websocket/src/main/java/org/apache/shenyu/examples/websocket/interceptor/WebSocketInterceptor.java
@@ -19,6 +19,8 @@ package org.apache.shenyu.examples.websocket.interceptor;
import cn.hutool.core.util.StrUtil;
import cn.hutool.http.HttpUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.http.server.ServerHttpRequest;
import org.springframework.http.server.ServerHttpResponse;
import org.springframework.stereotype.Component;
@@ -34,6 +36,8 @@ import java.util.Map;
@Component
public class WebSocketInterceptor implements HandshakeInterceptor {
+ private static final Logger LOG =
LoggerFactory.getLogger(WebSocketInterceptor.class);
+
/**
* Before handshake.
*
@@ -46,15 +50,15 @@ public class WebSocketInterceptor implements
HandshakeInterceptor {
*/
@Override
public boolean beforeHandshake(ServerHttpRequest request,
ServerHttpResponse response, WebSocketHandler wsHandler, Map<String, Object>
attributes) throws Exception {
- System.out.println("Shake hands.");
+ LOG.info("Shake hands.");
HashMap<String, String> paramMap =
HttpUtil.decodeParamMap(request.getURI().getQuery(), "utf-8");
String uid = paramMap.get("token");
if (StrUtil.isNotBlank(uid)) {
attributes.put("token", uid);
- System.out.println("user token " + uid + " shook hands
successfully！");
+ LOG.info("user token " + uid + " shook hands successfully！");
return true;
}
- System.out.println("user login has expired");
+ LOG.info("user login has expired");
return false;
}
@@ -68,7 +72,7 @@ public class WebSocketInterceptor implements
HandshakeInterceptor {
*/
@Override
public void afterHandshake(ServerHttpRequest request, ServerHttpResponse
response, WebSocketHandler wsHandler, Exception exception) {
- System.out.println("Handshake complete");
+ LOG.info("Handshake complete");
}
}
\ No newline at end of file
