Use LinkedHashMap over TreeMap everywhere

stelar7 · Sep 17, 2022 · 8d2d9a2 · 8d2d9a2
1 parent 87c01e7
commit 8d2d9a2
Show file tree

Hide file tree

Showing 28 changed files with 81 additions and 82 deletions.
diff --git a/src/main/java/no/stelar7/api/r4j/basic/cache/impl/FileSystemCacheProvider.java b/src/main/java/no/stelar7/api/r4j/basic/cache/impl/FileSystemCacheProvider.java
@@ -89,7 +89,7 @@ public void store(URLEndpoint type, Map<String, Object> obj)
             }
 
             // inject api key so cache still works in v4
-            vals.add(0, DataCall.getCredentials() == null ? "STATIC_DATA" : DataCall.getCredentials().getUniqueKeyCombination());
+            vals.add(DataCall.getCredentials() == null ? "STATIC_DATA" : DataCall.getCredentials().getUniqueKeyCombination());
 
             Path storePath = resolvePath(type, vals);
             Files.createDirectories(storePath.getParent());
@@ -125,7 +125,6 @@ private Path resolvePath(URLEndpoint type, List<Object> obj)
         Path storePath = home.resolve(type.toString());
 
         List<Object> pathData = new ArrayList<>(obj);
-        Collections.reverse(pathData);
 
         for (Object datum : pathData)
         {
@@ -155,7 +154,7 @@ public void update(URLEndpoint type, Map<String, Object> obj)
                 return;
             }
 
-            vals.add(0, DataCall.getCredentials().getUniqueKeyCombination());
+            vals.add(DataCall.getCredentials().getUniqueKeyCombination());
 
             Path storePath = resolvePath(type, vals);
             if (Files.exists(storePath))
@@ -177,7 +176,7 @@ public Optional<?> get(URLEndpoint type, Map<String, Object> obj)
         List<Object> vals = new ArrayList<>(obj.values());
 
         // inject api key so cache still works in v4
-        vals.add(0, DataCall.getCredentials() == null ? "STATIC_DATA" : DataCall.getCredentials().getUniqueKeyCombination());
+        vals.add(DataCall.getCredentials() == null ? "STATIC_DATA" : DataCall.getCredentials().getUniqueKeyCombination());
         Path filepath = resolvePath(type, vals);
 
         try

diff --git a/src/main/java/no/stelar7/api/r4j/basic/calling/DataCall.java b/src/main/java/no/stelar7/api/r4j/basic/calling/DataCall.java
@@ -24,9 +24,9 @@ public final class DataCall
     private static long           maxSleep       = 10000;
     private static int            globalTimeout  = 0;
 
-    private final Map<String, String> urlParams  = new TreeMap<>();
-    private final Map<String, String> urlData    = new TreeMap<>();
-    private final Map<String, String> urlHeaders = new TreeMap<>();
+    private final Map<String, String> urlParams  = new LinkedHashMap<>();
+    private final Map<String, String> urlData    = new LinkedHashMap<>();
+    private final Map<String, String> urlHeaders = new LinkedHashMap<>();
 
     private        Enum        platform;
     private        URLEndpoint endpoint;

diff --git a/src/main/java/no/stelar7/api/r4j/impl/lol/builders/champion/ChampionBuilder.java b/src/main/java/no/stelar7/api/r4j/impl/lol/builders/champion/ChampionBuilder.java
@@ -37,7 +37,7 @@ public ChampionRotationInfo getFreeToPlayRotation()
         DataCallBuilder builder = new DataCallBuilder().withEndpoint(URLEndpoint.V3_CHAMPION_ROTATIONS)
                                                        .withPlatform(this.platform);
 
-        Map<String, Object> data = new TreeMap<>();
+        Map<String, Object> data = new LinkedHashMap<>();
         data.put("platform", this.platform);
 
         Optional<?> chl = DataCall.getCacheProvider().get(URLEndpoint.V3_CHAMPION_ROTATIONS, data);

