Skip to content

Commit c29912b

Browse files
marceloinaciomarceloinacio
committed
Merge branch 'develop'
2 parents ac6b824 + ea1b602 commit c29912b

File tree

233 files changed

+1004
-1008
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

233 files changed

+1004
-1008
lines changed

‎.pubnub.yml‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,13 @@
11
name: java
2-
version: 4.6.1
2+
version: 4.6.2
33
schema: 1
44
scm: github.com/pubnub/java
55
changelog:
6+
- version: v4.6.2
7+
date:
8+
changes:
9+
- type: feature
10+
text: set a name for Subscription Manager Consumer Thead.
611
- version: v4.6.1
712
date:
813
changes:

‎build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ plugins {
1010
id 'findbugs'
1111
}
1212
group = 'com.pubnub'
13-
version = '4.6.1'
13+
version = '4.6.2'
1414

1515
description = """"""
1616

‎docs/allclasses-frame.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
<!-- NewPage -->
33
<html lang="en">
44
<head>
5-
<!-- Generated by javadoc (1.8.0_102) on Tue Apr 04 22:11:57 EDT 2017 -->
6-
<title>All Classes (pubnub-gson 4.6.1 API)</title>
7-
<meta name="date" content="2017-04-04">
5+
<!-- Generated by javadoc (1.8.0_121) on Tue Apr 11 18:15:16 BRT 2017 -->
6+
<title>All Classes (pubnub-gson 4.6.2 API)</title>
7+
<meta name="date" content="2017-04-11">
88
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
99
<script type="text/javascript" src="script.js"></script>
1010
</head>

‎docs/allclasses-noframe.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
<!-- NewPage -->
33
<html lang="en">
44
<head>
5-
<!-- Generated by javadoc (1.8.0_102) on Tue Apr 04 22:11:57 EDT 2017 -->
6-
<title>All Classes (pubnub-gson 4.6.1 API)</title>
7-
<meta name="date" content="2017-04-04">
5+
<!-- Generated by javadoc (1.8.0_121) on Tue Apr 11 18:15:16 BRT 2017 -->
6+
<title>All Classes (pubnub-gson 4.6.2 API)</title>
7+
<meta name="date" content="2017-04-11">
88
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
99
<script type="text/javascript" src="script.js"></script>
1010
</head>

