resolve #256

Author: toptobes

src/main/java/com/dtsx/astra/cli/commands/db/DbGetCmd.java

@@ -12,8 +12,7 @@
 import picocli.CommandLine.Command;
 import picocli.CommandLine.Option;
 
-import java.util.LinkedHashMap;
-import java.util.Optional;
+import java.util.*;
 import java.util.function.Supplier;
 
 import static com.dtsx.astra.cli.operations.db.DbGetOperation.*;
@@ -78,8 +77,8 @@ private RenderableShellTable mkTable(Database dbInfo) {
             put("Vector", Optional.ofNullable(dbInfo.getInfo().getDbType()).orElse("").equals("vector") ? "Enabled" : "Disabled");
             put("Default Keyspace", dbInfo.getInfo().getKeyspace());
             put("Creation Time", dbInfo.getCreationTime());
-            put("Keyspaces", dbInfo.getInfo().getKeyspaces().stream().sorted().toList());
-            put("Regions", dbInfo.getInfo().getDatacenters().stream().map(Datacenter::getRegion).sorted().toList());
+            put("Keyspaces", Objects.requireNonNullElse(dbInfo.getInfo().getKeyspaces(), Set.of()).stream().sorted().toList());
+            put("Regions", Objects.requireNonNullElse(dbInfo.getInfo().getDatacenters(), Set.<Datacenter>of()).stream().map(Datacenter::getRegion).sorted().toList());
         }});
     }
 

src/main/java/com/dtsx/astra/cli/gateways/db/DbCache.java

@@ -24,10 +24,12 @@ default void cache(Database db) {
 
         val keyspaces = db.getInfo().getKeyspaces();
 
-        if (keyspaces.size() == 1) {
-            cacheDbDefaultKs(id, keyspaces.stream().toList().getFirst());
-        } else if (keyspaces.contains(DEFAULT_KEYSPACE)) {
-            cacheDbDefaultKs(id, DEFAULT_KEYSPACE);
+        if (keyspaces != null) {
+            if (keyspaces.size() == 1) {
+                cacheDbDefaultKs(id, keyspaces.stream().toList().getFirst());
+            } else if (keyspaces.contains(DEFAULT_KEYSPACE)) {
+                cacheDbDefaultKs(id, DEFAULT_KEYSPACE);
+            }
         }
     }
 

src/main/java/com/dtsx/astra/cli/gateways/db/keyspace/KeyspaceGatewayImpl.java

@@ -11,6 +11,7 @@
 import lombok.val;
 
 import java.util.ArrayList;
+import java.util.List;
 
 @RequiredArgsConstructor
 public class KeyspaceGatewayImpl implements KeyspaceGateway {
@@ -24,11 +25,11 @@ public FoundKeyspaces findAll(DbRef dbRef) {
 
             val defaultKeyspace = db.getInfo().getKeyspace();
 
-            if (db.getInfo().getKeyspaces() == null) {
-                return new FoundKeyspaces(defaultKeyspace, java.util.List.of());
-            }
+            val keyspaces = (db.getInfo().getKeyspaces() != null)
+                ? new ArrayList<>(db.getInfo().getKeyspaces())
+                : List.<String>of();
 
-            return new FoundKeyspaces(defaultKeyspace, new ArrayList<>(db.getInfo().getKeyspaces()));
+            return new FoundKeyspaces(defaultKeyspace, keyspaces);
         });
     }
 

src/main/java/com/dtsx/astra/cli/operations/db/DbCreateDotEnvOperation.java

@@ -28,10 +28,7 @@
 import java.io.FileNotFoundException;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
-import java.util.Set;
+import java.util.*;
 import java.util.function.Function;
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
@@ -248,7 +245,7 @@ private RegionName resolveRegion(CreateDotEnvRequest request) {
     private String resolveKeyspace(CreateDotEnvRequest request) {
         if (cachedKeyspace == null) {
             cachedKeyspace = request.ksRef
-                .map(ks -> db(request).getInfo().getKeyspaces().stream()
+                .map(ks -> Optional.ofNullable(db(request).getInfo().getKeyspaces()).orElse(Set.of()).stream()
                     .filter(ks.name()::equalsIgnoreCase)
                     .findFirst()
                     .orElseThrow(() -> new KeyspaceNotFoundException(ks))

src/main/java/com/dtsx/astra/cli/operations/db/DbGetOperation.java

@@ -11,6 +11,7 @@
 import lombok.val;
 
 import java.util.Optional;
+import java.util.Set;
 
 @RequiredArgsConstructor
 public class DbGetOperation implements Operation<DbInfo> {
@@ -46,9 +47,9 @@ private DbInfo mkDbInfoValue(DbGetKeys key, Database database) {
             case status -> database.getStatus();
             case cloud -> database.getInfo().getCloudProvider();
             case keyspace -> database.getInfo().getKeyspace();
-            case keyspaces -> database.getInfo().getKeyspaces().stream().sorted().toList();
+            case keyspaces -> Optional.ofNullable(database.getInfo().getKeyspaces()).orElse(Set.of()).stream().sorted().toList();
             case region -> database.getInfo().getRegion();
-            case regions -> database.getInfo().getDatacenters().stream().map(Datacenter::getRegion).sorted().toList();
+            case regions -> Optional.of(database.getInfo().getDatacenters()).orElse(Set.of()).stream().map(Datacenter::getRegion).sorted().toList();
             case creation_time -> database.getCreationTime();
             case vector -> database.getInfo().getDbType().equals("vector");
         };