corrected rest param bug

Author: George Nash

member-service/src/main/java/org/orcid/memberportal/service/member/client/UserServiceClient.java

@@ -42,7 +42,7 @@ public interface UserServiceClient {
     ResponseEntity<Void> deleteUser(@PathVariable("loginOrId") String loginOrId,
             @RequestParam(value = "noMainContactCheck", required = false) boolean noMainContactCheck);
 
-    @RequestMapping(method = RequestMethod.PUT, value = "/api/users/memberName/{oldMemberName}/{newMemberName}", consumes = MediaType.APPLICATION_JSON, produces = MediaType.APPLICATION_JSON)
+    @RequestMapping(method = RequestMethod.PUT, value = "/api/users/memberName/{salesforceId}/{oldMemberName}/{newMemberName}", consumes = MediaType.APPLICATION_JSON, produces = MediaType.APPLICATION_JSON)
     @HystrixProperty(name = "hystrix.command.default.execution.isolation.thread.timeoutInMilliseconds", value = "50000")
-    ResponseEntity<String> updateUsersMemberNames(String salesforceId, String oldMemberName, String newMemberName);
+    ResponseEntity<String> updateUsersMemberNames(@PathVariable("salesforceId") String salesforceId, @PathVariable("oldMemberName") String oldMemberName, @PathVariable("newMemberName") String newMemberName);
 }

user-service/src/main/java/org/orcid/memberportal/service/user/web/rest/UserResource.java

@@ -433,7 +433,7 @@ public ResponseEntity<Void> updateUsersSalesforceId(@PathVariable String salesfo
      * @param newMemberName the new Value of the memberName to update
      * @return the {@link ResponseEntity} with status {@code 200 (OK)}.
      */
-    @PutMapping("/users/memberName/{oldMemberName}/{newMemberName}")
+    @PutMapping("/users/memberName/{salesforceId}/{oldMemberName}/{newMemberName}")
     @PreAuthorize("hasRole(\"" + AuthoritiesConstants.ADMIN + "\")")
     public ResponseEntity<Void> updateUsersMemberName(@PathVariable String salesforceId, @PathVariable String oldMemberName, @PathVariable String newMemberName) {
         LOG.debug("REST request to update users' member names id from {} to {}", oldMemberName, newMemberName);