pubnub
diff --git a/‎.pubnub.yml‎
Lines changed: 27 additions & 2 deletions b/‎.pubnub.yml‎
Lines changed: 27 additions & 2 deletions
diff --git a/‎build.gradle‎
Lines changed: 2 additions & 2 deletions b/‎build.gradle‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎src/main/java/com/pubnub/api/PubNub.java‎
Lines changed: 1 addition & 1 deletion b/‎src/main/java/com/pubnub/api/PubNub.java‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/main/java/com/pubnub/api/callbacks/PNCallback.java‎
Lines changed: 3 additions & 4 deletions b/‎src/main/java/com/pubnub/api/callbacks/PNCallback.java‎
Lines changed: 3 additions & 4 deletions
diff --git a/‎src/main/java/com/pubnub/api/callbacks/TimeCallback.java‎
Lines changed: 1 addition & 1 deletion b/‎src/main/java/com/pubnub/api/callbacks/TimeCallback.java‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/main/java/com/pubnub/api/callbacks/WhereNowCallback.java‎
Lines changed: 1 addition & 1 deletion b/‎src/main/java/com/pubnub/api/callbacks/WhereNowCallback.java‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/main/java/com/pubnub/api/endpoints/Endpoint.java‎
Lines changed: 12 additions & 9 deletions b/‎src/main/java/com/pubnub/api/endpoints/Endpoint.java‎
Lines changed: 12 additions & 9 deletions
diff --git a/‎src/main/java/com/pubnub/api/endpoints/objects_api/members/GetMembers.java‎
Lines changed: 9 additions & 0 deletions b/‎src/main/java/com/pubnub/api/endpoints/objects_api/members/GetMembers.java‎
Lines changed: 9 additions & 0 deletions
diff --git a/‎src/main/java/com/pubnub/api/endpoints/objects_api/memberships/GetMemberships.java‎
Lines changed: 9 additions & 0 deletions b/‎src/main/java/com/pubnub/api/endpoints/objects_api/memberships/GetMemberships.java‎
Lines changed: 9 additions & 0 deletions
diff --git a/‎src/main/java/com/pubnub/api/endpoints/objects_api/spaces/GetSpaces.java‎
Lines changed: 12 additions & 3 deletions b/‎src/main/java/com/pubnub/api/endpoints/objects_api/spaces/GetSpaces.java‎
Lines changed: 12 additions & 3 deletions
@@ -1,10 +1,23 @@
 name: java
-version: 4.29.2
+version: 4.31.0
 schema: 1
 scm: github.com/pubnub/java
 files:
-  - build/libs/pubnub-gson-4.30.0-all.jar
+  - build/libs/pubnub-gson-4.31.0-all.jar
 changelog:
+  - version: v4.31.0
+    date: 2020-02-25
+    changes:
+      - type: feature
+        text: Implemented Objects Filtering API
+      - type: improvement
+        text: Handled more network events to keep the client subscribed
+      - type: improvement
+        text: Improved interaction with classes from org.json*
+      - type: improvement
+        text: Made PNCallback eligible for SAM/lambda conversion
+      - type: improvement
+        text: Deprecated PNPushType.GCM in favor of PNPushType.FCM
   - version: v4.30.0
     date: 2020-01-23
     changes:
@@ -436,6 +449,11 @@ features:
     - PUSH-REMOVE-DEVICE-FROM-CHANNELS
     - PUSH-LIST-CHANNELS-FROM-DEVICE
     - PUSH-REMOVE-DEVICE
+    - PUSH-TYPE-APNS
+    - PUSH-TYPE-APNS2
+    - PUSH-TYPE-GCM
+    - PUSH-TYPE-FCM
+    - PUSH-TYPE-MPNS
   presence:
     - PRESENCE-HERE-NOW
     - PRESENCE-WHERE-NOW
@@ -474,6 +492,7 @@ features:
     - SUBSCRIBE-WILDCARD
     - SUBSCRIBE-FILTER-EXPRESSION
     - SUBSCRIBE-PUBLISHER-UUID
