Skip to content

Commit 254be85

Browse files
committed
use Lazy class for lazy initialization of singleton instance
1 parent 5db3da6 commit 254be85

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

http-client-spi/src/main/java/software/amazon/awssdk/http/SdkHttpRequest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@
2626
import java.util.function.BiConsumer;
2727
import software.amazon.awssdk.annotations.Immutable;
2828
import software.amazon.awssdk.annotations.SdkProtectedApi;
29-
import software.amazon.awssdk.utils.uri.SdkUri;
3029
import software.amazon.awssdk.utils.builder.CopyableBuilder;
3130
import software.amazon.awssdk.utils.builder.ToCopyableBuilder;
3231
import software.amazon.awssdk.utils.http.SdkHttpUtils;
32+
import software.amazon.awssdk.utils.uri.SdkUri;
3333

3434
/**
3535
* An immutable HTTP request without access to the request body. {@link SdkHttpFullRequest} should be used when access to a

utils/src/main/java/software/amazon/awssdk/utils/uri/SdkUri.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import java.net.URISyntaxException;
2020
import java.util.Objects;
2121
import software.amazon.awssdk.annotations.SdkProtectedApi;
22+
import software.amazon.awssdk.utils.Lazy;
2223
import software.amazon.awssdk.utils.Logger;
2324
import software.amazon.awssdk.utils.cache.lru.LruCache;
2425
import software.amazon.awssdk.utils.uri.internal.UriConstructorArgs;
@@ -40,7 +41,7 @@ public final class SdkUri {
4041
*/
4142
private static final int CACHE_SIZE = 150;
4243

43-
private static final SdkUri INSTANCE = new SdkUri();
44+
private static final Lazy<SdkUri> INSTANCE = new Lazy<>(SdkUri::new);
4445

4546
private final LruCache<UriConstructorArgs, URI> cache;
4647

@@ -51,7 +52,7 @@ private SdkUri() {
5152
}
5253

5354
public static SdkUri getInstance() {
54-
return INSTANCE;
55+
return INSTANCE.getValue();
5556
}
5657

5758
public URI create(String s) {
@@ -105,7 +106,6 @@ public URI newUri(String scheme,
105106
}
106107
throw e;
107108
}
108-
109109
}
110110

111111
public URI newUri(String scheme,

0 commit comments

Comments
 (0)