Skip to content

Commit 1945987

Browse files
Mart-BogdanMcHunkyTrunk
Mart-Bogdan
authored and
McHunkyTrunk
committed
used camelCase for SSL config #43 
1 parent 188d35b commit 1945987

File tree

7 files changed

+58
-40
lines changed

7 files changed

+58
-40
lines changed

‎src/main/asciidoc/groovy/index.adoc

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -229,8 +229,8 @@ Both the PostgreSql and MySql clients take the same configuration:
229229
"database" : <name-of-your-database>,
230230
"charset" : <name-of-the-character-set>,
231231
"queryTimeout" : <timeout-in-milliseconds>,
232-
"sslmode" : <"disable"|"prefer"|"require"|"verify-ca"|"verify-full">,
233-
"sslrootcert" : <path to file with certificate>
232+
"sslMode" : <"disable"|"prefer"|"require"|"verify-ca"|"verify-full">,
233+
"sslRootCert" : <path to file with certificate>
234234
}
235235
----
236236

@@ -242,12 +242,15 @@ Both the PostgreSql and MySql clients take the same configuration:
242242
`database`:: The name of the database you want to connect to. Defaults to `testdb`.
243243
`charset`:: The name of the character set you want to use for the connection. Defaults to `UTF-8`.
244244
`queryTimeout`:: The timeout to wait for a query in milliseconds. Defaults to `10000` (= 10 seconds).
245-
`sslmode` :: If you want to enable SSL support you should enable this parameter.
245+
`sslMode` :: If you want to enable SSL support you should enable this parameter.
246246
For example to connect Heroku you will need to use *prefer*.
247247

248248
"disable" ::: only try a non-SSL connection
249249
"prefer" ::: first try an SSL connection; if that fails, try a non-SSL connection
250250
"require" ::: only try an SSL connection, but don't verify Certificate Authority
251-
"verify-ca" ::: only try an SSL connection, and verify that the server certificate is issued by a trusted certificate authority (CA)
252-
"verify-full" ::: only try an SSL connection, verify that the server certificate is issued by a trusted CA and that the server host name matches that in the certificate
253-
`sslrootcert` :: Path to SSL root certificate file. Is used if you want to verify privately issued certificate.
251+
"verify-ca" ::: only try an SSL connection, and verify that the server certificate is issued by a trusted
252+
certificate authority (CA)
253+
"verify-full" ::: only try an SSL connection, verify that the server certificate is issued by a trusted CA and
254+
that the server host name matches that in the certificate
255+
`sslRootCert` :: Path to SSL root certificate file. Is used if you want to verify privately issued certificate.
256+
Refer to https://github.com/mauricio/postgresql-async[postgresql-async] documentation for more details.

‎src/main/asciidoc/java/index.adoc

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -197,8 +197,8 @@ Both the PostgreSql and MySql clients take the same configuration:
197197
"database" : <name-of-your-database>,
198198
"charset" : <name-of-the-character-set>,
199199
"queryTimeout" : <timeout-in-milliseconds>,
200-
"sslmode" : <"disable"|"prefer"|"require"|"verify-ca"|"verify-full">,
201-
"sslrootcert" : <path to file with certificate>
200+
"sslMode" : <"disable"|"prefer"|"require"|"verify-ca"|"verify-full">,
201+
"sslRootCert" : <path to file with certificate>
202202
}
203203
----
204204

@@ -210,12 +210,15 @@ Both the PostgreSql and MySql clients take the same configuration:
210210
`database`:: The name of the database you want to connect to. Defaults to `testdb`.
211211
`charset`:: The name of the character set you want to use for the connection. Defaults to `UTF-8`.
212212
`queryTimeout`:: The timeout to wait for a query in milliseconds. Defaults to `10000` (= 10 seconds).
213-
`sslmode` :: If you want to enable SSL support you should enable this parameter.
213+
`sslMode` :: If you want to enable SSL support you should enable this parameter.
214214
For example to connect Heroku you will need to use *prefer*.
215215

