This is an automated email from the ASF dual-hosted git repository. spmallette pushed a commit to branch driver-35 in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit e6ed49d72705077455fb969c4d640964db324934 Author: stephen <[email protected]> AuthorDate: Thu Dec 5 12:48:36 2019 -0500 Removed some code deprecation The code deprecation was left over from when this change was heading to tp34. Now that we're taking the breaking change we can just remove the code completely. --- docs/src/reference/gremlin-variants.asciidoc | 2 -- .../apache/tinkerpop/gremlin/driver/Connection.java | 20 -------------------- 2 files changed, 22 deletions(-) diff --git a/docs/src/reference/gremlin-variants.asciidoc b/docs/src/reference/gremlin-variants.asciidoc index 7d0c58c..adc1415 100644 --- a/docs/src/reference/gremlin-variants.asciidoc +++ b/docs/src/reference/gremlin-variants.asciidoc @@ -243,8 +243,6 @@ The following table describes the various configuration options for the Gremlin |connectionPool.keyStorePassword |The password of the `keyStore` if it is password-protected. |_none_ |connectionPool.keyStoreType |`JKS` (Java 8 default) or `PKCS12` (Java 9+ default)|_none_ |connectionPool.maxContentLength |The maximum length in bytes that a message can be sent to the server. This number can be no greater than the setting of the same name in the server configuration. |65536 -|connectionPool.maxInProcessPerConnection |The maximum number of in-flight requests that can occur on a connection. This setting is deprecated as of 3.4.3 and it's functionality has been rolled into maxSize. For backward compatibility it is still used to approximate the amount of parallelism required. In future versions, the approximation logic will be removed and dependency on this parameter will be completely eliminated. To disable the dependency on this parameter right now, set to 0.|4 -|connectionPool.maxSimultaneousUsagePerConnection |The maximum number of times that a connection can be borrowed from the pool simultaneously. This setting is deprecated as of 3.4.3 and it's functionality has been rolled into maxSize. For backward compatibility it is still used to approximate the amount of parallelism required. In future versions, the approximation logic will be removed and dependency on this parameter will be completely eliminated. To disable the dependency on this para [...] |connectionPool.maxSize |The maximum number of parallel requests that can be made to the server. This is the only configuration required to control the number of concurrent requests that can be made to the server. |8 |connectionPool.maxWaitForConnection |The amount of time in milliseconds to wait for a new connection before timing out. |3000 |connectionPool.maxWaitForSessionClose |The amount of time in milliseconds to wait for a session to close before timing out (does not apply to sessionless connections). |3000 diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Connection.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Connection.java index f02a501..c1a0b5a 100644 --- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Connection.java +++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Connection.java @@ -36,27 +36,7 @@ import java.util.concurrent.CompletableFuture; * @see ConnectionPool */ public interface Connection { - /** - * @deprecated As of release 3.5.0, replaced by {@link ConnectionPool#DEFAULT_MAX_POOL_SIZE}. For backward - * compatibility it is still used to approximate the amount of parallelism required. In future versions, the - * approximation logic will be removed and dependency on this parameter will be completely eliminated. - * To disable the dependency on this parameter right now, explicitly set the value of - * {@link Settings.ConnectionPoolSettings#maxInProcessPerConnection} and {@link Settings.ConnectionPoolSettings#maxSimultaneousUsagePerConnection} - * to 0. - * - * @see ConnectionPoolImpl#calculateMaxPoolSize(Settings.ConnectionPoolSettings) for approximation - * logic. - * @see <a href="https://issues.apache.org/jira/browse/TINKERPOP-2205";>TINKERPOP-2205</a> - */ - @Deprecated - int DEFAULT_MAX_IN_PROCESS = 4; - /** - * @deprecated As of release 3.5.0, not replaced, this setting is ignored. - * @see <a href="https://issues.apache.org/jira/browse/TINKERPOP-2205";>TINKERPOP-2205</a> - */ - @Deprecated - int DEFAULT_MIN_IN_PROCESS = 1; int DEFAULT_MAX_WAIT_FOR_CONNECTION = 3000; int DEFAULT_MAX_WAIT_FOR_SESSION_CLOSE = 3000; int DEFAULT_MAX_CONTENT_LENGTH = 65536;
