diff --git a/README.md b/README.md
index 0ede61c..66847b2 100644
--- a/README.md
+++ b/README.md
@@ -16,12 +16,12 @@ ConfigCat SDK for Java provides easy integration for your application to [Config
com.configcat
configcat-java-client
- [8.0.0,)
+ [10.0.0,)
```
*Gradle:*
```groovy
-implementation "com.configcat:configcat-java-client:8.+"
+implementation "com.configcat:configcat-java-client:10.+"
```
### 2. Go to the ConfigCat Dashboard to get your *SDK Key*:
diff --git a/gradle.properties b/gradle.properties
index a077c68..e6b5417 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,2 +1,2 @@
-version=10.0.1
+version=10.1.0
SONATYPE_CONNECT_TIMEOUT_SECONDS=120
\ No newline at end of file
diff --git a/src/main/java/com/configcat/Config.java b/src/main/java/com/configcat/Config.java
index 6d09e63..c4a0ca9 100644
--- a/src/main/java/com/configcat/Config.java
+++ b/src/main/java/com/configcat/Config.java
@@ -37,7 +37,10 @@ public Segment[] getSegments() {
public Map getEntries() {
// NOTE: Deserializing a JSON like '{ "f": null }' overwrites entries with null.
// However, we want to treat null as an empty map in that case too.
- return entries != null ? entries : (entries = new HashMap<>());
+ if(entries == null) {
+ entries = new HashMap<>();
+ }
+ return entries;
}
boolean isEmpty() {
diff --git a/src/main/java/com/configcat/ConfigCatClient.java b/src/main/java/com/configcat/ConfigCatClient.java
index d3d6c92..a6c3749 100644
--- a/src/main/java/com/configcat/ConfigCatClient.java
+++ b/src/main/java/com/configcat/ConfigCatClient.java
@@ -46,11 +46,7 @@ private ConfigCatClient(String sdkKey, Options options) {
createHttpClient(options.httpOptions()),
this.logger,
sdkKey,
- !options.isBaseURLCustom()
- ? options.dataGovernance == DataGovernance.GLOBAL
- ? BASE_URL_GLOBAL
- : BASE_URL_EU
- : options.baseUrl,
+ determineBaseUrl(options.baseUrl, options.dataGovernance, options.isBaseURLCustom()),
options.isBaseURLCustom(),
options.pollingMode.getPollingIdentifier());
@@ -288,8 +284,9 @@ public CompletableFuture>> getAllValueDetailsAsyn
Map settings = settingResult.settings();
List> result = new ArrayList<>();
- for (String key : settings.keySet()) {
- Setting setting = settings.get(key);
+ for (Map.Entry entry : settings.entrySet()) {
+ String key = entry.getKey();
+ Setting setting = entry.getValue();
EvaluationDetails