From b7d0fd526b05a146bcf9054d25d7d2916e787709 Mon Sep 17 00:00:00 2001 From: Catherine Quamme Date: Mon, 12 Jun 2023 09:13:55 -0400 Subject: [PATCH] 0005873: Open Registration in Rest API doesn't allow user to specify node if 2 nodes have the same external ID --- .../org/jumpmind/symmetric/web/rest/RestService.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/symmetric-server/src/main/java/org/jumpmind/symmetric/web/rest/RestService.java b/symmetric-server/src/main/java/org/jumpmind/symmetric/web/rest/RestService.java index 91ef741b4e..32afe4da5c 100644 --- a/symmetric-server/src/main/java/org/jumpmind/symmetric/web/rest/RestService.java +++ b/symmetric-server/src/main/java/org/jumpmind/symmetric/web/rest/RestService.java @@ -879,8 +879,10 @@ public final RegistrationInfo postRegisterNode(@PathVariable("engine") String en @ResponseBody public final String postOpenRegistration( @RequestParam(value = "nodeGroupId") String nodeGroupId, - @RequestParam(value = "externalId") String externalId) { - return postOpenRegistration(getSymmetricEngine().getEngineName(), nodeGroupId, externalId); + @RequestParam(value = "externalId") String externalId, + @RequestParam(value = "hostName", required = false) String hostName, + @RequestParam(value = "ipAddress", required = false) String ipAddress) { + return postOpenRegistration(getSymmetricEngine().getEngineName(), nodeGroupId, externalId, hostName, ipAddress); } @ApiOperation(value = "Open registration for the specified node at the specified engine") @@ -889,9 +891,11 @@ public final String postOpenRegistration( @ResponseBody public final String postOpenRegistration(@PathVariable("engine") String engineName, @RequestParam(value = "nodeGroupId") String nodeGroupId, - @RequestParam(value = "externalId") String externalId) { + @RequestParam(value = "externalId") String externalId, + @RequestParam(value = "hostName", required = false) String hostName, + @RequestParam(value = "ipAddress", required = false) String ipAddress) { ISymmetricEngine engine = getSymmetricEngine(engineName); - return engine.getRegistrationService().openRegistration(nodeGroupId, externalId); + return engine.getRegistrationService().openRegistration(nodeGroupId, externalId, hostName, ipAddress); } /**