diff --git a/...ain/java/no/stelar7/api/r4j/impl/lol/builders/championmastery/ChampionMasteryBuilder.java b/...ain/java/no/stelar7/api/r4j/impl/lol/builders/championmastery/ChampionMasteryBuilder.java
@@ -60,7 +60,7 @@ public Integer getMasteryScore()
                                                        .withEndpoint(URLEndpoint.V4_MASTERY_SCORE)
                                                        .withPlatform(this.platform);
 
-        Map<String, Object> data = new TreeMap<>();
+        Map<String, Object> data = new LinkedHashMap<>();
         data.put("platform", this.platform);
         data.put("id", summonerId);
 
@@ -96,7 +96,7 @@ public List<ChampionMastery> getChampionMasteries()
                                                        .withEndpoint(URLEndpoint.V4_MASTERY_BY_ID)
                                                        .withPlatform(this.platform);
 
-        Map<String, Object> data = new TreeMap<>();
+        Map<String, Object> data = new LinkedHashMap<>();
         data.put("platform", platform);
         data.put("id", summonerId);
 
@@ -149,7 +149,7 @@ public ChampionMastery getChampionMastery()
                                                        .withEndpoint(URLEndpoint.V4_MASTERY_BY_CHAMPION)
                                                        .withPlatform(this.platform);
 
-        Map<String, Object> data = new TreeMap<>();
+        Map<String, Object> data = new LinkedHashMap<>();
         data.put("platform", platform);
         data.put("id", summonerId);
         data.put("champion", championId);

diff --git a/src/main/java/no/stelar7/api/r4j/impl/lol/builders/league/LeagueBuilder.java b/src/main/java/no/stelar7/api/r4j/impl/lol/builders/league/LeagueBuilder.java
@@ -68,7 +68,7 @@ public List<LeagueEntry> getLeagueEntries()
                                                        .withURLParameter(Constants.SUMMONER_ID_PLACEHOLDER, this.summonerId)
                                                        .withEndpoint(URLEndpoint.V4_LEAGUE_ENTRY)
                                                        .withPlatform(this.platform);
-        Map<String, Object> data = new TreeMap<>();
+        Map<String, Object> data = new LinkedHashMap<>();
         data.put("platform", platform);
         data.put("id", summonerId);
 
@@ -112,7 +112,7 @@ public LeagueList getLeague()
                                                        .withEndpoint(URLEndpoint.V4_LEAGUE)
                                                        .withPlatform(this.platform);
 
-        Map<String, Object> data = new TreeMap<>();
+        Map<String, Object> data = new LinkedHashMap<>();
         data.put("platform", platform);
         data.put("id", leagueId);
 

diff --git a/src/main/java/no/stelar7/api/r4j/impl/lol/builders/matchv5/match/MatchBuilder.java b/src/main/java/no/stelar7/api/r4j/impl/lol/builders/matchv5/match/MatchBuilder.java
@@ -84,7 +84,7 @@ public GAMHSMatch getMatchRAW()
                                                        .withEndpoint(URLEndpoint.V5_MATCH)
                                                        .withPlatform(this.platform);
 
-        Map<String, Object> data = new TreeMap<>();
+        Map<String, Object> data = new LinkedHashMap<>();
         data.put("platform", this.platform);
         data.put("gameid", this.id);
 

diff --git a/src/main/java/no/stelar7/api/r4j/impl/lol/builders/matchv5/match/MatchListBuilder.java b/src/main/java/no/stelar7/api/r4j/impl/lol/builders/matchv5/match/MatchListBuilder.java
@@ -121,7 +121,7 @@ public List<String> get()
             builder.withQueryParameter(Constants.ENDTIME_PLACEHOLDER_DATA, String.valueOf(this.endTime));
         }
 
-        Map<String, Object> data = new TreeMap<>();
+        Map<String, Object> data = new LinkedHashMap<>();
         data.put("platform", platform);
         data.put("puuid", puuid);
         data.put("queue", queue);

diff --git a/src/main/java/no/stelar7/api/r4j/impl/lol/builders/matchv5/match/TimelineBuilder.java b/src/main/java/no/stelar7/api/r4j/impl/lol/builders/matchv5/match/TimelineBuilder.java
@@ -83,7 +83,7 @@ public GAMHSMatch getTimelineRAW()
                                                        .withEndpoint(URLEndpoint.V5_TIMELINE)
                                                        .withPlatform(this.platform);
 
