Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -220,13 +220,6 @@ public ConnectionProvider getDefaultConnectionProvider() {
return this.connectionProviderManager.getDefaultProvider();
}

@Deprecated
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We just deprecated them a month ago. Users probably need more time to adopt this deprecation.

public boolean isPooledConnectionProvider(HostSpec host, Properties props) {
final ConnectionProvider connectionProvider =
this.connectionProviderManager.getConnectionProvider(this.driverProtocol, host, props);
return (connectionProvider instanceof PooledConnectionProvider);
}

@Override
public String getDriverProtocol() {
return this.driverProtocol;
Expand Down
3 changes: 0 additions & 3 deletions wrapper/src/main/java/software/amazon/jdbc/PluginService.java
Original file line number Diff line number Diff line change
Expand Up @@ -234,9 +234,6 @@ Connection forceConnect(

ConnectionProvider getDefaultConnectionProvider();

@Deprecated
boolean isPooledConnectionProvider(HostSpec host, Properties props);

String getDriverProtocol();

Properties getProperties();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -250,13 +250,6 @@ public ConnectionProvider getDefaultConnectionProvider() {
return this.connectionProviderManager.getDefaultProvider();
}

@Deprecated
public boolean isPooledConnectionProvider(HostSpec host, Properties props) {
final ConnectionProvider connectionProvider =
this.connectionProviderManager.getConnectionProvider(this.driverProtocol, host, props);
return (connectionProvider instanceof PooledConnectionProvider);
}

@Override
public String getDriverProtocol() {
return this.driverProtocol;
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@ private void setWriterConnection(final Connection writerConnection,

private void setReaderConnection(final Connection conn, final HostSpec host) {
closeReaderConnectionIfIdle(this.readerConnection);
this.readerConnection = new CacheItem<>(conn, this.getKeepAliveTimeout(host));
this.readerConnection = new CacheItem<>(conn, this.getKeepAliveTimeout(this.isReaderConnFromInternalPool));
this.readerHostSpec = host;
LOGGER.finest(
() -> Messages.get(
Expand Down Expand Up @@ -534,8 +534,8 @@ private boolean isConnectionUsable(final Connection connection) throws SQLExcept
return connection != null && !connection.isClosed();
}

private long getKeepAliveTimeout(final HostSpec host) {
if (this.pluginService.isPooledConnectionProvider(host, properties)) {
private long getKeepAliveTimeout(boolean isPooledConnection) {
if (isPooledConnection) {
// Let the connection pool handle the lifetime of the reader connection.
return 0;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -404,7 +404,6 @@ ClusterTopologyMonitorImpl.reset=Reset: clusterId={0}, host={1}
ClusterTopologyMonitorImpl.resetEventReceived=MonitorResetEvent received.

# Blue/Green Deployment
bgd.inProgressConnectionClosed=Connection has been closed since Blue/Green switchover is in progress.
bgd.inProgressHoldConnect=Blue/Green Deployment switchover is in progress. The ''connect'' call will be delayed until switchover is completed.
bgd.inProgressTryConnectLater=Blue/Green Deployment switchover is still in progress after {0} ms. Try to connect again later.
bgd.switchoverCompleteContinueWithConnect=Blue/Green Deployment switchover is completed. Continue with connect call. The call was held for {0} ms.
Expand Down
Loading