Skip to content
This repository has been archived by the owner on Dec 16, 2021. It is now read-only.

Commit

Permalink
Fix instances of Response
Browse files Browse the repository at this point in the history
  • Loading branch information
Nick Galbraith committed Dec 22, 2016
1 parent 9ca6fb4 commit 09183c2
Show file tree
Hide file tree
Showing 8 changed files with 17 additions and 17 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ you will also need to download the Components JAR and include it in your build f

### Gradle
```groovy
compile 'com.constantcontact:java-sdk:5.1.1'
compile 'com.constantcontact:java-sdk:5.1.2'
```

### Maven
Expand All @@ -54,7 +54,7 @@ compile 'com.constantcontact:java-sdk:5.1.1'
<dependency>
<groupId>com.constantcontact</groupId>
<artifactId>java-sdk</artifactId>
<version>5.1.1</version>
<version>5.1.2</version>
</dependency>
</dependencies>
```
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ org.gradle.daemon=true

VERSION_MAJOR=5
VERSION_MINOR=1
VERSION_PATCH=1
VERSION_PATCH=2
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ Observable<Paged<Campaign>> getCampaigns(@Query("limit") int limit, @Query("modi
* @return an Observable that emits a {@link retrofit2.Response}
*/
@DELETE("v2/emailmarketing/campaigns/{campaignId}")
Observable<Response> deleteCampaign(@Path("campaignId") String campaignId);
Observable<Response<Void>> deleteCampaign(@Path("campaignId") String campaignId);

/**
* Send a {@link TestSend} of a {@link Campaign}
Expand Down Expand Up @@ -155,5 +155,5 @@ Observable<Paged<Campaign>> getCampaigns(@Query("limit") int limit, @Query("modi
* @return an Observable that emits a {@link retrofit2.Response}
*/
@DELETE("v2/emailmarketing/campaigns/{campaignId}/schedules/{scheduleId}")
Observable<Response> deleteCampaignSchedule(@Path("campaignId") String campaignId, @Path("scheduleId") String scheduleId);
Observable<Response<Void>> deleteCampaignSchedule(@Path("campaignId") String campaignId, @Path("scheduleId") String scheduleId);
}
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ Observable<Contact> updateContact(@Body Contact contact, @Path("contactId") Stri
* @return an Observable that emits a {@link retrofit2.Response}
*/
@DELETE("v2/contacts/{contactId}")
Observable<Response> unsubscribeContact(@Path("contactId") String contactId);
Observable<Response<Void>> unsubscribeContact(@Path("contactId") String contactId);

/**
* Get all {@link ContactList} in the account
Expand Down Expand Up @@ -153,7 +153,7 @@ Observable<Contact> updateContact(@Body Contact contact, @Path("contactId") Stri
* @return an Observable that emits a {@link retrofit2.Response}
*/
@DELETE("v2/lists/{listId}")
Observable<Response> deleteContactList(@Path("listId") String listId);
Observable<Response<Void>> deleteContactList(@Path("listId") String listId);

/**
* Create a custom signup form
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -160,15 +160,15 @@ Observable<Paged<File>> getFilesByFolder(@Path("folderId") String folderId, @Que
* @return an Observable that emits a {@link retrofit2.Response}
*/
@DELETE("v2/library/files/{fileId}")
Observable<Response> deleteFile(@Path("fileId") String fileId);
Observable<Response<Void>> deleteFile(@Path("fileId") String fileId);

/**
* Delete all {@link File} in the Trash {@link Folder}
*
* @return an Observable that emits a {@link retrofit2.Response}
*/
@DELETE("v2/library/folders/trash/files")
Observable<Response> deleteFilesInTrash();
Observable<Response<Void>> deleteFilesInTrash();

/**
* Get the {@link FileUploadStatus} of one or more {@link File}
Expand All @@ -194,7 +194,7 @@ Observable<Paged<File>> getFilesByFolder(@Path("folderId") String folderId, @Que
@Multipart
@Headers("Content-Type: multipart/form-data")
@POST("v2/library/files")
Observable<Response> uploadFile(@Part("data") RequestBody file, @Part("description") String description,
Observable<Response<Void>> uploadFile(@Part("data") RequestBody file, @Part("description") String description,
@Part("file_name") String fileName, @Part("file_type") String fileType,
@Part("folder_id") String folderId, @Part("source") String source);
}
4 changes: 2 additions & 2 deletions lib/src/main/java/com/constantcontact/v2/CampaignService.java
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ public interface CampaignService {
* @return an Observable that emits a {@link retrofit2.Response}
*/
@DELETE("v2/emailmarketing/campaigns/{campaignId}")
Call<Response> deleteCampaign(@Path("campaignId") String campaignId);
Call<Response<Void>> deleteCampaign(@Path("campaignId") String campaignId);

/**
* Send a {@link TestSend} of a {@link Campaign}
Expand Down Expand Up @@ -154,5 +154,5 @@ public interface CampaignService {
* @return an Observable that emits a {@link retrofit2.Response}
*/
@DELETE("v2/emailmarketing/campaigns/{campaignId}/schedules/{scheduleId}")
Call<Response> deleteCampaignSchedule(@Path("campaignId") String campaignId, @Path("scheduleId") String scheduleId);
Call<Response<Void>> deleteCampaignSchedule(@Path("campaignId") String campaignId, @Path("scheduleId") String scheduleId);
}
4 changes: 2 additions & 2 deletions lib/src/main/java/com/constantcontact/v2/ContactService.java
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ public interface ContactService {
* @return an Observable that emits a {@link retrofit2.Response}
*/
@DELETE("v2/contacts/{contactId}")
Call<Response> unsubscribeContact(@Path("contactId") String contactId);
Call<Response<Void>> unsubscribeContact(@Path("contactId") String contactId);

/**
* Get all {@link ContactList} in the account
Expand Down Expand Up @@ -151,7 +151,7 @@ public interface ContactService {
* @return an Observable that emits a {@link retrofit2.Response}
*/
@DELETE("v2/lists/{listId}")
Call<Response> deleteContactList(@Path("listId") String listId);
Call<Response<Void>> deleteContactList(@Path("listId") String listId);

/**
* Create a custom signup form
Expand Down
6 changes: 3 additions & 3 deletions lib/src/main/java/com/constantcontact/v2/LibraryService.java
Original file line number Diff line number Diff line change
Expand Up @@ -159,15 +159,15 @@ Call<Paged<File>> getFilesByFolder(@Path("folderId") String folderId, @Query("li
* @return an Observable that emits a {@link retrofit2.Response}
*/
@DELETE("v2/library/files/{fileId}")
Call<Response> deleteFile(@Path("fileId") String fileId);
Call<Response<Void>> deleteFile(@Path("fileId") String fileId);

/**
* Delete all {@link File} in the Trash {@link Folder}
*
* @return an Observable that emits a {@link retrofit2.Response}
*/
@DELETE("v2/library/folders/trash/files")
Call<Response> deleteFilesInTrash();
Call<Response<Void>> deleteFilesInTrash();

/**
* Get the {@link FileUploadStatus} of one or more {@link File}
Expand All @@ -193,7 +193,7 @@ Call<Paged<File>> getFilesByFolder(@Path("folderId") String folderId, @Query("li
@Multipart
@Headers("Content-Type: multipart/form-data")
@POST("v2/library/files")
Call<Response> uploadFile(
Call<Response<Void>> uploadFile(
@Part("data") RequestBody file,
@Part("description") String description,
@Part("file_name") String fileName,
Expand Down

0 comments on commit 09183c2

Please sign in to comment.