Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Feature/replace ucp with hikaricp #54

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
jgebal merged 3 commits into from
Nov 21, 2017
+32 −19
Merged

Feature/replace ucp with hikaricp #54

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d0fa80c
Replace Oracle Connection Pool with HikariCP
pesse Nov 21, 2017
356e95b
Fix problem appassembler not packing cli-jar into assembly
pesse Nov 21, 2017
7735c6d
Updated docs
pesse Nov 21, 2017
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
Next Next commit
Replace Oracle Connection Pool with HikariCP
  • Loading branch information
@pesse
pesse authored and Samuel Nitsche committed Nov 21, 2017
commit d0fa80ced9b0db520c099023b94c459465f5093a
26 changes: 22 additions & 4 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,12 @@
<artifactId>java-api</artifactId>
<version>3.0.4</version>
<scope>compile</scope>
<exclusions>
<exclusion>
<groupId>com.oracle.jdbc</groupId>
<artifactId>ucp</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.beust</groupId>
Expand All @@ -30,10 +36,22 @@
<scope>compile</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
<groupId>com.zaxxer</groupId>
<artifactId>HikariCP</artifactId>
<version>2.7.2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-nop</artifactId>
<version>1.7.25</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
</dependency>
</dependencies>

Expand Down
16 changes: 6 additions & 10 deletions src/main/java/org/utplsql/cli/ConnectionInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
package org.utplsql.cli;

import com.beust.jcommander.IStringConverter;
import oracle.ucp.jdbc.PoolDataSource;
import oracle.ucp.jdbc.PoolDataSourceFactory;
import com.zaxxer.hikari.HikariDataSource;

import java.io.File;
import java.sql.Connection;
Expand All @@ -22,16 +21,13 @@ public class ConnectionInfo {
}
}

private PoolDataSource pds = PoolDataSourceFactory.getPoolDataSource();
private HikariDataSource pds = new HikariDataSource();

public ConnectionInfo(String connectionInfo) {
try {
this.pds.setConnectionFactoryClassName("oracle.jdbc.pool.OracleDataSource");
this.pds.setURL("jdbc:oracle:thin:" + connectionInfo);
this.pds.setInitialPoolSize(2);
} catch (SQLException e) {
e.printStackTrace();
}

pds.setJdbcUrl("jdbc:oracle:thin:" + connectionInfo);
pds.setAutoCommit(false);

}

public Connection getConnection() throws SQLException {
Expand Down