This is an automated email from the ASF dual-hosted git repository. ofuks pushed a commit to branch DLAB-1571 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 2566f24ebae9e7f645cd0c5138320088f80a154c Author: Oleh Fuks <[email protected]> AuthorDate: Wed Mar 25 11:41:32 2020 +0200 Fixed merge conflicts --- .../java/com/epam/dlab/backendapi/service/ExploratoryService.java | 3 +-- .../epam/dlab/backendapi/service/impl/ExploratoryServiceImpl.java | 5 +++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/ExploratoryService.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/ExploratoryService.java index 2fe7d8e..f6bcb64 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/ExploratoryService.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/ExploratoryService.java @@ -45,9 +45,8 @@ public interface ExploratoryService { void updateClusterConfig(UserInfo userInfo, String project, String exploratoryName, List<ClusterConfig> config); Optional<UserInstanceDTO> getUserInstance(String user, String project, String exploratoryName); - List<UserInstanceDTO> findAll(); - void updateClusterConfig(UserInfo userInfo, String exploratoryName, List<ClusterConfig> config); + List<UserInstanceDTO> findAll(); List<ClusterConfig> getClusterConfig(UserInfo user, String project, String exploratoryName); diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/ExploratoryServiceImpl.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/ExploratoryServiceImpl.java index 77d870b..ffa3a6b 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/ExploratoryServiceImpl.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/ExploratoryServiceImpl.java @@ -194,6 +194,11 @@ public class ExploratoryServiceImpl implements ExploratoryService { } @Override + public List<UserInstanceDTO> findAll() { + return exploratoryDAO.getInstances(); + } + + @Override public List<ClusterConfig> getClusterConfig(UserInfo user, String project, String exploratoryName) { return exploratoryDAO.getClusterConfig(user.getName(), project, exploratoryName); } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
