Skip to content

Commit 0035a3b

Browse files
denis256denis256
committed
Imports cleanup
1 parent 7af67d1 commit 0035a3b

File tree

5 files changed

+58
-53
lines changed

5 files changed

+58
-53
lines changed

‎apache-http-client/src/main/java/com/unidev/httpclient/apache/HTTPClient.java‎

Lines changed: 24 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,15 @@
11
package com.unidev.httpclient.apache;
22

3-
import com.unidev.platform.Randoms;
4-
import com.unidev.platform.Strings;
53
import com.unidev.httpclient.socks.PlainSocksSocketFactory;
64
import com.unidev.httpclient.socks.SSLSocksSocketFactory;
7-
import java.io.IOException;
8-
import java.util.List;
9-
import java.util.concurrent.TimeUnit;
5+
import com.unidev.platform.Randoms;
6+
import com.unidev.platform.Strings;
107
import org.apache.commons.collections4.CollectionUtils;
11-
import org.apache.http.Header;
12-
import org.apache.http.HttpEntity;
13-
import org.apache.http.HttpHost;
14-
import org.apache.http.HttpResponse;
15-
import org.apache.http.StatusLine;
8+
import org.apache.http.*;
169
import org.apache.http.client.ClientProtocolException;
1710
import org.apache.http.client.HttpClient;
1811
import org.apache.http.client.config.RequestConfig;
19-
import org.apache.http.client.methods.HttpDelete;
20-
import org.apache.http.client.methods.HttpGet;
21-
import org.apache.http.client.methods.HttpHead;
22-
import org.apache.http.client.methods.HttpPatch;
23-
import org.apache.http.client.methods.HttpPost;
24-
import org.apache.http.client.methods.HttpPut;
25-
import org.apache.http.client.methods.HttpUriRequest;
12+
import org.apache.http.client.methods.*;
2613
import org.apache.http.config.RegistryBuilder;
2714
import org.apache.http.conn.socket.ConnectionSocketFactory;
2815
import org.apache.http.cookie.Cookie;
@@ -36,6 +23,10 @@
3623
import org.apache.http.protocol.HttpContext;
3724
import org.apache.http.util.EntityUtils;
3825

