Skip to content

Commit

Permalink
Use Java standard map instead of GSON internal one
Browse files Browse the repository at this point in the history
LinkedHashTreeMap is an internal class never intended for use outside of GSON.
It was removed in google/gson#1992 (version 2.9.0) and
its use in this project prevents the GSON version from being bumped.

The standard LinkedHashMap is a perfect drop-in replacement as it
also preserves insertion order.
  • Loading branch information
YavorPaunov committed Sep 8, 2022
1 parent 5f19d58 commit 63b6620
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions client/src/main/java/ai/vespa/client/dsl/FixedQuery.java
@@ -1,10 +1,9 @@
// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
package ai.vespa.client.dsl;

import com.google.gson.internal.LinkedHashTreeMap;

import java.math.BigDecimal;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.Map;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors;
Expand Down Expand Up @@ -359,7 +358,7 @@ public Map<String, String> buildQueryMap() {
}
sb.append(";");

queryMap = new LinkedHashTreeMap<>(); // for the order
queryMap = new LinkedHashMap<>(); // for the order
queryMap.put("yql", sb.toString());
queryMap.putAll(others);
queryMap.putAll(getUserInputs());
Expand Down

0 comments on commit 63b6620

Please sign in to comment.