Improved naming for clarity

Author: vitalii-t

examples/java/io/mailtrap/examples/contactexports/ContactExportsExample.java

@@ -12,7 +12,7 @@ public class ContactExportsExample {
 
     private static final String TOKEN = "<YOUR MAILTRAP TOKEN>";
     private static final long ACCOUNT_ID = 1L;
-    private static final long FILTER_ID = 1L;
+    private static final long CONTACT_LIST_ID = 1L;
 
     public static void main(String[] args) {
         final var config = new MailtrapConfig.Builder()
@@ -21,7 +21,7 @@ public static void main(String[] args) {
 
         final var client = MailtrapClientFactory.createMailtrapClient(config);
 
-        final var exportFilter = ContactExportFilter.ids(ContactExportFilterOperator.EQUAL, FILTER_ID);
+        final var exportFilter = ContactExportFilter.ids(ContactExportFilterOperator.EQUAL, CONTACT_LIST_ID);
 
         final var createExportRequest = new CreateContactsExportRequest(List.of(exportFilter));
 

src/main/java/io/mailtrap/model/request/contactexports/ContactExportFilter.java

@@ -18,8 +18,8 @@ private ContactExportFilter(final String name, final String operator, final Obje
         this.value = value;
     }
 
-    public static ContactExportFilter ids(final ContactExportFilterOperator operator, final Long... ids) {
-        return new ContactExportFilter(list_id.name(), operator.getValue(), ids);
+    public static ContactExportFilter listIDs(final ContactExportFilterOperator operator, final Long... listIDs) {
+        return new ContactExportFilter(list_id.name(), operator.getValue(), listIDs);
     }
 
     public static ContactExportFilter subscriptionStatus(final ContactExportFilterOperator operator, final ContactExportFilterSubscriptionStatus status) {

src/test/java/io/mailtrap/api/contactexports/ContactExportsImplTest.java

@@ -30,7 +30,7 @@ public void init() {
             DataMock.build(Constants.GENERAL_HOST + "/api/accounts/" + accountId + "/contacts/exports",
                 "POST", "api/contactexports/createContactExportRequest.json", "api/contactexports/createContactExportResponse.json"),
 
-            DataMock.build(Constants.GENERAL_HOST + "/api/accounts/" + accountId + "/contacts/exports/" + exportId,
+            DataMock.build(Constants.GENERAL_HOST + "/api/accounts/" + accountId + "/contacts/exports/" + contactsExportId,
                 "GET", null, "api/contactexports/getContactExportResponse.json")
         ));
 
@@ -44,22 +44,22 @@ public void init() {
 
     @Test
     void test_createContactExport_ids_filter() {
-        final var idsFilter = ContactExportFilter.ids(ContactExportFilterOperator.EQUAL, filterExportId);
+        final var idsFilter = ContactExportFilter.listIDs(ContactExportFilterOperator.EQUAL, contactsExportFilterListId);
         final var subscriptionStatusFilter = ContactExportFilter.subscriptionStatus(ContactExportFilterOperator.EQUAL, ContactExportFilterSubscriptionStatus.SUBSCRIBED);
 
         final var request = new CreateContactsExportRequest(List.of(idsFilter, subscriptionStatusFilter));
 
         final ContactExportResponse contactExportResponse = api.createContactExport(accountId, request);
 
-        assertEquals(exportId, contactExportResponse.getId());
+        assertEquals(contactsExportId, contactExportResponse.getId());
         assertSame(ContactExportStatus.STARTED, contactExportResponse.getStatus());
     }
 
     @Test
     void test_getContactExport() {
-        final ContactExportResponse contactExport = api.getContactExport(accountId, exportId);
+        final ContactExportResponse contactExport = api.getContactExport(accountId, contactsExportId);
 
-        assertEquals(exportId, contactExport.getId());
+        assertEquals(contactsExportId, contactExport.getId());
         assertSame(ContactExportStatus.FINISHED, contactExport.getStatus());
     }
 }

src/test/java/io/mailtrap/testutils/BaseTest.java

@@ -18,8 +18,8 @@ public class BaseTest {
     protected final String contactUUID = "018dd5e3-f6d2-7c00-8f9b-e5c3f2d8a132";
     protected final String contactUUIDEncoded = URLEncoder.encode(contactUUID, StandardCharsets.UTF_8);
     protected final Long importId = 1L;
-    protected final Long filterExportId = 101L;
-    protected final Long exportId = 1L;
+    protected final Long contactsExportFilterListId = 101L;
+    protected final Long contactsExportId = 1L;
     protected final Long getFieldId = 777L;
     protected final Long updateFieldId = 999L;
     protected final Long deleteFieldId = 1111L;