tinkerpop git commit: TINKERPOP-2030 Cancelled keep-alive tasks are removed from queue
Repository: tinkerpop
Updated Branches:
refs/heads/TINKERPOP-2030 [created] 564236ed6
TINKERPOP-2030 Cancelled keep-alive tasks are removed from queue
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/564236ed
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/564236ed
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/564236ed
Branch: refs/heads/TINKERPOP-2030
Commit: 564236ed6aa84682fa5f25d07347d8dfcf73b69a
Parents: af73f45
Author: Stephen Mallette
Authored: Thu Sep 20 16:25:34 2018 -0400
Committer: Stephen Mallette
Committed: Thu Sep 20 16:25:34 2018 -0400
--
.../tinkerpop/gremlin/driver/Cluster.java | 23 +++-
1 file changed, 13 insertions(+), 10 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/564236ed/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Cluster.java
--
diff --git
a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Cluster.java
b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Cluster.java
index 33ff574..9adaaa1 100644
---
a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Cluster.java
+++
b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Cluster.java
@@ -62,6 +62,7 @@ import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.ScheduledThreadPoolExecutor;
import java.util.concurrent.atomic.AtomicReference;
import java.util.stream.Collectors;
@@ -703,7 +704,7 @@ public final class Cluster {
this.keyPassword = keyPassword;
return this;
}
-
+
/**
* The file location of the private key in JKS or PKCS#12 format.
*/
@@ -711,7 +712,7 @@ public final class Cluster {
this.keyStore = keyStore;
return this;
}
-
+
/**
* The password of the {@link #keyStore}, or {@code null} if it's not
password-protected.
*/
@@ -719,7 +720,7 @@ public final class Cluster {
this.keyStorePassword = keyStorePassword;
return this;
}
-
+
/**
* The file location for a SSL Certificate Chain to use when SSL is
enabled. If
* this value is not provided and SSL is enabled, the default {@link
TrustManager} will be used.
@@ -728,7 +729,7 @@ public final class Cluster {
this.trustStore = trustStore;
return this;
}
-
+
/**
* The password of the {@link #trustStore}, or {@code null} if it's
not password-protected.
*/
@@ -736,7 +737,7 @@ public final class Cluster {
this.trustStorePassword = trustStorePassword;
return this;
}
-
+
/**
* The format of the {@link #keyStore}, either {@code JKS} or {@code
PKCS12}
*/
@@ -744,7 +745,7 @@ public final class Cluster {
this.keyStoreType = keyStoreType;
return this;
}
-
+
/**
* A list of SSL protocols to enable. @see https://docs.oracle.com/javase/8/docs/technotes/guides/security/SunProviders.html#SunJSSE_Protocols;>JSSE
@@ -754,7 +755,7 @@ public final class Cluster {
this.sslEnabledProtocols = sslEnabledProtocols;
return this;
}
-
+
/**
* A list of cipher suites to enable. @see https://docs.oracle.com/javase/8/docs/technotes/guides/security/SunProviders.html#SupportedCipherSuites;>Cipher
@@ -764,7 +765,7 @@ public final class Cluster {
this.sslCipherSuites = sslCipherSuites;
return this;
}
-
+
/**
* If true, trust all certificates and do not perform any validation.
*/
@@ -1020,7 +1021,7 @@ public final class Cluster {
private final AuthProperties authProps;
private final Optional sslContextOptional;
-private final ScheduledExecutorService executor;
+private final ScheduledThreadPoolExecutor executor;
private final int nioPoolSize;
private final int workerPoolSize;
@@ -1074,8 +1075,10 @@ public final class Cluster {
this.factory = new Factory(builder.nioPoolSize);
this.serializer = builder.serializer;
-this.executor =
Executors.newScheduledThreadPool(builder.workerPoolSize,
+
+this.executor = new
ScheduledThreadPoolExecutor(builder.workerPoolSize,
new
[1/2] tinkerpop git commit: Fixed bad links in javadoc CTR
Repository: tinkerpop
Updated Branches:
refs/heads/tp33 096271390 -> 84777d4a0
Fixed bad links in javadoc CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/af73f45a
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/af73f45a
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/af73f45a
Branch: refs/heads/tp33
Commit: af73f45ad1afd94d984bd144523060fc948cb234
Parents: 0eec0c5
Author: Stephen Mallette
Authored: Thu Sep 20 15:47:58 2018 -0400
Committer: Stephen Mallette
Committed: Thu Sep 20 15:47:58 2018 -0400
--
.../java/org/apache/tinkerpop/gremlin/driver/Cluster.java | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/af73f45a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Cluster.java
--
diff --git
a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Cluster.java
b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Cluster.java
index 7ae8d2d..33ff574 100644
---
a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Cluster.java
+++
b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Cluster.java
@@ -656,7 +656,7 @@ public final class Cluster {
/**
* File location for a SSL Certificate Chain to use when SSL is
enabled. If this value is not provided and
* SSL is enabled, the default {@link TrustManager} will be used.
- * @deprecated As of release 3.2.10, replaced by {@link trustStore}
+ * @deprecated As of release 3.2.10, replaced by {@link #trustStore}
*/
@Deprecated
public Builder trustCertificateChainFile(final String
certificateChainFile) {
@@ -676,7 +676,7 @@ public final class Cluster {
/**
* The X.509 certificate chain file in PEM format.
- * @deprecated As of release 3.2.10, replaced by {@link keyStore}
+ * @deprecated As of release 3.2.10, replaced by {@link #keyStore}
*/
@Deprecated
public Builder keyCertChainFile(final String keyCertChainFile) {
@@ -686,7 +686,7 @@ public final class Cluster {
/**
* The PKCS#8 private key file in PEM format.
- * @deprecated As of release 3.2.10, replaced by {@link keyStore}
+ * @deprecated As of release 3.2.10, replaced by {@link #keyStore}
*/
@Deprecated
public Builder keyFile(final String keyFile) {
@@ -696,7 +696,7 @@ public final class Cluster {
/**
* The password of the {@link #keyFile}, or {@code null} if it's not
password-protected.
- * @deprecated As of release 3.2.10, replaced by {@link
keyStorePassword}
+ * @deprecated As of release 3.2.10, replaced by {@link
#keyStorePassword}
*/
@Deprecated
public Builder keyPassword(final String keyPassword) {
@@ -738,7 +738,7 @@ public final class Cluster {
}
/**
- * The format of the {@link keyStore}, either {@code JKS} or {@code
PKCS12}
+ * The format of the {@link #keyStore}, either {@code JKS} or {@code
PKCS12}
*/
public Builder keyStoreType(final String keyStoreType) {
this.keyStoreType = keyStoreType;
tinkerpop git commit: Fixed bad links in javadoc CTR
Repository: tinkerpop
Updated Branches:
refs/heads/tp32 0eec0c53a -> af73f45ad
Fixed bad links in javadoc CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/af73f45a
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/af73f45a
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/af73f45a
Branch: refs/heads/tp32
Commit: af73f45ad1afd94d984bd144523060fc948cb234
Parents: 0eec0c5
Author: Stephen Mallette
Authored: Thu Sep 20 15:47:58 2018 -0400
Committer: Stephen Mallette
Committed: Thu Sep 20 15:47:58 2018 -0400
--
.../java/org/apache/tinkerpop/gremlin/driver/Cluster.java | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/af73f45a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Cluster.java
--
diff --git
a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Cluster.java
b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Cluster.java
index 7ae8d2d..33ff574 100644
---
a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Cluster.java
+++
b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Cluster.java
@@ -656,7 +656,7 @@ public final class Cluster {
/**
* File location for a SSL Certificate Chain to use when SSL is
enabled. If this value is not provided and
* SSL is enabled, the default {@link TrustManager} will be used.
- * @deprecated As of release 3.2.10, replaced by {@link trustStore}
+ * @deprecated As of release 3.2.10, replaced by {@link #trustStore}
*/
@Deprecated
public Builder trustCertificateChainFile(final String
certificateChainFile) {
@@ -676,7 +676,7 @@ public final class Cluster {
/**
* The X.509 certificate chain file in PEM format.
- * @deprecated As of release 3.2.10, replaced by {@link keyStore}
+ * @deprecated As of release 3.2.10, replaced by {@link #keyStore}
*/
@Deprecated
public Builder keyCertChainFile(final String keyCertChainFile) {
@@ -686,7 +686,7 @@ public final class Cluster {
/**
* The PKCS#8 private key file in PEM format.
- * @deprecated As of release 3.2.10, replaced by {@link keyStore}
+ * @deprecated As of release 3.2.10, replaced by {@link #keyStore}
*/
@Deprecated
public Builder keyFile(final String keyFile) {
@@ -696,7 +696,7 @@ public final class Cluster {
/**
* The password of the {@link #keyFile}, or {@code null} if it's not
password-protected.
- * @deprecated As of release 3.2.10, replaced by {@link
keyStorePassword}
+ * @deprecated As of release 3.2.10, replaced by {@link
#keyStorePassword}
*/
@Deprecated
public Builder keyPassword(final String keyPassword) {
@@ -738,7 +738,7 @@ public final class Cluster {
}
/**
- * The format of the {@link keyStore}, either {@code JKS} or {@code
PKCS12}
+ * The format of the {@link #keyStore}, either {@code JKS} or {@code
PKCS12}
*/
public Builder keyStoreType(final String keyStoreType) {
this.keyStoreType = keyStoreType;
[2/2] tinkerpop git commit: Merge branch 'tp32' into tp33
Merge branch 'tp32' into tp33 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/84777d4a Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/84777d4a Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/84777d4a Branch: refs/heads/tp33 Commit: 84777d4a0189a37e9448154c484803f6870d80f8 Parents: 0962713 af73f45 Author: Stephen Mallette Authored: Thu Sep 20 15:48:17 2018 -0400 Committer: Stephen Mallette Committed: Thu Sep 20 15:48:17 2018 -0400 -- .../java/org/apache/tinkerpop/gremlin/driver/Cluster.java | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/84777d4a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Cluster.java --
[2/3] tinkerpop git commit: Merge branch 'tp32' into tp33
Merge branch 'tp32' into tp33 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/84777d4a Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/84777d4a Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/84777d4a Branch: refs/heads/master Commit: 84777d4a0189a37e9448154c484803f6870d80f8 Parents: 0962713 af73f45 Author: Stephen Mallette Authored: Thu Sep 20 15:48:17 2018 -0400 Committer: Stephen Mallette Committed: Thu Sep 20 15:48:17 2018 -0400 -- .../java/org/apache/tinkerpop/gremlin/driver/Cluster.java | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/84777d4a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Cluster.java --
[1/3] tinkerpop git commit: Fixed bad links in javadoc CTR
Repository: tinkerpop
Updated Branches:
refs/heads/master 7fee0e741 -> 459174b62
Fixed bad links in javadoc CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/af73f45a
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/af73f45a
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/af73f45a
Branch: refs/heads/master
Commit: af73f45ad1afd94d984bd144523060fc948cb234
Parents: 0eec0c5
Author: Stephen Mallette
Authored: Thu Sep 20 15:47:58 2018 -0400
Committer: Stephen Mallette
Committed: Thu Sep 20 15:47:58 2018 -0400
--
.../java/org/apache/tinkerpop/gremlin/driver/Cluster.java | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/af73f45a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Cluster.java
--
diff --git
a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Cluster.java
b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Cluster.java
index 7ae8d2d..33ff574 100644
---
a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Cluster.java
+++
b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Cluster.java
@@ -656,7 +656,7 @@ public final class Cluster {
/**
* File location for a SSL Certificate Chain to use when SSL is
enabled. If this value is not provided and
* SSL is enabled, the default {@link TrustManager} will be used.
- * @deprecated As of release 3.2.10, replaced by {@link trustStore}
+ * @deprecated As of release 3.2.10, replaced by {@link #trustStore}
*/
@Deprecated
public Builder trustCertificateChainFile(final String
certificateChainFile) {
@@ -676,7 +676,7 @@ public final class Cluster {
/**
* The X.509 certificate chain file in PEM format.
- * @deprecated As of release 3.2.10, replaced by {@link keyStore}
+ * @deprecated As of release 3.2.10, replaced by {@link #keyStore}
*/
@Deprecated
public Builder keyCertChainFile(final String keyCertChainFile) {
@@ -686,7 +686,7 @@ public final class Cluster {
/**
* The PKCS#8 private key file in PEM format.
- * @deprecated As of release 3.2.10, replaced by {@link keyStore}
+ * @deprecated As of release 3.2.10, replaced by {@link #keyStore}
*/
@Deprecated
public Builder keyFile(final String keyFile) {
@@ -696,7 +696,7 @@ public final class Cluster {
/**
* The password of the {@link #keyFile}, or {@code null} if it's not
password-protected.
- * @deprecated As of release 3.2.10, replaced by {@link
keyStorePassword}
+ * @deprecated As of release 3.2.10, replaced by {@link
#keyStorePassword}
*/
@Deprecated
public Builder keyPassword(final String keyPassword) {
@@ -738,7 +738,7 @@ public final class Cluster {
}
/**
- * The format of the {@link keyStore}, either {@code JKS} or {@code
PKCS12}
+ * The format of the {@link #keyStore}, either {@code JKS} or {@code
PKCS12}
*/
public Builder keyStoreType(final String keyStoreType) {
this.keyStoreType = keyStoreType;
[3/3] tinkerpop git commit: Merge branch 'tp33'
Merge branch 'tp33' Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/459174b6 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/459174b6 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/459174b6 Branch: refs/heads/master Commit: 459174b626464eb9e05cfa58cc3ee1bfa83eb287 Parents: 7fee0e7 84777d4 Author: Stephen Mallette Authored: Thu Sep 20 15:48:27 2018 -0400 Committer: Stephen Mallette Committed: Thu Sep 20 15:48:27 2018 -0400 -- .../java/org/apache/tinkerpop/gremlin/driver/Cluster.java | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) --
