Skip to content

Commit 2bf2aee

Browse files
author
Max Presman
committed
findBugs adjustments
1 parent 9727e8b commit 2bf2aee

25 files changed

+24
-14
lines changed

‎src/main/java/com/pubnub/api/PubNubUtil.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,13 +78,11 @@ public static String preparePamArguments(Map<String, String> pamArgs){
7878

7979
for (String pamKey : pamKeys) {
8080
if (i != 0) {
81-
stringifiedArguments += "&";
81+
stringifiedArguments = stringifiedArguments.concat("&");
8282
}
8383

8484

85-
stringifiedArguments += pamEncode(pamKey);
86-
stringifiedArguments += "=";
87-
stringifiedArguments += pamEncode(pamArgs.get(pamKey));
85+
stringifiedArguments = stringifiedArguments.concat(pamKey).concat("=").concat(pamEncode(pamArgs.get(pamKey)));
8886

8987
i += 1;
9088
}

‎src/main/java/com/pubnub/api/endpoints/push/AddChannelsToPush.java‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
package com.pubnub.api.endpoints.push;
22

33
import com.pubnub.api.PubNub;
4+
import com.pubnub.api.PubNubError;
45
import com.pubnub.api.PubNubException;
56
import com.pubnub.api.PubNubUtil;
7+
import com.pubnub.api.endpoints.Endpoint;
68
import com.pubnub.api.enums.PNOperationType;
79
import com.pubnub.api.enums.PNPushType;
8-
import com.pubnub.api.endpoints.Endpoint;
10+
import com.pubnub.api.models.consumer.push.PNPushAddChannelResult;
911
import lombok.Setter;
1012
import lombok.experimental.Accessors;
1113
import retrofit2.Call;
@@ -16,7 +18,7 @@
1618
import java.util.Map;
1719

1820
@Accessors(chain = true, fluent = true)
19-
public class AddChannelsToPush extends Endpoint<List<Object>, Boolean> {
21+
public class AddChannelsToPush extends Endpoint<List<Object>, PNPushAddChannelResult> {
2022

2123
@Setter private PNPushType pushType;
2224
@Setter private List<String> channels;
@@ -59,8 +61,12 @@ protected Call<List<Object>> doWork(Map<String, String> baseParams) throws PubNu
5961
}
6062

6163
@Override
62-
protected Boolean createResponse(Response<List<Object>> input) throws PubNubException {
63-
return null;
64+
protected PNPushAddChannelResult createResponse(Response<List<Object>> input) throws PubNubException {
65+
if (input.body() == null) {
66+
throw PubNubException.builder().pubnubError(PubNubError.PNERROBJ_PARSING_ERROR).build();
67+
}
68+
69+
return PNPushAddChannelResult.builder().build();
6470
}
6571

6672
protected int getConnectTimeout() {

‎src/main/java/com/pubnub/api/models/consumer/push/PNPushAddChannelResult.java‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
package com.pubnub.api.models.consumer.push;
2+
3+
import lombok.Builder;
4+
import lombok.Getter;
5+
6+
@Builder
7+
@Getter
8+
public class PNPushAddChannelResult {
9+
}

src/test/java/com.pubnub.api/endpoints/EndpointTest.java renamed to src/test/java/com/pubnub/api/endpoints/EndpointTest.java

File renamed without changes.

src/test/java/com.pubnub.api/endpoints/HeartbeatEndpointTest.java renamed to src/test/java/com/pubnub/api/endpoints/HeartbeatEndpointTest.java

File renamed without changes.

src/test/java/com.pubnub.api/endpoints/HistoryEndpointTest.java renamed to src/test/java/com/pubnub/api/endpoints/HistoryEndpointTest.java

File renamed without changes.

src/test/java/com.pubnub.api/endpoints/TestHarness.java renamed to src/test/java/com/pubnub/api/endpoints/TestHarness.java

File renamed without changes.

src/test/java/com.pubnub.api/endpoints/TimeEndpointTest.java renamed to src/test/java/com/pubnub/api/endpoints/TimeEndpointTest.java

File renamed without changes.

src/test/java/com.pubnub.api/endpoints/access/AuditEndpointTest.java renamed to src/test/java/com/pubnub/api/endpoints/access/AuditEndpointTest.java

File renamed without changes.

src/test/java/com.pubnub.api/endpoints/access/GrantEndpointTest.java renamed to src/test/java/com/pubnub/api/endpoints/access/GrantEndpointTest.java

File renamed without changes.

0 commit comments

Comments
 (0)