From 22b2bfe17de5d6be30882629679501ec72720e7b Mon Sep 17 00:00:00 2001
From: kobe860219 <kobe860219@gmail.com>
Date: Tue, 11 Aug 2020 20:52:37 +0800
Subject: [PATCH 01/10] SUBMARINE-598. Support get environment list from
 database

---
 .vscode/tasks.json                            | 61 +++++++++++++++++++
 .../environment/EnvironmentManager.java       | 27 +++++++-
 .../database/mappers/EnvironmentMapper.java   |  4 ++
 .../database/mappers/EnvironmentMapper.xml    |  7 +++
 4 files changed, 97 insertions(+), 2 deletions(-)
 create mode 100644 .vscode/tasks.json

diff --git a/.vscode/tasks.json b/.vscode/tasks.json
new file mode 100644
index 000000000..c375c4446
--- /dev/null
+++ b/.vscode/tasks.json
@@ -0,0 +1,61 @@
+{
+	"version": "2.0.0",
+	"tasks": [
+		{
+            "label": "Checking releases for licenses",
+            "type": "shell",
+            "command": "mvn clean org.apache.rat:apache-rat-plugin:check",
+            "group": "test"
+        },
+        {
+            "label": "build all",
+            "type": "shell",
+            "command": "mvn clean install package -DskipTests -pl '!submarine-cloud'",
+            "group": "test"
+        },
+        {           
+            "label": "server-core",
+            "type": "shell",
+            "command": "mvn clean install package -DskipTests -pl 'submarine-server/server-core';cp submarine-server/server-core/target/submarine-server-core-0.5.0-SNAPSHOT.jar submarine-dist/target/submarine-dist-0.5.0-SNAPSHOT-hadoop-2.9/submarine-dist-0.5.0-SNAPSHOT-hadoop-2.9/lib/;",
+            
+            "group":"test"
+        },
+        {
+            "label": "server-api",
+            "type": "shell",
+            "command": "mvn clean install package -DskipTests -pl 'submarine-server/server-api';cp submarine-server/server-api/target/submarine-server-api-0.5.0-SNAPSHOT.jar submarine-dist/target/submarine-dist-0.5.0-SNAPSHOT-hadoop-2.9/submarine-dist-0.5.0-SNAPSHOT-hadoop-2.9/lib/;",
+            
+            "group": "test"
+        },
+        {
+            "label": "submarine-server",
+            "type": "shell",
+            "command": "",
+            "dependsOrder": "sequence",
+            "dependsOn": [
+                "server-api",
+                "server-core"
+            ],
+            "group": "test"
+        },
+        {
+            "label": "start getMysqlJar",
+            "type": "shell",
+            "command": "cd submarine-dist/target/submarine-dist-0.5.0-SNAPSHOT-hadoop-2.9/submarine-dist-0.5.0-SNAPSHOT-hadoop-2.9/;rm logs/submarine.log;bin/submarine-daemon.sh start getMysqlJar;cd ~/submarine;",
+            "group": "test"
+        },
+        {
+            "label": "restart",
+            "type": "shell",
+            "command": "bash",
+            "args": ["cd submarine-dist/target/submarine-dist-0.5.0-SNAPSHOT-hadoop-2.9/submarine-dist-0.5.0-SNAPSHOT-hadoop-2.9/;rm logs/submarine.log;bin/submarine-daemon.sh restart;cd ~/submarine;"],
+            "group":"test"
+        },
+        {
+            "label": "rebase",
+            "type": "shell",
+            "command": "git fetch upstream;git checkout master;git rebase upstream/master",
+            "group":"test"
+        }
+	]
+}
\ No newline at end of file
diff --git a/submarine-server/server-core/src/main/java/org/apache/submarine/server/environment/EnvironmentManager.java b/submarine-server/server-core/src/main/java/org/apache/submarine/server/environment/EnvironmentManager.java
index eb238a5b9..500117846 100644
--- a/submarine-server/server-core/src/main/java/org/apache/submarine/server/environment/EnvironmentManager.java
+++ b/submarine-server/server-core/src/main/java/org/apache/submarine/server/environment/EnvironmentManager.java
@@ -204,9 +204,32 @@ public Environment getEnvironment(String name)
    */
   public List<Environment> listEnvironments(String status)
       throws SubmarineRuntimeException {
-    List<Environment> environmentList =
+    List<Environment> envs =
         new ArrayList<Environment>(cachedEnvironments.values());
-    return environmentList;
+    // Is it available in cache?
+    if (envs != null && envs.size() != 0) {
+      return envs;
+    }
+    try (SqlSession sqlSession = MyBatisUtil.getSqlSession()) {
+      EnvironmentMapper environmentMapper =
+            sqlSession.getMapper(EnvironmentMapper.class);
+      List<EnvironmentEntity> environmentEntitys = environmentMapper.selectAll();
+      for (EnvironmentEntity environmentEntity: environmentEntitys) {
+        if (environmentEntity != null) {
+          Environment env = new Environment();
+
+          env.setEnvironmentSpec(new Gson().fromJson(
+                environmentEntity.getEnvironmentSpec(), EnvironmentSpec.class));
+          envs.add(env);
+          cachedEnvironments.put(env.getEnvironmentSpec().getName(), env);
+        }
+      }
+    } catch (Exception e) {
+      LOG.error(e.getMessage(), e);
+      throw new SubmarineRuntimeException(Status.BAD_REQUEST.getStatusCode(),
+            "Unable to get the environment details.");
+    }
+    return envs;
   }
 
   private void checkSpec(EnvironmentSpec spec)
