Commonize response_metadata holding message strings for error patterns

slackapi · Dec 14, 2019 · 9242528 · 9242528
1 parent 8dbe45c
commit 9242528
Show file tree

Hide file tree

Showing 14 changed files with 37 additions and 110 deletions.
diff --git a/.../com/github/seratch/jslack/api/methods/response/admin/teams/AdminTeamsCreateResponse.java b/.../com/github/seratch/jslack/api/methods/response/admin/teams/AdminTeamsCreateResponse.java
@@ -1,10 +1,9 @@
 package com.github.seratch.jslack.api.methods.response.admin.teams;
 
 import com.github.seratch.jslack.api.methods.SlackApiResponse;
+import com.github.seratch.jslack.api.model.ErrorResponseMetadata;
 import lombok.Data;
 
-import java.util.List;
-
 @Data
 public class AdminTeamsCreateResponse implements SlackApiResponse {
 
@@ -15,11 +14,6 @@ public class AdminTeamsCreateResponse implements SlackApiResponse {
     private String provided;
 
     private String team; // created team id
-    private ResponseMetadata responseMetadata;
-
-    @Data
-    public static class ResponseMetadata {
-        private List<String> messages;
-    }
 
+    private ErrorResponseMetadata responseMetadata;
 }
diff --git a/.../com/github/seratch/jslack/api/methods/response/admin/users/AdminUsersAssignResponse.java b/.../com/github/seratch/jslack/api/methods/response/admin/users/AdminUsersAssignResponse.java
@@ -1,10 +1,9 @@
 package com.github.seratch.jslack.api.methods.response.admin.users;
 
 import com.github.seratch.jslack.api.methods.SlackApiResponse;
+import com.github.seratch.jslack.api.model.ErrorResponseMetadata;
 import lombok.Data;
 
-import java.util.List;
-
 @Data
 public class AdminUsersAssignResponse implements SlackApiResponse {
 
@@ -14,10 +13,5 @@ public class AdminUsersAssignResponse implements SlackApiResponse {
     private String needed;
     private String provided;
 
-    private ResponseMetadata responseMetadata;
-
-    @Data
-    public static class ResponseMetadata {
-        private List<String> messages;
-    }
+    private ErrorResponseMetadata responseMetadata;
 }
diff --git a/.../com/github/seratch/jslack/api/methods/response/admin/users/AdminUsersInviteResponse.java b/.../com/github/seratch/jslack/api/methods/response/admin/users/AdminUsersInviteResponse.java
@@ -1,10 +1,9 @@
 package com.github.seratch.jslack.api.methods.response.admin.users;
 
 import com.github.seratch.jslack.api.methods.SlackApiResponse;
+import com.github.seratch.jslack.api.model.ErrorResponseMetadata;
 import lombok.Data;
 
-import java.util.List;
-
 @Data
 public class AdminUsersInviteResponse implements SlackApiResponse {
 
@@ -14,11 +13,5 @@ public class AdminUsersInviteResponse implements SlackApiResponse {
     private String needed;
     private String provided;
 
-    private ResponseMetadata responseMetadata;
-
-    @Data
-    public static class ResponseMetadata {
-        private List<String> messages;
-    }
-
+    private ErrorResponseMetadata responseMetadata;
 }
diff --git a/.../com/github/seratch/jslack/api/methods/response/admin/users/AdminUsersRemoveResponse.java b/.../com/github/seratch/jslack/api/methods/response/admin/users/AdminUsersRemoveResponse.java
@@ -1,10 +1,9 @@
 package com.github.seratch.jslack.api.methods.response.admin.users;
 
 import com.github.seratch.jslack.api.methods.SlackApiResponse;
+import com.github.seratch.jslack.api.model.ErrorResponseMetadata;
 import lombok.Data;
 
-import java.util.List;
-
 @Data
 public class AdminUsersRemoveResponse implements SlackApiResponse {
 
@@ -14,11 +13,5 @@ public class AdminUsersRemoveResponse implements SlackApiResponse {
     private String needed;
     private String provided;
 
-    private ResponseMetadata responseMetadata;
-
-    @Data
-    public static class ResponseMetadata {
-        private List<String> messages;
-    }
-
+    private ErrorResponseMetadata responseMetadata;
 }
diff --git a/...om/github/seratch/jslack/api/methods/response/admin/users/AdminUsersSetAdminResponse.java b/...om/github/seratch/jslack/api/methods/response/admin/users/AdminUsersSetAdminResponse.java
@@ -1,10 +1,9 @@
 package com.github.seratch.jslack.api.methods.response.admin.users;
 
 import com.github.seratch.jslack.api.methods.SlackApiResponse;
+import com.github.seratch.jslack.api.model.ErrorResponseMetadata;
 import lombok.Data;
 
-import java.util.List;
-
 @Data
 public class AdminUsersSetAdminResponse implements SlackApiResponse {
 
@@ -14,11 +13,5 @@ public class AdminUsersSetAdminResponse implements SlackApiResponse {
     private String needed;
     private String provided;
 
-    private ResponseMetadata responseMetadata;
-
-    @Data
-    public static class ResponseMetadata {
-        private List<String> messages;
-    }
-
+    private ErrorResponseMetadata responseMetadata;
 }
diff --git a/...om/github/seratch/jslack/api/methods/response/admin/users/AdminUsersSetOwnerResponse.java b/...om/github/seratch/jslack/api/methods/response/admin/users/AdminUsersSetOwnerResponse.java
@@ -1,10 +1,9 @@
 package com.github.seratch.jslack.api.methods.response.admin.users;
 
 import com.github.seratch.jslack.api.methods.SlackApiResponse;
+import com.github.seratch.jslack.api.model.ErrorResponseMetadata;
 import lombok.Data;
 
-import java.util.List;
-
 @Data
 public class AdminUsersSetOwnerResponse implements SlackApiResponse {
 
@@ -14,11 +13,5 @@ public class AdminUsersSetOwnerResponse implements SlackApiResponse {
     private String needed;
     private String provided;
 
-    private ResponseMetadata responseMetadata;
-
-    @Data
-    public static class ResponseMetadata {
-        private List<String> messages;
-    }
-
+    private ErrorResponseMetadata responseMetadata;
 }
diff --git a/.../github/seratch/jslack/api/methods/response/admin/users/AdminUsersSetRegularResponse.java b/.../github/seratch/jslack/api/methods/response/admin/users/AdminUsersSetRegularResponse.java
@@ -1,10 +1,9 @@
 package com.github.seratch.jslack.api.methods.response.admin.users;
 
 import com.github.seratch.jslack.api.methods.SlackApiResponse;
+import com.github.seratch.jslack.api.model.ErrorResponseMetadata;
 import lombok.Data;
 
-import java.util.List;
-
 @Data
 public class AdminUsersSetRegularResponse implements SlackApiResponse {
 
@@ -14,11 +13,5 @@ public class AdminUsersSetRegularResponse implements SlackApiResponse {
     private String needed;
     private String provided;
 
-    private ResponseMetadata responseMetadata;
-
-    @Data
-    public static class ResponseMetadata {
-        private List<String> messages;
-    }
-
+    private ErrorResponseMetadata responseMetadata;
 }
diff --git a/...ain/java/com/github/seratch/jslack/api/methods/response/chat/ChatPostMessageResponse.java b/...ain/java/com/github/seratch/jslack/api/methods/response/chat/ChatPostMessageResponse.java
@@ -1,11 +1,10 @@
 package com.github.seratch.jslack.api.methods.response.chat;
 
 import com.github.seratch.jslack.api.methods.SlackApiResponse;
+import com.github.seratch.jslack.api.model.ErrorResponseMetadata;
 import com.github.seratch.jslack.api.model.Message;
 import lombok.Data;
 
-import java.util.List;
-
 @Data
 public class ChatPostMessageResponse implements SlackApiResponse {
 
@@ -15,12 +14,7 @@ public class ChatPostMessageResponse implements SlackApiResponse {
     private String needed;
     private String provided;
 
-    private ResponseMetadata responseMetadata;
-
-    @Data
-    public static class ResponseMetadata {
-        private List<String> messages;
-    }
+    private ErrorResponseMetadata responseMetadata;
 
     private String channel;
     private String ts;

diff --git a/...nt/src/main/java/com/github/seratch/jslack/api/methods/response/pins/PinsAddResponse.java b/...nt/src/main/java/com/github/seratch/jslack/api/methods/response/pins/PinsAddResponse.java
@@ -1,10 +1,9 @@
 package com.github.seratch.jslack.api.methods.response.pins;
 
 import com.github.seratch.jslack.api.methods.SlackApiResponse;
+import com.github.seratch.jslack.api.model.ErrorResponseMetadata;
 import lombok.Data;
 
-import java.util.List;
-
 @Data
 public class PinsAddResponse implements SlackApiResponse {
 
@@ -14,11 +13,5 @@ public class PinsAddResponse implements SlackApiResponse {
     private String needed;
     private String provided;
 
-    private ResponseMetadata responseMetadata;
-
-    @Data
-    public static class ResponseMetadata {
-        private List<String> messages;
-    }
-
+    private ErrorResponseMetadata responseMetadata;
 }
diff --git a/...src/main/java/com/github/seratch/jslack/api/methods/response/views/ViewsOpenResponse.java b/...src/main/java/com/github/seratch/jslack/api/methods/response/views/ViewsOpenResponse.java
@@ -1,11 +1,10 @@
 package com.github.seratch.jslack.api.methods.response.views;
 
 import com.github.seratch.jslack.api.methods.SlackApiResponse;
+import com.github.seratch.jslack.api.model.ErrorResponseMetadata;
 import com.github.seratch.jslack.api.model.view.View;
 import lombok.Data;
 
-import java.util.List;
-
 @Data
 public class ViewsOpenResponse implements SlackApiResponse {
 
@@ -17,10 +16,5 @@ public class ViewsOpenResponse implements SlackApiResponse {
 
     private View view;
 
-    private ResponseMetadata responseMetadata;
-
-    @Data
-    public static class ResponseMetadata {
-        private List<String> messages;
-    }
+    private ErrorResponseMetadata responseMetadata;
 }
diff --git a/.../main/java/com/github/seratch/jslack/api/methods/response/views/ViewsPublishResponse.java b/.../main/java/com/github/seratch/jslack/api/methods/response/views/ViewsPublishResponse.java
@@ -1,11 +1,10 @@
 package com.github.seratch.jslack.api.methods.response.views;
 
 import com.github.seratch.jslack.api.methods.SlackApiResponse;
+import com.github.seratch.jslack.api.model.ErrorResponseMetadata;
 import com.github.seratch.jslack.api.model.view.View;
 import lombok.Data;
 
-import java.util.List;
-
 @Data
 public class ViewsPublishResponse implements SlackApiResponse {
 
@@ -17,10 +16,5 @@ public class ViewsPublishResponse implements SlackApiResponse {
 
     private View view;
 
-    private ResponseMetadata responseMetadata;
-
-    @Data
-    public static class ResponseMetadata {
-        private List<String> messages;
-    }
+    private ErrorResponseMetadata responseMetadata;
 }
diff --git a/...src/main/java/com/github/seratch/jslack/api/methods/response/views/ViewsPushResponse.java b/...src/main/java/com/github/seratch/jslack/api/methods/response/views/ViewsPushResponse.java
@@ -1,11 +1,10 @@
 package com.github.seratch.jslack.api.methods.response.views;
 
 import com.github.seratch.jslack.api.methods.SlackApiResponse;
+import com.github.seratch.jslack.api.model.ErrorResponseMetadata;
 import com.github.seratch.jslack.api.model.view.View;
 import lombok.Data;
 
-import java.util.List;
-
 @Data
 public class ViewsPushResponse implements SlackApiResponse {
 
@@ -17,10 +16,5 @@ public class ViewsPushResponse implements SlackApiResponse {
 
     private View view;
 
-    private ResponseMetadata responseMetadata;
-
-    @Data
-    public static class ResponseMetadata {
-        private List<String> messages;
-    }
+    private ErrorResponseMetadata responseMetadata;
 }
diff --git a/...c/main/java/com/github/seratch/jslack/api/methods/response/views/ViewsUpdateResponse.java b/...c/main/java/com/github/seratch/jslack/api/methods/response/views/ViewsUpdateResponse.java
@@ -1,11 +1,10 @@
 package com.github.seratch.jslack.api.methods.response.views;
 
 import com.github.seratch.jslack.api.methods.SlackApiResponse;
+import com.github.seratch.jslack.api.model.ErrorResponseMetadata;
 import com.github.seratch.jslack.api.model.view.View;
 import lombok.Data;
 
-import java.util.List;
-
 @Data
 public class ViewsUpdateResponse implements SlackApiResponse {
 
@@ -17,10 +16,5 @@ public class ViewsUpdateResponse implements SlackApiResponse {
 
     private View view;
 
-    private ResponseMetadata responseMetadata;
-
-    @Data
-    public static class ResponseMetadata {
-        private List<String> messages;
-    }
+    private ErrorResponseMetadata responseMetadata;
 }
diff --git a/...ck-api-model/src/main/java/com/github/seratch/jslack/api/model/ErrorResponseMetadata.java b/...ck-api-model/src/main/java/com/github/seratch/jslack/api/model/ErrorResponseMetadata.java
@@ -0,0 +1,11 @@
+package com.github.seratch.jslack.api.model;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class ErrorResponseMetadata {
+
+    private List<String> messages;
+}