This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/DLAB-1546 by this push:
     new 77ac1ef  Added endpoint name for some action
     new 866c6d9  Merge remote-tracking branch 'origin/DLAB-1546' into DLAB-1546
77ac1ef is described below

commit 77ac1ef177e99671315b149f09b40aec5fb33a6b
Author: Oleh Fuks <[email protected]>
AuthorDate: Tue Mar 3 13:54:24 2020 +0200

    Added endpoint name for some action
---
 .../java/com/epam/dlab/backendapi/util/RequestBuilder.java    | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git 
a/services/self-service/src/main/java/com/epam/dlab/backendapi/util/RequestBuilder.java
 
b/services/self-service/src/main/java/com/epam/dlab/backendapi/util/RequestBuilder.java
index f705884..69aeb6c 100644
--- 
a/services/self-service/src/main/java/com/epam/dlab/backendapi/util/RequestBuilder.java
+++ 
b/services/self-service/src/main/java/com/epam/dlab/backendapi/util/RequestBuilder.java
@@ -299,6 +299,7 @@ public class RequestBuilder {
                return (T) newResourceSysBaseDTO(userInfo, 
endpointDTO.getCloudProvider(), ExploratoryActionDTO.class)
                                
.withNotebookInstanceName(userInstance.getExploratoryId())
                                .withProject(userInstance.getProject())
+                               .withEndpoint(endpointDTO.getName())
                                .withNotebookImage(userInstance.getImageName())
                                
.withApplicationName(getApplicationNameFromImage(userInstance.getImageName()))
                                
.withExploratoryName(userInstance.getExploratoryName());
@@ -331,6 +332,7 @@ public class RequestBuilder {
                return (T) newResourceSysBaseDTO(userInfo, 
endpointDTO.getCloudProvider(), LibListComputationalDTO.class)
                                
.withComputationalId(computationalResource.getComputationalId())
                                .withProject(userInstance.getProject())
+                               .withEndpoint(endpointDTO.getName())
                                
.withComputationalImage(computationalResource.getImageName())
                                
.withLibCacheKey(ExploratoryLibCache.libraryCacheKey(userInstance))
                                
.withApplicationName(getApplicationNameFromImage(userInstance.getImageName()));
@@ -501,7 +503,8 @@ public class RequestBuilder {
                                .withComputationalName(computationalName)
                                
.withNotebookInstanceName(exploratory.getExploratoryId())
                                
.withApplicationName(getApplicationNameFromImage(exploratory.getImageName()))
-                               .withProject(exploratory.getProject());
+                               .withProject(exploratory.getProject())
+                               .withEndpoint(endpointDTO.getName());
        }
 
        @SuppressWarnings("unchecked")
@@ -531,7 +534,8 @@ public class RequestBuilder {
                                
.withNotebookImageName(exploratory.getImageName())
                                .withImage(cr.getImageName())
                                .withComputationalId(cr.getComputationalId())
-                               .withProject(exploratory.getProject());
+                               .withProject(exploratory.getProject())
+                               .withEndpoint(endpointDTO.getName());
        }
 
 
@@ -601,7 +605,8 @@ public class RequestBuilder {
                                .withNotebookImage(userInstance.getImageName())
                                
.withExploratoryName(userInstance.getExploratoryName())
                                
.withReuploadKeyRequired(userInstance.isReuploadKeyRequired())
-                               .withProject(userInstance.getProject());
+                               .withProject(userInstance.getProject())
+                               .withEndpoint(endpointDTO.getName());
                return dto;
        }
 


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to