You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@datalab.apache.org by of...@apache.org on 2020/10/02 08:52:30 UTC
[incubator-datalab] branch develop updated: Fixed minor code smell
issue
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-datalab.git
The following commit(s) were added to refs/heads/develop by this push:
new 8f7d493 Fixed minor code smell issue
8f7d493 is described below
commit 8f7d4938d6a11a7fed3a5e33e9cd83604414fc5b
Author: Oleh Fuks <ol...@gmail.com>
AuthorDate: Fri Oct 2 11:50:49 2020 +0300
Fixed minor code smell issue
---
.../service/impl/ProjectServiceImpl.java | 40 ++++++++++++----------
1 file changed, 21 insertions(+), 19 deletions(-)
diff --git a/services/provisioning-service/src/main/java/com/epam/datalab/backendapi/service/impl/ProjectServiceImpl.java b/services/provisioning-service/src/main/java/com/epam/datalab/backendapi/service/impl/ProjectServiceImpl.java
index d7a94e1..640190c 100644
--- a/services/provisioning-service/src/main/java/com/epam/datalab/backendapi/service/impl/ProjectServiceImpl.java
+++ b/services/provisioning-service/src/main/java/com/epam/datalab/backendapi/service/impl/ProjectServiceImpl.java
@@ -45,19 +45,21 @@ import java.util.Objects;
@Slf4j
public class ProjectServiceImpl implements ProjectService {
- private static final String PROJECT_IMAGE = "docker.datalab-project";
- private static final String EDGE_IMAGE = "docker.datalab-edge";
- private static final String CALLBACK_URI = "/api/project/status";
-
- protected final RESTService selfService;
- private final ProvisioningServiceApplicationConfiguration configuration;
- private final FolderListenerExecutor folderListenerExecutor;
- private final ICommandExecutor commandExecutor;
- private final CommandBuilder commandBuilder;
-
- @Inject
- public ProjectServiceImpl(RESTService selfService, ProvisioningServiceApplicationConfiguration configuration,
- FolderListenerExecutor folderListenerExecutor, ICommandExecutor commandExecutor, CommandBuilder commandBuilder) {
+ private static final String PROJECT_IMAGE = "docker.datalab-project";
+ private static final String EDGE_IMAGE = "docker.datalab-edge";
+ private static final String CALLBACK_URI = "/api/project/status";
+ private static final String PROJECT_RESOURCE_TYPE = "project";
+ private static final String EDGE_RESOURCE_TYPE = "edge";
+
+ protected final RESTService selfService;
+ private final ProvisioningServiceApplicationConfiguration configuration;
+ private final FolderListenerExecutor folderListenerExecutor;
+ private final ICommandExecutor commandExecutor;
+ private final CommandBuilder commandBuilder;
+
+ @Inject
+ public ProjectServiceImpl(RESTService selfService, ProvisioningServiceApplicationConfiguration configuration,
+ FolderListenerExecutor folderListenerExecutor, ICommandExecutor commandExecutor, CommandBuilder commandBuilder) {
this.selfService = selfService;
this.configuration = configuration;
this.folderListenerExecutor = folderListenerExecutor;
@@ -67,27 +69,27 @@ public class ProjectServiceImpl implements ProjectService {
@Override
public String create(UserInfo userInfo, ProjectCreateDTO dto) {
- return executeDocker(userInfo, dto, DockerAction.CREATE, dto.getName(), "project", PROJECT_IMAGE, dto.getEndpoint());
+ return executeDocker(userInfo, dto, DockerAction.CREATE, dto.getName(), PROJECT_RESOURCE_TYPE, PROJECT_IMAGE, dto.getEndpoint());
}
@Override
public String recreate(UserInfo userInfo, ProjectCreateDTO dto) {
- return executeDocker(userInfo, dto, DockerAction.RECREATE, dto.getName(), "project", PROJECT_IMAGE, dto.getEndpoint());
+ return executeDocker(userInfo, dto, DockerAction.RECREATE, dto.getName(), PROJECT_RESOURCE_TYPE, PROJECT_IMAGE, dto.getEndpoint());
}
@Override
public String terminate(UserInfo userInfo, ProjectActionDTO dto) {
- return executeDocker(userInfo, dto, DockerAction.TERMINATE, dto.getName(), "project", PROJECT_IMAGE, dto.getEndpoint());
+ return executeDocker(userInfo, dto, DockerAction.TERMINATE, dto.getName(), PROJECT_RESOURCE_TYPE, PROJECT_IMAGE, dto.getEndpoint());
}
@Override
public String start(UserInfo userInfo, ProjectActionDTO dto) {
- return executeDocker(userInfo, dto, DockerAction.START, dto.getName(), "edge", EDGE_IMAGE, dto.getEndpoint());
- }
+ return executeDocker(userInfo, dto, DockerAction.START, dto.getName(), EDGE_RESOURCE_TYPE, EDGE_IMAGE, dto.getEndpoint());
+ }
@Override
public String stop(UserInfo userInfo, ProjectActionDTO dto) {
- return executeDocker(userInfo, dto, DockerAction.STOP, dto.getName(), "edge", EDGE_IMAGE, dto.getEndpoint());
+ return executeDocker(userInfo, dto, DockerAction.STOP, dto.getName(), EDGE_RESOURCE_TYPE, EDGE_IMAGE, dto.getEndpoint());
}
private String executeDocker(UserInfo userInfo, ResourceBaseDTO dto, DockerAction action, String projectName,
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org