update installation script

Author: clun

astra-sdk/src/test/java/com/datastax/astra/sdk/stargate/ApiGraphQLAstraTest.java

@@ -0,0 +1,5 @@
+package com.datastax.astra.sdk.stargate;
+
+public class ApiGraphQLAstraTest {
+
+}

astra-shell/dist/astra-install.sh

@@ -82,6 +82,7 @@ if [ -d "$ASTRA_DIR" ]; then
 	echo "    ${ASTRA_CLI_DIR}"
 	echo ""
 	echo " Please delete this folder if you need to upgrade."
+	echo " rm -Rf ${ASTRA_CLI_DIR}"
 	echo "======================================================================================================"
 	echo ""
 	exit 0
@@ -131,7 +132,6 @@ mkdir -p "$astra_tmp_folder"
 echo "$(tput setaf 2)[OK]$(tput setaf 7) - Created $astra_tmp_folder"
 mkdir -p "$ASTRA_CLI_DIR"
 echo "$(tput setaf 2)[OK]$(tput setaf 7) - Created $ASTRA_CLI_DIR"
-
 echo ""
 echo "Downloading archive:"
 download_url="https://github.com/datastaxdevs/datastaxdevs.github.io/raw/master/cli/${ASTRA_CLI_VERSION}.zip"
@@ -193,18 +193,10 @@ touch "$astra_zshrc"
 if [[ -z $(grep 'astra-init.sh' "$astra_zshrc") ]]; then
     echo -e "\n$astra_init_snippet" >> "$astra_zshrc"
     echo "$(tput setaf 2)[OK]$(tput setaf 7) - astra added to ${astra_zshrc}"
-    echo "Updated existing ${astra_zshrc}"
 fi
 
-
-echo "$(tput setaf 2)[OK]$(tput setaf 7) - ALL DONE"
-
-echo ""
-echo "Please open a new terminal, or run the following in the existing one:"
-echo ""
-echo "    source \"${ASTRA_CLI_DIR}/astra-init.sh\""
+echo "$(tput setaf 2)[OK]$(tput setaf 7) - Installation Successful"
 echo ""
-echo "Then issue the following command:"
+echo "Open $(tput setaf 2)A NEW TERMINAL$(tput setaf 7) and run: $(tput setaf 3)astra setup$(tput setaf 7)"
 echo ""
-echo "    astra setup"
-echo ""
+echo "You can close this window."

stargate-sdk/src/main/java/com/datastax/stargate/sdk/gql/CqlKeyspaceClient.java

@@ -50,16 +50,6 @@ public String query(String input) {
         return res.getBody();
     }
 
-    /**
-     * List tables.
-     *
-     * @return
-     *      return list of table
-     */
-    public String listTables() {
-        return query(GraphQLQueryBuilder.queryListTables(this.keyspace));
-    }
-    
     /**
      * Mapping from root URL to rest endpoint listing keyspaces definitions.
      */

stargate-sdk/src/main/java/com/datastax/stargate/sdk/gql/CqlSchemaClient.java

@@ -2,9 +2,12 @@
 
 import static com.datastax.stargate.sdk.utils.JsonUtils.unmarshallType;
 
+import java.util.Optional;
 import java.util.function.Function;
 import java.util.stream.Stream;
 
+import com.datastax.stargate.graphql.client.KeyspaceGraphQLQuery;
+import com.datastax.stargate.graphql.client.KeyspaceProjectionRoot;
 import com.datastax.stargate.graphql.client.KeyspacesGraphQLQuery;
 import com.datastax.stargate.graphql.client.KeyspacesProjectionRoot;
 import com.datastax.stargate.graphql.types.Keyspace;
@@ -69,15 +72,39 @@ public Stream<Keyspace> keyspaces() {
      *      list of keyspaces.
      */
     public Stream<Keyspace> keyspaces(KeyspacesProjectionRoot projection) {
-        String res = query(new GraphQLQueryRequest(
+        // Shape your request
+        String graphQLRequest = new GraphQLQueryRequest(
                 new KeyspacesGraphQLQuery.Builder().build(),
-                projection).serialize());
-        return unmarshallType(res, new TypeReference<ApiResponse<Keyspaces>>(){})
+                projection).serialize();
+        // Invoke endpoint
+        ApiResponseHttp res = stargateHttpClient.POST_GRAPHQL(cqlSchemaResource, graphQLRequest);
+        // Marshall output
+        return unmarshallType(res.getBody(), new TypeReference<ApiResponse<Keyspaces>>(){})
                 .getData()
                 .getKeyspaces()
                 .stream();
     }
 
+    /**
+     * Using the keyspace(...) functions about cqlShema.
+     *
+     * @param keyspaceName
+     *      keyspace name
+     * @param projection
+     *      
+     * @return
+     */
+    public Optional<Keyspace> keyspace(String keyspaceName, KeyspaceProjectionRoot projection) {
+        String graphQLRequest = new GraphQLQueryRequest(
+                new KeyspaceGraphQLQuery.Builder().name(keyspaceName).build(), 
+                projection).serialize();
+        // Invoke endpoint
+        ApiResponseHttp res = stargateHttpClient.POST_GRAPHQL(cqlSchemaResource, graphQLRequest);
+        // Marshall output
+        return Optional.ofNullable(unmarshallType(res.getBody(), 
+                new TypeReference<ApiResponse<Keyspace>>(){}).getData());
+    }
+    
     /**
      * Mutation to create a keyspace.
      * 

stargate-sdk/src/main/java/com/datastax/stargate/sdk/gql/GraphQLQueryBuilder.java

@@ -11,17 +11,7 @@ public class GraphQLQueryBuilder {
      * Hide default constructor.
      */
     private GraphQLQueryBuilder() {}
-    
-    /**
-     * List keyspaces.
-     *
-     * @return
-     *      a query.
-     */
-    public static String queryListKeyspaces() {
-        return "{ keyspaces { name } }";
-    }
-    
+   
     /**
      * List tables in a keyspace.
      *