-        Map<String, Object> data = new TreeMap<>();
+        Map<String, Object> data = new LinkedHashMap<>();
         data.put("platform", platform);
         data.put("matchId", this.id);
 

diff --git a/src/main/java/no/stelar7/api/r4j/impl/lol/builders/spectator/SpectatorBuilder.java b/src/main/java/no/stelar7/api/r4j/impl/lol/builders/spectator/SpectatorBuilder.java
@@ -44,7 +44,7 @@ public List<SpectatorGameInfo> getFeaturedGames()
             return Collections.emptyList();
         }
 
-        Map<String, Object> data = new TreeMap<>();
+        Map<String, Object> data = new LinkedHashMap<>();
         data.put("platform", platform);
 
         Optional<?> chl = DataCall.getCacheProvider().get(URLEndpoint.V4_SPECTATOR_FEATURED, data);
@@ -82,7 +82,7 @@ public SpectatorGameInfo getCurrentGame()
             return null;
         }
 
-        Map<String, Object> data = new TreeMap<>();
+        Map<String, Object> data = new LinkedHashMap<>();
         data.put("platform", platform);
         data.put("id", this.summonerId);
 

diff --git a/src/main/java/no/stelar7/api/r4j/impl/lol/builders/summoner/SummonerBuilder.java b/src/main/java/no/stelar7/api/r4j/impl/lol/builders/summoner/SummonerBuilder.java
@@ -105,7 +105,7 @@ public Summoner get()
         URLEndpoint     endpoint = null;
 
 
-        Map<String, Object> data = new TreeMap<>();
+        Map<String, Object> data = new LinkedHashMap<>();
         data.put("platform", platform);
 
         if (accId.length() > 0)

diff --git a/src/main/java/no/stelar7/api/r4j/impl/lol/raw/ChallengeAPI.java b/src/main/java/no/stelar7/api/r4j/impl/lol/raw/ChallengeAPI.java
@@ -27,7 +27,7 @@ public ChallengeConfigInfoList getChallengesList(LeagueShard server)
         DataCallBuilder builder = new DataCallBuilder().withEndpoint(URLEndpoint.V1_CHALLENGES_CONFIG)
                                                        .withPlatform(server);
 
-        Map<String, Object> data = new TreeMap<>();
+        Map<String, Object> data = new LinkedHashMap<>();
         data.put("platform", server);
 
         Optional<?> chl = DataCall.getCacheProvider().get(URLEndpoint.V1_CHALLENGES_CONFIG, data);