216216
"disable" ::: only try a non-SSL connection
217217
"prefer" ::: first try an SSL connection; if that fails, try a non-SSL connection
218218
"require" ::: only try an SSL connection, but don't verify Certificate Authority
219-
"verify-ca" ::: only try an SSL connection, and verify that the server certificate is issued by a trusted certificate authority (CA)
220-
"verify-full" ::: only try an SSL connection, verify that the server certificate is issued by a trusted CA and that the server host name matches that in the certificate
221-
`sslrootcert` :: Path to SSL root certificate file. Is used if you want to verify privately issued certificate.
219+
"verify-ca" ::: only try an SSL connection, and verify that the server certificate is issued by a trusted
220+
certificate authority (CA)
221+
"verify-full" ::: only try an SSL connection, verify that the server certificate is issued by a trusted CA and
222+
that the server host name matches that in the certificate
223+
`sslRootCert` :: Path to SSL root certificate file. Is used if you want to verify privately issued certificate.
224+
Refer to https://github.com/mauricio/postgresql-async[postgresql-async] documentation for more details.

‎src/main/asciidoc/js/index.adoc

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -235,8 +235,8 @@ Both the PostgreSql and MySql clients take the same configuration:
235235
"database" : <name-of-your-database>,
236236
"charset" : <name-of-the-character-set>,
237237
"queryTimeout" : <timeout-in-milliseconds>,
238-
"sslmode" : <"disable"|"prefer"|"require"|"verify-ca"|"verify-full">,
239-
"sslrootcert" : <path to file with certificate>
238+
"sslMode" : <"disable"|"prefer"|"require"|"verify-ca"|"verify-full">,
239+
"sslRootCert" : <path to file with certificate>
240240
}
241241
----
242242

@@ -248,12 +248,15 @@ Both the PostgreSql and MySql clients take the same configuration:
248248
`database`:: The name of the database you want to connect to. Defaults to `testdb`.
249249
`charset`:: The name of the character set you want to use for the connection. Defaults to `UTF-8`.
250250
`queryTimeout`:: The timeout to wait for a query in milliseconds. Defaults to `10000` (= 10 seconds).
251-
`sslmode` :: If you want to enable SSL support you should enable this parameter.
251+
`sslMode` :: If you want to enable SSL support you should enable this parameter.
252252
For example to connect Heroku you will need to use *prefer*.
253253

254254
"disable" ::: only try a non-SSL connection
255255
"prefer" ::: first try an SSL connection; if that fails, try a non-SSL connection
256256
"require" ::: only try an SSL connection, but don't verify Certificate Authority
257-
"verify-ca" ::: only try an SSL connection, and verify that the server certificate is issued by a trusted certificate authority (CA)
258-
"verify-full" ::: only try an SSL connection, verify that the server certificate is issued by a trusted CA and that the server host name matches that in the certificate
259-
`sslrootcert` :: Path to SSL root certificate file. Is used if you want to verify privately issued certificate.
257+
"verify-ca" ::: only try an SSL connection, and verify that the server certificate is issued by a trusted
258+
certificate authority (CA)
259+
"verify-full" ::: only try an SSL connection, verify that the server certificate is issued by a trusted CA and
260+
that the server host name matches that in the certificate
261+
`sslRootCert` :: Path to SSL root certificate file. Is used if you want to verify privately issued certificate.
262+
Refer to https://github.com/mauricio/postgresql-async[postgresql-async] documentation for more details.

‎src/main/asciidoc/kotlin/index.adoc

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -229,8 +229,8 @@ Both the PostgreSql and MySql clients take the same configuration:
229229
"database" : <name-of-your-database>,
230230
"charset" : <name-of-the-character-set>,
231231
"queryTimeout" : <timeout-in-milliseconds>,
232-
"sslmode" : <"disable"|"prefer"|"require"|"verify-ca"|"verify-full">,
233-
"sslrootcert" : <path to file with certificate>
232+
"sslMode" : <"disable"|"prefer"|"require"|"verify-ca"|"verify-full">,
233+
"sslRootCert" : <path to file with certificate>
234234
}
235235
----
236236