diff --git a/submarine-server/server-core/src/main/java/org/apache/submarine/server/environment/database/mappers/EnvironmentMapper.java b/submarine-server/server-core/src/main/java/org/apache/submarine/server/environment/database/mappers/EnvironmentMapper.java
index eddea3266..43b1a3c4a 100644
--- a/submarine-server/server-core/src/main/java/org/apache/submarine/server/environment/database/mappers/EnvironmentMapper.java
+++ b/submarine-server/server-core/src/main/java/org/apache/submarine/server/environment/database/mappers/EnvironmentMapper.java
@@ -20,8 +20,12 @@
 
 import org.apache.submarine.server.environment.database.entity.EnvironmentEntity;
 
+import java.util.List;
+
 public interface EnvironmentMapper {
 
+  List<EnvironmentEntity> selectAll();
+
   EnvironmentEntity select(String environmentName);
 
   int insert(EnvironmentEntity environment);
diff --git a/submarine-server/server-core/src/main/resources/org/apache/submarine/database/mappers/EnvironmentMapper.xml b/submarine-server/server-core/src/main/resources/org/apache/submarine/database/mappers/EnvironmentMapper.xml
index 0efce7dda..58996f90f 100644
--- a/submarine-server/server-core/src/main/resources/org/apache/submarine/database/mappers/EnvironmentMapper.xml
+++ b/submarine-server/server-core/src/main/resources/org/apache/submarine/database/mappers/EnvironmentMapper.xml
@@ -36,6 +36,13 @@
     id, environment_name, environment_spec, create_by, create_time, update_by, update_time
   </sql>
 
+  <select id="selectAll" parameterType="java.lang.String" resultMap="resultMap">
+    select
+    <include refid="Base_Column_List" />
+    from environment
+    where 1 = 1
+  </select>
+
   <select id="select" parameterType="java.lang.String" resultMap="resultMap">
     select
     <include refid="Base_Column_List" />

From 9d5506c9c00d6abe8e5458930458a7d54d3e7020 Mon Sep 17 00:00:00 2001
From: kobe860219 <kobe860219@gmail.com>
Date: Tue, 11 Aug 2020 21:07:37 +0800
Subject: [PATCH 02/10] Edit .gitignore

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 996243c18..6f881b70c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -95,6 +95,7 @@ submarine-security/spark-security/derby.log
 .classpath
 .settings
 .factorypath
+.vscode/tasks.json
 
 # jupyter notebook checkpoints
 .ipynb_checkpoints

From 19920f2640617467867eabc8e27a39da7096ae6a Mon Sep 17 00:00:00 2001
From: kobe860219 <kobe860219@gmail.com>
Date: Tue, 11 Aug 2020 21:11:28 +0800
Subject: [PATCH 03/10] Edit .gitignore

---
 .gitignore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 6f881b70c..7b559e779 100644
--- a/.gitignore
+++ b/.gitignore
@@ -95,7 +95,7 @@ submarine-security/spark-security/derby.log
 .classpath
 .settings
 .factorypath
-.vscode/tasks.json
+.vscode
 
 # jupyter notebook checkpoints
 .ipynb_checkpoints

From 730c0b81d4582dc0a9ede8765d1b3bfd60d2f0da Mon Sep 17 00:00:00 2001
From: kobe860219 <kobe860219@gmail.com>
Date: Tue, 11 Aug 2020 21:14:22 +0800
Subject: [PATCH 04/10] SUBMARINE-598. Support get environment list from
 database

---
 .gitignore         |  1 -
 .vscode/tasks.json | 61 ----------------------------------------------
 2 files changed, 62 deletions(-)
 delete mode 100644 .vscode/tasks.json

diff --git a/.gitignore b/.gitignore
index 7b559e779..996243c18 100644
--- a/.gitignore
+++ b/.gitignore
@@ -95,7 +95,6 @@ submarine-security/spark-security/derby.log
 .classpath
 .settings
 .factorypath
-.vscode
 
 # jupyter notebook checkpoints
 .ipynb_checkpoints
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
deleted file mode 100644
index c375c4446..000000000
--- a/.vscode/tasks.json
+++ /dev/null
@@ -1,61 +0,0 @@
-{
-	"version": "2.0.0",
-	"tasks": [
-		{
-            "label": "Checking releases for licenses",
-            "type": "shell",
-            "command": "mvn clean org.apache.rat:apache-rat-plugin:check",
-            "group": "test"
-        },
-        {
-            "label": "build all",
-            "type": "shell",
-            "command": "mvn clean install package -DskipTests -pl '!submarine-cloud'",
-            "group": "test"
-        },
-        {           
-            "label": "server-core",
-            "type": "shell",
-            "command": "mvn clean install package -DskipTests -pl 'submarine-server/server-core';cp submarine-server/server-core/target/submarine-server-core-0.5.0-SNAPSHOT.jar submarine-dist/target/submarine-dist-0.5.0-SNAPSHOT-hadoop-2.9/submarine-dist-0.5.0-SNAPSHOT-hadoop-2.9/lib/;",
-            
-            "group":"test"
-        },
-        {
-            "label": "server-api",
-            "type": "shell",
-            "command": "mvn clean install package -DskipTests -pl 'submarine-server/server-api';cp submarine-server/server-api/target/submarine-server-api-0.5.0-SNAPSHOT.jar submarine-dist/target/submarine-dist-0.5.0-SNAPSHOT-hadoop-2.9/submarine-dist-0.5.0-SNAPSHOT-hadoop-2.9/lib/;",
-            
-            "group": "test"
-        },
-        {
-            "label": "submarine-server",
-            "type": "shell",
-            "command": "",
-            "dependsOrder": "sequence",
-            "dependsOn": [
-                "server-api",
-                "server-core"
-            ],
-            "group": "test"
-        },
-        {
-            "label": "start getMysqlJar",
-            "type": "shell",
-            "command": "cd submarine-dist/target/submarine-dist-0.5.0-SNAPSHOT-hadoop-2.9/submarine-dist-0.5.0-SNAPSHOT-hadoop-2.9/;rm logs/submarine.log;bin/submarine-daemon.sh start getMysqlJar;cd ~/submarine;",
-            "group": "test"
-        },
-        {
-            "label": "restart",
-            "type": "shell",
-            "command": "bash",
-            "args": ["cd submarine-dist/target/submarine-dist-0.5.0-SNAPSHOT-hadoop-2.9/submarine-dist-0.5.0-SNAPSHOT-hadoop-2.9/;rm logs/submarine.log;bin/submarine-daemon.sh restart;cd ~/submarine;"],
-            "group":"test"
-        },
-        {
-            "label": "rebase",
-            "type": "shell",
-            "command": "git fetch upstream;git checkout master;git rebase upstream/master",
-            "group":"test"
-        }
-	]
-}
\ No newline at end of file

From 065ef0d6f495fcb6e411f29c1e45fbaab42a4b61 Mon Sep 17 00:00:00 2001
From: kobe860219 <kobe860219@gmail.com>
Date: Wed, 12 Aug 2020 19:33:06 +0800
Subject: [PATCH 05/10] SUBMARINE-598. Support get environment list from
 database

---
 .../submarine/server/environment/EnvironmentManager.java   | 7 +++----
 .../submarine/database/mappers/EnvironmentMapper.xml       | 1 -
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/submarine-server/server-core/src/main/java/org/apache/submarine/server/environment/EnvironmentManager.java b/submarine-server/server-core/src/main/java/org/apache/submarine/server/environment/EnvironmentManager.java
index 500117846..0dc2e5061 100644
--- a/submarine-server/server-core/src/main/java/org/apache/submarine/server/environment/EnvironmentManager.java
+++ b/submarine-server/server-core/src/main/java/org/apache/submarine/server/environment/EnvironmentManager.java
@@ -206,18 +206,17 @@ public List<Environment> listEnvironments(String status)
       throws SubmarineRuntimeException {
     List<Environment> envs =
         new ArrayList<Environment>(cachedEnvironments.values());
-    // Is it available in cache?
-    if (envs != null && envs.size() != 0) {
+
+    if (envs.size() != 0) {
       return envs;
     }
     try (SqlSession sqlSession = MyBatisUtil.getSqlSession()) {
       EnvironmentMapper environmentMapper =
             sqlSession.getMapper(EnvironmentMapper.class);
       List<EnvironmentEntity> environmentEntitys = environmentMapper.selectAll();
-      for (EnvironmentEntity environmentEntity: environmentEntitys) {
+      for (EnvironmentEntity environmentEntity : environmentEntitys) {
         if (environmentEntity != null) {
           Environment env = new Environment();
-
           env.setEnvironmentSpec(new Gson().fromJson(
                 environmentEntity.getEnvironmentSpec(), EnvironmentSpec.class));
           envs.add(env);
diff --git a/submarine-server/server-core/src/main/resources/org/apache/submarine/database/mappers/EnvironmentMapper.xml b/submarine-server/server-core/src/main/resources/org/apache/submarine/database/mappers/EnvironmentMapper.xml
index 58996f90f..4d870b75f 100644
--- a/submarine-server/server-core/src/main/resources/org/apache/submarine/database/mappers/EnvironmentMapper.xml
+++ b/submarine-server/server-core/src/main/resources/org/apache/submarine/database/mappers/EnvironmentMapper.xml
@@ -40,7 +40,6 @@
     select
     <include refid="Base_Column_List" />
     from environment
-    where 1 = 1
   </select>
 
   <select id="select" parameterType="java.lang.String" resultMap="resultMap">

From 736c19275a878370f79101d1f23268be4595800e Mon Sep 17 00:00:00 2001
From: kobe860219 <kobe860219@gmail.com>
Date: Wed, 12 Aug 2020 22:13:47 +0800
Subject: [PATCH 06/10] SUBMARINE-598. Support get environment list from
 database

---
 .../environment/EnvironmentManager.java       | 19 +++++++++++----
 .../server/rest/EnvironmentRestApi.java       | 24 +++++++++++++++++++
 2 files changed, 38 insertions(+), 5 deletions(-)

diff --git a/submarine-server/server-core/src/main/java/org/apache/submarine/server/environment/EnvironmentManager.java b/submarine-server/server-core/src/main/java/org/apache/submarine/server/environment/EnvironmentManager.java
index 0dc2e5061..deae4a024 100644
--- a/submarine-server/server-core/src/main/java/org/apache/submarine/server/environment/EnvironmentManager.java
+++ b/submarine-server/server-core/src/main/java/org/apache/submarine/server/environment/EnvironmentManager.java
@@ -204,12 +204,21 @@ public Environment getEnvironment(String name)
    */
   public List<Environment> listEnvironments(String status)
       throws SubmarineRuntimeException {
-    List<Environment> envs =
+    List<Environment> environmentList =
         new ArrayList<Environment>(cachedEnvironments.values());
+    return environmentList;
+  }
+
+  /**
+   * List all environments from database
+   * @return environment list
+   * @throws SubmarineRuntimeException the service error
+   */
+  public List<Environment> listAllEnvironments()
+      throws SubmarineRuntimeException {
+    List<Environment> envs =
+        new ArrayList<Environment>();
 
-    if (envs.size() != 0) {
-      return envs;
-    }
     try (SqlSession sqlSession = MyBatisUtil.getSqlSession()) {
       EnvironmentMapper environmentMapper =
             sqlSession.getMapper(EnvironmentMapper.class);
@@ -226,7 +235,7 @@ public List<Environment> listEnvironments(String status)
     } catch (Exception e) {
       LOG.error(e.getMessage(), e);
       throw new SubmarineRuntimeException(Status.BAD_REQUEST.getStatusCode(),
-            "Unable to get the environment details.");
+            "Unable to get the environment list.");
     }
     return envs;
   }
diff --git a/submarine-server/server-core/src/main/java/org/apache/submarine/server/rest/EnvironmentRestApi.java b/submarine-server/server-core/src/main/java/org/apache/submarine/server/rest/EnvironmentRestApi.java
index 6e381c7ed..c4004977c 100644
--- a/submarine-server/server-core/src/main/java/org/apache/submarine/server/rest/EnvironmentRestApi.java
+++ b/submarine-server/server-core/src/main/java/org/apache/submarine/server/rest/EnvironmentRestApi.java
@@ -159,6 +159,30 @@ public Response listEnvironment(@QueryParam("status") String status) {
     }
   }
 
+  /**
+   * List all environments from database.
+   * @return environment list
+   */
+  @GET
+  @Path("/list")
+  @Operation(summary = "List of Environments from database",
+          tags = {"environments"},
+          responses = {
+                  @ApiResponse(description = "successful operation", 
+                      content = @Content(
+                          schema = @Schema(
+                              implementation = Environment.class)))})
+  public Response listAllEnvironments() {
+    try {
+      List<Environment> allEnvironmentList =
+          environmentManager.listAllEnvironments();
+      return new JsonResponse.Builder<List<Environment>>(Response.Status.OK)
+          .success(true).result(allEnvironmentList).build();
+    } catch (SubmarineRuntimeException e) {
+      return parseEnvironmentServiceException(e);
+    }
+  }
+
   /**
    * Returns details for the given environment.
    * @param name Name of the environment

From d535c6624b78a7913486701d2399c5b321d06ddf Mon Sep 17 00:00:00 2001
From: kobe860219 <kobe860219@gmail.com>
Date: Thu, 13 Aug 2020 09:56:21 +0800
Subject: [PATCH 07/10] SUBMARINE-598. Support get environment list from
 database

---
 .../environment/EnvironmentManager.java       | 19 +++----------
 .../server/rest/EnvironmentRestApi.java       | 27 ++-----------------
 2 files changed, 5 insertions(+), 41 deletions(-)

diff --git a/submarine-server/server-core/src/main/java/org/apache/submarine/server/environment/EnvironmentManager.java b/submarine-server/server-core/src/main/java/org/apache/submarine/server/environment/EnvironmentManager.java
index deae4a024..37c3f6ee5 100644
--- a/submarine-server/server-core/src/main/java/org/apache/submarine/server/environment/EnvironmentManager.java
+++ b/submarine-server/server-core/src/main/java/org/apache/submarine/server/environment/EnvironmentManager.java
@@ -197,26 +197,13 @@ public Environment getEnvironment(String name)
   }
 
   /**
-   * List environments
-   * @param status environment status, if null will return all status
+   * List all environments from database
    * @return environment list
    * @throws SubmarineRuntimeException the service error
    */
   public List<Environment> listEnvironments(String status)
       throws SubmarineRuntimeException {
     List<Environment> environmentList =
-        new ArrayList<Environment>(cachedEnvironments.values());
-    return environmentList;
-  }
-
-  /**
-   * List all environments from database
-   * @return environment list
-   * @throws SubmarineRuntimeException the service error
-   */
-  public List<Environment> listAllEnvironments()
-      throws SubmarineRuntimeException {
-    List<Environment> envs =
         new ArrayList<Environment>();
 
     try (SqlSession sqlSession = MyBatisUtil.getSqlSession()) {
@@ -228,7 +215,7 @@ public List<Environment> listAllEnvironments()
           Environment env = new Environment();
           env.setEnvironmentSpec(new Gson().fromJson(
                 environmentEntity.getEnvironmentSpec(), EnvironmentSpec.class));
-          envs.add(env);
+          environmentList.add(env);
           cachedEnvironments.put(env.getEnvironmentSpec().getName(), env);
         }
       }
@@ -237,7 +224,7 @@ public List<Environment> listAllEnvironments()
       throw new SubmarineRuntimeException(Status.BAD_REQUEST.getStatusCode(),
             "Unable to get the environment list.");
     }
-    return envs;
+    return environmentList;
   }
 
   private void checkSpec(EnvironmentSpec spec)
diff --git a/submarine-server/server-core/src/main/java/org/apache/submarine/server/rest/EnvironmentRestApi.java b/submarine-server/server-core/src/main/java/org/apache/submarine/server/rest/EnvironmentRestApi.java
index c4004977c..6d95c436b 100644
--- a/submarine-server/server-core/src/main/java/org/apache/submarine/server/rest/EnvironmentRestApi.java
+++ b/submarine-server/server-core/src/main/java/org/apache/submarine/server/rest/EnvironmentRestApi.java
@@ -137,10 +137,11 @@ public Response deleteEnvironment(
   }
   
   /**
-   * List all environments.
+   * List all environments from database.
    * @return environment list
    */
   @GET
+  @Path("/list")
   @Operation(summary = "List of Environments",
           tags = {"environments"},
           responses = {
@@ -159,30 +160,6 @@ public Response listEnvironment(@QueryParam("status") String status) {
     }
   }
 
-  /**
-   * List all environments from database.
-   * @return environment list
-   */
-  @GET
-  @Path("/list")
-  @Operation(summary = "List of Environments from database",
-          tags = {"environments"},
-          responses = {
-                  @ApiResponse(description = "successful operation", 
-                      content = @Content(
-                          schema = @Schema(
-                              implementation = Environment.class)))})
-  public Response listAllEnvironments() {
-    try {
-      List<Environment> allEnvironmentList =
-          environmentManager.listAllEnvironments();
-      return new JsonResponse.Builder<List<Environment>>(Response.Status.OK)
-          .success(true).result(allEnvironmentList).build();
-    } catch (SubmarineRuntimeException e) {
-      return parseEnvironmentServiceException(e);
-    }
-  }
-
   /**
    * Returns details for the given environment.
    * @param name Name of the environment

From e7552016fca646cfda66388b4f49e69ec42bde12 Mon Sep 17 00:00:00 2001
From: kobe860219 <kobe860219@gmail.com>
Date: Sat, 15 Aug 2020 21:05:34 +0800
Subject: [PATCH 08/10] SUBMARINE-598. Support get environment list from
 database

---
 .../environment/EnvironmentManager.java       | 41 +++++++++++--------
 .../server/rest/EnvironmentRestApi.java       |  3 +-
 2 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/submarine-server/server-core/src/main/java/org/apache/submarine/server/environment/EnvironmentManager.java b/submarine-server/server-core/src/main/java/org/apache/submarine/server/environment/EnvironmentManager.java
index 37c3f6ee5..06ac0fccb 100644
--- a/submarine-server/server-core/src/main/java/org/apache/submarine/server/environment/EnvironmentManager.java
+++ b/submarine-server/server-core/src/main/java/org/apache/submarine/server/environment/EnvironmentManager.java
@@ -54,6 +54,8 @@ public class EnvironmentManager {
 
   private final AtomicInteger environmentIdCounter = new AtomicInteger(0);
 
+  private static Boolean readedDB = true;
+
   /**
    * Environment Cache
    */
@@ -197,33 +199,38 @@ public Environment getEnvironment(String name)
   }
 
   /**
-   * List all environments from database
+   * List environments
+   * @param status environment status, if null will return all status
    * @return environment list
    * @throws SubmarineRuntimeException the service error
    */
   public List<Environment> listEnvironments(String status)
       throws SubmarineRuntimeException {
     List<Environment> environmentList =
-        new ArrayList<Environment>();
+        new ArrayList<Environment>(cachedEnvironments.values());
 
-    try (SqlSession sqlSession = MyBatisUtil.getSqlSession()) {
-      EnvironmentMapper environmentMapper =
-            sqlSession.getMapper(EnvironmentMapper.class);
-      List<EnvironmentEntity> environmentEntitys = environmentMapper.selectAll();
-      for (EnvironmentEntity environmentEntity : environmentEntitys) {
-        if (environmentEntity != null) {
-          Environment env = new Environment();
-          env.setEnvironmentSpec(new Gson().fromJson(
-                environmentEntity.getEnvironmentSpec(), EnvironmentSpec.class));
-          environmentList.add(env);
-          cachedEnvironments.put(env.getEnvironmentSpec().getName(), env);
+    // Is it available in cache?
+    if (this.readedDB == true) {
+      try (SqlSession sqlSession = MyBatisUtil.getSqlSession()) {
+        EnvironmentMapper environmentMapper =
+              sqlSession.getMapper(EnvironmentMapper.class);
+        List<EnvironmentEntity> environmentEntitys = environmentMapper.selectAll();
+        for (EnvironmentEntity environmentEntity : environmentEntitys) {
+          if (environmentEntity != null) {
+            Environment env = new Environment();
+            env.setEnvironmentSpec(new Gson().fromJson(
+                  environmentEntity.getEnvironmentSpec(), EnvironmentSpec.class));
+            environmentList.add(env);
+            cachedEnvironments.put(env.getEnvironmentSpec().getName(), env);
+          }
         }
+      } catch (Exception e) {
+        LOG.error(e.getMessage(), e);
+        throw new SubmarineRuntimeException(Status.BAD_REQUEST.getStatusCode(),
+              "Unable to get the environment list.");
       }
-    } catch (Exception e) {
-      LOG.error(e.getMessage(), e);
-      throw new SubmarineRuntimeException(Status.BAD_REQUEST.getStatusCode(),
-            "Unable to get the environment list.");
     }
+    this.readedDB = false;
     return environmentList;
   }
 
diff --git a/submarine-server/server-core/src/main/java/org/apache/submarine/server/rest/EnvironmentRestApi.java b/submarine-server/server-core/src/main/java/org/apache/submarine/server/rest/EnvironmentRestApi.java
index 6d95c436b..6e381c7ed 100644
--- a/submarine-server/server-core/src/main/java/org/apache/submarine/server/rest/EnvironmentRestApi.java
+++ b/submarine-server/server-core/src/main/java/org/apache/submarine/server/rest/EnvironmentRestApi.java
@@ -137,11 +137,10 @@ public Response deleteEnvironment(
   }
   
   /**
-   * List all environments from database.
+   * List all environments.
    * @return environment list
    */
   @GET
-  @Path("/list")
   @Operation(summary = "List of Environments",
           tags = {"environments"},
           responses = {

From 8c078028b62d237bea84513512deffdc4b7824d5 Mon Sep 17 00:00:00 2001
From: kobe860219 <kobe860219@gmail.com>
Date: Sun, 16 Aug 2020 00:14:02 +0800
Subject: [PATCH 09/10] SUBMARINE-598. Support get environment list from
 database

---
 .../apache/submarine/server/environment/EnvironmentManager.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/submarine-server/server-core/src/main/java/org/apache/submarine/server/environment/EnvironmentManager.java b/submarine-server/server-core/src/main/java/org/apache/submarine/server/environment/EnvironmentManager.java
index 06ac0fccb..0721746c2 100644
--- a/submarine-server/server-core/src/main/java/org/apache/submarine/server/environment/EnvironmentManager.java
+++ b/submarine-server/server-core/src/main/java/org/apache/submarine/server/environment/EnvironmentManager.java
@@ -220,6 +220,8 @@ public List<Environment> listEnvironments(String status)
             Environment env = new Environment();
             env.setEnvironmentSpec(new Gson().fromJson(
                   environmentEntity.getEnvironmentSpec(), EnvironmentSpec.class));
+            env.setEnvironmentId(
+                  EnvironmentId.fromString(environmentEntity.getId()));
             environmentList.add(env);
             cachedEnvironments.put(env.getEnvironmentSpec().getName(), env);
           }

From d4d49389b12e8da7448c726c32cb54953c56b39e Mon Sep 17 00:00:00 2001
From: kobe860219 <kobe860219@gmail.com>
Date: Tue, 18 Aug 2020 19:33:47 +0800
Subject: [PATCH 10/10] SUBMARINE-598. Support get environment list from
 database

---
 .../apache/submarine/server/rest/EnvironmentRestApiTest.java  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/submarine-server/server-core/src/test/java/org/apache/submarine/server/rest/EnvironmentRestApiTest.java b/submarine-server/server-core/src/test/java/org/apache/submarine/server/rest/EnvironmentRestApiTest.java
index 67a36994f..4f7b86142 100644
--- a/submarine-server/server-core/src/test/java/org/apache/submarine/server/rest/EnvironmentRestApiTest.java
+++ b/submarine-server/server-core/src/test/java/org/apache/submarine/server/rest/EnvironmentRestApiTest.java
@@ -124,9 +124,11 @@ public void listEnvironment() {
     Response getEnvResponse = environmentStoreApi.listEnvironment("");
     String entity = (String) getEnvResponse.getEntity();
     JsonResponse jsonResponse = gson.fromJson(entity, JsonResponse.class);
+
+    // environments.length = 2; One is created in this test, one is get from database
     Environment[] environments = gson
         .fromJson(gson.toJson(jsonResponse.getResult()), Environment[].class);
-    assertEquals(1, environments.length);
+    assertEquals(2, environments.length);
 
     Environment environment = environments[0];
     assertEquals("foo", environment.getEnvironmentSpec().getName());