‎docs/com/pubnub/api/PNConfiguration.html‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@
22
<!-- NewPage -->
33
<html lang="en">
44
<head>
5-
<!-- Generated by javadoc (1.8.0_102) on Tue Apr 04 22:11:53 EDT 2017 -->
6-
<title>PNConfiguration (pubnub-gson 4.6.1 API)</title>
7-
<meta name="date" content="2017-04-04">
5+
<!-- Generated by javadoc (1.8.0_121) on Tue Apr 11 18:15:15 BRT 2017 -->
6+
<title>PNConfiguration (pubnub-gson 4.6.2 API)</title>
7+
<meta name="date" content="2017-04-11">
88
<link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
99
<script type="text/javascript" src="../../../script.js"></script>
1010
</head>
1111
<body>
1212
<script type="text/javascript"><!--
1313
try {
1414
if (location.href.indexOf('is-external=true') == -1) {
15-
parent.document.title="PNConfiguration (pubnub-gson 4.6.1 API)";
15+
parent.document.title="PNConfiguration (pubnub-gson 4.6.2 API)";
1616
}
1717
}
1818
catch(err) {
@@ -203,7 +203,6 @@ <h3>Method Summary</h3>
203203
<td class="colFirst"><code>int</code></td>
204204
<td class="colLast"><code><span class="memberNameLink"><a href="../../../com/pubnub/api/PNConfiguration.html#getNonSubscribeRequestTimeout--">getNonSubscribeRequestTimeout</a></span>()</code>
205205
<div class="block">Reference on number of seconds which is used by client during non-subscription operations to
206-
207206
check whether response potentially failed with 'timeout' or not.</div>
208207
</td>
209208
</tr>
@@ -385,7 +384,6 @@ <h3>Method Summary</h3>
385384
<td class="colFirst"><code><a href="../../../com/pubnub/api/PNConfiguration.html" title="class in com.pubnub.api">PNConfiguration</a></code></td>
386385
<td class="colLast"><code><span class="memberNameLink"><a href="../../../com/pubnub/api/PNConfiguration.html#setNonSubscribeRequestTimeout-int-">setNonSubscribeRequestTimeout</a></span>(int&nbsp;nonSubscribeRequestTimeout)</code>
387386
<div class="block">Reference on number of seconds which is used by client during non-subscription operations to
388-
389387
check whether response potentially failed with 'timeout' or not.</div>
390388
</td>
391389
</tr>
@@ -559,7 +557,6 @@ <h4>getOrigin</h4>
559557
<pre>@Generated(value="lombok")
560558
public&nbsp;java.lang.String&nbsp;getOrigin()</pre>
561559
<div class="block">By default, the origin is pointing directly to PubNub servers. If a proxy origin is needed, set a custom
562-
563560
origin using this parameter.</div>
564561
</li>
565562
</ul>
@@ -679,7 +676,6 @@ <h4>isCacheBusting</h4>
679676
public&nbsp;boolean&nbsp;isCacheBusting()</pre>
680677
<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;</div>
681678
<div class="block">If proxies are forcefully caching requests, set to true to allow the client to randomize the subdomain.
682-
683679
This configuration is not supported if custom origin is enabled.</div>
684680
</li>
685681
</ul>
@@ -714,7 +710,6 @@ <h4>getNonSubscribeRequestTimeout</h4>
714710
<pre>@Generated(value="lombok")
715711
public&nbsp;int&nbsp;getNonSubscribeRequestTimeout()</pre>
716712
<div class="block">Reference on number of seconds which is used by client during non-subscription operations to
717-
718713
check whether response potentially failed with 'timeout' or not.</div>
719714
</li>
720715
</ul>
@@ -904,7 +899,6 @@ <h4>setOrigin</h4>
904899
<pre>@Generated(value="lombok")
905900
public&nbsp;<a href="../../../com/pubnub/api/PNConfiguration.html" title="class in com.pubnub.api">PNConfiguration</a>&nbsp;setOrigin(java.lang.String&nbsp;origin)</pre>
906901
<div class="block">By default, the origin is pointing directly to PubNub servers. If a proxy origin is needed, set a custom
907-
908902
origin using this parameter.</div>
909903
<dl>
910904
<dt><span class="returnLabel">Returns:</span></dt>
@@ -1018,7 +1012,6 @@ <h4>setCacheBusting</h4>
10181012
public&nbsp;<a href="../../../com/pubnub/api/PNConfiguration.html" title="class in com.pubnub.api">PNConfiguration</a>&nbsp;setCacheBusting(boolean&nbsp;cacheBusting)</pre>
10191013
<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;</div>
10201014
<div class="block">If proxies are forcefully caching requests, set to true to allow the client to randomize the subdomain.
1021-
10221015
This configuration is not supported if custom origin is enabled.</div>
10231016
<dl>
10241017
<dt><span class="returnLabel">Returns:</span></dt>
@@ -1065,7 +1058,6 @@ <h4>setNonSubscribeRequestTimeout</h4>
10651058
<pre>@Generated(value="lombok")
10661059
public&nbsp;<a href="../../../com/pubnub/api/PNConfiguration.html" title="class in com.pubnub.api">PNConfiguration</a>&nbsp;setNonSubscribeRequestTimeout(int&nbsp;nonSubscribeRequestTimeout)</pre>
10671060
<div class="block">Reference on number of seconds which is used by client during non-subscription operations to
1068-
10691061
check whether response potentially failed with 'timeout' or not.</div>
10701062
<dl>
10711063
<dt><span class="returnLabel">Returns:</span></dt>

‎docs/com/pubnub/api/PubNub.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@
22
<!-- NewPage -->
33
<html lang="en">
44
<head>
5-
<!-- Generated by javadoc (1.8.0_102) on Tue Apr 04 22:11:54 EDT 2017 -->
6-
<title>PubNub (pubnub-gson 4.6.1 API)</title>
7-
<meta name="date" content="2017-04-04">
5+
<!-- Generated by javadoc (1.8.0_121) on Tue Apr 11 18:15:15 BRT 2017 -->
6+
<title>PubNub (pubnub-gson 4.6.2 API)</title>
7+
<meta name="date" content="2017-04-11">
88
<link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
99
<script type="text/javascript" src="../../../script.js"></script>
1010
</head>
1111
<body>
1212
<script type="text/javascript"><!--
1313
try {
1414
if (location.href.indexOf('is-external=true') == -1) {
15-
parent.document.title="PubNub (pubnub-gson 4.6.1 API)";
15+
parent.document.title="PubNub (pubnub-gson 4.6.2 API)";
1616
}
1717
}
1818
catch(err) {

‎docs/com/pubnub/api/PubNubError.PubNubErrorBuilder.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@
22
<!-- NewPage -->
33
<html lang="en">
44
<head>
5-
<!-- Generated by javadoc (1.8.0_102) on Tue Apr 04 22:11:54 EDT 2017 -->
6-
<title>PubNubError.PubNubErrorBuilder (pubnub-gson 4.6.1 API)</title>
7-
<meta name="date" content="2017-04-04">
5+
<!-- Generated by javadoc (1.8.0_121) on Tue Apr 11 18:15:15 BRT 2017 -->
6+
<title>PubNubError.PubNubErrorBuilder (pubnub-gson 4.6.2 API)</title>
7+
<meta name="date" content="2017-04-11">
88
<link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
99
<script type="text/javascript" src="../../../script.js"></script>
1010
</head>
1111
<body>
1212
<script type="text/javascript"><!--
1313
try {
1414
if (location.href.indexOf('is-external=true') == -1) {
15-
parent.document.title="PubNubError.PubNubErrorBuilder (pubnub-gson 4.6.1 API)";
15+
parent.document.title="PubNubError.PubNubErrorBuilder (pubnub-gson 4.6.2 API)";
1616
}
1717
}
1818
catch(err) {

‎docs/com/pubnub/api/PubNubError.html‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@
22
<!-- NewPage -->
33
<html lang="en">
44
<head>
5-
<!-- Generated by javadoc (1.8.0_102) on Tue Apr 04 22:11:54 EDT 2017 -->
6-
<title>PubNubError (pubnub-gson 4.6.1 API)</title>
7-
<meta name="date" content="2017-04-04">
5+
<!-- Generated by javadoc (1.8.0_121) on Tue Apr 11 18:15:15 BRT 2017 -->
6+
<title>PubNubError (pubnub-gson 4.6.2 API)</title>
7+
<meta name="date" content="2017-04-11">
88
<link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
99
<script type="text/javascript" src="../../../script.js"></script>
1010
</head>
1111
<body>
1212
<script type="text/javascript"><!--
1313
try {
1414
if (location.href.indexOf('is-external=true') == -1) {
15-
parent.document.title="PubNubError (pubnub-gson 4.6.1 API)";
15+
parent.document.title="PubNubError (pubnub-gson 4.6.2 API)";
1616
}
1717
}
1818
catch(err) {
@@ -111,7 +111,6 @@ <h2 title="Class PubNubError" class="title">Class PubNubError</h2>
111111
<pre>public class <span class="typeNameLabel">PubNubError</span>
112112
extends java.lang.Object</pre>
113113
<div class="block">PubNubError object is passed to errorCallback. It contains details of error,
114-
115114
like error code, error string, and optional message</div>
116115
</li>
117116
</ul>

‎docs/com/pubnub/api/PubNubException.PubNubExceptionBuilder.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@
22
<!-- NewPage -->
33
<html lang="en">
44
<head>
5-
<!-- Generated by javadoc (1.8.0_102) on Tue Apr 04 22:11:54 EDT 2017 -->
6-
<title>PubNubException.PubNubExceptionBuilder (pubnub-gson 4.6.1 API)</title>
7-
<meta name="date" content="2017-04-04">
5+
<!-- Generated by javadoc (1.8.0_121) on Tue Apr 11 18:15:15 BRT 2017 -->
6+
<title>PubNubException.PubNubExceptionBuilder (pubnub-gson 4.6.2 API)</title>
7+
<meta name="date" content="2017-04-11">
88
<link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
99
<script type="text/javascript" src="../../../script.js"></script>
1010
</head>
1111
<body>
1212
<script type="text/javascript"><!--
1313
try {
1414
if (location.href.indexOf('is-external=true') == -1) {
15-
parent.document.title="PubNubException.PubNubExceptionBuilder (pubnub-gson 4.6.1 API)";
15+
parent.document.title="PubNubException.PubNubExceptionBuilder (pubnub-gson 4.6.2 API)";
1616
}
1717
}
1818
catch(err) {

‎docs/com/pubnub/api/PubNubException.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@
22
<!-- NewPage -->
33
<html lang="en">
44
<head>
5-
<!-- Generated by javadoc (1.8.0_102) on Tue Apr 04 22:11:54 EDT 2017 -->
6-
<title>PubNubException (pubnub-gson 4.6.1 API)</title>
7-
<meta name="date" content="2017-04-04">
5+
<!-- Generated by javadoc (1.8.0_121) on Tue Apr 11 18:15:15 BRT 2017 -->
6+
<title>PubNubException (pubnub-gson 4.6.2 API)</title>
7+
<meta name="date" content="2017-04-11">
88
<link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
99
<script type="text/javascript" src="../../../script.js"></script>
1010
</head>
1111
<body>
1212
<script type="text/javascript"><!--
1313
try {
1414
if (location.href.indexOf('is-external=true') == -1) {
15-
parent.document.title="PubNubException (pubnub-gson 4.6.1 API)";
15+
parent.document.title="PubNubException (pubnub-gson 4.6.2 API)";
1616
}
1717
}
1818
catch(err) {

0 commit comments

Comments
 (0)