26+
import java.io.IOException;
27+
import java.util.List;
28+
import java.util.concurrent.TimeUnit;
29+
3930
/**
4031
* Basic HTTP client, used to get stuff from web pages
4132
*/
@@ -111,9 +102,9 @@ public void init(String socksIP, int socksPort) {
111102
*/
112103
protected RequestConfig.Builder buildRequestConfig() {
113104
return RequestConfig.custom().setCircularRedirectsAllowed(true)
114-
.setConnectTimeout(connectionTimeout)
115-
.setConnectionRequestTimeout(connectionTimeout)
116-
.setSocketTimeout(connectionTimeout);
105+
.setConnectTimeout(connectionTimeout)
106+
.setConnectionRequestTimeout(connectionTimeout)
107+
.setSocketTimeout(connectionTimeout);
117108
}
118109

119110
/**
@@ -142,11 +133,11 @@ public String get(String url, Header... headers) throws IOException {
142133
rsp = httpClient.execute(httpget, context);
143134

144135
HttpUriRequest currentReq = (HttpUriRequest) context.getAttribute(
145-
ExecutionContext.HTTP_REQUEST);
136+
ExecutionContext.HTTP_REQUEST);
146137
HttpHost currentHost = (HttpHost) context.getAttribute(
147-
ExecutionContext.HTTP_TARGET_HOST);
138+
ExecutionContext.HTTP_TARGET_HOST);
148139
currentUrl = (currentReq.getURI().isAbsolute()) ? currentReq.getURI().toString()
149-
: (currentHost.toURI() + currentReq.getURI());
140+
: (currentHost.toURI() + currentReq.getURI());
150141

151142
HttpEntity entity = rsp.getEntity();
152143
lastResponseHeaders = rsp.getAllHeaders();
@@ -159,7 +150,7 @@ public String get(String url, Header... headers) throws IOException {
159150
}
160151

161152
public HttpEntity getAsEntity(String url, Header... headers)
162-
throws ClientProtocolException, IOException {
153+
throws ClientProtocolException, IOException {
163154
HttpGet httpget = new HttpGet(url);
164155
copyHeaders(httpget, headers);
165156
rsp = httpClient.execute(httpget, context);
@@ -199,11 +190,11 @@ public String post(String url, HttpEntity data, Header... headers) throws IOExce
199190
rsp = httpClient.execute(httpPost, context);
200191

201192
HttpUriRequest currentReq = (HttpUriRequest) context.getAttribute(
202-
ExecutionContext.HTTP_REQUEST);
193+
ExecutionContext.HTTP_REQUEST);
203194
HttpHost currentHost = (HttpHost) context.getAttribute(
204-
ExecutionContext.HTTP_TARGET_HOST);
195+
ExecutionContext.HTTP_TARGET_HOST);
205196
currentUrl = (currentReq.getURI().isAbsolute()) ? currentReq.getURI().toString()
206-
: (currentHost.toURI() + currentReq.getURI());
197+
: (currentHost.toURI() + currentReq.getURI());
207198

208199
HttpEntity entity = rsp.getEntity();
209200

@@ -217,7 +208,7 @@ public String post(String url, HttpEntity data, Header... headers) throws IOExce
217208
}
218209

219210
public HttpEntity postAsEntity(String url, Header... headers)
220-
throws ClientProtocolException, IOException {
211+
throws ClientProtocolException, IOException {
221212
HttpPost httpPost = new HttpPost(url);
222213
copyHeaders(httpPost, headers);
223214

@@ -311,10 +302,10 @@ public Cookie getCookie(String name) {
311302

312303
private void createProxyConnectionManager(String socksIP, int socksPort) {
313304
connectionManager = new PoolingHttpClientConnectionManager(
314-
RegistryBuilder.<ConnectionSocketFactory>create()
315-
.register("http", new PlainSocksSocketFactory(socksIP, socksPort))
316-
.register("https", new SSLSocksSocketFactory(socksIP, socksPort))
317-
.build()
305+
RegistryBuilder.<ConnectionSocketFactory>create()
306+
.register("http", new PlainSocksSocketFactory(socksIP, socksPort))
307+
.register("https", new SSLSocksSocketFactory(socksIP, socksPort))
308+
.build()
318309
);
319310
}
320311

@@ -403,7 +394,7 @@ public PoolingHttpClientConnectionManager getConnectionManager() {
403394
}
404395

405396
public void setConnectionManager(
406-
PoolingHttpClientConnectionManager connectionManager) {
397+
PoolingHttpClientConnectionManager connectionManager) {
407398
this.connectionManager = connectionManager;
408399
}
409400
}

‎apache-http-client/src/main/java/com/unidev/httpclient/apache/HTTPClientUtils.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,14 @@
33

44
import java.util.ArrayList;
55
import java.util.List;
6-
import org.apache.http.client.config.RequestConfig;
7-
import org.apache.http.client.config.RequestConfig.Builder;
86

97
/**
108
* Common utils class
119
*/
1210
public class HTTPClientUtils {
1311

1412
public static List<String> USER_AGENTS = new ArrayList<>();
13+
1514
static {
1615
USER_AGENTS.add("Mozilla/5.0 (X11; Linux i686; rv:2.0) Gecko/20100101 Firefox/4.0");
1716
USER_AGENTS.add("Mozilla/5.0 (Windows; U; Windows NT 5.1; en-GB; rv:1.8.1.6) Gecko/20070725 Firefox/2.0");

‎apache-http-client/src/main/java/com/unidev/httpclient/apache/XTrustProvider.java‎

Lines changed: 22 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,26 +28,39 @@ public Object run() {
2828
}
2929

3030
public static void install() {
31-
if(Security.getProvider(NAME) == null) {
31+
if (Security.getProvider(NAME) == null) {
3232
Security.insertProviderAt(new XTrustProvider(), 2);
3333
Security.setProperty("ssl.TrustManagerFactory.algorithm", TrustManagerFactoryImpl.getAlgorithm());
3434
}
3535
}
3636

3737
public final static class TrustManagerFactoryImpl extends TrustManagerFactorySpi {
38-
public TrustManagerFactoryImpl() { }
39-
public static String getAlgorithm() { return "XTrust509"; }
40-
protected void engineInit(KeyStore keystore) throws KeyStoreException { }
38+
public TrustManagerFactoryImpl() {
39+
}
40+
41+
public static String getAlgorithm() {
42+
return "XTrust509";
43+
}
44+
45+
protected void engineInit(KeyStore keystore) throws KeyStoreException {
46+
}
47+
4148
protected void engineInit(ManagerFactoryParameters mgrparams) throws InvalidAlgorithmParameterException {
42-
throw new InvalidAlgorithmParameterException( XTrustProvider.NAME + " does not use ManagerFactoryParameters");
49+
throw new InvalidAlgorithmParameterException(XTrustProvider.NAME + " does not use ManagerFactoryParameters");
4350
}
4451

4552
protected TrustManager[] engineGetTrustManagers() {
46-
return new TrustManager[] {
53+
return new TrustManager[]{
4754
new X509TrustManager() {
48-
public X509Certificate[] getAcceptedIssuers() { return null; }
49-
public void checkClientTrusted(X509Certificate[] certs, String authType) { }
50-
public void checkServerTrusted(X509Certificate[] certs, String authType) { }
55+
public X509Certificate[] getAcceptedIssuers() {
56+
return null;
57+
}
58+
59+
public void checkClientTrusted(X509Certificate[] certs, String authType) {
60+
}
61+
62+
public void checkServerTrusted(X509Certificate[] certs, String authType) {
63+
}
5164
}
5265
};
5366
}

‎apache-http-client/src/test/java/com/unidev/http/HttpClientTest.java‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
package com.unidev.http;
22

3-
import static org.junit.jupiter.api.Assertions.assertNotNull;
4-
import static org.junit.jupiter.api.Assertions.assertNull;
5-
3+
import com.unidev.httpclient.apache.HTTPClient;
64
import com.unidev.platform.Randoms;
75
import com.unidev.platform.Strings;
8-
import com.unidev.httpclient.apache.HTTPClient;
9-
import java.io.IOException;
106
import org.junit.jupiter.api.BeforeEach;
117
import org.junit.jupiter.api.Test;
128

9+
import java.io.IOException;
10+
11+
import static org.junit.jupiter.api.Assertions.assertNotNull;
12+
import static org.junit.jupiter.api.Assertions.assertNull;
13+
1314

1415
public class HttpClientTest {
1516

‎apache-http-client/src/test/java/com/unidev/http/ProxyHTTPClientTest.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
package com.unidev.http;
22

3-
import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
4-
3+
import com.unidev.httpclient.apache.HTTPClient;
54
import com.unidev.platform.Randoms;
65
import com.unidev.platform.Strings;
7-
import com.unidev.httpclient.apache.HTTPClient;
8-
import java.io.IOException;
96
import org.junit.jupiter.api.BeforeEach;
107
import org.junit.jupiter.api.Disabled;
118
import org.junit.jupiter.api.Test;
129

10+
import java.io.IOException;
11+
12+
import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
13+
1314
@Disabled
1415
public class ProxyHTTPClientTest {
1516

0 commit comments

Comments
 (0)