This is an automated email from the ASF dual-hosted git repository.
pnoltes pushed a commit to branch
feature/685-update-container-config-properties-usage
in repository https://gitbox.apache.org/repos/asf/celix.git
commit 0566315d6d9aac188956f18493ed9b293f0f88a4
Author: Pepijn Noltes <pnol...@apache.org>
AuthorDate: Thu May 30 18:33:35 2024 +0200
gh-685: Rename properties load2/loadFromString2 to load/loadFromString
---
.../gtest/src/rsa_client_server_tests.cc | 4 +--
.../gtest/src/rsa_tests.cc | 2 +-
cmake/cmake_celix/ContainerPackaging.cmake | 2 +-
documents/containers.md | 4 +--
documents/properties_encoding.md | 4 +--
.../src/CelixBundleCacheErrorInjectionTestSuite.cc | 4 +--
.../framework/gtest/src/CelixFrameworkTestSuite.cc | 2 +-
libs/framework/src/bundle_archive.c | 2 +-
libs/framework/src/celix_bundle_cache.c | 2 +-
libs/framework/src/celix_launcher.c | 2 +-
.../error_injector/celix_properties/CMakeLists.txt | 2 +-
.../celix_properties/include/celix_properties_ei.h | 2 +-
.../celix_properties/src/celix_properties_ei.cc | 10 +++----
libs/utils/gtest/src/FileUtilsTestSuite.cc | 8 ++---
.../PropertiesEncodingErrorInjectionTestSuite.cc | 24 +++++++--------
.../utils/gtest/src/PropertiesEncodingTestSuite.cc | 34 +++++++++++-----------
libs/utils/include/celix/Properties.h | 4 +--
libs/utils/include/celix_properties.h | 4 +--
libs/utils/src/properties_encoding.c | 4 +--
19 files changed, 60 insertions(+), 60 deletions(-)
diff --git
a/bundles/remote_services/remote_service_admin_dfi/gtest/src/rsa_client_server_tests.cc
b/bundles/remote_services/remote_service_admin_dfi/gtest/src/rsa_client_server_tests.cc
index a5d241cf1..e8fd6719a 100644
---
a/bundles/remote_services/remote_service_admin_dfi/gtest/src/rsa_client_server_tests.cc
+++
b/bundles/remote_services/remote_service_admin_dfi/gtest/src/rsa_client_server_tests.cc
@@ -62,7 +62,7 @@ typedef struct rsa_dfi_exception_test_service {
static void setupFm(bool useCurlShare) {
//server
celix_properties_t *serverProps = nullptr;
- ASSERT_EQ(CELIX_SUCCESS, celix_properties_load2("server.properties",
0, &serverProps));
+ ASSERT_EQ(CELIX_SUCCESS, celix_properties_load("server.properties", 0,
&serverProps));
ASSERT_TRUE(serverProps != nullptr);
serverFramework = celix_frameworkFactory_createFramework(serverProps);
ASSERT_TRUE(serverFramework != nullptr);
@@ -71,7 +71,7 @@ typedef struct rsa_dfi_exception_test_service {
//client
celix_properties_t *clientProperties = nullptr;
- ASSERT_EQ(CELIX_SUCCESS, celix_properties_load2("client.properties",
0, &clientProperties));
+ ASSERT_EQ(CELIX_SUCCESS, celix_properties_load("client.properties", 0,
&clientProperties));
celix_properties_setBool(clientProperties,
"RSA_DFI_USE_CURL_SHARE_HANDLE", useCurlShare);
ASSERT_TRUE(clientProperties != nullptr);
clientFramework =
celix_frameworkFactory_createFramework(clientProperties);
diff --git
a/bundles/remote_services/remote_service_admin_dfi/gtest/src/rsa_tests.cc
b/bundles/remote_services/remote_service_admin_dfi/gtest/src/rsa_tests.cc
index 8d8fef378..ad29905d8 100644
--- a/bundles/remote_services/remote_service_admin_dfi/gtest/src/rsa_tests.cc
+++ b/bundles/remote_services/remote_service_admin_dfi/gtest/src/rsa_tests.cc
@@ -40,7 +40,7 @@ extern "C" {
static void setupFm(void) {
celix_properties_t *fwProperties = nullptr;
- EXPECT_EQ(CELIX_SUCCESS, celix_properties_load2("config.properties",
0, &fwProperties));
+ EXPECT_EQ(CELIX_SUCCESS, celix_properties_load("config.properties", 0,
&fwProperties));
ASSERT_TRUE(fwProperties != nullptr);
framework = celix_frameworkFactory_createFramework(fwProperties);
ASSERT_TRUE(framework != nullptr);
diff --git a/cmake/cmake_celix/ContainerPackaging.cmake
b/cmake/cmake_celix/ContainerPackaging.cmake
index 6523b3d44..31a3e7f26 100644
--- a/cmake/cmake_celix/ContainerPackaging.cmake
+++ b/cmake/cmake_celix/ContainerPackaging.cmake
@@ -239,7 +239,7 @@ int main(int argc, char *argv[]) {
});
celix_properties_t *embeddedProps;
- celix_status_t status = celix_properties_loadFromString2(config, 0,
&embeddedProps);
+ celix_status_t status = celix_properties_loadFromString(config, 0,
&embeddedProps);
if (status != CELIX_SUCCESS) {
celix_err_printErrors(stderr, \"Error creating embedded properties.\",
NULL);
return -1;
diff --git a/documents/containers.md b/documents/containers.md
index 37e366b37..3bdcf1dec 100644
--- a/documents/containers.md
+++ b/documents/containers.md
@@ -55,7 +55,7 @@ int main(int argc, char *argv[]) {
});
celix_properties_t *embeddedProps;
- celix_status_t status = celix_properties_loadFromString2(config, 0,
&embeddedProps);
+ celix_status_t status = celix_properties_loadFromString(config, 0,
&embeddedProps);
if (status != CELIX_SUCCESS) {
celix_err_printErrors(stderr, "Error creating embedded properties.",
NULL);
return -1;
@@ -106,7 +106,7 @@ int main(int argc, char *argv[]) {
});
celix_properties_t *embeddedProps;
- celix_status_t status = celix_properties_loadFromString2(config, 0,
&embeddedProps);
+ celix_status_t status = celix_properties_loadFromString(config, 0,
&embeddedProps);
if (status != CELIX_SUCCESS) {
celix_err_printErrors(stderr, "Error creating embedded properties.",
NULL);
return -1;
diff --git a/documents/properties_encoding.md b/documents/properties_encoding.md
index c4cdb38d7..29078de25 100644
--- a/documents/properties_encoding.md
+++ b/documents/properties_encoding.md
@@ -255,7 +255,7 @@ Properties encoding flags can be used control the behavior
of the encoding. The
## Properties Decoding
JSON can be decoded to an Apache Celix properties object using
-the `celix_properties_load2`, `celix_properties_loadFromStream` and
`celix_properties_loadFromString2` functions. These
+the `celix_properties_load`, `celix_properties_loadFromStream` and
`celix_properties_loadFromString` functions. These
functions take a JSON input and decode it to a properties object. Because
properties use a flat key structure,
decoding a nested JSON object to properties results in combining JSON object
keys to a flat key structure. This can
result in key collisions.
@@ -290,7 +290,7 @@ Combined with the following code:
int main() {
celix_autoptr(celix_properties_t) props;
- celix_status_t status = celix_properties_load2("example.json", 0, &props):
+ celix_status_t status = celix_properties_load("example.json", 0, &props):
(void)status; //for production code check status
CELIX_PROPERTIES_ITERATE(props, iter) {
printf("key=%s, value=%s\n", celix_properties_key(iter.key),
celix_properties_value(iter.entry.value));
diff --git
a/libs/framework/gtest/src/CelixBundleCacheErrorInjectionTestSuite.cc
b/libs/framework/gtest/src/CelixBundleCacheErrorInjectionTestSuite.cc
index 84b8a0464..9745da35f 100644
--- a/libs/framework/gtest/src/CelixBundleCacheErrorInjectionTestSuite.cc
+++ b/libs/framework/gtest/src/CelixBundleCacheErrorInjectionTestSuite.cc
@@ -56,7 +56,7 @@ class CelixBundleCacheErrorInjectionTestSuite : public
::testing::Test {
celix_ei_expect_celix_stringHashMap_create(nullptr, 0, nullptr);
celix_ei_expect_malloc(nullptr, 0, nullptr);
celix_ei_expect_calloc(nullptr, 0, nullptr);
- celix_ei_expect_celix_properties_load2(nullptr, 0, CELIX_SUCCESS);
+ celix_ei_expect_celix_properties_load(nullptr, 0, CELIX_SUCCESS);
celix_frameworkLogger_destroy(fw.logger);
celix_properties_destroy(fw.configurationMap);
}
@@ -196,7 +196,7 @@ TEST_F(CelixBundleCacheErrorInjectionTestSuite,
LoadBundleStatePropertiesErrorTe
celix_bundleContext_uninstallBundle(ctx->getCBundleContext(), bndId);
// And a celix_properties_load error is injected
- celix_ei_expect_celix_properties_load2(
+ celix_ei_expect_celix_properties_load(
(void*)celix_bundleCache_findBundleIdForLocation, 1,
CELIX_FILE_IO_EXCEPTION);
// Then installing the bundle will fail
diff --git a/libs/framework/gtest/src/CelixFrameworkTestSuite.cc
b/libs/framework/gtest/src/CelixFrameworkTestSuite.cc
index 5af8f391f..57c82c529 100644
--- a/libs/framework/gtest/src/CelixFrameworkTestSuite.cc
+++ b/libs/framework/gtest/src/CelixFrameworkTestSuite.cc
@@ -325,7 +325,7 @@ TEST_F(FrameworkFactoryTestSuite,
LaunchFrameworkWithConfigTest) {
*/
celix_properties_t* config = nullptr;
- ASSERT_EQ(CELIX_SUCCESS,
celix_properties_load2(INSTALL_AND_START_BUNDLES_CONFIG_PROPERTIES_FILE, 0,
&config));
+ ASSERT_EQ(CELIX_SUCCESS,
celix_properties_load(INSTALL_AND_START_BUNDLES_CONFIG_PROPERTIES_FILE, 0,
&config));
ASSERT_TRUE(config != nullptr);
framework_t* fw = celix_frameworkFactory_createFramework(config);
diff --git a/libs/framework/src/bundle_archive.c
b/libs/framework/src/bundle_archive.c
index 4607a7b62..bba4befde 100644
--- a/libs/framework/src/bundle_archive.c
+++ b/libs/framework/src/bundle_archive.c
@@ -62,7 +62,7 @@ struct bundleArchive {
static celix_status_t
celix_bundleArchive_storeBundleStateProperties(bundle_archive_pt archive) {
bool needUpdate = false;
celix_properties_t* bundleStateProperties;
- celix_status_t status =
celix_properties_load2(archive->savedBundleStatePropertiesPath, 0,
&bundleStateProperties);
+ celix_status_t status =
celix_properties_load(archive->savedBundleStatePropertiesPath, 0,
&bundleStateProperties);
if (status != CELIX_SUCCESS) {
celix_framework_logTssErrors(archive->fw->logger,
CELIX_LOG_LEVEL_ERROR);
bundleStateProperties = celix_properties_create();
diff --git a/libs/framework/src/celix_bundle_cache.c
b/libs/framework/src/celix_bundle_cache.c
index 54d6fc2fb..d99f64fc5 100644
--- a/libs/framework/src/celix_bundle_cache.c
+++ b/libs/framework/src/celix_bundle_cache.c
@@ -237,7 +237,7 @@ static celix_status_t
celix_bundleCache_updateIdForLocationLookupMap(celix_bundl
celix_auto(celix_utils_string_guard_t) strGuard =
celix_utils_stringGuard_init(archiveRootBuffer, bundleStateProperties);
if (celix_utils_fileExists(bundleStateProperties)) {
celix_autoptr(celix_properties_t) props = NULL;
- celix_status_t status =
celix_properties_load2(bundleStateProperties, 0, &props);
+ celix_status_t status =
celix_properties_load(bundleStateProperties, 0, &props);
if (status != CELIX_SUCCESS) {
fw_logCode(cache->fw->logger, CELIX_LOG_LEVEL_ERROR,
status,
"Cannot load bundle state properties from %s",
bundleStateProperties);
diff --git a/libs/framework/src/celix_launcher.c
b/libs/framework/src/celix_launcher.c
index 2d2791292..96a9279ee 100644
--- a/libs/framework/src/celix_launcher.c
+++ b/libs/framework/src/celix_launcher.c
@@ -282,7 +282,7 @@ static celix_status_t
celixLauncher_loadConfigProperties(const char* configFile,
configFile = DEFAULT_CONFIG_FILE;
}
if (loadConfig) {
- celix_status_t status = celix_properties_load2(configFile, 0,
&configProperties);
+ celix_status_t status = celix_properties_load(configFile, 0,
&configProperties);
if (status != CELIX_SUCCESS) {
celix_err_printErrors(stderr, "Error loading config file: ", NULL);
*outConfigProperties = NULL;
diff --git a/libs/utils/error_injector/celix_properties/CMakeLists.txt
b/libs/utils/error_injector/celix_properties/CMakeLists.txt
index 717cb50a5..445c544ea 100644
--- a/libs/utils/error_injector/celix_properties/CMakeLists.txt
+++ b/libs/utils/error_injector/celix_properties/CMakeLists.txt
@@ -27,6 +27,6 @@ target_link_options(properties_ei INTERFACE
LINKER:--wrap,celix_properties_setLong
LINKER:--wrap,celix_properties_setVersion
LINKER:--wrap,celix_properties_save
- LINKER:--wrap,celix_properties_load2
+ LINKER:--wrap,celix_properties_load
)
add_library(Celix::properties_ei ALIAS properties_ei)
diff --git
a/libs/utils/error_injector/celix_properties/include/celix_properties_ei.h
b/libs/utils/error_injector/celix_properties/include/celix_properties_ei.h
index c4076ec46..4c7d54ee5 100644
--- a/libs/utils/error_injector/celix_properties/include/celix_properties_ei.h
+++ b/libs/utils/error_injector/celix_properties/include/celix_properties_ei.h
@@ -32,7 +32,7 @@ CELIX_EI_DECLARE(celix_properties_set, celix_status_t);
CELIX_EI_DECLARE(celix_properties_setLong, celix_status_t);
CELIX_EI_DECLARE(celix_properties_setVersion, celix_status_t);
CELIX_EI_DECLARE(celix_properties_save, celix_status_t);
-CELIX_EI_DECLARE(celix_properties_load2, celix_status_t);
+CELIX_EI_DECLARE(celix_properties_load, celix_status_t);
#ifdef __cplusplus
}
diff --git
a/libs/utils/error_injector/celix_properties/src/celix_properties_ei.cc
b/libs/utils/error_injector/celix_properties/src/celix_properties_ei.cc
index 1f2eeba60..c6616ee00 100644
--- a/libs/utils/error_injector/celix_properties/src/celix_properties_ei.cc
+++ b/libs/utils/error_injector/celix_properties/src/celix_properties_ei.cc
@@ -65,16 +65,16 @@ __wrap_celix_properties_save(const celix_properties_t*
properties, const char* f
}
celix_status_t
-__real_celix_properties_load2(const char* filename,
+__real_celix_properties_load(const char* filename,
int decodeFlags,
celix_properties_t** out);
-CELIX_EI_DEFINE(celix_properties_load2, celix_status_t)
+CELIX_EI_DEFINE(celix_properties_load, celix_status_t)
celix_status_t
-__wrap_celix_properties_load2(const char* filename,
+__wrap_celix_properties_load(const char* filename,
int decodeFlags,
celix_properties_t** out) {
- CELIX_EI_IMPL(celix_properties_load2);
- return __real_celix_properties_load2(filename, decodeFlags, out);
+ CELIX_EI_IMPL(celix_properties_load);
+ return __real_celix_properties_load(filename, decodeFlags, out);
}
}
\ No newline at end of file
diff --git a/libs/utils/gtest/src/FileUtilsTestSuite.cc
b/libs/utils/gtest/src/FileUtilsTestSuite.cc
index 775bcb108..e61afc8ff 100644
--- a/libs/utils/gtest/src/FileUtilsTestSuite.cc
+++ b/libs/utils/gtest/src/FileUtilsTestSuite.cc
@@ -179,13 +179,13 @@ TEST_F(FileUtilsTestSuite, ExtractZipFileTest) {
EXPECT_TRUE(celix_utils_fileExists(file1));
celix_properties_t* props = nullptr;
- EXPECT_EQ(CELIX_SUCCESS, celix_properties_load2(file1, 0, &props));
+ EXPECT_EQ(CELIX_SUCCESS, celix_properties_load(file1, 0, &props));
EXPECT_EQ(celix_properties_getAsLong(props, "level", 0), 1);
celix_properties_destroy(props);
EXPECT_TRUE(celix_utils_fileExists(file2));
props = nullptr;
- EXPECT_EQ(CELIX_SUCCESS, celix_properties_load2(file2, 0, &props));
+ EXPECT_EQ(CELIX_SUCCESS, celix_properties_load(file2, 0, &props));
EXPECT_NE(props, nullptr);
EXPECT_EQ(celix_properties_getAsLong(props, "level", 0), 2);
celix_properties_destroy(props);
@@ -264,14 +264,14 @@ TEST_F(FileUtilsTestSuite, ExtractZipDataTest) {
EXPECT_TRUE(celix_utils_fileExists(file1));
celix_properties_t* props = nullptr;
- EXPECT_EQ(CELIX_SUCCESS, celix_properties_load2(file1, 0, &props));
+ EXPECT_EQ(CELIX_SUCCESS, celix_properties_load(file1, 0, &props));
EXPECT_NE(props, nullptr);
EXPECT_EQ(celix_properties_getAsLong(props, "level", 0), 1);
celix_properties_destroy(props);
EXPECT_TRUE(celix_utils_fileExists(file2));
props = nullptr;
- EXPECT_EQ(CELIX_SUCCESS, celix_properties_load2(file2, 0, &props));
+ EXPECT_EQ(CELIX_SUCCESS, celix_properties_load(file2, 0, &props));
EXPECT_NE(props, nullptr);
EXPECT_EQ(celix_properties_getAsLong(props, "level", 0), 2);
celix_properties_destroy(props);
diff --git a/libs/utils/gtest/src/PropertiesEncodingErrorInjectionTestSuite.cc
b/libs/utils/gtest/src/PropertiesEncodingErrorInjectionTestSuite.cc
index 9a5c15f7e..1ec9e7dd3 100644
--- a/libs/utils/gtest/src/PropertiesEncodingErrorInjectionTestSuite.cc
+++ b/libs/utils/gtest/src/PropertiesEncodingErrorInjectionTestSuite.cc
@@ -254,11 +254,11 @@ TEST_F(PropertiesEncodingErrorInjectionTestSuite,
LoadErrorTest) {
const char* json = R"({"key":"value"})";
//When an error injected is prepared for fmemopen() from loadFromString2
- celix_ei_expect_fmemopen((void*)celix_properties_loadFromString2, 0,
nullptr);
+ celix_ei_expect_fmemopen((void*)celix_properties_loadFromString, 0,
nullptr);
//When I call celix_properties_loadFromString
celix_properties_t* props;
- auto status = celix_properties_loadFromString2(json, 0, &props);
+ auto status = celix_properties_loadFromString(json, 0, &props);
//Then I expect an error
EXPECT_EQ(ENOMEM, status);
@@ -273,20 +273,20 @@ TEST_F(PropertiesEncodingErrorInjectionTestSuite,
DecodeErrorTest) {
const char* json = R"({"key":"value", "object": {"key":"value"}})";
//When an error injected is prepared for
celix_properties_create()->malloc() from celix_properties_loadFromString2
- celix_ei_expect_malloc((void*)celix_properties_loadFromString2, 3,
nullptr);
+ celix_ei_expect_malloc((void*)celix_properties_loadFromString, 3, nullptr);
//When I call celix_properties_loadFromString
celix_properties_t* props;
- auto status = celix_properties_loadFromString2(json, 0, &props);
+ auto status = celix_properties_loadFromString(json, 0, &props);
//Then I expect an error
EXPECT_EQ(ENOMEM, status);
//When an error injected is prepared for celix_utils_writeOrCreateString()
from celix_properties_loadFromString2
-
celix_ei_expect_celix_utils_writeOrCreateString((void*)celix_properties_loadFromString2,
3, nullptr);
+
celix_ei_expect_celix_utils_writeOrCreateString((void*)celix_properties_loadFromString,
3, nullptr);
//When I call celix_properties_loadFromString
- status = celix_properties_loadFromString2(json, 0, &props);
+ status = celix_properties_loadFromString(json, 0, &props);
//Then I expect an error
EXPECT_EQ(ENOMEM, status);
@@ -301,20 +301,20 @@ TEST_F(PropertiesEncodingErrorInjectionTestSuite,
DecodeArrayErrorTest) {
const char* json = R"({"key":["value1", "value2"]})";
// When an error injected is prepared for
celix_arrayList_createWithOptions() from celix_properties_loadFromString2
-
celix_ei_expect_celix_arrayList_createWithOptions((void*)celix_properties_loadFromString2,
4, nullptr);
+
celix_ei_expect_celix_arrayList_createWithOptions((void*)celix_properties_loadFromString,
4, nullptr);
//When I call celix_properties_loadFromString
celix_properties_t* props;
- auto status = celix_properties_loadFromString2(json, 0, &props);
+ auto status = celix_properties_loadFromString(json, 0, &props);
//Then I expect an error
EXPECT_EQ(ENOMEM, status);
// When an error injected is prepared for celix_arrayList_addString() from
celix_properties_loadFromString2
-
celix_ei_expect_celix_arrayList_addString((void*)celix_properties_loadFromString2,
4, ENOMEM);
+
celix_ei_expect_celix_arrayList_addString((void*)celix_properties_loadFromString,
4, ENOMEM);
//When I call celix_properties_loadFromString
- status = celix_properties_loadFromString2(json, 0, &props);
+ status = celix_properties_loadFromString(json, 0, &props);
//Then I expect an error
EXPECT_EQ(ENOMEM, status);
@@ -330,11 +330,11 @@ TEST_F(PropertiesEncodingErrorInjectionTestSuite,
DecodeVersionErrorTest) {
const char* json = R"({"key":"version<1.2.3.qualifier>"})";
// When an error injected is prepared for
celix_utils_writeOrCreateString() from celix_properties_loadFromString2
-
celix_ei_expect_celix_utils_writeOrCreateString((void*)celix_properties_loadFromString2,
4, nullptr);
+
celix_ei_expect_celix_utils_writeOrCreateString((void*)celix_properties_loadFromString,
4, nullptr);
// And I call celix_properties_loadFromString
celix_properties_t* props;
- auto status = celix_properties_loadFromString2(json, 0, &props);
+ auto status = celix_properties_loadFromString(json, 0, &props);
// Then I expect an error
EXPECT_EQ(ENOMEM, status);
diff --git a/libs/utils/gtest/src/PropertiesEncodingTestSuite.cc
b/libs/utils/gtest/src/PropertiesEncodingTestSuite.cc
index fedec728a..a1eceb4aa 100644
--- a/libs/utils/gtest/src/PropertiesEncodingTestSuite.cc
+++ b/libs/utils/gtest/src/PropertiesEncodingTestSuite.cc
@@ -241,7 +241,7 @@ TEST_F(PropertiesSerializationTestSuite, SaveEmptyKeyTest) {
ASSERT_EQ(CELIX_SUCCESS, status);
celix_autoptr(celix_properties_t) prop2 = nullptr;
- status = celix_properties_loadFromString2(output1, 0, &prop2);
+ status = celix_properties_loadFromString(output1, 0, &prop2);
ASSERT_EQ(CELIX_SUCCESS, status);
ASSERT_TRUE(celix_properties_equals(props, prop2));
@@ -524,7 +524,7 @@ TEST_F(PropertiesSerializationTestSuite,
LoadEmptyPropertiesTest) {
//When loading the properties from the stream
celix_autoptr(celix_properties_t) props = nullptr;
- auto status = celix_properties_loadFromString2(json, 0, &props);
+ auto status = celix_properties_loadFromString(json, 0, &props);
ASSERT_EQ(CELIX_SUCCESS, status);
//Then the properties object is empty
@@ -681,7 +681,7 @@ TEST_F(PropertiesSerializationTestSuite,
LoadPropertiesWithEmptyArrayTest) {
//When loading the properties from string
celix_autoptr(celix_properties_t) props = nullptr;
- auto status = celix_properties_loadFromString2(inputJSON, 0, &props);
+ auto status = celix_properties_loadFromString(inputJSON, 0, &props);
//Then loading succeeds
ASSERT_EQ(CELIX_SUCCESS, status);
@@ -691,7 +691,7 @@ TEST_F(PropertiesSerializationTestSuite,
LoadPropertiesWithEmptyArrayTest) {
//When loading the properties from string with a strict flag
celix_properties_t* props2;
- status = celix_properties_loadFromString2(inputJSON,
CELIX_PROPERTIES_DECODE_ERROR_ON_EMPTY_ARRAYS, &props2);
+ status = celix_properties_loadFromString(inputJSON,
CELIX_PROPERTIES_DECODE_ERROR_ON_EMPTY_ARRAYS, &props2);
//Then loading fails, because the empty array generates an error
ASSERT_EQ(CELIX_ILLEGAL_ARGUMENT, status);
@@ -746,7 +746,7 @@ TEST_F(PropertiesSerializationTestSuite,
LoadPropertiesWithDuplicatesTest) {
// When loading the properties from a string.
celix_autoptr(celix_properties_t) props = nullptr;
- auto status = celix_properties_loadFromString2(jsonInput, 0, &props);
+ auto status = celix_properties_loadFromString(jsonInput, 0, &props);
// Then loading succeeds
ASSERT_EQ(CELIX_SUCCESS, status);
@@ -757,7 +757,7 @@ TEST_F(PropertiesSerializationTestSuite,
LoadPropertiesWithDuplicatesTest) {
// When decoding the properties from the stream using a flog that does not
allow duplicates
celix_properties_t* props2;
- status = celix_properties_loadFromString2(jsonInput,
CELIX_PROPERTIES_DECODE_ERROR_ON_DUPLICATES, &props2);
+ status = celix_properties_loadFromString(jsonInput,
CELIX_PROPERTIES_DECODE_ERROR_ON_DUPLICATES, &props2);
// Then loading fails, because of a duplicate key
EXPECT_EQ(CELIX_ILLEGAL_ARGUMENT, status);
@@ -793,7 +793,7 @@ TEST_F(PropertiesSerializationTestSuite,
LoadPropertiesEscapedDotsTest) {
// When loading the properties from a string.
celix_autoptr(celix_properties_t) props;
- auto status = celix_properties_loadFromString2(jsonInput, 0, &props);
+ auto status = celix_properties_loadFromString(jsonInput, 0, &props);
// Then loading succeeds
ASSERT_EQ(CELIX_SUCCESS, status);
@@ -809,7 +809,7 @@ TEST_F(PropertiesSerializationTestSuite,
LoadPropertiesEscapedDotsTest) {
// When decoding the properties from a string using a flag that allows
duplicates
celix_properties_t* props2;
- status = celix_properties_loadFromString2(jsonInput,
CELIX_PROPERTIES_DECODE_ERROR_ON_DUPLICATES, &props2);
+ status = celix_properties_loadFromString(jsonInput,
CELIX_PROPERTIES_DECODE_ERROR_ON_DUPLICATES, &props2);
// Then loading fails, because of a duplicate key
EXPECT_EQ(CELIX_ILLEGAL_ARGUMENT, status);
@@ -820,7 +820,7 @@ TEST_F(PropertiesSerializationTestSuite,
LoadPropertiesEscapedDotsTest) {
// When decoding the properties from a string using a flag that allows
collisions
celix_properties_t* props3;
- status = celix_properties_loadFromString2(jsonInput,
CELIX_PROPERTIES_DECODE_ERROR_ON_COLLISIONS, &props3);
+ status = celix_properties_loadFromString(jsonInput,
CELIX_PROPERTIES_DECODE_ERROR_ON_COLLISIONS, &props3);
// Then loading fails, because of a collision
EXPECT_EQ(CELIX_ILLEGAL_ARGUMENT, status);
@@ -889,7 +889,7 @@ TEST_F(PropertiesSerializationTestSuite,
LoadPropertiesWithUnsupportedArrayTypes
for (auto& invalidArray : invalidArrays) {
// When loading the properties from the string
celix_autoptr(celix_properties_t) props = nullptr;
- auto status = celix_properties_loadFromString2(invalidArray, 0,
&props);
+ auto status = celix_properties_loadFromString(invalidArray, 0, &props);
// Then decoding succeeds, because strict is disabled
ASSERT_EQ(CELIX_SUCCESS, status);
@@ -903,7 +903,7 @@ TEST_F(PropertiesSerializationTestSuite,
LoadPropertiesWithUnsupportedArrayTypes
for (auto& invalidArray : invalidArrays) {
// When loading the properties from the string
celix_autoptr(celix_properties_t) props = nullptr;
- auto status = celix_properties_loadFromString2(invalidArray,
CELIX_PROPERTIES_DECODE_STRICT, &props);
+ auto status = celix_properties_loadFromString(invalidArray,
CELIX_PROPERTIES_DECODE_STRICT, &props);
// Then decoding fails
EXPECT_EQ(CELIX_ILLEGAL_ARGUMENT, status);
@@ -914,8 +914,8 @@ TEST_F(PropertiesSerializationTestSuite,
LoadPropertiesWithUnsupportedArrayTypes
// When loading the properties from the
CELIX_PROPERTIES_DECODE_ERROR_ON_UNSUPPORTED_ARRAYS flag
celix_properties_t* props2;
- status = celix_properties_loadFromString2(
- invalidArray, CELIX_PROPERTIES_DECODE_ERROR_ON_UNSUPPORTED_ARRAYS,
&props2);
+ status =
+ celix_properties_loadFromString(invalidArray,
CELIX_PROPERTIES_DECODE_ERROR_ON_UNSUPPORTED_ARRAYS, &props2);
// Then decoding fails
EXPECT_EQ(CELIX_ILLEGAL_ARGUMENT, status);
@@ -965,7 +965,7 @@ TEST_F(PropertiesSerializationTestSuite,
LoadPropertiesWithInvalidVersionsTest)
// When loading the properties from the stream
celix_autoptr(celix_properties_t) props = nullptr;
- auto status = celix_properties_loadFromString2(jsonInput, 0, &props);
+ auto status = celix_properties_loadFromString(jsonInput, 0, &props);
// Then loading fails
ASSERT_EQ(CELIX_ILLEGAL_ARGUMENT, status);
@@ -979,7 +979,7 @@ TEST_F(PropertiesSerializationTestSuite,
LoadPropertiesWithInvalidVersionsTest)
R"( {"key1":"version<1.2.3", "key2":"version1.2.3>",
"key3":"ver<1.2.3>}", "key4":"celix_version<1.2.3>"} )";
// When loading the properties from the stream
- status = celix_properties_loadFromString2(jsonInput, 0, &props);
+ status = celix_properties_loadFromString(jsonInput, 0, &props);
// Then loading succeeds
ASSERT_EQ(CELIX_SUCCESS, status);
@@ -995,7 +995,7 @@ TEST_F(PropertiesSerializationTestSuite,
LoadWithInvalidStreamTest) {
celix_properties_t* dummyProps = nullptr;
// Loading properties with invalid stream will fail
- auto status = celix_properties_load2("non_existing_file.json", 0,
&dummyProps);
+ auto status = celix_properties_load("non_existing_file.json", 0,
&dummyProps);
EXPECT_EQ(CELIX_FILE_IO_EXCEPTION, status);
EXPECT_EQ(1, celix_err_getErrorCount());
@@ -1084,7 +1084,7 @@ TEST_F(PropertiesSerializationTestSuite,
SaveAndLoadFlatProperties) {
// When loading the properties from the properties_test.json file
celix_autoptr(celix_properties_t) loadedProps = nullptr;
- status = celix_properties_load2(filename, 0, &loadedProps);
+ status = celix_properties_load(filename, 0, &loadedProps);
// Then loading succeeds
ASSERT_EQ(CELIX_SUCCESS, status);
diff --git a/libs/utils/include/celix/Properties.h
b/libs/utils/include/celix/Properties.h
index 2ca9672d1..9389d0950 100644
--- a/libs/utils/include/celix/Properties.h
+++ b/libs/utils/include/celix/Properties.h
@@ -1049,7 +1049,7 @@ namespace celix {
*/
static Properties load2(const std::string& filename, DecodeFlags
decodeFlags = DecodeFlags::None) {
celix_properties_t* props;
- auto status = celix_properties_load2(filename.c_str(),
static_cast<int>(decodeFlags), &props);
+ auto status = celix_properties_load(filename.c_str(),
static_cast<int>(decodeFlags), &props);
if (status == ENOMEM) {
throw std::bad_alloc();
} else if (status != CELIX_SUCCESS) {
@@ -1075,7 +1075,7 @@ namespace celix {
*/
static Properties loadFromString(const std::string& input, DecodeFlags
decodeFlags = DecodeFlags::None) {
celix_properties_t* props;
- auto status = celix_properties_loadFromString2(input.c_str(),
static_cast<int>(decodeFlags), &props);
+ auto status = celix_properties_loadFromString(input.c_str(),
static_cast<int>(decodeFlags), &props);
if (status == ENOMEM) {
throw std::bad_alloc();
} else if (status != CELIX_SUCCESS) {
diff --git a/libs/utils/include/celix_properties.h
b/libs/utils/include/celix_properties.h
index bf927935e..b145fc72d 100644
--- a/libs/utils/include/celix_properties.h
+++ b/libs/utils/include/celix_properties.h
@@ -1208,7 +1208,7 @@ CELIX_UTILS_EXPORT celix_status_t
celix_properties_loadFromStream(FILE* stream,
* decoded to a properties object and ENOMEM if there was not enough memory.
CELIX_FILE_IO_EXCEPTION if the file
* could not be opened.
*/
-CELIX_UTILS_EXPORT celix_status_t celix_properties_load2(const char* filename,
+CELIX_UTILS_EXPORT celix_status_t celix_properties_load(const char* filename,
int decodeFlags,
celix_properties_t**
out);
@@ -1232,7 +1232,7 @@ CELIX_UTILS_EXPORT celix_status_t
celix_properties_load2(const char* filename,
* @return CELIX_SUCCESS if the operation was successful,
CELIX_ILLEGAL_ARGUMENT if the provided input cannot be
* decoded to a properties object and ENOMEM if there was not enough memory.
*/
-CELIX_UTILS_EXPORT celix_status_t celix_properties_loadFromString2(const char*
input,
+CELIX_UTILS_EXPORT celix_status_t celix_properties_loadFromString(const char*
input,
int
decodeFlags,
celix_properties_t** out);
diff --git a/libs/utils/src/properties_encoding.c
b/libs/utils/src/properties_encoding.c
index 53af5ec4b..93897b7a2 100644
--- a/libs/utils/src/properties_encoding.c
+++ b/libs/utils/src/properties_encoding.c
@@ -593,7 +593,7 @@ celix_status_t celix_properties_loadFromStream(FILE*
stream, int decodeFlags, ce
return celix_properties_decodeFromJson(root, decodeFlags, out);
}
-celix_status_t celix_properties_load2(const char* filename, int decodeFlags,
celix_properties_t** out) {
+celix_status_t celix_properties_load(const char* filename, int decodeFlags,
celix_properties_t** out) {
FILE* stream = fopen(filename, "r");
if (!stream) {
celix_err_pushf("Failed to open file %s.", filename);
@@ -604,7 +604,7 @@ celix_status_t celix_properties_load2(const char* filename,
int decodeFlags, cel
return status;
}
-celix_status_t celix_properties_loadFromString2(const char* input, int
decodeFlags, celix_properties_t** out) {
+celix_status_t celix_properties_loadFromString(const char* input, int
decodeFlags, celix_properties_t** out) {
FILE* stream = fmemopen((void*)input, strlen(input), "r");
if (!stream) {
celix_err_push("Failed to open memstream.");
