Merge pull request #40 from aiven/getTeamNameFromTeamId

Simplify and optimize ManageDatabase#getTeamNameFromTeamId
Aiven-Open · Sep 26, 2022 · 57f008d · 57f008d
2 parents 7253d06 + d6274fd
commit 57f008d
Showing 1 changed file with 3 additions and 6 deletions.
diff --git a/src/main/java/io/aiven/klaw/config/ManageDatabase.java b/src/main/java/io/aiven/klaw/config/ManageDatabase.java
@@ -313,12 +313,9 @@ public Integer getTeamIdFromTeamName(int tenantId, String teamName) {
   }
 
   public String getTeamNameFromTeamId(int tenantId, int teamId) {
-    Optional<Map.Entry<Integer, String>> optionalTeam =
-        teamIdAndNamePerTenant.get(tenantId).entrySet().stream()
-            .filter(a -> a.getKey() == teamId)
-            .findFirst();
-    if (optionalTeam.isPresent()) return optionalTeam.get().getValue();
-    else return ""; // unknown team
+    return teamIdAndNamePerTenant
+        .getOrDefault(tenantId, Collections.emptyMap())
+        .getOrDefault(teamId, ""); // empty string in case of unknown team
   }
 
   public Map<Integer, List<String>> getEnvsOfTenantsMap() {