Skip to content
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

Bump org.apache.derby:derby from 10.14.2.0 to 10.17.1.0 #7

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Bump org.apache.derby:derby from 10.14.2.0 to 10.17.1.0 #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
855fecf
Apply auto-formatting
safris Sep 26, 2023
b35d92c
Bump org.apache.derby:derby from 10.14.2.0 to 10.17.1.0
dependabot[bot] Nov 20, 2023
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
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
<version>10.14.2.0</version> <!-- 10.14.2.0 is the highest jdk8 version -->
<version>10.17.1.0</version> <!-- 10.17.1.0 is the highest jdk8 version -->
<scope>test</scope>
</dependency>
<dependency>
Expand Down
48 changes: 27 additions & 21 deletions src/main/java/org/openjax/dbcp/DataSources.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,9 +121,9 @@ public static BasicDataSource createDataSource(final URL url, final ClassLoader
}

/**
* Create a {@link BasicDataSource} from the configuration supplied by the array of {@link Dbcp dbcp} JAX-B bindings that match
* the specified {@code id}. {@link ClassLoader#getSystemClassLoader()} will be used by the {@link BasicDataSource} when it loads
* the JDBC driver.
* Create a {@link BasicDataSource} from the configuration supplied by the array of {@link Dbcp dbcp} JAX-B bindings that match the
* specified {@code id}. {@link ClassLoader#getSystemClassLoader()} will be used by the {@link BasicDataSource} when it loads the
* JDBC driver.
*
* @param id The id of the {@link Dbcp dbcp} bindings to match, or {@code null} to match all bindings.
* @param dbcps Array of {@link Dbcp} JAX-B bindings.
Expand All @@ -136,9 +136,8 @@ public static BasicDataSource createDataSource(final String id, final Dbcp ... d
}

/**
* Create a {@link BasicDataSource} from the configuration supplied by the array of {@link Dbcp dbcp} JAX-B bindings that match
* any {@code id}. {@link ClassLoader#getSystemClassLoader()} will be used by the {@link BasicDataSource} when it loads the JDBC
* driver.
* Create a {@link BasicDataSource} from the configuration supplied by the array of {@link Dbcp dbcp} JAX-B bindings that match any
* {@code id}. {@link ClassLoader#getSystemClassLoader()} will be used by the {@link BasicDataSource} when it loads the JDBC driver.
*
* @param dbcps Array of {@link Dbcp} JAX-B bindings.
* @return The {@link BasicDataSource} instance.
Expand Down Expand Up @@ -181,8 +180,8 @@ public static BasicDataSource createDataSource(final $Dbcp ... dbcps) {

/**
* Create a {@link BasicDataSource} from the configuration supplied by the {@code /dbcp:dbcp} child elements of the provided
* {@link org.openjax.dbcp_1_2.Dbcps} JAX-B binding that match the specified {@code id}.
* {@link ClassLoader#getSystemClassLoader()} will be used by the {@link BasicDataSource} when it loads the JDBC driver.
* {@link org.openjax.dbcp_1_2.Dbcps} JAX-B binding that match the specified {@code id}. {@link ClassLoader#getSystemClassLoader()}
* will be used by the {@link BasicDataSource} when it loads the JDBC driver.
*
* @param id The id of the {@code /dbcp:dbcp} child elements of the provided {@link org.openjax.dbcp_1_2.Dbcps} to match, or
* {@code null} to match all child elements.
Expand Down Expand Up @@ -213,8 +212,8 @@ public static BasicDataSource createDataSource(final org.openjax.dbcp_1_2.Dbcps

/**
* Create a {@link BasicDataSource} from the configuration supplied by the {@code /dbcp:dbcp} child elements of the provided
* {@link Dbcps} JAX-SB binding that match the specified {@code id}. {@link ClassLoader#getSystemClassLoader()} will be used by
* the {@link BasicDataSource} when it loads the JDBC driver.
* {@link Dbcps} JAX-SB binding that match the specified {@code id}. {@link ClassLoader#getSystemClassLoader()} will be used by the
* {@link BasicDataSource} when it loads the JDBC driver.
*
* @param id The id of the {@code /dbcp:dbcp} child elements of the provided {@link Dbcps} to match, or {@code null} to match all
* child elements.
Expand Down Expand Up @@ -336,9 +335,9 @@ public static BasicDataSource createDataSource(final ClassLoader driverClassLoad
}

/**
* Create a {@link BasicDataSource} from the configuration supplied by the array of {@link Dbcp dbcp} JAX-B bindings that that
* match any {@code id}. {@link ClassLoader#getSystemClassLoader()} will be used by the {@link BasicDataSource} when it loads the
* JDBC driver.
* Create a {@link BasicDataSource} from the configuration supplied by the array of {@link Dbcp dbcp} JAX-B bindings that that match
* any {@code id}. {@link ClassLoader#getSystemClassLoader()} will be used by the {@link BasicDataSource} when it loads the JDBC
* driver.
*
* @param dbcp The {@link Dbcp} JAX-B bindings providing the configuration.
* @return The {@link BasicDataSource} instance.
Expand Down Expand Up @@ -413,8 +412,8 @@ public static BasicDataSource createDataSource(final $Dbcp dbcp) {
private boolean logAbandoned = false;

/**
* Create a {@link BasicDataSource} from the configuration supplied by the array of {@link Dbcp dbcp} JAX-B bindings that match
* the specified {@code id}.
* Create a {@link BasicDataSource} from the configuration supplied by the array of {@link Dbcp dbcp} JAX-B bindings that match the
* specified {@code id}.
*
* @param id The id of the {@link Dbcp dbcp} bindings to match, or {@code null} to match all bindings.
* @param driverClassLoader Class loader to be used by the {@link BasicDataSource} when it loads the JDBC driver.
Expand Down Expand Up @@ -493,7 +492,8 @@ private DataSources(final String id, final ClassLoader driverClassLoader, final
final int i$ = properties.size();
if (i$ > 0) {
if (CollectionUtil.isRandomAccess(properties)) {
int i = 0; do { // [RA]
int i = 0;
do { // [RA]
final Dbcp.Connection.Properties.Property property = properties.get(i);
final String name = property.getName();
final String value = property.getValue();
Expand All @@ -503,7 +503,8 @@ private DataSources(final String id, final ClassLoader driverClassLoader, final
while (++i < i$);
}
else {
final Iterator<Dbcp.Connection.Properties.Property> it = properties.iterator(); do { // [I]
final Iterator<Dbcp.Connection.Properties.Property> it = properties.iterator();
do { // [I]
final Dbcp.Connection.Properties.Property property = it.next();
final String name = property.getName();
final String value = property.getValue();
Expand Down Expand Up @@ -730,7 +731,8 @@ private DataSources(final String id, final ClassLoader driverClassLoader, final
final int i$ = properties.size();
if (i$ > 0) {
if (CollectionUtil.isRandomAccess(properties)) {
int i = 0; do { // [RA]
int i = 0;
do { // [RA]
final $Dbcp.Connection.Properties.Property property = properties.get(i);
final $Dbcp.Connection.Properties.Property.Name$ name = property.getName$();
final $Dbcp.Connection.Properties.Property.Value$ value = property.getValue$();
Expand All @@ -740,7 +742,8 @@ private DataSources(final String id, final ClassLoader driverClassLoader, final
while (++i < i$);
}
else {
final Iterator<$Dbcp.Connection.Properties.Property> it = properties.iterator(); do { // [I]
final Iterator<$Dbcp.Connection.Properties.Property> it = properties.iterator();
do { // [I]
final $Dbcp.Connection.Properties.Property property = it.next();
final $Dbcp.Connection.Properties.Property.Name$ name = property.getName$();
final $Dbcp.Connection.Properties.Property.Value$ value = property.getValue$();
Expand All @@ -758,12 +761,15 @@ private DataSources(final String id, final ClassLoader driverClassLoader, final
if (initSqls != null && (size = (sqls = initSqls.getInitSql()).size()) > 0) {
final String[] sql = new String[size];
if (CollectionUtil.isRandomAccess(sqls)) {
int i = 0; do // [RA]
int i = 0;
do // [RA]
sql[i] = sqls.get(i).text();
while (++i < size);
}
else {
int i = -1; final Iterator<$StringNonEmpty> it = sqls.iterator(); do // [I]
int i = -1;
final Iterator<$StringNonEmpty> it = sqls.iterator();
do // [I]
sql[++i] = it.next().text();
while (it.hasNext());
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/openjax/dbcp/DelegateDataSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ public Logger getParentLogger() throws SQLFeatureNotSupportedException {
}

@Override
public <T>T unwrap(final Class<T> iface) throws SQLException {
public <T> T unwrap(final Class<T> iface) throws SQLException {
return target.unwrap(iface);
}

Expand Down
Loading