Skip to content

Commit 5b74d5c

Browse files
committed
fix syntax error for Oracle + TLS
Signed-off-by: Pedro Ruivo <1492066+pruivo@users.noreply.github.com>
1 parent 3bfbe71 commit 5b74d5c

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

quarkus/config-api/src/main/java/org/keycloak/config/database/Database.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ private String escapeReplacements(String snippet) {
213213
(namedProperty, alias) -> "jdbc:oracle:thin:%s//%s:%s/%s".formatted(
214214
getProperty(DatabaseOptions.DB_ORACLE_TLS_TRANSPORT, namedProperty, "@"),
215215
getProperty(DatabaseOptions.DB_URL_HOST, namedProperty, "localhost"),
216-
getProperty(DatabaseOptions.DB_URL_PORT, namedProperty, "1521"), //TODO how to change default!?
216+
getProperty(DatabaseOptions.DB_URL_PORT, namedProperty, "1521"),
217217
getProperty(DatabaseOptions.DB_URL_DATABASE, namedProperty, "keycloak")),
218218
"liquibase.database.core.OracleDatabase"
219219
);

quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/DatabasePropertyMappers.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -104,31 +104,31 @@ public List<PropertyMapper<?>> getPropertyMappers() {
104104
.build(),
105105
fromOption(DatabaseOptions.DB_MSSQL_SEND_STRING_PARAMETER_AS_UNICODE)
106106
.to(MSSQL_SEND_STRING_PARAMETER_AS_UNICODE)
107-
.isEnabled(() -> isMssqlSendStringParametersAsUnicode())
107+
.isEnabled(DatabasePropertyMappers::isMssqlSendStringParametersAsUnicode)
108108
.build(),
109109
fromOption(DatabaseOptions.DB_MYSQL_CONNECT_TIMEOUT)
110110
.to(MYSQL_CONNECT_TIMEOUT)
111-
.isEnabled(() -> isMysqlConnectTimeoutEnabled())
111+
.isEnabled(DatabasePropertyMappers::isMysqlConnectTimeoutEnabled)
112112
.build(),
113113
fromOption(DatabaseOptions.DB_MARIADB_CONNECT_TIMEOUT)
114114
.to(MARIADB_CONNECT_TIMEOUT)
115-
.isEnabled(() -> isMariadbConnectTimeoutEnabled())
115+
.isEnabled(DatabasePropertyMappers::isMariadbConnectTimeoutEnabled)
116116
.build(),
117117
fromOption(DatabaseOptions.DB_ORACLE_CONNECT_TIMEOUT)
118118
.to(ORACLEDB_CONNECT_TIMEOUT)
119-
.isEnabled(() -> isOracleConnectTimeoutEnabled())
119+
.isEnabled(DatabasePropertyMappers::isOracleConnectTimeoutEnabled)
120120
.build(),
121121
fromOption(DatabaseOptions.DB_MSSQL_CONNECT_TIMEOUT)
122122
.to(MSSQL_CONNECT_TIMEOUT)
123-
.isEnabled(() -> isMssqlLoginTimeoutEnabled())
123+
.isEnabled(DatabasePropertyMappers::isMssqlLoginTimeoutEnabled)
124124
.build(),
125125
fromOption(DatabaseOptions.DB_POSTGRES_CONNECT_TIMEOUT)
126126
.to(POSTGRES_CONNECT_TIMEOUT)
127-
.isEnabled(() -> isPostgresConnectTimeoutEnabled())
127+
.isEnabled(DatabasePropertyMappers::isPostgresConnectTimeoutEnabled)
128128
.build(),
129129
fromOption(DatabaseOptions.DB_TIDB_CONNECT_TIMEOUT)
130130
.to(TIDB_CONNECT_TIMEOUT)
131-
.isEnabled(() -> isTidbConnectTimeoutEnabled())
131+
.isEnabled(DatabasePropertyMappers::isTidbConnectTimeoutEnabled)
132132
.build(),
133133
fromOption(DatabaseOptions.DB_URL_HOST)
134134
.paramLabel("hostname")
@@ -517,7 +517,7 @@ private static String transformDatasourceTo(String to) {
517517

518518
private static String transformOracleProtocol(String datasource, String value, ConfigSourceInterceptorContext configSourceInterceptorContext) {
519519
var tlsMode = DatabaseOptions.DatabaseTlsMode.fromCliValue(value);
520-
return tlsMode != DatabaseOptions.DatabaseTlsMode.DISABLED ? "@tcps" : "@";
520+
return tlsMode != DatabaseOptions.DatabaseTlsMode.DISABLED ? "@tcps:" : "@";
521521
}
522522

523523
private static PropertyMapper<?> setTlsJdbcProperty(Option<String> option, String jdbcPropertyKey, Map<Database.Vendor, String> vendorValues) {

0 commit comments

Comments
 (0)