@@ -242,12 +242,15 @@ Both the PostgreSql and MySql clients take the same configuration:
242242
`database`:: The name of the database you want to connect to. Defaults to `testdb`.
243243
`charset`:: The name of the character set you want to use for the connection. Defaults to `UTF-8`.
244244
`queryTimeout`:: The timeout to wait for a query in milliseconds. Defaults to `10000` (= 10 seconds).
245-
`sslmode` :: If you want to enable SSL support you should enable this parameter.
245+
`sslMode` :: If you want to enable SSL support you should enable this parameter.
246246
For example to connect Heroku you will need to use *prefer*.
247247

248248
"disable" ::: only try a non-SSL connection
249249
"prefer" ::: first try an SSL connection; if that fails, try a non-SSL connection
250250
"require" ::: only try an SSL connection, but don't verify Certificate Authority
251-
"verify-ca" ::: only try an SSL connection, and verify that the server certificate is issued by a trusted certificate authority (CA)
252-
"verify-full" ::: only try an SSL connection, verify that the server certificate is issued by a trusted CA and that the server host name matches that in the certificate
253-
`sslrootcert` :: Path to SSL root certificate file. Is used if you want to verify privately issued certificate.
251+
"verify-ca" ::: only try an SSL connection, and verify that the server certificate is issued by a trusted
252+
certificate authority (CA)
253+
"verify-full" ::: only try an SSL connection, verify that the server certificate is issued by a trusted CA and
254+
that the server host name matches that in the certificate
255+
`sslRootCert` :: Path to SSL root certificate file. Is used if you want to verify privately issued certificate.
256+
Refer to https://github.com/mauricio/postgresql-async[postgresql-async] documentation for more details.

‎src/main/asciidoc/ruby/index.adoc

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -235,8 +235,8 @@ Both the PostgreSql and MySql clients take the same configuration:
235235
"database" : <name-of-your-database>,
236236
"charset" : <name-of-the-character-set>,
237237
"queryTimeout" : <timeout-in-milliseconds>,
238-
"sslmode" : <"disable"|"prefer"|"require"|"verify-ca"|"verify-full">,
239-
"sslrootcert" : <path to file with certificate>
238+
"sslMode" : <"disable"|"prefer"|"require"|"verify-ca"|"verify-full">,
239+
"sslRootCert" : <path to file with certificate>
240240
}
241241
----
242242

@@ -248,12 +248,15 @@ Both the PostgreSql and MySql clients take the same configuration:
248248
`database`:: The name of the database you want to connect to. Defaults to `testdb`.
249249
`charset`:: The name of the character set you want to use for the connection. Defaults to `UTF-8`.
250250
`queryTimeout`:: The timeout to wait for a query in milliseconds. Defaults to `10000` (= 10 seconds).
251-
`sslmode` :: If you want to enable SSL support you should enable this parameter.
251+
`sslMode` :: If you want to enable SSL support you should enable this parameter.
252252
For example to connect Heroku you will need to use *prefer*.
253253

254254
"disable" ::: only try a non-SSL connection
255255
"prefer" ::: first try an SSL connection; if that fails, try a non-SSL connection
256256
"require" ::: only try an SSL connection, but don't verify Certificate Authority
257-
"verify-ca" ::: only try an SSL connection, and verify that the server certificate is issued by a trusted certificate authority (CA)
258-
"verify-full" ::: only try an SSL connection, verify that the server certificate is issued by a trusted CA and that the server host name matches that in the certificate
259-
`sslrootcert` :: Path to SSL root certificate file. Is used if you want to verify privately issued certificate.
257+
"verify-ca" ::: only try an SSL connection, and verify that the server certificate is issued by a trusted
258+
certificate authority (CA)
259+
"verify-full" ::: only try an SSL connection, verify that the server certificate is issued by a trusted CA and
260+
that the server host name matches that in the certificate
261+
`sslRootCert` :: Path to SSL root certificate file. Is used if you want to verify privately issued certificate.
262+
Refer to https://github.com/mauricio/postgresql-async[postgresql-async] documentation for more details.

