Skip to content

fix wrong calls in wrapper class #1413

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 23, 2025
Merged

fix wrong calls in wrapper class #1413

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion wrapper/src/main/java/software/amazon/jdbc/C3P0PooledConnectionProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@
import software.amazon.jdbc.util.Messages;
import software.amazon.jdbc.util.PropertyUtils;
import software.amazon.jdbc.util.SlidingExpirationCache;
import software.amazon.jdbc.wrapper.HighestWeightHostSelector;

public class C3P0PooledConnectionProvider implements PooledConnectionProvider, CanReleaseResources {

Expand Down
2 changes: 0 additions & 2 deletions wrapper/src/main/java/software/amazon/jdbc/DataSourceConnectionProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,12 @@
import org.checkerframework.checker.nullness.qual.Nullable;
import software.amazon.jdbc.dialect.Dialect;
import software.amazon.jdbc.exceptions.SQLLoginException;
import software.amazon.jdbc.targetdriverdialect.ConnectInfo;
import software.amazon.jdbc.targetdriverdialect.TargetDriverDialect;
import software.amazon.jdbc.util.Messages;
import software.amazon.jdbc.util.PropertyUtils;
import software.amazon.jdbc.util.RdsUtils;
import software.amazon.jdbc.util.SqlState;
import software.amazon.jdbc.util.WrapperUtils;
import software.amazon.jdbc.wrapper.HighestWeightHostSelector;

/**
* This class is a basic implementation of {@link ConnectionProvider} interface. It creates and
Expand Down
1 change: 0 additions & 1 deletion wrapper/src/main/java/software/amazon/jdbc/DriverConnectionProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
import software.amazon.jdbc.util.Messages;
import software.amazon.jdbc.util.PropertyUtils;
import software.amazon.jdbc.util.RdsUtils;
import software.amazon.jdbc.wrapper.HighestWeightHostSelector;

/**
* This class is a basic implementation of {@link ConnectionProvider} interface. It creates and
Expand Down
5 changes: 1 addition & 4 deletions ...bc/wrapper/HighestWeightHostSelector.java → ...mazon/jdbc/HighestWeightHostSelector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

package software.amazon.jdbc.wrapper;
package software.amazon.jdbc;

import java.sql.SQLException;
import java.util.Comparator;
Expand All @@ -23,9 +23,6 @@
import java.util.stream.Collectors;
import org.checkerframework.checker.nullness.qual.NonNull;
import org.checkerframework.checker.nullness.qual.Nullable;
import software.amazon.jdbc.HostRole;
import software.amazon.jdbc.HostSelector;
import software.amazon.jdbc.HostSpec;
import software.amazon.jdbc.hostavailability.HostAvailability;
import software.amazon.jdbc.util.Messages;

Expand Down
1 change: 0 additions & 1 deletion wrapper/src/main/java/software/amazon/jdbc/HikariPooledConnectionProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@
import software.amazon.jdbc.util.RdsUrlType;
import software.amazon.jdbc.util.RdsUtils;
import software.amazon.jdbc.util.SlidingExpirationCache;
import software.amazon.jdbc.wrapper.HighestWeightHostSelector;

public class HikariPooledConnectionProvider implements PooledConnectionProvider,
CanReleaseResources {
Expand Down
2 changes: 1 addition & 1 deletion wrapper/src/main/java/software/amazon/jdbc/plugin/limitless/LimitlessRouterServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import java.util.logging.Logger;
import org.checkerframework.checker.nullness.qual.NonNull;
import software.amazon.jdbc.AwsWrapperProperty;
import software.amazon.jdbc.HighestWeightHostSelector;
import software.amazon.jdbc.HostRole;
import software.amazon.jdbc.HostSpec;
import software.amazon.jdbc.PluginService;
Expand All @@ -35,7 +36,6 @@
import software.amazon.jdbc.util.Messages;
import software.amazon.jdbc.util.SlidingExpirationCacheWithCleanupThread;
import software.amazon.jdbc.util.Utils;
import software.amazon.jdbc.wrapper.HighestWeightHostSelector;

public class LimitlessRouterServiceImpl implements LimitlessRouterService {
private static final Logger LOGGER =
Expand Down
19 changes: 14 additions & 5 deletions wrapper/src/main/java/software/amazon/jdbc/wrapper/ArrayWrapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,8 @@ public Object getArray(Map<String, Class<?>> map) throws SQLException {
this.pluginManager,
this.array,
"Array.getArray",
() -> this.array.getArray());
() -> this.array.getArray(map),
map);
}

@Override
Expand All @@ -86,7 +87,9 @@ public Object getArray(long index, int count) throws SQLException {
this.pluginManager,
this.array,
"Array.getArray",
() -> this.array.getArray());
() -> this.array.getArray(index, count),
index,
count);
}

@Override
Expand All @@ -97,7 +100,10 @@ public Object getArray(long index, int count, Map<String, Class<?>> map) throws
this.pluginManager,
this.array,
"Array.getArray",
() -> this.array.getArray());
() -> this.array.getArray(index, count, map),
index,
count,
map);
}

@Override
Expand All @@ -119,7 +125,8 @@ public ResultSet getResultSet(Map<String, Class<?>> map) throws SQLException {
this.pluginManager,
this.array,
"Array.getResultSet",
() -> this.array.getResultSet());
() -> this.array.getResultSet(map),
map);
}

@Override
Expand All @@ -130,7 +137,9 @@ public ResultSet getResultSet(long index, int count) throws SQLException {
this.pluginManager,
this.array,
"Array.getResultSet",
() -> this.array.getResultSet());
() -> this.array.getResultSet(index, count),
index,
count);
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion wrapper/src/test/java/software/amazon/jdbc/plugin/HighestWeightHostSelectorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@
import java.util.Properties;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import software.amazon.jdbc.HighestWeightHostSelector;
import software.amazon.jdbc.HostRole;
import software.amazon.jdbc.HostSpec;
import software.amazon.jdbc.HostSpecBuilder;
import software.amazon.jdbc.hostavailability.SimpleHostAvailabilityStrategy;
import software.amazon.jdbc.wrapper.HighestWeightHostSelector;

public class HighestWeightHostSelectorTest {

Expand Down
2 changes: 1 addition & 1 deletion ...r/src/test/java/software/amazon/jdbc/plugin/limitless/LimitlessRouterServiceImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
import org.junit.jupiter.api.Test;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import software.amazon.jdbc.HighestWeightHostSelector;
import software.amazon.jdbc.HostListProvider;
import software.amazon.jdbc.HostRole;
import software.amazon.jdbc.HostSpec;
Expand All @@ -47,7 +48,6 @@
import software.amazon.jdbc.RoundRobinHostSelector;
import software.amazon.jdbc.hostavailability.HostAvailability;
import software.amazon.jdbc.hostavailability.SimpleHostAvailabilityStrategy;
import software.amazon.jdbc.wrapper.HighestWeightHostSelector;

public class LimitlessRouterServiceImplTest {

Expand Down
Loading