[incubator-dlab] 02/02: Fixed merge conflicts

2020-06-24 Thread ofuks 
This is an automated email from the ASF dual-hosted git repository.

ofuks pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git

commit 167c62698725d9206e5c25cdb9d918a2143c1018
Author: Oleh Fuks 
AuthorDate: Wed Jun 24 15:26:37 2020 +0300

Fixed merge conflicts
---
 .../src/main/java/com/epam/dlab/backendapi/service/BucketService.java  | 2 ++
 .../java/com/epam/dlab/backendapi/service/impl/ProjectServiceImpl.java | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git 
a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/BucketService.java
 
b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/BucketService.java
index 8cf09dd..f7632fe 100644
--- 
a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/BucketService.java
+++ 
b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/BucketService.java
@@ -31,6 +31,8 @@ public interface BucketService {
 
 void uploadObject(UserInfo userInfo, String bucket, String object, String 
endpoint, InputStream inputStream, String contentType, long fileSize, String 
auditInfo);
 
+void uploadFolder(UserInfo userInfo, String bucket, String folder, String 
endpoint);
+
 void downloadObject(UserInfo userInfo, String bucket, String object, 
String endpoint, HttpServletResponse resp, String auditInfo);
 
 void deleteObjects(UserInfo userInfo, String bucket, List objects, 
String endpoint, String auditInfo);
diff --git 
a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/ProjectServiceImpl.java
 
b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/ProjectServiceImpl.java
index 2c6154e..2253685 100644
--- 
a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/ProjectServiceImpl.java
+++ 
b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/ProjectServiceImpl.java
@@ -58,6 +58,7 @@ public class ProjectServiceImpl implements ProjectService {
private static final String START_PRJ_API = 
"infrastructure/project/start";
private static final String STOP_PRJ_API = 
"infrastructure/project/stop";
private static final String STOP_ACTION = "stop";
+   private static final String TERMINATE_ACTION = "terminate";
 
private static final String AUDIT_ADD_ENDPOINT = "Added endpoint(s) %s";
private static final String AUDIT_ADD_GROUP = "Added group(s) %s";
@@ -117,7 +118,7 @@ public class ProjectServiceImpl implements ProjectService {
 
@BudgetLimited
@Override
-   public void create(UserInfo user, ProjectDTO projectDTO) {
+   public void create(UserInfo user, ProjectDTO projectDTO, String 
resourceName) {
if (!projectDAO.get(projectDTO.getName()).isPresent()) {
projectDAO.create(projectDTO);
createProjectOnCloud(user, projectDTO);


-
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org

[incubator-dlab] 02/02: Fixed merge conflicts

2020-03-25 Thread ofuks 
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 
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 config);
 
 Optional getUserInstance(String user, String project, 
String exploratoryName);
-   List findAll();
 
-   void updateClusterConfig(UserInfo userInfo, String exploratoryName, 
List config);
+List findAll();
 
 List 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 findAll() {
+   return exploratoryDAO.getInstances();
+   }
+
+   @Override
public List getClusterConfig(UserInfo user, String 
project, String exploratoryName) {
return exploratoryDAO.getClusterConfig(user.getName(), project, 
exploratoryName);
}


-
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org