‎src/main/java/io/vertx/ext/asyncsql/impl/BaseSQLClient.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -139,11 +139,11 @@ protected Configuration getConfiguration(
139139

140140
private Map<String, String> buildSslConfig(JsonObject config) {
141141
Map<String, String> sslConfig = Map$.MODULE$.empty();
142-
if (config.getString("sslmode")!= null) {
143-
sslConfig = sslConfig.$plus(Tuple2.apply("sslmode", config.getString("sslmode")));
142+
if (config.getString("sslMode")!= null) {
143+
sslConfig = sslConfig.$plus(Tuple2.apply("sslmode", config.getString("sslMode")));
144144
}
145-
if (config.getString("sslrootcert") != null) {
146-
sslConfig = sslConfig.$plus(Tuple2.apply("sslrootcert", config.getString("sslrootcert")));
145+
if (config.getString("sslRootCert") != null) {
146+
sslConfig = sslConfig.$plus(Tuple2.apply("sslrootcert", config.getString("sslRootCert")));
147147
}
148148
return sslConfig;
149149
}

‎src/main/java/io/vertx/ext/asyncsql/package-info.java

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -186,8 +186,8 @@
186186
* "database" : <name-of-your-database>,
187187
* "charset" : <name-of-the-character-set>,
188188
* "queryTimeout" : <timeout-in-milliseconds>,
189-
* "sslmode" : <"disable"|"prefer"|"require"|"verify-ca"|"verify-full">,
190-
* "sslrootcert" : <path to file with certificate>
189+
* "sslMode" : <"disable"|"prefer"|"require"|"verify-ca"|"verify-full">,
190+
* "sslRootCert" : <path to file with certificate>
191191
* }
192192
* ----
193193
*
@@ -199,15 +199,18 @@
199199
* `database`:: The name of the database you want to connect to. Defaults to `testdb`.
200200
* `charset`:: The name of the character set you want to use for the connection. Defaults to `UTF-8`.
201201
* `queryTimeout`:: The timeout to wait for a query in milliseconds. Defaults to `10000` (= 10 seconds).
202-
* `sslmode` :: If you want to enable SSL support you should enable this parameter.
202+
* `sslMode` :: If you want to enable SSL support you should enable this parameter.
203203
* For example to connect Heroku you will need to use *prefer*.
204204
*
205205
* "disable" ::: only try a non-SSL connection
206206
* "prefer" ::: first try an SSL connection; if that fails, try a non-SSL connection
207207
* "require" ::: only try an SSL connection, but don't verify Certificate Authority
208-
* "verify-ca" ::: only try an SSL connection, and verify that the server certificate is issued by a trusted certificate authority (CA)
209-
* "verify-full" ::: only try an SSL connection, verify that the server certificate is issued by a trusted CA and that the server host name matches that in the certificate
210-
* `sslrootcert` :: Path to SSL root certificate file. Is used if you want to verify privately issued certificate.
208+
* "verify-ca" ::: only try an SSL connection, and verify that the server certificate is issued by a trusted
209+
* certificate authority (CA)
210+
* "verify-full" ::: only try an SSL connection, verify that the server certificate is issued by a trusted CA and
211+
* that the server host name matches that in the certificate
212+
* `sslRootCert` :: Path to SSL root certificate file. Is used if you want to verify privately issued certificate.
213+
* Refer to https://github.com/mauricio/postgresql-async[postgresql-async] documentation for more details.
211214
*/
212215
@Document(fileName = "index.adoc")
213216
@ModuleGen(name = "vertx-mysql-postgresql", groupPackage = "io.vertx") package io.vertx.ext.asyncsql;

0 commit comments

Comments
 (0)