Skip to content

Commit

Permalink
Github merging.
Browse files Browse the repository at this point in the history
  • Loading branch information
@guw @wwadge
guw authored and wwadge committed May 11, 2012
1 parent a43f7b2 commit 28aa127
Show file tree
Hide file tree
Showing 12 changed files with 840 additions and 776 deletions.
12 changes: 6 additions & 6 deletions bonecp-test-commons/src/main/java/com/jolbox/bonecp/MockCallableStatement.java
View file
Expand Up @@ -1366,26 +1366,26 @@ public boolean isPoolable() throws SQLException {
return false;
}

// #ifdef JDK7
@Override
/* #ifdef JDK7
// @Override
public <T> T getObject(int parameterIndex, Class<T> type) throws SQLException {
return null;
}
@Override
// @Override
public <T> T getObject(String parameterName, Class<T> type) throws SQLException {
return null;
}
@Override
// @Override
public void closeOnCompletion() throws SQLException {
}
@Override
// @Override
public boolean isCloseOnCompletion() throws SQLException {
return false;
}
// #endif JDK7
#endif JDK7 */

/** {@inheritDoc}
* @see java.sql.Statement#setCursorName(java.lang.String)
Expand Down
18 changes: 9 additions & 9 deletions bonecp-test-commons/src/main/java/com/jolbox/bonecp/MockConnection.java
View file
Expand Up @@ -34,9 +34,9 @@
import java.sql.Struct;
import java.util.Map;
import java.util.Properties;
// #ifdef JDK7
/* #ifdef JDK7
import java.util.concurrent.Executor;
// #endif JDK7
#endif JDK7 */

/**
* @author Wallace
Expand Down Expand Up @@ -102,29 +102,29 @@ public SQLXML createSQLXML() throws SQLException {
}
// #endif JDK6

// #ifdef JDK7
@Override
/* #ifdef JDK7
// @Override
public void setSchema(String schema) throws SQLException {
}
@Override
// @Override
public String getSchema() throws SQLException {
return null;
}
@Override
// @Override
public void abort(Executor executor) throws SQLException {
}
@Override
// @Override
public void setNetworkTimeout(Executor executor, int milliseconds) throws SQLException {
}
@Override
// @Override
public int getNetworkTimeout() throws SQLException {
return 0;
}
// #endif JDK7
#endif JDK7 */

/** {@inheritDoc}
* @see java.sql.Connection#createStatement()
Expand Down
10 changes: 5 additions & 5 deletions bonecp-test-commons/src/main/java/com/jolbox/bonecp/MockJDBCDriver.java
View file
Expand Up @@ -25,10 +25,10 @@
import java.sql.DriverPropertyInfo;
import java.sql.SQLException;
import java.util.Properties;
// #ifdef JDK7
/* #ifdef JDK7
import java.sql.SQLFeatureNotSupportedException;
import java.util.logging.Logger;
// #endif JDK7
#endif JDK7 */

/** A Fake jdbc driver for mocking purposes.
* @author Wallace
Expand Down Expand Up @@ -139,12 +139,12 @@ public boolean jdbcCompliant() {
return true;
}

// #ifdef JDK7
@Override
/* #ifdef JDK7
// @Override
public Logger getParentLogger() throws SQLFeatureNotSupportedException {
return null;
}
// #endif JDK7
#endif JDK7 */

/**
* Disable everything.
Expand Down
8 changes: 4 additions & 4 deletions bonecp-test-commons/src/main/java/com/jolbox/bonecp/MockJDBCStatement.java
View file
Expand Up @@ -261,16 +261,16 @@ public boolean isPoolable() throws SQLException {
return false;
}

// #ifdef JDK7
@Override
/* #ifdef JDK7
// @Override
public void closeOnCompletion() throws SQLException {
}
@Override
// @Override
public boolean isCloseOnCompletion() throws SQLException {
return false;
}
// #endif JDK7
#endif JDK7 */

/** {@inheritDoc}
* @see java.sql.Statement#setCursorName(java.lang.String)
Expand Down
4 changes: 2 additions & 2 deletions bonecp-test-commons/src/main/java/com/jolbox/bonecp/MockPreparedStatement.java
View file
Expand Up @@ -714,7 +714,7 @@ public boolean isPoolable() throws SQLException {
return false;
}

// #ifdef JDK7
/* #ifdef JDK7
// @Override
public void closeOnCompletion() throws SQLException {
}
Expand All @@ -723,7 +723,7 @@ public void closeOnCompletion() throws SQLException {
public boolean isCloseOnCompletion() throws SQLException {
return false;
}
// #endif JDK7
#endif JDK7 */

