Skip to content

Commit

Permalink
Merge branch 'master' into task/add_polyline_arcgis
Browse files Browse the repository at this point in the history
  • Loading branch information
AlvaroVega committed Aug 1, 2024
2 parents 7e31f6d + 7764af1 commit 006af08
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 3 deletions.
1 change: 1 addition & 0 deletions CHANGES_NEXT_RELEASE
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
[cygnus-ngsi] [mongo-sink] Add mongo_ssl, mongo_ssl_invalid_host_allowed, mongo_ssl_keystore_path_file, mongo_ssl_keystore_password, mongo_ssl_truststore_path_file and mongo_ssl_truststore_password options for mongoDB connections
[cygnus-common] [mongo-backend] Use sslEnabled, sslInvalidHostNameAllowed, sslKeystorePathFile, sslKeystorePassword, sslTruststorePathFile and sslTruststorePassword options for mongoDB connections
[cygnus-common] [mongo-backend] Allow mongodb autodiscover at connect when just one server is provided
Original file line number Diff line number Diff line change
Expand Up @@ -661,9 +661,17 @@ private MongoDatabase getDatabase(String dbName) {
.sslContext(sslContext)
.build();
}
client = new MongoClient(servers, credential, options);
if (servers.size() == 1) { // allow auto-discover when just one endpoint is provided
client = new MongoClient(servers.get(0), credential, options);
} else {
client = new MongoClient(servers, credential, options);
}
} else {
client = new MongoClient(servers, options);
if (servers.size() == 1) { // allow auto-discover when just one endpoint is provided
client = new MongoClient(servers.get(0), options);
} else {
client = new MongoClient(servers, options);
}
} // if else
} // if

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -375,7 +375,7 @@ From version 1.3.0 (included), Cygnus applies this specific encoding tailored to
* Underscore character, `_`, is not encoded.
* Hyphen character, `-`, is not encoded.
* Equals character, `=`, is encoded as `xffff`.
* All other characters, including the slash in the FIWARE service paths, are encoded as a `x` character followed by the [Unicode](http://unicode-table.com) of the character.
* All other characters, including the slash in the FIWARE service paths, are encoded as a `x` character followed by the [Unicode](https://symbl.cc) of the character.
* User defined strings composed of a `x` character and a Unicode are encoded as `xx` followed by the Unicode.
* `xffff` is used as concatenator character.

Expand Down

0 comments on commit 006af08

Please sign in to comment.