Merge pull request #486 from seratch/move-UsersLookupByEmailResponse

Move UsersLookupByEmailResponse to the right package (source code compatible)

Author: seratch

slack-api-client/src/main/java/com/slack/api/methods/AsyncMethodsClient.java

@@ -96,7 +96,6 @@
 import com.slack.api.methods.response.calls.CallsInfoResponse;
 import com.slack.api.methods.response.calls.CallsUpdateResponse;
 import com.slack.api.methods.response.calls.participants.CallsParticipantsAddResponse;
-import com.slack.api.methods.response.channels.UsersLookupByEmailResponse;
 import com.slack.api.methods.response.chat.*;
 import com.slack.api.methods.response.chat.scheduled_messages.ChatScheduledMessagesListResponse;
 import com.slack.api.methods.response.conversations.*;

slack-api-client/src/main/java/com/slack/api/methods/MethodsClient.java

@@ -159,6 +159,7 @@
 import com.slack.api.methods.response.usergroups.users.UsergroupsUsersListResponse;
 import com.slack.api.methods.response.usergroups.users.UsergroupsUsersUpdateResponse;
 import com.slack.api.methods.response.users.*;
+import com.slack.api.methods.response.users.UsersLookupByEmailResponse;
 import com.slack.api.methods.response.users.profile.UsersProfileGetResponse;
 import com.slack.api.methods.response.users.profile.UsersProfileSetResponse;
 import com.slack.api.methods.response.views.ViewsOpenResponse;

slack-api-client/src/main/java/com/slack/api/methods/impl/AsyncMethodsClientImpl.java

@@ -100,7 +100,6 @@
 import com.slack.api.methods.response.calls.CallsInfoResponse;
 import com.slack.api.methods.response.calls.CallsUpdateResponse;
 import com.slack.api.methods.response.calls.participants.CallsParticipantsAddResponse;
-import com.slack.api.methods.response.channels.UsersLookupByEmailResponse;
 import com.slack.api.methods.response.chat.*;
 import com.slack.api.methods.response.chat.scheduled_messages.ChatScheduledMessagesListResponse;
 import com.slack.api.methods.response.conversations.*;

slack-api-client/src/main/java/com/slack/api/methods/impl/MethodsClientImpl.java

@@ -161,6 +161,7 @@
 import com.slack.api.methods.response.usergroups.users.UsergroupsUsersListResponse;
 import com.slack.api.methods.response.usergroups.users.UsergroupsUsersUpdateResponse;
 import com.slack.api.methods.response.users.*;
+import com.slack.api.methods.response.users.UsersLookupByEmailResponse;
 import com.slack.api.methods.response.users.profile.UsersProfileGetResponse;
 import com.slack.api.methods.response.users.profile.UsersProfileSetResponse;
 import com.slack.api.methods.response.views.ViewsOpenResponse;

slack-api-client/src/main/java/com/slack/api/methods/response/channels/UsersLookupByEmailResponse.java

@@ -4,6 +4,7 @@
 import com.slack.api.model.User;
 import lombok.Data;
 
+@Deprecated // use com.slack.api.methods.response.users.UsersLookupByEmailResponse instead
 @Data
 public class UsersLookupByEmailResponse implements SlackApiResponse {
 

slack-api-client/src/main/java/com/slack/api/methods/response/users/UsersLookupByEmailResponse.java

@@ -0,0 +1,4 @@
+package com.slack.api.methods.response.users;
+
+public class UsersLookupByEmailResponse extends com.slack.api.methods.response.channels.UsersLookupByEmailResponse {
+}

slack-api-client/src/test/java/test_locally/api/methods/FieldValidation_o_to_z_Test.java

@@ -1,6 +1,5 @@
 package test_locally.api.methods;
 
-import com.slack.api.methods.response.channels.UsersLookupByEmailResponse;
 import com.slack.api.methods.response.oauth.OAuthAccessResponse;
 import com.slack.api.methods.response.oauth.OAuthTokenResponse;
 import com.slack.api.methods.response.oauth.OAuthV2AccessResponse;
@@ -458,6 +457,14 @@ public void users_lookupByEmail() throws Exception {
         verifyIfAllGettersReturnNonNull(obj);
     }
 
+    // NOTE: com.slack.api.methods.response.channels.UsersLookupByEmailResponse will be removed in v1.1
+    @Test
+    public void users_lookupByEmail_deprecation() throws Exception {
+        com.slack.api.methods.response.channels.UsersLookupByEmailResponse obj =
+                parse("users.lookupByEmail", com.slack.api.methods.response.channels.UsersLookupByEmailResponse.class);
+        verifyIfAllGettersReturnNonNull(obj);
+    }
+
     @Test
     public void users_profile_get() throws Exception {
         UsersProfileGetResponse obj = parse("users.profile.get", UsersProfileGetResponse.class);

slack-api-client/src/test/java/test_locally/api/methods/UsersTest.java

@@ -2,6 +2,7 @@
 
 import com.slack.api.Slack;
 import com.slack.api.SlackConfig;
+import com.slack.api.methods.response.users.UsersLookupByEmailResponse;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -84,4 +85,15 @@ public void test_async() throws Exception {
                 .get().isOk(), is(true));
     }
 
+    // NOTE: we can safely remove this tests since v1.1
+    @Test
+    public void test_deprecated_UsersLookupByEmailResponse() throws Exception {
+        UsersLookupByEmailResponse response = slack.methods(ValidToken).usersLookupByEmail(r -> r.email("[email protected]"));
+        assertThat(response.isOk(), is(true));
+        // for backward-compatibility
+        com.slack.api.methods.response.channels.UsersLookupByEmailResponse deprecatedResponse
+                = slack.methods(ValidToken).usersLookupByEmail(r -> r.email("[email protected]"));
+        assertThat(deprecatedResponse.isOk(), is(true));
+    }
+
 }

slack-api-client/src/test/java/test_with_remote_apis/methods/users_Test.java

@@ -4,7 +4,7 @@
 import com.slack.api.methods.SlackApiException;
 import com.slack.api.methods.request.users.UsersLookupByEmailRequest;
 import com.slack.api.methods.request.users.UsersSetActiveRequest;
-import com.slack.api.methods.response.channels.UsersLookupByEmailResponse;
+import com.slack.api.methods.response.users.UsersLookupByEmailResponse;
 import com.slack.api.methods.response.users.*;
 import com.slack.api.model.User;
 import config.Constants;