+    - SUBSCRIBE-PUBSUB-V2
     - SUBSCRIBE-SIGNAL-LISTENER
     - SUBSCRIBE-MEMBERSHIP-LISTENER
     - SUBSCRIBE-SPACE-LISTENER
@@ -502,10 +521,16 @@ features:
     - OBJECTS-ADD-MEMBERS
     - OBJECTS-REMOVE-MEMBERS
     - OBJECTS-UPDATE-MEMBERS
+    - OBJECTS-FILTERING
   message-actions:
     - MESSAGE-ACTIONS-GET
     - MESSAGE-ACTIONS-ADD
     - MESSAGE-ACTIONS-REMOVE
+  others:
+    - TELEMETRY
+    - QUERY-PARAM
+    - PN-OTHER-PROCESSING
+    - CREATE-PUSH-PAYLOAD
 supported-platforms:
   - version: PubNub Java SDK
     platforms:
 
@@ -11,7 +11,7 @@ plugins {
 }
 group = 'com.pubnub'
 
-version = '4.30.0'
+version = '4.31.0'
 
 description = """"""
 
@@ -57,7 +57,7 @@ dependencies {
     testImplementation group: 'junit', name: 'junit', version: '4.12'
     testImplementation group: 'com.github.tomakehurst', name: 'wiremock', version: '2.25.0'
     testImplementation group: 'org.awaitility', name: 'awaitility', version: '4.0.1'
-    testImplementation group: 'org.json', name: 'json', version: '20190722'
+    implementation group: 'org.json', name: 'json', version: '20190722'
 }
 
 jacoco {
 
@@ -89,7 +89,7 @@ public class PubNub {
     private static final int TIMESTAMP_DIVIDER = 1000;
     private static final int MAX_SEQUENCE = 65535;
 
-    private static final String SDK_VERSION = "4.30.0";
+    private static final String SDK_VERSION = "4.31.0";
 
     public PubNub(@NotNull PNConfiguration initialConfig) {
         this.configuration = initialConfig;
 
@@ -1,11 +1,10 @@
 package com.pubnub.api.callbacks;
 
-
 import com.pubnub.api.models.consumer.PNStatus;
+
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-public abstract class PNCallback<@Nullable X> {
-    public abstract void onResponse(@Nullable X result, @NotNull PNStatus status);
+public interface PNCallback<@Nullable X> {
+   void onResponse(@Nullable X result, @NotNull PNStatus status);
 }
-
@@ -2,5 +2,5 @@
 
 import com.pubnub.api.models.consumer.PNTimeResult;
 
-public abstract class TimeCallback extends PNCallback<PNTimeResult> {
+public abstract class TimeCallback implements PNCallback<PNTimeResult> {
 }
@@ -3,5 +3,5 @@
 import com.pubnub.api.models.consumer.presence.PNWhereNowResult;
 
 
-public abstract class WhereNowCallback extends PNCallback<PNWhereNowResult> {
+public abstract class WhereNowCallback implements PNCallback<PNWhereNowResult> {
 }
@@ -16,19 +16,12 @@
 import com.pubnub.api.managers.token_manager.TokenManagerPropertyProvider;
 import com.pubnub.api.models.consumer.PNErrorData;
 import com.pubnub.api.models.consumer.PNStatus;
-import lombok.AccessLevel;
-import lombok.Getter;
-import lombok.Setter;
-import lombok.experimental.Accessors;
-import lombok.extern.java.Log;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import retrofit2.Call;
-import retrofit2.Response;
 
 import java.io.IOException;
-import java.net.ConnectException;
+import java.net.SocketException;
 import java.net.SocketTimeoutException;
 import java.net.UnknownHostException;
 import java.util.ArrayList;
@@ -37,6 +30,16 @@
 import java.util.List;
 import java.util.Map;
 
+import javax.net.ssl.SSLException;
+
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+import lombok.extern.java.Log;
+import retrofit2.Call;
+import retrofit2.Response;
+
 @Log
 public abstract class Endpoint<Input, Output> {
 
@@ -245,7 +248,7 @@ public void onFailure(Call<Input> performedCall, Throwable throwable) {
                 } catch (UnknownHostException networkException) {
                     pubnubException.pubnubError(PubNubErrorBuilder.PNERROBJ_CONNECTION_NOT_SET);
                     pnStatusCategory = PNStatusCategory.PNUnexpectedDisconnectCategory;
-                } catch (ConnectException connectException) {
+                } catch (SocketException | SSLException exception) {
                     pubnubException.pubnubError(PubNubErrorBuilder.PNERROBJ_CONNECT_EXCEPTION);
                     pnStatusCategory = PNStatusCategory.PNUnexpectedDisconnectCategory;
                 } catch (SocketTimeoutException socketTimeoutException) {
 
@@ -2,6 +2,7 @@
 
 import com.pubnub.api.PubNub;
 import com.pubnub.api.PubNubException;
+import com.pubnub.api.PubNubUtil;
 import com.pubnub.api.builder.PubNubErrorBuilder;
 import com.pubnub.api.endpoints.Endpoint;
 import com.pubnub.api.enums.PNMemberFields;
@@ -13,6 +14,7 @@
 import com.pubnub.api.managers.token_manager.TokenManagerPropertyProvider;
 import com.pubnub.api.models.consumer.objects_api.member.PNGetMembersResult;
 import com.pubnub.api.models.consumer.objects_api.member.PNMember;
+import com.pubnub.api.models.consumer.objects_api.util.FilteringParamsProvider;
 import com.pubnub.api.models.consumer.objects_api.util.InclusionParamsProvider;
 import com.pubnub.api.models.consumer.objects_api.util.ListingParamsProvider;
 import com.pubnub.api.models.server.objects_api.EntityArrayEnvelope;
@@ -32,6 +34,7 @@
 public class GetMembers extends Endpoint<EntityArrayEnvelope<PNMember>, PNGetMembersResult> implements
         InclusionParamsProvider<GetMembers, PNMemberFields>,
         ListingParamsProvider<GetMembers>,
+        FilteringParamsProvider<GetMembers>,
         TokenManagerPropertyProvider {
 
     private Map<String, String> extraParamsMap;
@@ -124,6 +127,12 @@ public GetMembers withTotalCount(Boolean count) {
         return this;
     }
 
+    @Override
+    public GetMembers filter(String expression) {
+        extraParamsMap.put("filter", PubNubUtil.urlEncode(expression));
+        return this;
+    }
+
     @Override
     public TokenManagerProperties getTmsProperties() {
         return TokenManagerProperties.builder()
 
@@ -2,6 +2,7 @@
 
 import com.pubnub.api.PubNub;
 import com.pubnub.api.PubNubException;
+import com.pubnub.api.PubNubUtil;
 import com.pubnub.api.builder.PubNubErrorBuilder;
 import com.pubnub.api.endpoints.Endpoint;
 import com.pubnub.api.enums.PNMembershipFields;
@@ -13,6 +14,7 @@
 import com.pubnub.api.managers.token_manager.TokenManagerPropertyProvider;
 import com.pubnub.api.models.consumer.objects_api.membership.PNGetMembershipsResult;
 import com.pubnub.api.models.consumer.objects_api.membership.PNMembership;
+import com.pubnub.api.models.consumer.objects_api.util.FilteringParamsProvider;
 import com.pubnub.api.models.consumer.objects_api.util.InclusionParamsProvider;
 import com.pubnub.api.models.consumer.objects_api.util.ListingParamsProvider;
 import com.pubnub.api.models.server.objects_api.EntityArrayEnvelope;
@@ -32,6 +34,7 @@
 public class GetMemberships extends Endpoint<EntityArrayEnvelope<PNMembership>, PNGetMembershipsResult> implements
         InclusionParamsProvider<GetMemberships, PNMembershipFields>,
         ListingParamsProvider<GetMemberships>,
+        FilteringParamsProvider<GetMemberships>,
         TokenManagerPropertyProvider {
 
     private Map<String, String> extraParamsMap;
@@ -124,6 +127,12 @@ public GetMemberships withTotalCount(Boolean count) {
         return this;
     }
 
+    @Override
+    public GetMemberships filter(String expression) {
+        extraParamsMap.put("filter", PubNubUtil.urlEncode(expression));
+        return this;
+    }
+
     @Override
     public TokenManagerProperties getTmsProperties() {
         return TokenManagerProperties.builder()
 
@@ -2,6 +2,7 @@
 
 import com.pubnub.api.PubNub;
 import com.pubnub.api.PubNubException;
+import com.pubnub.api.PubNubUtil;
 import com.pubnub.api.builder.PubNubErrorBuilder;
 import com.pubnub.api.endpoints.Endpoint;
 import com.pubnub.api.enums.PNOperationType;
@@ -13,21 +14,24 @@
 import com.pubnub.api.managers.token_manager.TokenManagerPropertyProvider;
 import com.pubnub.api.models.consumer.objects_api.space.PNGetSpacesResult;
 import com.pubnub.api.models.consumer.objects_api.space.PNSpace;
+import com.pubnub.api.models.consumer.objects_api.util.FilteringParamsProvider;
 import com.pubnub.api.models.consumer.objects_api.util.InclusionParamsProvider;
 import com.pubnub.api.models.consumer.objects_api.util.ListingParamsProvider;
 import com.pubnub.api.models.server.objects_api.EntityArrayEnvelope;
-import lombok.experimental.Accessors;
-import retrofit2.Call;
-import retrofit2.Response;
 
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import lombok.experimental.Accessors;
+import retrofit2.Call;
+import retrofit2.Response;
+
 @Accessors(chain = true, fluent = true)
 public class GetSpaces extends Endpoint<EntityArrayEnvelope<PNSpace>, PNGetSpacesResult> implements
         InclusionParamsProvider<GetSpaces, PNSpaceFields>,
         ListingParamsProvider<GetSpaces>,
+        FilteringParamsProvider<GetSpaces>,
         TokenManagerPropertyProvider {
 
     private Map<String, String> extraParamsMap;
@@ -113,6 +117,11 @@ public GetSpaces withTotalCount(Boolean count) {
         return this;
     }
 
+    @Override
+    public GetSpaces filter(String expression) {
+        extraParamsMap.put("filter", PubNubUtil.urlEncode(expression));
+        return this;
+    }
 
     @Override
     public TokenManagerProperties getTmsProperties() {
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ plugins {`
`11`	`11`	`}`
`12`	`12`	`group = 'com.pubnub'`
`13`	`13`
`14`		`-version = '4.30.0'`
	`14`	`+version = '4.31.0'`
`15`	`15`
`16`	`16`	`description = """"""`
`17`	`17`
`@@ -57,7 +57,7 @@ dependencies {`
`57`	`57`	`testImplementation group: 'junit', name: 'junit', version: '4.12'`
`58`	`58`	`testImplementation group: 'com.github.tomakehurst', name: 'wiremock', version: '2.25.0'`
`59`	`59`	`testImplementation group: 'org.awaitility', name: 'awaitility', version: '4.0.1'`
`60`		`- testImplementation group: 'org.json', name: 'json', version: '20190722'`
	`60`	`+ implementation group: 'org.json', name: 'json', version: '20190722'`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`jacoco {`
Original file line number	Diff line number	Diff line change
`@@ -2,5 +2,5 @@`
`2`	`2`
`3`	`3`	`import com.pubnub.api.models.consumer.PNTimeResult;`
`4`	`4`
`5`		`-public abstract class TimeCallback extends PNCallback<PNTimeResult> {`
	`5`	`+public abstract class TimeCallback implements PNCallback<PNTimeResult> {`
`6`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,5 +3,5 @@`
`3`	`3`	`import com.pubnub.api.models.consumer.presence.PNWhereNowResult;`
`4`	`4`
`5`	`5`
`6`		`-public abstract class WhereNowCallback extends PNCallback<PNWhereNowResult> {`
	`6`	`+public abstract class WhereNowCallback implements PNCallback<PNWhereNowResult> {`
`7`	`7`	`}`