Skip to content

Oracle: Support POOLED server mode for DRCP #1566

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+9 −2
Open

Oracle: Support POOLED server mode for DRCP #1566

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
4 changes: 2 additions & 2 deletions vertx-oracle-client/src/main/java/io/vertx/oracleclient/ServerMode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
@VertxGen
public enum ServerMode {

DEDICATED("dedicated"), SHARED("shared");
DEDICATED("dedicated"), SHARED("shared"), POOLED("pooled");

private final String mode;

Expand All @@ -28,7 +28,7 @@ public enum ServerMode {
}

public static ServerMode of(String mode) {
return DEDICATED.mode.equalsIgnoreCase(mode) ? DEDICATED : SHARED.mode.equalsIgnoreCase(mode) ? SHARED : null;
return DEDICATED.mode.equalsIgnoreCase(mode) ? DEDICATED : SHARED.mode.equalsIgnoreCase(mode) ? SHARED : POOLED.mode.equalsIgnoreCase(mode) ? POOLED : null;
}

@Override
Expand Down
2 changes: 2 additions & 0 deletions vertx-oracle-client/src/main/java/io/vertx/oracleclient/impl/OracleDatabaseHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,8 @@ private static String composeJdbcUrl(OracleConnectOptions options) {
url.append("/").append(encodeUrl(database));
if (options.getServerMode() == ServerMode.SHARED) {
url.append(":").append(ServerMode.SHARED);
} else if (options.getServerMode() == ServerMode.POOLED) {
url.append(":").append(ServerMode.POOLED);
}
}
}
Expand Down
5 changes: 5 additions & 0 deletions ...cle-client/src/test/java/tests/oracleclient/impl/ValidOracleConnectionUriParsingTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,11 @@ public static Object[][] data() {
.put("serviceName", "orcl")
.put("host", "::1")
.put("serverMode", "dedicated")},
{"uri with service name and server mode pooled", "oracle:thin:@[::1]/orcl:pooled",
new JsonObject()
.put("serviceName", "orcl")
.put("host", "::1")
.put("serverMode", "pooled")},
{"uri with service name with prop", "oracle:thin:@[::1]:1521/orcl?key=val",
new JsonObject()
.put("properties", new JsonObject().put("key", "val"))
Expand Down