Merge pull request cloudbees-oss#132 from solarmosaic/update-identity

Fixes cloudbees-oss#130 and cloudbees-oss#131.

Author: stephenc

src/main/java/org/zendesk/client/v2/Zendesk.java

@@ -808,6 +808,18 @@ public Identity requestVerifyUserIdentity(long userId, long identityId) {
                 .set("identityId", identityId), JSON, null), handle(Identity.class, "identity")));
     }
 
+    public Identity updateUserIdentity(long userId, Identity identity) {
+        checkHasId(identity);
+        return complete(submit(req("PUT", tmpl("/users/{userId}/identities/{identityId}.json")
+                .set("userId", userId)
+                .set("identityId", identity.getId()), JSON, null), handle(Identity.class, "identity")));
+    }
+
+    public Identity updateUserIdentity(User user, Identity identity) {
+        checkHasId(user);
+        return updateUserIdentity(user.getId(), identity);
+    }
+
     public void deleteUserIdentity(User user, Identity identity) {
         checkHasId(identity);
         deleteUserIdentity(user, identity.getId());
@@ -825,14 +837,14 @@ public void deleteUserIdentity(long userId, long identityId) {
         ), handleStatus()));
     }
 
-    public void createUserIdentity(long userId, Identity identity) {
-        complete(submit(req("POST", tmpl("/users/{userId}/identities.json").set("userId", userId), JSON, json(
-                Collections.singletonMap("identity", identity))), handle(Identity.class, "identity")));
+    public Identity createUserIdentity(long userId, Identity identity) {
+        return complete(submit(req("POST", tmpl("/users/{userId}/identities.json").set("userId", userId), JSON,
+                json(Collections.singletonMap("identity", identity))), handle(Identity.class, "identity")));
     }
 
-    public void createUserIdentity(User user, Identity identity) {
-        complete(submit(req("POST", tmpl("/users/{userId}/identities.json").set("userId", user.getId()), JSON, json(
-                Collections.singletonMap("identity", identity))), handle(Identity.class, "identity")));
+    public Identity createUserIdentity(User user, Identity identity) {
+        return complete(submit(req("POST", tmpl("/users/{userId}/identities.json").set("userId", user.getId()), JSON,
+                json(Collections.singletonMap("identity", identity))), handle(Identity.class, "identity")));
     }
 
     public Iterable<org.zendesk.client.v2.model.Request> getRequests() {

src/test/java/org/zendesk/client/v2/RealSmokeTest.java

@@ -348,6 +348,27 @@ public void lookupUserIdentities() throws Exception {
         }
     }
 
+    @Test
+    public void updateUserIdentity() throws Exception {
+        createClientWithTokenOrPassword();
+        User user = instance.getCurrentUser();
+
+        Identity identity = new Identity();
+        identity.setUserId(user.getId());
+        identity.setType("email");
+        identity.setValue("[email protected]");
+
+        Identity createdIdentity = instance.createUserIdentity(user, identity);
+        assertThat(createdIdentity.getValue(), is("[email protected]"));
+
+        createdIdentity.setValue("[email protected]");
+        Identity updatedIdentity = instance.updateUserIdentity(user, createdIdentity);
+
+        assertThat(updatedIdentity.getValue(), is("[email protected]"));
+
+        instance.deleteUserIdentity(user, identity);
+    }
+
     @Test
     public void getUserRequests() throws Exception {
         createClientWithTokenOrPassword();