/** {@inheritDoc}
* @see java.sql.Statement#setCursorName(java.lang.String)
Expand Down
8 changes: 4 additions & 4 deletions bonecp-test-commons/src/main/java/com/jolbox/bonecp/MockResultSet.java
View file
Expand Up @@ -1234,17 +1234,17 @@ public void updateSQLXML(String columnLabel, SQLXML xmlObject)
}
// #endif JDK6

// #ifdef JDK7
@Override
/* #ifdef JDK7
// @Override
public <T> T getObject(int columnIndex, Class<T> type) throws SQLException {
return null;
}
@Override
// @Override
public <T> T getObject(String columnLabel, Class<T> type) throws SQLException {
return null;
}
// #endif JDK7
#endif JDK7 */

/** {@inheritDoc}
* @see java.sql.ResultSet#updateShort(int, short)
Expand Down
8 changes: 4 additions & 4 deletions bonecp/src/main/java/com/jolbox/bonecp/BoneCPDataSource.java
View file
Expand Up @@ -39,8 +39,8 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

// #ifdef JDK7
// #endif JDK7
/* #ifdef JDK7
#endif JDK7 */

/**
* DataSource for use with LazyConnection Provider etc.
Expand Down Expand Up @@ -196,12 +196,12 @@ public int getLoginTimeout()
throw new UnsupportedOperationException("getLoginTimeout is unsupported.");
}

// #ifdef JDK7
/* #ifdef JDK7
@Override
public java.util.logging.Logger getParentLogger() throws SQLFeatureNotSupportedException {
throw new SQLFeatureNotSupportedException("getParentLogger is unsupported");
}
// #endif JDK7
#endif JDK7 */

/**
* Sets the log writer for this DataSource object to the given java.io.PrintWriter object.
Expand Down
4 changes: 2 additions & 2 deletions bonecp/src/main/java/com/jolbox/bonecp/CallableStatementHandle.java
View file
Expand Up @@ -737,7 +737,7 @@ public void setSQLXML(String parameterName, SQLXML xmlObject)

// #endif JDK6

// #ifdef JDK7
/* #ifdef JDK7
@Override
public <T> T getObject(int parameterIndex, Class<T> type) throws SQLException {
return this.internalCallableStatement.getObject(parameterIndex, type);
Expand All @@ -747,7 +747,7 @@ public <T> T getObject(int parameterIndex, Class<T> type) throws SQLException {
public <T> T getObject(String parameterName, Class<T> type) throws SQLException {
return this.internalCallableStatement.getObject(parameterName, type);
}
// #endif JDK7
#endif JDK7 */


/**
Expand Down
8 changes: 4 additions & 4 deletions bonecp/src/main/java/com/jolbox/bonecp/ConnectionHandle.java
View file
Expand Up @@ -38,9 +38,9 @@
import java.util.Map.Entry;
import java.util.Properties;
import java.util.concurrent.ConcurrentMap;
// #ifdef JDK7
/* #ifdef JDK7
import java.util.concurrent.Executor;
// #endif JDK7
#endif JDK7 */
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
Expand Down Expand Up @@ -750,7 +750,7 @@ public SQLXML createSQLXML() throws SQLException {
}
// #endif JDK6

// #ifdef JDK7
/* #ifdef JDK7
@Override
public void setSchema(String schema) throws SQLException {
this.connection.setSchema(schema);
Expand All @@ -775,7 +775,7 @@ public void setNetworkTimeout(Executor executor, int milliseconds) throws SQLExc
public int getNetworkTimeout() throws SQLException {
return this.connection.getNetworkTimeout();
}
// #endif JDK7
#endif JDK7 */

public Statement createStatement() throws SQLException {
Statement result = null;
Expand Down
4 changes: 2 additions & 2 deletions bonecp/src/main/java/com/jolbox/bonecp/StatementHandle.java
View file
Expand Up @@ -1011,7 +1011,7 @@ public boolean isPoolable()
}
// #endif JDK6

// #ifdef JDK7
/* #ifdef JDK7
@Override
public void closeOnCompletion() throws SQLException {
this.internalStatement.closeOnCompletion();
Expand All @@ -1021,7 +1021,7 @@ public void closeOnCompletion() throws SQLException {
public boolean isCloseOnCompletion() throws SQLException {
return this.internalStatement.isCloseOnCompletion();
}
// #endif JDK7
#endif JDK7 */


public void setCursorName(String name)
Expand Down

1 comment on commit 28aa127

@rvowles
Copy link

Choose a reason for hiding this comment

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

I'd remove the jboss repository, they are not allowed in Apache Maven Central artifacts and are bad Maven practice. Hopefully 0.8.0 gets released soon.

Please sign in to comment.