@@ -55,7 +55,7 @@ public MultiChallengePercentileMap getAllChallengePercentiles(LeagueShard server
         DataCallBuilder builder = new DataCallBuilder().withEndpoint(URLEndpoint.V1_CHALLENGES_PERCENTILES)
                                                        .withPlatform(server);
 
-        Map<String, Object> data = new TreeMap<>();
+        Map<String, Object> data = new LinkedHashMap<>();
         data.put("platform", server);
 
         Optional<?> chl = DataCall.getCacheProvider().get(URLEndpoint.V1_CHALLENGES_PERCENTILES, data);
@@ -84,7 +84,7 @@ public ChallengeConfigInfo getChallengeInfo(LeagueShard server, Long challengeId
                                                        .withURLParameter(Constants.CHALLENGE_ID_PLACEHOLDER, String.valueOf(challengeId))
                                                        .withPlatform(server);
 
-        Map<String, Object> data = new TreeMap<>();
+        Map<String, Object> data = new LinkedHashMap<>();
         data.put("platform", server);
         data.put("challenge", challengeId);
 
@@ -120,7 +120,7 @@ public ChallengeLeaderboardInfoList getChallengeLeaderboard(LeagueShard server,
             builder = builder.withQueryParameter(Constants.LIMIT_PLACEHOLDER_DATA, String.valueOf(limit));
         }
 
-        Map<String, Object> data = new TreeMap<>();
+        Map<String, Object> data = new LinkedHashMap<>();
         data.put("platform", server);
         data.put("challenge", challengeId);
         data.put("level", level);
@@ -152,7 +152,7 @@ public MultiChallengePercentileMap getChallengePercentiles(LeagueShard server, L
                                                        .withURLParameter(Constants.CHALLENGE_ID_PLACEHOLDER, String.valueOf(challengeId))
                                                        .withPlatform(server);
 
-        Map<String, Object> data = new TreeMap<>();
+        Map<String, Object> data = new LinkedHashMap<>();
         data.put("platform", server);
         data.put("challenge", challengeId);
 
@@ -182,7 +182,7 @@ public ChallengePlayerInfo getChallengePlayerInfo(LeagueShard server, String puu
                                                        .withURLParameter(Constants.PUUID_ID_PLACEHOLDER, puuid)
                                                        .withPlatform(server);
 
-        Map<String, Object> data = new TreeMap<>();
+        Map<String, Object> data = new LinkedHashMap<>();
         data.put("platform", server);
         data.put("puuid", puuid);
 

diff --git a/src/main/java/no/stelar7/api/r4j/impl/lol/raw/ChampionAPI.java b/src/main/java/no/stelar7/api/r4j/impl/lol/raw/ChampionAPI.java
@@ -26,7 +26,7 @@ public ChampionRotationInfo getFreeToPlayRotation(LeagueShard server)
         DataCallBuilder builder = new DataCallBuilder().withEndpoint(URLEndpoint.V3_CHAMPION_ROTATIONS)
                                                        .withPlatform(server);
 
-        Map<String, Object> data = new TreeMap<>();
+        Map<String, Object> data = new LinkedHashMap<>();
         data.put("platform", server);
 
         Optional<?> chl = DataCall.getCacheProvider().get(URLEndpoint.V3_CHAMPION_ROTATIONS, data);

diff --git a/src/main/java/no/stelar7/api/r4j/impl/lol/raw/ClashAPI.java b/src/main/java/no/stelar7/api/r4j/impl/lol/raw/ClashAPI.java
@@ -30,7 +30,7 @@ public List<ClashPlayer> getPlayerInfo(final LeagueShard server, String summoner
                                                        .withURLParameter(Constants.SUMMONER_ID_PLACEHOLDER, summonerId)
                                                        .withPlatform(server);
 
-        Map<String, Object> data = new TreeMap<>();
+        Map<String, Object> data = new LinkedHashMap<>();
         data.put("platform", server);
         data.put("summonerId", summonerId);
 
@@ -63,7 +63,7 @@ public ClashTeam getTeam(final LeagueShard server, String teamId)
                                                        .withURLParameter(Constants.TEAM_ID_PLACEHOLDER, teamId)
                                                        .withPlatform(server);
 
-        Map<String, Object> data = new TreeMap<>();
+        Map<String, Object> data = new LinkedHashMap<>();
         data.put("platform", server);
         data.put("teamId", teamId);
 
@@ -95,7 +95,7 @@ public List<ClashTournament> getTournaments(final LeagueShard server)
         DataCallBuilder builder = new DataCallBuilder().withEndpoint(URLEndpoint.V1_CLASH_TOURNAMENTS)
                                                        .withPlatform(server);
 
-        Map<String, Object> data = new TreeMap<>();
+        Map<String, Object> data = new LinkedHashMap<>();
         data.put("platform", server);
 
         Optional<?> chl = DataCall.getCacheProvider().get(URLEndpoint.V1_CLASH_TOURNAMENTS, data);
@@ -127,7 +127,7 @@ public ClashTournament getTournamentByTeam(final LeagueShard server, String team
                                                        .withURLParameter(Constants.TEAM_ID_PLACEHOLDER, teamId)
                                                        .withPlatform(server);
 
-        Map<String, Object> data = new TreeMap<>();
+        Map<String, Object> data = new LinkedHashMap<>();
         data.put("platform", server);
         data.put("teamId", teamId);
 
@@ -160,7 +160,7 @@ public ClashTournament getTournamentById(final LeagueShard server, int tournamen
                                                        .withURLParameter(Constants.TOURNAMENT_ID_PLACEHOLDER, String.valueOf(tournamentId))
                                                        .withPlatform(server);
 
-        Map<String, Object> data = new TreeMap<>();
+        Map<String, Object> data = new LinkedHashMap<>();
         data.put("platform", server);
         data.put("tournamentId", tournamentId);