From 99605e658249251f4470015f9162721837f3b83e Mon Sep 17 00:00:00 2001 From: deltoro05 <162127830+deltoro05@users.noreply.github.com> Date: Fri, 26 Jul 2024 18:19:19 +0300 Subject: [PATCH 1/3] Update ngsi_ckan_sink.md This URL has changed to https://symbl.cc/ --- doc/cygnus-ngsi-ld/flume_extensions_catalogue/ngsi_ckan_sink.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/cygnus-ngsi-ld/flume_extensions_catalogue/ngsi_ckan_sink.md b/doc/cygnus-ngsi-ld/flume_extensions_catalogue/ngsi_ckan_sink.md index 2b9ecfa65..c838ab52d 100644 --- a/doc/cygnus-ngsi-ld/flume_extensions_catalogue/ngsi_ckan_sink.md +++ b/doc/cygnus-ngsi-ld/flume_extensions_catalogue/ngsi_ckan_sink.md @@ -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. From b8712ecf82c17f4871173a0bd4d9ee94bdfb75bc Mon Sep 17 00:00:00 2001 From: Alvaro Vega Date: Thu, 1 Aug 2024 08:36:32 +0200 Subject: [PATCH 2/3] Update MongoBackendImpl.java --- .../iot/cygnus/backends/mongo/MongoBackendImpl.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/cygnus-common/src/main/java/com/telefonica/iot/cygnus/backends/mongo/MongoBackendImpl.java b/cygnus-common/src/main/java/com/telefonica/iot/cygnus/backends/mongo/MongoBackendImpl.java index d324e6b7a..d4021859d 100644 --- a/cygnus-common/src/main/java/com/telefonica/iot/cygnus/backends/mongo/MongoBackendImpl.java +++ b/cygnus-common/src/main/java/com/telefonica/iot/cygnus/backends/mongo/MongoBackendImpl.java @@ -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 From 7e2201b19238ab97ff9616b83b1d428ca5e19c7a Mon Sep 17 00:00:00 2001 From: Alvaro Vega Date: Thu, 1 Aug 2024 08:38:08 +0200 Subject: [PATCH 3/3] Update CHANGES_NEXT_RELEASE --- CHANGES_NEXT_RELEASE | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGES_NEXT_RELEASE b/CHANGES_NEXT_RELEASE index 1e33bbc51..5100d2164 100644 --- a/CHANGES_NEXT_RELEASE +++ b/CHANGES_NEXT_RELEASE @@ -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