diff --git a/gui-backend/pom.xml b/gui-backend/pom.xml index 74c6fe1ed02ec5371e5c9337ef8f1fc7f71a82db..8d2860abc653664243a04fd08444a7343ea07245 100644 --- a/gui-backend/pom.xml +++ b/gui-backend/pom.xml @@ -117,7 +117,7 @@ cloud.morphemic.connectors proactive_client - 2.0-SNAPSHOT + 2.3-SNAPSHOT diff --git a/gui-backend/src/main/java/eu/melodic/upperware/guibackend/communication/proactive/ProactiveClientServiceGUI.java b/gui-backend/src/main/java/eu/melodic/upperware/guibackend/communication/proactive/ProactiveClientServiceGUI.java index 180b8c27e6315e4e951563e2fb93c63a3f9ef695..f16be61bf694ae7aae6de61b84e9a42dac8ac601 100644 --- a/gui-backend/src/main/java/eu/melodic/upperware/guibackend/communication/proactive/ProactiveClientServiceGUI.java +++ b/gui-backend/src/main/java/eu/melodic/upperware/guibackend/communication/proactive/ProactiveClientServiceGUI.java @@ -17,7 +17,7 @@ public interface ProactiveClientServiceGUI extends IProactiveClientServiceConnec List getAllLocation(); - ByonNode registerNewByonNode(ByonDefinition byonNodeDefinition, String jobId); + ByonNode registerNewByonNode(ByonDefinition byonNodeDefinition, String jobId, boolean automate); List getByonNodeList(String jobId); diff --git a/gui-backend/src/main/java/eu/melodic/upperware/guibackend/communication/proactive/ProactiveClientServiceGUIImpl.java b/gui-backend/src/main/java/eu/melodic/upperware/guibackend/communication/proactive/ProactiveClientServiceGUIImpl.java index 440ea11046b04a68237343902cb3e5de16816c33..12c0274712d95f560491882a53287be3b732577a 100644 --- a/gui-backend/src/main/java/eu/melodic/upperware/guibackend/communication/proactive/ProactiveClientServiceGUIImpl.java +++ b/gui-backend/src/main/java/eu/melodic/upperware/guibackend/communication/proactive/ProactiveClientServiceGUIImpl.java @@ -41,8 +41,8 @@ public class ProactiveClientServiceGUIImpl extends ProactiveClientServiceConnect } @Override - public ByonNode registerNewByonNode(ByonDefinition byonNodeDefinition, String jobId) { - return getPAGateway().map(paGateway -> paGateway.registerNewByonNode(byonNodeDefinition, jobId)).orElse(null); + public ByonNode registerNewByonNode(ByonDefinition byonNodeDefinition, String jobId, boolean automate) { + return getPAGateway().map(paGateway -> paGateway.registerNewByonNode(byonNodeDefinition, jobId, automate)).orElse(null); } @Override diff --git a/gui-backend/src/main/java/eu/melodic/upperware/guibackend/controller/byon/ByonController.java b/gui-backend/src/main/java/eu/melodic/upperware/guibackend/controller/byon/ByonController.java index 3246e260fa5dcd4122def3dd8f2a9929a11a013a..a4aaa01d8f01058f269abf59f4d9e635b4e797b8 100644 --- a/gui-backend/src/main/java/eu/melodic/upperware/guibackend/controller/byon/ByonController.java +++ b/gui-backend/src/main/java/eu/melodic/upperware/guibackend/controller/byon/ByonController.java @@ -66,9 +66,10 @@ public class ByonController { @PostMapping("/proactive/{byonDefinitionId}") @ResponseStatus(HttpStatus.CREATED) - public eu.passage.upperware.commons.model.byon.ByonNode createByonNode(@PathVariable(value = "byonDefinitionId") int byonDefinitionId, @RequestParam(value = "applicationId") String applicationId) { + public eu.passage.upperware.commons.model.byon.ByonNode createByonNode(@PathVariable(value = "byonDefinitionId") int byonDefinitionId, @RequestParam(value = "applicationId") String applicationId, + @RequestParam(value = "automate") boolean automate) { log.info("POST request for creating new byon node from byon definition with id {} and for application id {}", byonDefinitionId, applicationId); - final eu.passage.upperware.commons.model.byon.ByonNode byonNode = byonService.createByonNode(byonDefinitionId, applicationId); + final eu.passage.upperware.commons.model.byon.ByonNode byonNode = byonService.createByonNode(byonDefinitionId, applicationId, automate); log.info("Byon node with id {} successfully added to Proactive", byonNode.getId()); return byonNode; } diff --git a/gui-backend/src/main/java/eu/melodic/upperware/guibackend/service/byon/ByonService.java b/gui-backend/src/main/java/eu/melodic/upperware/guibackend/service/byon/ByonService.java index 111587778e4b34225ca66c7033be47a798b1b658..11bc63be2cf8ef508f3d8c02aa2566c0544f5fe1 100644 --- a/gui-backend/src/main/java/eu/melodic/upperware/guibackend/service/byon/ByonService.java +++ b/gui-backend/src/main/java/eu/melodic/upperware/guibackend/service/byon/ByonService.java @@ -129,7 +129,7 @@ public class ByonService { } } - public ByonNode createByonNode(int byonDefinitionId, String applicationId) { + public ByonNode createByonNode(int byonDefinitionId, String applicationId, boolean automate) { ByonDefinition byonDefinitionForNode = getByonDefList(true).orElseGet(ArrayList::new) .stream() .filter(byonDefinition -> byonDefinition.getId() == byonDefinitionId) @@ -137,7 +137,7 @@ public class ByonService { .orElseThrow(() -> new ByonDefinitionNotFoundException(byonDefinitionId)); final org.activeeon.morphemic.model.ByonDefinition byonDefinitionProactive = byonMapper.mapByonDefinitionToProactive(byonDefinitionForNode); log.info("LSZ DEV[ByonService]: createByonNode: byonDefinitionProactive={}", byonDefinitionProactive); - final Optional byonNodeProactive = Optional.ofNullable(proactiveClientServiceGUI.registerNewByonNode(byonDefinitionProactive, applicationId)); + final Optional byonNodeProactive = Optional.ofNullable(proactiveClientServiceGUI.registerNewByonNode(byonDefinitionProactive, applicationId, automate)); log.info("LSZ DEV[ByonService]: createByonNode: byonNodeProactive={}", byonNodeProactive); ByonNode byonNode = null; if(byonNodeProactive.isPresent()) {