Skip to content
This repository was archived by the owner on Mar 14, 2025. It is now read-only.

Commit be51834

Browse files
committed
Use only explicit and no wildcard imports
1 parent 06dfcda commit be51834

File tree

10 files changed

+77
-29
lines changed

10 files changed

+77
-29
lines changed

src/main/java/org/cryptomator/cloudaccess/webdav/ProgressRequestWrapper.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,11 @@
22

33
import okhttp3.MediaType;
44
import okhttp3.RequestBody;
5-
import okio.*;
5+
import okio.Buffer;
6+
import okio.BufferedSink;
7+
import okio.ForwardingSink;
8+
import okio.Okio;
9+
import okio.Sink;
610
import org.cryptomator.cloudaccess.api.ProgressListener;
711

812
import java.io.IOException;

src/main/java/org/cryptomator/cloudaccess/webdav/ProgressResponseWrapper.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,11 @@
22

33
import okhttp3.MediaType;
44
import okhttp3.ResponseBody;
5-
import okio.*;
5+
import okio.Buffer;
6+
import okio.BufferedSource;
7+
import okio.ForwardingSource;
8+
import okio.Okio;
9+
import okio.Source;
610
import org.cryptomator.cloudaccess.api.ProgressListener;
711

812
import java.io.IOException;
@@ -39,7 +43,7 @@ private Source source(final Source source) {
3943
long totalBytesRead = 0L;
4044

4145
@Override public long read(final Buffer sink, final long byteCount) throws IOException {
42-
long bytesRead = super.read(sink, byteCount);
46+
final var bytesRead = super.read(sink, byteCount);
4347
totalBytesRead += bytesRead != EOF ? bytesRead : 0;
4448
if(bytesRead != EOF) {
4549
progressListener.onProgress(totalBytesRead);

src/main/java/org/cryptomator/cloudaccess/webdav/PropfindResponseParser.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,10 @@
1111
import java.text.ParseException;
1212
import java.text.SimpleDateFormat;
1313
import java.time.Instant;
14-
import java.util.*;
14+
import java.util.ArrayList;
15+
import java.util.List;
16+
import java.util.Locale;
17+
import java.util.Optional;
1518

1619
import static java.lang.String.format;
1720

src/main/java/org/cryptomator/cloudaccess/webdav/WebDavClient.java

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,28 @@
11
package org.cryptomator.cloudaccess.webdav;
22

3-
import okhttp3.*;
3+
import okhttp3.MediaType;
4+
import okhttp3.Request;
5+
import okhttp3.RequestBody;
6+
import okhttp3.Response;
47
import org.cryptomator.cloudaccess.api.CloudItemList;
58
import org.cryptomator.cloudaccess.api.CloudItemMetadata;
6-
import org.cryptomator.cloudaccess.api.exceptions.*;
79
import org.cryptomator.cloudaccess.api.ProgressListener;
10+
import org.cryptomator.cloudaccess.api.exceptions.BackendException;
11+
import org.cryptomator.cloudaccess.api.exceptions.CloudNodeAlreadyExistsException;
12+
import org.cryptomator.cloudaccess.api.exceptions.ForbiddenException;
13+
import org.cryptomator.cloudaccess.api.exceptions.InsufficientStorageException;
14+
import org.cryptomator.cloudaccess.api.exceptions.NotFoundException;
15+
import org.cryptomator.cloudaccess.api.exceptions.UnauthorizedException;
816
import org.xmlpull.v1.XmlPullParserException;
917

1018
import java.io.IOException;
1119
import java.io.InputStream;
20+
import java.net.HttpURLConnection;
1221
import java.nio.file.Path;
1322
import java.util.ArrayList;
1423
import java.util.Comparator;
1524
import java.util.List;
1625

17-
import static java.lang.String.format;
18-
import static java.net.HttpURLConnection.*;
19-
2026
public class WebDavClient {
2127

2228
private final WebDavCompatibleHttpClient httpClient;
@@ -144,7 +150,7 @@ Path move(final Path from, final Path to, boolean replace) throws BackendExcepti
144150
}
145151

146152
try (final var response = httpClient.execute(builder)) {
147-
if (response.code() == HTTP_PRECON_FAILED) {
153+
if (response.code() == HttpURLConnection.HTTP_PRECON_FAILED) {
148154
throw new CloudNodeAlreadyExistsException(absolutePathFrom(to));
149155
}
150156

@@ -165,7 +171,7 @@ InputStream read(final Path path, final ProgressListener progressListener) throw
165171

166172
InputStream read(final Path path, final long offset, final long count, final ProgressListener progressListener) throws BackendException {
167173
final var getRequest = new Request.Builder() //
168-
.header("Range", format("bytes=%d-%d", offset, offset + count - 1))
174+
.header("Range", String.format("bytes=%d-%d", offset, offset + count - 1))
169175
.get() //
170176
.url(absolutePathFrom(path));
171177
return read(getRequest, progressListener);
@@ -261,12 +267,12 @@ void tryAuthenticatedRequest() throws UnauthorizedException {
261267

262268
private void checkExecutionSucceeded(final int status) throws BackendException {
263269
switch (status) {
264-
case HTTP_UNAUTHORIZED:
270+
case HttpURLConnection.HTTP_UNAUTHORIZED:
265271
throw new UnauthorizedException();
266-
case HTTP_FORBIDDEN:
272+
case HttpURLConnection.HTTP_FORBIDDEN:
267273
throw new ForbiddenException();
268-
case HTTP_NOT_FOUND: // fall through
269-
case HTTP_CONFLICT: //
274+
case HttpURLConnection.HTTP_NOT_FOUND: // fall through
275+
case HttpURLConnection.HTTP_CONFLICT: //
270276
throw new NotFoundException();
271277
case HTTP_INSUFFICIENT_STORAGE:
272278
throw new InsufficientStorageException();

src/main/java/org/cryptomator/cloudaccess/webdav/WebDavCompatibleHttpClient.java

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,18 @@
77
import com.burgstaller.okhttp.digest.CachingAuthenticator;
88
import com.burgstaller.okhttp.digest.Credentials;
99
import com.burgstaller.okhttp.digest.DigestAuthenticator;
10-
import okhttp3.*;
10+
import okhttp3.Authenticator;
11+
import okhttp3.OkHttpClient;
12+
import okhttp3.Request;
13+
import okhttp3.Response;
14+
import org.cryptomator.cloudaccess.api.NetworkTimeout;
1115
import org.slf4j.Logger;
1216
import org.slf4j.LoggerFactory;
1317

1418
import java.io.IOException;
1519
import java.util.Map;
1620
import java.util.concurrent.ConcurrentHashMap;
1721

18-
import static org.cryptomator.cloudaccess.api.NetworkTimeout.*;
19-
2022
class WebDavCompatibleHttpClient {
2123

2224
private static final Logger LOG = LoggerFactory.getLogger(WebDavCompatibleHttpClient.class);
@@ -40,9 +42,9 @@ private static OkHttpClient httpClientFor(final WebDavCredential webDavCredentia
4042

4143
final var builder = new OkHttpClient()
4244
.newBuilder()
43-
.connectTimeout(CONNECTION.getTimeout(), CONNECTION.getUnit())
44-
.readTimeout(READ.getTimeout(), READ.getUnit())
45-
.writeTimeout(WRITE.getTimeout(), WRITE.getUnit())
45+
.connectTimeout(NetworkTimeout.CONNECTION.getTimeout(), NetworkTimeout.CONNECTION.getUnit())
46+
.readTimeout(NetworkTimeout.READ.getTimeout(), NetworkTimeout.READ.getUnit())
47+
.writeTimeout(NetworkTimeout.WRITE.getTimeout(), NetworkTimeout.WRITE.getUnit())
4648
.followRedirects(false)
4749
.addInterceptor(new HttpLoggingInterceptor(LOG::info))
4850
.authenticator(httpAuthenticator(webDavCredential.getUsername(), webDavCredential.getPassword(), authCache))

src/test/java/org/cryptomator/cloudaccess/webdav/HttpLoggingInterceptorTest.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
package org.cryptomator.cloudaccess.webdav;
22

3-
import okhttp3.*;
3+
import okhttp3.Interceptor;
4+
import okhttp3.MediaType;
5+
import okhttp3.Protocol;
6+
import okhttp3.Request;
7+
import okhttp3.Response;
8+
import okhttp3.ResponseBody;
49
import org.junit.jupiter.api.Test;
510
import org.mockito.ArgumentMatchers;
611
import org.mockito.Mockito;

src/test/java/org/cryptomator/cloudaccess/webdav/PropfindResponseParserTest.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,11 @@
1212
import java.io.IOException;
1313
import java.io.InputStream;
1414
import java.nio.file.Path;
15-
import java.util.*;
15+
import java.util.ArrayList;
16+
import java.util.Collections;
17+
import java.util.Comparator;
18+
import java.util.List;
19+
import java.util.Optional;
1620

1721
public class PropfindResponseParserTest {
1822

src/test/java/org/cryptomator/cloudaccess/webdav/WebDavClientTest.java

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,27 @@
11
package org.cryptomator.cloudaccess.webdav;
22

3-
import okhttp3.*;
3+
import okhttp3.MediaType;
4+
import okhttp3.Protocol;
5+
import okhttp3.Request;
6+
import okhttp3.Response;
7+
import okhttp3.ResponseBody;
48
import org.cryptomator.cloudaccess.api.CloudItemMetadata;
59
import org.cryptomator.cloudaccess.api.CloudItemType;
610
import org.cryptomator.cloudaccess.api.ProgressListener;
711
import org.cryptomator.cloudaccess.api.exceptions.CloudNodeAlreadyExistsException;
812
import org.cryptomator.cloudaccess.api.exceptions.UnauthorizedException;
913
import org.junit.Assert;
10-
import org.junit.jupiter.api.*;
14+
import org.junit.jupiter.api.Assertions;
15+
import org.junit.jupiter.api.BeforeEach;
16+
import org.junit.jupiter.api.DisplayName;
17+
import org.junit.jupiter.api.Test;
1118
import org.mockito.ArgumentMatchers;
1219
import org.mockito.Mockito;
1320

14-
import java.io.*;
21+
import java.io.BufferedReader;
22+
import java.io.IOException;
23+
import java.io.InputStream;
24+
import java.io.InputStreamReader;
1525
import java.nio.charset.StandardCharsets;
1626
import java.nio.file.Path;
1727
import java.util.List;

src/test/java/org/cryptomator/cloudaccess/webdav/WebDavCloudProviderTestIT.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,13 @@
99
import org.cryptomator.cloudaccess.api.ProgressListener;
1010
import org.cryptomator.cloudaccess.api.exceptions.CloudNodeAlreadyExistsException;
1111
import org.junit.Assert;
12-
import org.junit.jupiter.api.*;
12+
import org.junit.jupiter.api.Assertions;
13+
import org.junit.jupiter.api.DisplayName;
14+
import org.junit.jupiter.api.Test;
1315

14-
import java.io.*;
16+
import java.io.BufferedReader;
17+
import java.io.IOException;
18+
import java.io.InputStreamReader;
1519
import java.nio.charset.StandardCharsets;
1620
import java.nio.file.Path;
1721
import java.util.List;

src/test/java/org/cryptomator/cloudaccess/webdav/WebDavRedirectHandlerTest.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
package org.cryptomator.cloudaccess.webdav;
22

3-
import okhttp3.*;
3+
import okhttp3.Call;
4+
import okhttp3.MediaType;
5+
import okhttp3.OkHttpClient;
6+
import okhttp3.Protocol;
7+
import okhttp3.Request;
8+
import okhttp3.Response;
9+
import okhttp3.ResponseBody;
410
import org.junit.Assert;
511
import org.junit.jupiter.api.Assertions;
612
import org.junit.jupiter.api.BeforeEach;

0 commit comments

Comments
 (0)