13
13
14
14
package wtx .woocommerce .api .client .invoker ;
15
15
16
- import okhttp3 .*;
17
- import okhttp3 .internal .http .HttpMethod ;
18
- import okhttp3 .internal .tls .OkHostnameVerifier ;
19
- import okhttp3 .logging .HttpLoggingInterceptor ;
20
- import okhttp3 .logging .HttpLoggingInterceptor .Level ;
21
- import okio .Buffer ;
22
- import okio .BufferedSink ;
23
- import okio .Okio ;
24
-
25
- import javax .net .ssl .*;
26
16
import java .io .File ;
27
17
import java .io .IOException ;
28
18
import java .io .InputStream ;
37
27
import java .security .KeyStore ;
38
28
import java .security .SecureRandom ;
39
29
import java .security .cert .Certificate ;
40
- import java .security .cert .CertificateException ;
41
30
import java .security .cert .CertificateFactory ;
42
- import java .security .cert .X509Certificate ;
43
31
import java .text .DateFormat ;
44
32
import java .time .LocalDate ;
45
33
import java .time .OffsetDateTime ;
46
34
import java .time .format .DateTimeFormatter ;
47
- import java .util .*;
35
+ import java .util .ArrayList ;
36
+ import java .util .Arrays ;
37
+ import java .util .Collection ;
38
+ import java .util .Collections ;
39
+ import java .util .Date ;
40
+ import java .util .HashMap ;
41
+ import java .util .List ;
42
+ import java .util .Map ;
48
43
import java .util .Map .Entry ;
44
+ import java .util .Objects ;
49
45
import java .util .concurrent .TimeUnit ;
50
- import java .util .function .Supplier ;
51
46
import java .util .regex .Matcher ;
52
47
import java .util .regex .Pattern ;
53
48
49
+ import javax .net .ssl .HostnameVerifier ;
50
+ import javax .net .ssl .KeyManager ;
51
+ import javax .net .ssl .SSLContext ;
52
+ import javax .net .ssl .TrustManager ;
53
+ import javax .net .ssl .TrustManagerFactory ;
54
+ import javax .net .ssl .X509TrustManager ;
55
+
56
+ import okhttp3 .Call ;
57
+ import okhttp3 .Callback ;
58
+ import okhttp3 .Headers ;
59
+ import okhttp3 .Interceptor ;
60
+ import okhttp3 .MediaType ;
61
+ import okhttp3 .MultipartBody ;
62
+ import okhttp3 .OkHttpClient ;
63
+ import okhttp3 .Request ;
64
+ import okhttp3 .RequestBody ;
65
+ import okhttp3 .Response ;
66
+ import okhttp3 .internal .http .HttpMethod ;
67
+ import okhttp3 .internal .tls .OkHostnameVerifier ;
68
+ import okhttp3 .logging .HttpLoggingInterceptor ;
69
+ import okhttp3 .logging .HttpLoggingInterceptor .Level ;
70
+ import okio .Buffer ;
71
+ import okio .BufferedSink ;
72
+ import okio .Okio ;
73
+ import wtx .woocommerce .api .client .invoker .auth .ApiKeyAuth ;
54
74
import wtx .woocommerce .api .client .invoker .auth .Authentication ;
55
75
import wtx .woocommerce .api .client .invoker .auth .HttpBasicAuth ;
56
- import wtx .woocommerce .api .client .invoker .auth .HttpBearerAuth ;
57
- import wtx .woocommerce .api .client .invoker .auth .ApiKeyAuth ;
58
76
59
77
/**
60
78
* <p>ApiClient class.</p>
@@ -79,9 +97,6 @@ public class ApiClient {
79
97
private Map <String , Authentication > authentications ;
80
98
81
99
private DateFormat dateFormat ;
82
- private DateFormat datetimeFormat ;
83
- private boolean lenientDatetimeFormat ;
84
- private int dateLength ;
85
100
86
101
private InputStream sslCaCert ;
87
102
private boolean verifyingSsl ;
@@ -1498,28 +1513,10 @@ private void applySslSettings() {
1498
1513
TrustManager [] trustManagers ;
1499
1514
HostnameVerifier hostnameVerifier ;
1500
1515
if (!verifyingSsl ) {
1501
- trustManagers = new TrustManager []{
1502
- new X509TrustManager () {
1503
- @ Override
1504
- public void checkClientTrusted (java .security .cert .X509Certificate [] chain , String authType ) throws CertificateException {
1505
- }
1506
-
1507
- @ Override
1508
- public void checkServerTrusted (java .security .cert .X509Certificate [] chain , String authType ) throws CertificateException {
1509
- }
1510
-
1511
- @ Override
1512
- public java .security .cert .X509Certificate [] getAcceptedIssuers () {
1513
- return new java .security .cert .X509Certificate []{};
1514
- }
1515
- }
1516
- };
1517
- hostnameVerifier = new HostnameVerifier () {
1518
- @ Override
1519
- public boolean verify (String hostname , SSLSession session ) {
1520
- return true ;
1521
- }
1522
- };
1516
+ TrustManagerFactory trustManagerFactory = TrustManagerFactory .getInstance (TrustManagerFactory .getDefaultAlgorithm ());
1517
+ trustManagerFactory .init ((KeyStore ) null );
1518
+ trustManagers = trustManagerFactory .getTrustManagers ();
1519
+ hostnameVerifier = OkHostnameVerifier .INSTANCE ;
1523
1520
} else {
1524
1521
TrustManagerFactory trustManagerFactory = TrustManagerFactory .getInstance (TrustManagerFactory .getDefaultAlgorithm ());
1525
1522
0 commit comments