diff --git a/aliyun-java-sdk-core/pom.xml b/aliyun-java-sdk-core/pom.xml index 4930983851..fc5d4c4d9a 100644 --- a/aliyun-java-sdk-core/pom.xml +++ b/aliyun-java-sdk-core/pom.xml @@ -31,7 +31,7 @@ The Apache License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt + https://www.apache.org/licenses/LICENSE-2.0.txt @@ -135,12 +135,6 @@ 0.8.12 runtime - - org.projectlombok - lombok - 1.18.34 - provided - org.ini4j ini4j diff --git a/aliyun-java-sdk-core/src/main/java/com/aliyuncs/http/HttpMessage.java b/aliyun-java-sdk-core/src/main/java/com/aliyuncs/http/HttpMessage.java index 8ebc20c934..03e4a71334 100644 --- a/aliyun-java-sdk-core/src/main/java/com/aliyuncs/http/HttpMessage.java +++ b/aliyun-java-sdk-core/src/main/java/com/aliyuncs/http/HttpMessage.java @@ -3,7 +3,6 @@ import com.aliyuncs.exceptions.ClientException; import com.aliyuncs.policy.retry.RetryPolicy; import com.aliyuncs.utils.ParameterHelper; -import lombok.ToString; import javax.net.ssl.KeyManager; import javax.net.ssl.X509TrustManager; @@ -12,7 +11,6 @@ import java.util.HashMap; import java.util.Map; -@ToString public abstract class HttpMessage { protected static final String CONTENT_TYPE = "Content-Type"; diff --git a/aliyun-java-sdk-core/src/main/java/com/aliyuncs/http/HttpRequest.java b/aliyun-java-sdk-core/src/main/java/com/aliyuncs/http/HttpRequest.java index ecebd4aa7d..dcf860f91f 100644 --- a/aliyun-java-sdk-core/src/main/java/com/aliyuncs/http/HttpRequest.java +++ b/aliyun-java-sdk-core/src/main/java/com/aliyuncs/http/HttpRequest.java @@ -1,10 +1,7 @@ package com.aliyuncs.http; -import lombok.ToString; - import java.util.Map; -@ToString(callSuper = true) public class HttpRequest extends HttpMessage { public HttpRequest(String strUrl) { @@ -17,4 +14,5 @@ public HttpRequest(String strUrl, Map tmpHeaders) { this.headers = tmpHeaders; } } + } diff --git a/aliyun-java-sdk-core/src/main/java/com/aliyuncs/http/HttpResponse.java b/aliyun-java-sdk-core/src/main/java/com/aliyuncs/http/HttpResponse.java index 1c3c2094e5..71d5ab3e44 100644 --- a/aliyun-java-sdk-core/src/main/java/com/aliyuncs/http/HttpResponse.java +++ b/aliyun-java-sdk-core/src/main/java/com/aliyuncs/http/HttpResponse.java @@ -1,8 +1,5 @@ package com.aliyuncs.http; -import lombok.ToString; - -@ToString(callSuper = true) public class HttpResponse extends HttpMessage { private int status; diff --git a/aliyun-java-sdk-core/src/main/java/com/aliyuncs/http/IHttpClient.java b/aliyun-java-sdk-core/src/main/java/com/aliyuncs/http/IHttpClient.java index 026949d609..5d11c37d8b 100644 --- a/aliyun-java-sdk-core/src/main/java/com/aliyuncs/http/IHttpClient.java +++ b/aliyun-java-sdk-core/src/main/java/com/aliyuncs/http/IHttpClient.java @@ -16,7 +16,6 @@ public IHttpClient(HttpClientConfig clientConfig) throws ClientException { } this.clientConfig = clientConfig; init(clientConfig); - } public IHttpClient() { diff --git a/aliyun-java-sdk-core/src/main/java/com/aliyuncs/http/clients/CompatibleUrlConnClient.java b/aliyun-java-sdk-core/src/main/java/com/aliyuncs/http/clients/CompatibleUrlConnClient.java index d51356156b..4410cff5d7 100644 --- a/aliyun-java-sdk-core/src/main/java/com/aliyuncs/http/clients/CompatibleUrlConnClient.java +++ b/aliyun-java-sdk-core/src/main/java/com/aliyuncs/http/clients/CompatibleUrlConnClient.java @@ -182,7 +182,6 @@ private Proxy calcProxy(URL url, HttpRequest request) throws ClientException { proxy = HttpUtil.getJDKProxy(clientConfig.getHttpProxy(), httpProxy, request); } return proxy; - } private HttpURLConnection initHttpConnection(URL url, HttpRequest request) throws ClientException, IOException { diff --git a/aliyun-java-sdk-core/src/main/java/com/aliyuncs/utils/LogUtils.java b/aliyun-java-sdk-core/src/main/java/com/aliyuncs/utils/LogUtils.java index b6390b05f2..b2332328b9 100644 --- a/aliyun-java-sdk-core/src/main/java/com/aliyuncs/utils/LogUtils.java +++ b/aliyun-java-sdk-core/src/main/java/com/aliyuncs/utils/LogUtils.java @@ -3,8 +3,6 @@ import com.aliyuncs.exceptions.ClientException; import com.aliyuncs.http.HttpRequest; import com.aliyuncs.http.HttpResponse; -import lombok.Getter; -import lombok.Setter; import java.net.InetAddress; import java.net.MalformedURLException; @@ -120,8 +118,6 @@ public static LogUnit createLogUnit(HttpRequest httpRequest, HttpResponse httpRe return new LogUnit(httpRequest, httpResponse); } - @Getter - @Setter public static class LogUnit { private HttpRequest httpRequest; private HttpResponse httpResponse; @@ -186,5 +182,165 @@ public LogUnit(HttpRequest httpRequest, HttpResponse httpResponse) { this.pid = String.valueOf(getCurrentPID()); this.time = localeNow(); } + + public String getMethod() { + return method; + } + + public void setMethod(String method) { + this.method = method; + } + + public String getUrl() { + return url; + } + + public void setUrl(String url) { + this.url = url; + } + + public String getVersion() { + return version; + } + + public void setVersion(String version) { + this.version = version; + } + + public String getTime() { + return time; + } + + public void setTime(String time) { + this.time = time; + } + + public HttpRequest getHttpRequest() { + return httpRequest; + } + + public void setHttpRequest(HttpRequest httpRequest) { + this.httpRequest = httpRequest; + } + + public HttpResponse getHttpResponse() { + return httpResponse; + } + + public void setHttpResponse(HttpResponse httpResponse) { + this.httpResponse = httpResponse; + } + + public String getTs() { + return ts; + } + + public void setTs(String ts) { + this.ts = ts; + } + + public String getHost() { + return host; + } + + public void setHost(String host) { + this.host = host; + } + + public String getTarget() { + return target; + } + + public void setTarget(String target) { + this.target = target; + } + + public String getReqHeaders() { + return reqHeaders; + } + + public void setReqHeaders(String reqHeaders) { + this.reqHeaders = reqHeaders; + } + + public String getResHeaders() { + return resHeaders; + } + + public void setResHeaders(String resHeaders) { + this.resHeaders = resHeaders; + } + + public String getPhrase() { + return phrase; + } + + public void setPhrase(String phrase) { + this.phrase = phrase; + } + + public String getHostname() { + return hostname; + } + + public void setHostname(String hostname) { + this.hostname = hostname; + } + + public String getReqBody() { + return reqBody; + } + + public void setReqBody(String reqBody) { + this.reqBody = reqBody; + } + + public String getResBody() { + return resBody; + } + + public void setResBody(String resBody) { + this.resBody = resBody; + } + + public String getPid() { + return pid; + } + + public void setPid(String pid) { + this.pid = pid; + } + + public String getCost() { + return cost; + } + + public void setCost(String cost) { + this.cost = cost; + } + + public String getStartTime() { + return startTime; + } + + public void setStartTime(String startTime) { + this.startTime = startTime; + } + + public String getError() { + return error; + } + + public void setError(String error) { + this.error = error; + } + + public String getCode() { + return code; + } + + public void setCode(String code) { + this.code = code; + } } } diff --git a/aliyun-java-sdk-core/src/test/java/com/aliyuncs/http/HttpRequestTest.java b/aliyun-java-sdk-core/src/test/java/com/aliyuncs/http/HttpRequestTest.java index 28ba1f7fc1..73fce15a68 100644 --- a/aliyun-java-sdk-core/src/test/java/com/aliyuncs/http/HttpRequestTest.java +++ b/aliyun-java-sdk-core/src/test/java/com/aliyuncs/http/HttpRequestTest.java @@ -65,11 +65,4 @@ public void getHttpContentStringTest() throws ClientException, UnsupportedEncodi } } - - @Test - public void toStringTest() { - HttpRequest request = new HttpRequest("testURL"); - String res = request.toString(); - Assert.assertTrue(res.contains("testURL")); - } } diff --git a/aliyun-java-sdk-core/src/test/java/com/aliyuncs/http/HttpResponseTest.java b/aliyun-java-sdk-core/src/test/java/com/aliyuncs/http/HttpResponseTest.java index a0c855fbba..338808776e 100644 --- a/aliyun-java-sdk-core/src/test/java/com/aliyuncs/http/HttpResponseTest.java +++ b/aliyun-java-sdk-core/src/test/java/com/aliyuncs/http/HttpResponseTest.java @@ -54,10 +54,4 @@ public void isSuccessTest() { response.setStatus(100); Assert.assertFalse(response.isSuccess()); } - - @Test - public void toStringTest() { - HttpResponse response = new HttpResponse("testURL"); - Assert.assertTrue(response.toString().contains("testURL")); - } }