Skip to content

Commit d3496de

Browse files
committed
Replace all result classes not containing data with EmptyResult
1 parent aaa4027 commit d3496de

11 files changed

Lines changed: 31 additions & 110 deletions

File tree

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
package com.proxerme.library.connection;
2+
3+
import android.support.annotation.Nullable;
4+
5+
/**
6+
* TODO: Describe class
7+
*
8+
* @author Ruben Gees
9+
*/
10+
11+
public class EmptyResult extends ProxerResult<Void> {
12+
13+
protected EmptyResult() {
14+
}
15+
16+
@Override
17+
@Nullable
18+
public Void getData() {
19+
return null;
20+
}
21+
}

library/src/main/java/com/proxerme/library/connection/info/request/SetUserInfoRequest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
import android.support.annotation.NonNull;
44
import android.support.annotation.Nullable;
55

6+
import com.proxerme.library.connection.EmptyResult;
67
import com.proxerme.library.connection.ProxerResult;
78
import com.proxerme.library.connection.info.InfoRequest;
8-
import com.proxerme.library.connection.info.result.SetUserInfoResult;
99
import com.proxerme.library.parameters.ViewStateParameter;
1010
import com.squareup.moshi.Moshi;
1111

@@ -47,7 +47,7 @@ public SetUserInfoRequest(@NonNull String id, @ViewStateParameter.ViewState Stri
4747
@Override
4848
protected ProxerResult<Void> parse(@NonNull Moshi moshi, @NonNull ResponseBody body)
4949
throws IOException {
50-
return moshi.adapter(SetUserInfoResult.class).fromJson(body.source());
50+
return moshi.adapter(EmptyResult.class).fromJson(body.source());
5151
}
5252

5353
@NonNull

library/src/main/java/com/proxerme/library/connection/info/result/SetUserInfoResult.java

Lines changed: 0 additions & 20 deletions
This file was deleted.

library/src/main/java/com/proxerme/library/connection/messenger/request/ModifyConferenceRequest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
import android.support.annotation.StringDef;
55
import android.util.Pair;
66

7+
import com.proxerme.library.connection.EmptyResult;
78
import com.proxerme.library.connection.ProxerResult;
89
import com.proxerme.library.connection.messenger.MessengerRequest;
9-
import com.proxerme.library.connection.messenger.result.ModifyConferenceResult;
1010
import com.squareup.moshi.Moshi;
1111

1212
import java.io.IOException;
@@ -80,7 +80,7 @@ public ModifyConferenceRequest(@NonNull String conferenceId,
8080
@Override
8181
protected ProxerResult<Void> parse(@NonNull Moshi moshi, @NonNull ResponseBody body)
8282
throws IOException {
83-
return moshi.adapter(ModifyConferenceResult.class).fromJson(body.source());
83+
return moshi.adapter(EmptyResult.class).fromJson(body.source());
8484
}
8585

8686
@NonNull

library/src/main/java/com/proxerme/library/connection/messenger/result/ModifyConferenceResult.java

Lines changed: 0 additions & 20 deletions
This file was deleted.

library/src/main/java/com/proxerme/library/connection/ucp/request/DeleteFavoriteRequest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
import android.support.annotation.NonNull;
44
import android.support.annotation.Nullable;
55

6+
import com.proxerme.library.connection.EmptyResult;
67
import com.proxerme.library.connection.ProxerResult;
78
import com.proxerme.library.connection.ucp.UcpRequest;
8-
import com.proxerme.library.connection.ucp.result.DeleteFavoriteResult;
99
import com.squareup.moshi.Moshi;
1010

1111
import java.io.IOException;
@@ -41,7 +41,7 @@ public DeleteFavoriteRequest(@NonNull String id) {
4141
@Override
4242
protected ProxerResult<Void> parse(@NonNull Moshi moshi, @NonNull ResponseBody body)
4343
throws IOException {
44-
return moshi.adapter(DeleteFavoriteResult.class).fromJson(body.source());
44+
return moshi.adapter(EmptyResult.class).fromJson(body.source());
4545
}
4646

4747
@NonNull

library/src/main/java/com/proxerme/library/connection/ucp/request/DeleteReminderRequest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
import android.support.annotation.NonNull;
44
import android.support.annotation.Nullable;
55

6+
import com.proxerme.library.connection.EmptyResult;
67
import com.proxerme.library.connection.ProxerResult;
78
import com.proxerme.library.connection.ucp.UcpRequest;
8-
import com.proxerme.library.connection.ucp.result.DeleteReminderResult;
99
import com.squareup.moshi.Moshi;
1010

1111
import java.io.IOException;
@@ -40,7 +40,7 @@ public DeleteReminderRequest(@NonNull String id) {
4040
@Override
4141
protected ProxerResult<Void> parse(@NonNull Moshi moshi, @NonNull ResponseBody body)
4242
throws IOException {
43-
return moshi.adapter(DeleteReminderResult.class).fromJson(body.source());
43+
return moshi.adapter(EmptyResult.class).fromJson(body.source());
4444
}
4545

4646
@NonNull

library/src/main/java/com/proxerme/library/connection/ucp/result/DeleteFavoriteResult.java

Lines changed: 0 additions & 20 deletions
This file was deleted.

library/src/main/java/com/proxerme/library/connection/ucp/result/DeleteReminderResult.java

Lines changed: 0 additions & 20 deletions
This file was deleted.

library/src/main/java/com/proxerme/library/connection/user/request/LogoutRequest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
import android.support.annotation.NonNull;
44

5+
import com.proxerme.library.connection.EmptyResult;
56
import com.proxerme.library.connection.ProxerResult;
67
import com.proxerme.library.connection.user.UserRequest;
7-
import com.proxerme.library.connection.user.result.LogoutResult;
88
import com.squareup.moshi.Moshi;
99

1010
import java.io.IOException;
@@ -26,7 +26,7 @@ public class LogoutRequest extends UserRequest<Void> {
2626
@Override
2727
protected ProxerResult<Void> parse(@NonNull Moshi moshi, @NonNull ResponseBody body)
2828
throws IOException {
29-
return moshi.adapter(LogoutResult.class).fromJson(body.source());
29+
return moshi.adapter(EmptyResult.class).fromJson(body.source());
3030
}
3131

3232
@NonNull

0 commit comments

Comments
 (0)