Update CreateUpdate*Request -> *Request

Author: vitalii-t

examples/java/io/mailtrap/examples/contactlists/ContactListsExample.java

@@ -2,7 +2,7 @@
 
 import io.mailtrap.config.MailtrapConfig;
 import io.mailtrap.factory.MailtrapClientFactory;
-import io.mailtrap.model.request.contactlists.CreateUpdateContactListRequest;
+import io.mailtrap.model.request.contactlists.ContactListRequest;
 
 public class ContactListsExample {
 
@@ -18,10 +18,10 @@ public static void main(String[] args) {
 
         final var client = MailtrapClientFactory.createMailtrapClient(config);
 
-        final var created = client.contactsApi().contactLists().createContactList(ACCOUNT_ID, new CreateUpdateContactListRequest(NAME_FOR_CREATE));
+        final var created = client.contactsApi().contactLists().createContactList(ACCOUNT_ID, new ContactListRequest(NAME_FOR_CREATE));
         System.out.println(created);
 
-        final var updated = client.contactsApi().contactLists().updateContactList(ACCOUNT_ID, created.getId(), new CreateUpdateContactListRequest(NAME_FOR_UPDATE));
+        final var updated = client.contactsApi().contactLists().updateContactList(ACCOUNT_ID, created.getId(), new ContactListRequest(NAME_FOR_UPDATE));
         System.out.println(updated);
 
         final var byId = client.contactsApi().contactLists().getContactList(ACCOUNT_ID, updated.getId());

examples/java/io/mailtrap/examples/testing/ProjectsExample.java

@@ -2,7 +2,7 @@
 
 import io.mailtrap.config.MailtrapConfig;
 import io.mailtrap.factory.MailtrapClientFactory;
-import io.mailtrap.model.request.projects.CreateUpdateProjectRequest;
+import io.mailtrap.model.request.projects.ProjectRequest;
 
 public class ProjectsExample {
 
@@ -22,7 +22,7 @@ public static void main(String[] args) {
             long firstProjectId = projects.get(0).getId();
 
             final var updatedProject =
-                    testingClient.projects().updateProject(ACCOUNT_ID, firstProjectId, new CreateUpdateProjectRequest(new CreateUpdateProjectRequest.ProjectData("mock project")));
+                    testingClient.projects().updateProject(ACCOUNT_ID, firstProjectId, new ProjectRequest(new ProjectRequest.ProjectData("mock project")));
             System.out.println(updatedProject);
 
             final var deletedProject = testingClient.projects().deleteProject(ACCOUNT_ID, firstProjectId);

src/main/java/io/mailtrap/api/contactlists/ContactLists.java

@@ -1,6 +1,6 @@
 package io.mailtrap.api.contactlists;
 
-import io.mailtrap.model.request.contactlists.CreateUpdateContactListRequest;
+import io.mailtrap.model.request.contactlists.ContactListRequest;
 import io.mailtrap.model.response.contactlists.ContactListResponse;
 
 import java.util.List;
@@ -22,7 +22,7 @@ public interface ContactLists {
      * @param request   body
      * @return created contact list
      */
-    ContactListResponse createContactList(long accountId, CreateUpdateContactListRequest request);
+    ContactListResponse createContactList(long accountId, ContactListRequest request);
 
     /**
      * Get a contact list by ID
@@ -41,7 +41,7 @@ public interface ContactLists {
      * @param request       body
      * @return updated contact list
      */
-    ContactListResponse updateContactList(long accountId, long contactListId, CreateUpdateContactListRequest request);
+    ContactListResponse updateContactList(long accountId, long contactListId, ContactListRequest request);
 
     /**
      * Delete existing Contact List

src/main/java/io/mailtrap/api/contactlists/ContactListsImpl.java

@@ -4,7 +4,7 @@
 import io.mailtrap.api.apiresource.ApiResource;
 import io.mailtrap.config.MailtrapConfig;
 import io.mailtrap.http.RequestData;
-import io.mailtrap.model.request.contactlists.CreateUpdateContactListRequest;
+import io.mailtrap.model.request.contactlists.ContactListRequest;
 import io.mailtrap.model.response.contactlists.ContactListResponse;
 
 import java.util.List;
@@ -26,7 +26,7 @@ public List<ContactListResponse> findAll(final long accountId) {
     }
 
     @Override
-    public ContactListResponse createContactList(final long accountId, final CreateUpdateContactListRequest request) {
+    public ContactListResponse createContactList(final long accountId, final ContactListRequest request) {
         return httpClient.post(
             String.format(apiHost + "/api/accounts/%d/contacts/lists", accountId),
             request,
@@ -45,7 +45,7 @@ public ContactListResponse getContactList(final long accountId, final long conta
     }
 
     @Override
-    public ContactListResponse updateContactList(final long accountId, final long contactListId, final CreateUpdateContactListRequest request) {
+    public ContactListResponse updateContactList(final long accountId, final long contactListId, final ContactListRequest request) {
         return httpClient.patch(
             String.format(apiHost + "/api/accounts/%d/contacts/lists/%d", accountId, contactListId),
             request,

src/main/java/io/mailtrap/api/projects/Projects.java

@@ -1,6 +1,6 @@
 package io.mailtrap.api.projects;
 
-import io.mailtrap.model.request.projects.CreateUpdateProjectRequest;
+import io.mailtrap.model.request.projects.ProjectRequest;
 import io.mailtrap.model.response.projects.DeleteProjectResponse;
 import io.mailtrap.model.response.projects.ProjectsResponse;
 
@@ -18,7 +18,7 @@ public interface Projects {
      * @param request   request data
      * @return Returns attributes of the created project. <b>permissions</b> returns the permissions of the token for the project
      */
-    ProjectsResponse createProject(long accountId, CreateUpdateProjectRequest request);
+    ProjectsResponse createProject(long accountId, ProjectRequest request);
 
     /**
      * List projects and their inboxes to which the API token has access.
@@ -45,7 +45,7 @@ public interface Projects {
      * @param updateRequest request data
      * @return project attributes and inboxes of this project with their attributes. <b>permissions</b> returns the permissions of the token for the project
      */
-    ProjectsResponse updateProject(long accountId, long projectId, CreateUpdateProjectRequest updateRequest);
+    ProjectsResponse updateProject(long accountId, long projectId, ProjectRequest updateRequest);
 
     /**
      * Delete project and its inboxes

src/main/java/io/mailtrap/api/projects/ProjectsImpl.java

@@ -5,7 +5,7 @@
 import io.mailtrap.api.apiresource.ApiResourceWithValidation;
 import io.mailtrap.config.MailtrapConfig;
 import io.mailtrap.http.RequestData;
-import io.mailtrap.model.request.projects.CreateUpdateProjectRequest;
+import io.mailtrap.model.request.projects.ProjectRequest;
 import io.mailtrap.model.response.projects.DeleteProjectResponse;
 import io.mailtrap.model.response.projects.ProjectsResponse;
 
@@ -19,7 +19,7 @@ public ProjectsImpl(final MailtrapConfig config, final MailtrapValidator mailtra
     }
 
     @Override
-    public ProjectsResponse createProject(final long accountId, final CreateUpdateProjectRequest request) {
+    public ProjectsResponse createProject(final long accountId, final ProjectRequest request) {
 
         validateRequestBodyAndThrowException(request);
 
@@ -50,7 +50,7 @@ public ProjectsResponse getProject(final long accountId, final long projectId) {
     }
 
     @Override
-    public ProjectsResponse updateProject(final long accountId, final long projectId, final CreateUpdateProjectRequest updateRequest) {
+    public ProjectsResponse updateProject(final long accountId, final long projectId, final ProjectRequest updateRequest) {
 
         validateRequestBodyAndThrowException(updateRequest);
 

…ists/CreateUpdateContactListRequest.java …est/contactlists/ContactListRequest.javasrc/main/java/io/mailtrap/model/request/contactlists/CreateUpdateContactListRequest.java renamed to src/main/java/io/mailtrap/model/request/contactlists/ContactListRequest.java src/main/java/io/mailtrap/model/request/contactlists/CreateUpdateContactListRequest.java renamed to src/main/java/io/mailtrap/model/request/contactlists/ContactListRequest.java

@@ -6,6 +6,6 @@
 
 @Getter
 @AllArgsConstructor
-public class CreateUpdateContactListRequest extends AbstractModel {
+public class ContactListRequest extends AbstractModel {
     private String name;
 }

…projects/CreateUpdateProjectRequest.java …del/request/projects/ProjectRequest.javasrc/main/java/io/mailtrap/model/request/projects/CreateUpdateProjectRequest.java renamed to src/main/java/io/mailtrap/model/request/projects/ProjectRequest.java src/main/java/io/mailtrap/model/request/projects/CreateUpdateProjectRequest.java renamed to src/main/java/io/mailtrap/model/request/projects/ProjectRequest.java

@@ -8,7 +8,7 @@
 
 @Getter
 @AllArgsConstructor
-public class CreateUpdateProjectRequest extends AbstractModel {
+public class ProjectRequest extends AbstractModel {
 
     @JsonProperty("project")
     private ProjectData project;

src/test/java/io/mailtrap/api/contactlists/ContactListsImplTest.java

@@ -3,7 +3,7 @@
 import io.mailtrap.Constants;
 import io.mailtrap.config.MailtrapConfig;
 import io.mailtrap.factory.MailtrapClientFactory;
-import io.mailtrap.model.request.contactlists.CreateUpdateContactListRequest;
+import io.mailtrap.model.request.contactlists.ContactListRequest;
 import io.mailtrap.model.response.contactlists.ContactListResponse;
 import io.mailtrap.testutils.BaseTest;
 import io.mailtrap.testutils.DataMock;
@@ -51,7 +51,7 @@ void test_findAll() {
 
     @Test
     void test_create() {
-        final ContactListResponse contactList = api.createContactList(accountId, new CreateUpdateContactListRequest("Customers"));
+        final ContactListResponse contactList = api.createContactList(accountId, new ContactListRequest("Customers"));
 
         assertNotNull(contactList);
         assertEquals(contactListId, contactList.getId());
@@ -67,7 +67,7 @@ void test_findOne() {
 
     @Test
     void test_update() {
-        final ContactListResponse contactList = api.updateContactList(accountId, contactListId, new CreateUpdateContactListRequest("Old-Customers"));
+        final ContactListResponse contactList = api.updateContactList(accountId, contactListId, new ContactListRequest("Old-Customers"));
 
         assertNotNull(contactList);
         assertEquals(contactListId, contactList.getId());

src/test/java/io/mailtrap/api/projects/ProjectsImplTest.java

@@ -3,8 +3,8 @@
 import io.mailtrap.Constants;
 import io.mailtrap.config.MailtrapConfig;
 import io.mailtrap.factory.MailtrapClientFactory;
-import io.mailtrap.model.request.projects.CreateUpdateProjectRequest;
-import io.mailtrap.model.request.projects.CreateUpdateProjectRequest.ProjectData;
+import io.mailtrap.model.request.projects.ProjectRequest;
+import io.mailtrap.model.request.projects.ProjectRequest.ProjectData;
 import io.mailtrap.model.response.projects.DeleteProjectResponse;
 import io.mailtrap.model.response.projects.ProjectsResponse;
 import io.mailtrap.testutils.BaseTest;
@@ -51,7 +51,7 @@ public void init() {
 
     @Test
     void test_createProject() {
-        final ProjectsResponse createdProject = api.createProject(accountId, new CreateUpdateProjectRequest(new ProjectData("My New Project")));
+        final ProjectsResponse createdProject = api.createProject(accountId, new ProjectRequest(new ProjectData("My New Project")));
 
         assertNotNull(createdProject);
         assertEquals(projectId, createdProject.getId());
@@ -80,7 +80,7 @@ void test_getProject() {
 
     @Test
     void test_updateProject() {
-        final ProjectsResponse updatedProject = api.updateProject(accountId, projectId, new CreateUpdateProjectRequest(new ProjectData("Updated Project Name")));
+        final ProjectsResponse updatedProject = api.updateProject(accountId, projectId, new ProjectRequest(new ProjectData("Updated Project Name")));
 
         assertNotNull(updatedProject);
         assertEquals(projectId, updatedProject.getId());