type support for properties

bundles/pubsub/examples/pubsub/subscriber/private/src/pubsub_subscriber.c

@@ -62,10 +62,8 @@ int pubsub_subscriber_recv(void* handle, const char* msgType, unsigned int msgTy
     if (metadata == NULL || celix_properties_size(metadata) == 0) {
         printf("No metadata\n");
     } else {
-        const char *key;
-        CELIX_PROPERTIES_FOR_EACH(metadata, key) {
-            const char *val = celix_properties_get(metadata, key, "!Error!");
-            printf("%s=%s\n", key, val);
+        CELIX_PROPERTIES_ITERATE(metadata, iter) {
+            printf("%s=%s\n", iter.key, iter.entry.value);
         }
     }
 

bundles/pubsub/integration/gtest/PubSubInterceptorTestSuite.cc

@@ -110,9 +110,8 @@ class PubSubInterceptorTestSuite : public ::testing::Test {
             const auto *msg = static_cast<const msg_t*>(rawMsg);
             EXPECT_GE(msg->seqNr, 0);
             EXPECT_STREQ(celix_properties_get(metadata, "test", nullptr), "preSend");
-            const char *key;
-            CELIX_PROPERTIES_FOR_EACH(metadata, key) {
-                printf("got property %s=%s\n", key, celix_properties_get(metadata, key, nullptr));
+            CELIX_PROPERTIES_ITERATE(metadata, iter) {
+                printf("got property %s=%s\n", iter.key, iter.entry.value);
             }
             fprintf(stdout, "Got message in postSend interceptor %s/%s for type %s and ser %s with seq nr %i\n", intProps->scope, intProps->topic, intProps->psaType, intProps->serializationType, msg->seqNr);
 

bundles/pubsub/pubsub_admin_udp_mc/src/pubsub_udpmc_admin.c

@@ -455,9 +455,8 @@ static celix_status_t pubsub_udpmcAdmin_connectEndpointToReceiver(pubsub_udpmc_a
 
     if (sockAddress == NULL || sockPort < 0) {
         L_WARN("[PSA UPDMC] Error got endpoint without udpmc socket address/port or endpoint type. Properties:");
-        const char *key = NULL;
-        CELIX_PROPERTIES_FOR_EACH(endpoint, key) {
-            L_WARN("[PSA UPDMC] |- %s=%s\n", key, celix_properties_get(endpoint, key, NULL));
+        CELIX_PROPERTIES_ITERATE(endpoint, iter) {
+            L_WARN("[PSA UPDMC] |- %s=%s\n", iter.key, iter.entry.value);
         }
         status = CELIX_BUNDLE_EXCEPTION;
     } else {

bundles/pubsub/pubsub_admin_websocket/src/pubsub_websocket_admin.c

@@ -379,9 +379,8 @@ static celix_status_t pubsub_websocketAdmin_connectEndpointToReceiver(pubsub_web
 
     if (publisher && (sockAddress == NULL || sockPort < 0)) {
         L_WARN("[PSA WEBSOCKET] Error got endpoint without websocket address/port or endpoint type. Properties:");
-        const char *key = NULL;
-        CELIX_PROPERTIES_FOR_EACH(endpoint, key) {
-            L_WARN("[PSA WEBSOCKET] |- %s=%s\n", key, celix_properties_get(endpoint, key, NULL));
+        CELIX_PROPERTIES_ITERATE(endpoint, iter) {
+            L_WARN("[PSA WEBSOCKET] |- %s=%s\n", iter.key, iter.entry.value);
         }
         status = CELIX_BUNDLE_EXCEPTION;
     } else {
@@ -436,9 +435,8 @@ static celix_status_t pubsub_websocketAdmin_disconnectEndpointFromReceiver(pubsu
 
     if (publisher && (sockAddress == NULL || sockPort < 0)) {
         L_WARN("[PSA WEBSOCKET] Error got endpoint without websocket address/port or endpoint type. Properties:");
-        const char *key = NULL;
-        CELIX_PROPERTIES_FOR_EACH(endpoint, key) {
-            L_WARN("[PSA WEBSOCKET] |- %s=%s\n", key, celix_properties_get(endpoint, key, NULL));
+        CELIX_PROPERTIES_ITERATE(endpoint, iter) {
+            L_WARN("[PSA WEBSOCKET] |- %s=%s\n", iter.key, iter.entry.value);
         }
         status = CELIX_BUNDLE_EXCEPTION;
     } else if (eTopic != NULL && strncmp(eTopic, topic, 1024 * 1024) == 0) {

bundles/pubsub/pubsub_discovery/src/pubsub_discovery_impl.c

@@ -557,10 +557,8 @@ static char* pubsub_discovery_createJsonEndpoint(const celix_properties_t *props
     //note props is already check for validity (pubsubEndpoint_isValid)
 
     json_t *jsEndpoint = json_object();
-    const char* propKey = NULL;
-    PROPERTIES_FOR_EACH((celix_properties_t*)props, propKey) {
-        const char* val = celix_properties_get(props, propKey, NULL);
-        json_object_set_new(jsEndpoint, propKey, json_string(val));
+    CELIX_PROPERTIES_ITERATE(props, iter) {
+        json_object_set_new(jsEndpoint, iter.key, json_string(iter.entry.value));
     }
     char* str = json_dumps(jsEndpoint, JSON_COMPACT);
     json_decref(jsEndpoint);

bundles/pubsub/pubsub_spi/src/pubsub_endpoint.c

@@ -44,9 +44,8 @@ static void pubsubEndpoint_setFields(celix_properties_t *ep, const char* fwUUID,
 
     //copy topic properties
     if (topic_props != NULL) {
-        const char *key = NULL;
-        CELIX_PROPERTIES_FOR_EACH((celix_properties_t *) topic_props, key) {
-            celix_properties_set(ep, key, celix_properties_get(topic_props, key, NULL));
+        CELIX_PROPERTIES_ITERATE((celix_properties_t *) topic_props, iter) {
+            celix_properties_set(ep, iter.key, iter.entry.value);
         }
     }
 

bundles/remote_services/discovery_common/src/endpoint_descriptor_writer.c

@@ -139,20 +139,15 @@ static celix_status_t endpointDescriptorWriter_writeEndpoint(endpoint_descriptor
     } else {
         xmlTextWriterStartElement(writer->writer, ENDPOINT_DESCRIPTION);
 
-        hash_map_iterator_pt iter = hashMapIterator_create(endpoint->properties);
-        while (hashMapIterator_hasNext(iter)) {
-            hash_map_entry_pt entry = hashMapIterator_nextEntry(iter);
-
-            void* propertyName = hashMapEntry_getKey(entry);
-			const xmlChar* propertyValue = (const xmlChar*) hashMapEntry_getValue(entry);
-
+        CELIX_PROPERTIES_ITERATE(endpoint->properties, iter) {
+			const xmlChar* propertyValue = (const xmlChar*) celix_properties_get(endpoint->properties, iter.key, "");
             xmlTextWriterStartElement(writer->writer, PROPERTY);
-            xmlTextWriterWriteAttribute(writer->writer, NAME, propertyName);
+            xmlTextWriterWriteAttribute(writer->writer, NAME, (const xmlChar*)iter.key);
 
-            if (strcmp(OSGI_FRAMEWORK_OBJECTCLASS, (char*) propertyName) == 0) {
+            if (strcmp(OSGI_FRAMEWORK_OBJECTCLASS, (char*) iter.key) == 0) {
             	// objectClass *must* be represented as array of string values...
             	endpointDescriptorWriter_writeArrayValue(writer->writer, propertyValue);
-            } else if (strcmp(OSGI_RSA_ENDPOINT_SERVICE_ID, (char*) propertyName) == 0) {
+            } else if (strcmp(OSGI_RSA_ENDPOINT_SERVICE_ID, (char*) iter.key) == 0) {
             	// endpoint.service.id *must* be represented as long value...
             	endpointDescriptorWriter_writeTypedValue(writer->writer, VALUE_TYPE_LONG, propertyValue);
             } else {
@@ -162,7 +157,6 @@ static celix_status_t endpointDescriptorWriter_writeEndpoint(endpoint_descriptor
 
             xmlTextWriterEndElement(writer->writer);
         }
-        hashMapIterator_destroy(iter);
 
         xmlTextWriterEndElement(writer->writer);
     }

bundles/remote_services/remote_service_admin_dfi/src/remote_service_admin_dfi.c

@@ -751,10 +751,7 @@ static celix_status_t remoteServiceAdmin_createEndpointDescription(remote_servic
         }
     }
 
-    hash_map_entry_pt entry = hashMap_getEntry(endpointProperties, (void *) OSGI_FRAMEWORK_SERVICE_ID);
-
-    char* key = hashMapEntry_getKey(entry);
-    char *serviceId = (char *) hashMap_remove(endpointProperties, (void *) OSGI_FRAMEWORK_SERVICE_ID);
+    const char* serviceId = celix_properties_get(endpointProperties, CELIX_FRAMEWORK_SERVICE_ID, "-1");
     const char *uuid = NULL;
 
     char buf[512];
@@ -781,12 +778,9 @@ static celix_status_t remoteServiceAdmin_createEndpointDescription(remote_servic
     }
 
     if (props != NULL) {
-        hash_map_iterator_pt propIter = hashMapIterator_create(props);
-        while (hashMapIterator_hasNext(propIter)) {
-            hash_map_entry_pt entry = hashMapIterator_nextEntry(propIter);
-            celix_properties_set(endpointProperties, (char*)hashMapEntry_getKey(entry), (char*)hashMapEntry_getValue(entry));
+        CELIX_PROPERTIES_ITERATE(props, iter) {
+            celix_properties_set(endpointProperties, iter.key, iter.entry.value);
         }
-        hashMapIterator_destroy(propIter);
     }
 
     *endpoint = calloc(1, sizeof(**endpoint));
@@ -800,8 +794,6 @@ static celix_status_t remoteServiceAdmin_createEndpointDescription(remote_servic
         (*endpoint)->properties = endpointProperties;
     }
 
-    free(key);
-    free(serviceId);
     free(keys);
 
     return status;
@@ -1008,14 +1000,10 @@ static celix_status_t remoteServiceAdmin_send(void *handle, endpoint_description
     } else {
         struct curl_slist *metadataHeader = NULL;
         if (metadata != NULL && celix_properties_size(metadata) > 0) {
-            const char *key = NULL;
-            CELIX_PROPERTIES_FOR_EACH(metadata, key) {
-                const char *val = celix_properties_get(metadata, key, "");
-                size_t length = strlen(key) + strlen(val) + 18; // "X-RSA-Metadata-key: val\0"
-
+            CELIX_PROPERTIES_ITERATE(metadata, iter) {
+                size_t length = strlen(iter.key) + strlen(iter.entry.value) + 18; // "X-RSA-Metadata-key: val\0"
                 char header[length];
-
-                snprintf(header, length, "X-RSA-Metadata-%s: %s", key, val);
+                snprintf(header, length, "X-RSA-Metadata-%s: %s", iter.key, iter.entry.value);
                 metadataHeader = curl_slist_append(metadataHeader, header);
             }
 

bundles/remote_services/remote_service_admin_shm_v2/rsa_shm/src/rsa_shm_impl.c

@@ -254,12 +254,12 @@ static void rsaShm_overlayProperties(celix_properties_t *additionalProperties, c
      * A property key in the additional properties map must therefore override any case variant property key in the properties of the specified Service Reference.*/
     const char *additionalPropKey = NULL;
     const char *servicePropKey = NULL;
-    PROPERTIES_FOR_EACH(additionalProperties, additionalPropKey) {
+    CELIX_PROPERTIES_FOR_EACH(additionalProperties, additionalPropKey) {
         if (strcmp(additionalPropKey,(char*) OSGI_FRAMEWORK_OBJECTCLASS) != 0
                 && strcmp(additionalPropKey,(char*) OSGI_FRAMEWORK_SERVICE_ID) != 0) {
             bool propKeyCaseEqual = false;
 
-            PROPERTIES_FOR_EACH(serviceProperties, servicePropKey) {
+            CELIX_PROPERTIES_FOR_EACH(serviceProperties, servicePropKey) {
                 if (strcasecmp(additionalPropKey,servicePropKey) == 0) {
                     const char* val = celix_properties_get(additionalProperties,additionalPropKey,NULL);
                     celix_properties_set(serviceProperties,servicePropKey,val);
@@ -274,7 +274,6 @@ static void rsaShm_overlayProperties(celix_properties_t *additionalProperties, c
             }
         }
     }
-    return;
 }
 
 static bool rsaShm_isConfigTypeMatched(celix_properties_t *properties) {

bundles/remote_services/topology_manager/src/topology_manager.c

@@ -402,8 +402,7 @@ celix_status_t topologyManager_importScopeChanged(void *handle, char *service_na
 		hash_map_entry_pt entry = hashMapIterator_nextEntry(importedServicesIterator);
 		endpoint = hashMapEntry_getKey(entry);
 
-		entry = hashMap_getEntry(endpoint->properties, (void *) OSGI_FRAMEWORK_OBJECTCLASS);
-		char* name = (char *) hashMapEntry_getValue(entry);
+        const char* name = celix_properties_get(endpoint->properties, OSGI_FRAMEWORK_OBJECTCLASS, "");
 		// Test if a service with the same name is imported
 		if (strcmp(name, service_name) == 0) {
 			found = true;

bundles/remote_services/topology_manager/tms_tst/tms_tests.cpp

@@ -397,8 +397,7 @@ extern "C" {
         for (unsigned int i = 0; i < arrayList_size(epList); i++) {
             endpoint_description_t *ep = (endpoint_description_t *) arrayList_get(epList, i);
             celix_properties_t *props = ep->properties;
-            hash_map_entry_pt entry = hashMap_getEntry(props, (void*)"key2");
-            char* value = (char*) hashMapEntry_getValue(entry);
+            const char* value = celix_properties_get(props, "key2", "");
             EXPECT_STREQ("inaetics", value);
             /*
             printf("Service: %s ", ep->service);
@@ -433,8 +432,7 @@ extern "C" {
         for (unsigned int i = 0; i < arrayList_size(epList); i++) {
             endpoint_description_t *ep = (endpoint_description_t *) arrayList_get(epList, i);
             celix_properties_t *props = ep->properties;
-            hash_map_entry_pt entry = hashMap_getEntry(props, (void*)"key2");
-            char* value = (char*) hashMapEntry_getValue(entry);
+            const char* value = celix_properties_get(props, "key2", "");
             EXPECT_STREQ("inaetics", value);
         }
         printf("End: %s\n", __func__);
@@ -458,8 +456,7 @@ extern "C" {
         for (unsigned int i = 0; i < arrayList_size(epList); i++) {
             endpoint_description_t *ep = (endpoint_description_t *) arrayList_get(epList, i);
             celix_properties_t *props = ep->properties;
-            hash_map_entry_pt entry = hashMap_getEntry(props, (void *)"key2");
-            char* value = (char*) hashMapEntry_getValue(entry);
+            const char* value = celix_properties_get(props, "key2", "");
             EXPECT_STREQ("inaetics", value);
         }
         printf("End: %s\n", __func__);

bundles/shell/shell/src/query_command.c

@@ -96,10 +96,8 @@ static void queryCommand_callback(void *handle, const celix_bundle_t *bnd) {
                 if (data->opts->verbose) {
                     fprintf(data->sout, "   |- Is factory: %s\n", entry->factory ? "true" : "false");
                     fprintf(data->sout, "   |- Properties:\n");
-                    const char *key;
-                    CELIX_PROPERTIES_FOR_EACH(entry->serviceProperties, key) {
-                        const char *val = celix_properties_get(entry->serviceProperties, key, "!ERROR!");
-                        fprintf(data->sout, "      |- %20s = %s\n", key, val);
+                    CELIX_PROPERTIES_ITERATE(entry->serviceProperties, iter) {
+                        fprintf(data->sout, "      |- %20s = %s\n", iter.key, iter.entry.value);
                     }
                 }
             }

libs/framework/include/celix/Exception.h

@@ -27,7 +27,11 @@ namespace celix {
      */
     class Exception : public std::exception {
     public:
+#if __cplusplus >= 201703L //C++17 or higher
+        explicit Exception(std::string_view msg) : w{msg} {}
+#else
         explicit Exception(std::string msg) : w{std::move(msg)} {}
+#endif
 
         Exception(const Exception&) = default;
         Exception(Exception&&) = default;

libs/framework/include/celix/dm/DependencyManager_Impl.h

@@ -210,7 +210,6 @@ inline celix::dm::DependencyManagerInfo DependencyManager::getInfo() const {
     }
 }
 
-
 inline std::vector<celix::dm::DependencyManagerInfo> DependencyManager::getInfos() const {
     std::vector<celix::dm::DependencyManagerInfo> result{};
     auto* cInfos = celix_dependencyManager_createInfos(cDependencyManager());

libs/framework/src/service_reference.c

@@ -196,23 +196,28 @@ celix_status_t serviceReference_getProperty(service_reference_pt ref, const char
 }
 
 celix_status_t serviceReference_getPropertyKeys(service_reference_pt ref, char **keys[], unsigned int *size) {
-    celix_status_t status = CELIX_SUCCESS;
-    properties_pt props = NULL;
+    if (!keys || !size) {
+        return CELIX_ILLEGAL_ARGUMENT;
+    }
+
+    celix_properties_t* props = NULL;
+    celix_status_t status = serviceRegistration_getProperties(ref->registration, &props);
+    if (status != CELIX_SUCCESS) {
+        return status;
+    }
+
+    *size = celix_properties_size(props);
+    *keys = malloc((*size) * sizeof(**keys));
+    if (!*keys) {
+        return ENOMEM;
+    }
 
-    status = serviceRegistration_getProperties(ref->registration, &props);
-    assert(status == CELIX_SUCCESS);
-    hash_map_iterator_pt it;
     int i = 0;
-    int vsize = hashMap_size(props);
-    *size = (unsigned int)vsize;
-    *keys = malloc(vsize * sizeof(**keys));
-    it = hashMapIterator_create(props);
-    while (hashMapIterator_hasNext(it)) {
-        (*keys)[i] = hashMapIterator_nextKey(it);
-        i++;
+    CELIX_PROPERTIES_ITERATE(props, entry) {
+        (*keys)[i++] = (char*)entry.key;
     }
-    hashMapIterator_destroy(it);
-    return status;
+
+    return CELIX_SUCCESS;
 }
 
 celix_status_t serviceReference_invalidateCache(service_reference_pt reference) {

libs/utils/CMakeLists.txt

@@ -143,34 +143,14 @@ if (ENABLE_TESTING)
         target_include_directories(linked_list_test PRIVATE include_deprecated)
         target_link_libraries(linked_list_test utils_cut CppUTest::CppUTest pthread)
 
-        add_executable(properties_test private/test/properties_test.cpp)
-        target_include_directories(properties_test PRIVATE include_deprecated)
-        target_link_libraries(properties_test CppUTest::CppUTest CppUTest::CppUTestExt utils_cut pthread)
-
         add_executable(ip_utils_test private/test/ip_utils_test.cpp)
         target_include_directories(ip_utils_test PRIVATE include_deprecated)
         target_link_libraries(ip_utils_test CppUTest::CppUTest  utils_cut pthread)
 
-        add_executable(version_test private/test/version_test.cpp)
-        target_include_directories(version_test PRIVATE include_deprecated)
-        target_link_libraries(version_test CppUTest::CppUTest utils_cut pthread)
-
-
-        if (LINKER_WRAP_SUPPORTED)
-            add_executable(version_ei_test private/test/version_ei_test.cc)
-            target_include_directories(version_ei_test PRIVATE include_deprecated)
-            target_link_libraries(version_ei_test CppUTest::CppUTest utils_cut Celix::malloc_ei Celix::utils_ei pthread)
-            add_test(NAME version_ei_test COMMAND version_ei_test)
-        endif ()
-
-        configure_file(private/resources-test/properties.txt ${CMAKE_CURRENT_BINARY_DIR}/resources-test/properties.txt COPYONLY)
-
         add_test(NAME run_array_list_test COMMAND array_list_test)
         add_test(NAME run_hash_map_test COMMAND hash_map_test)
         add_test(NAME run_linked_list_test COMMAND linked_list_test)
-        add_test(NAME run_properties_test COMMAND properties_test)
         add_test(NAME run_ip_utils_test COMMAND ip_utils_test)
-        add_test(NAME version_test COMMAND version_test)
 
         setup_target_for_coverage(array_list_test)
         setup_target_for_coverage(hash_map_test)

libs/utils/gtest/CMakeLists.txt

@@ -21,6 +21,7 @@ set(CELIX_UTIL_TEST_SOURCES_FOR_CXX_HEADERS
         src/CxxUtilsTestSuite.cc
         src/CxxPropertiesTestSuite.cc
         src/CxxFilterTestSuite.cc
+        src/CxxVersionTestSuite.cc
 )
 
 add_executable(test_utils
@@ -33,6 +34,8 @@ add_executable(test_utils
         src/FilterTestSuite.cc
         src/CelixUtilsTestSuite.cc
         src/ConvertUtilsTestSuite.cc
+        src/PropertiesTestSuite.cc
+        src/VersionTestSuite.cc
         src/ErrTestSuite.cc
         src/ThreadsTestSuite.cc
         src/CelixErrnoTestSuite.cc
@@ -43,6 +46,9 @@ target_link_libraries(test_utils PRIVATE utils_cut GTest::gtest GTest::gtest_mai
 target_include_directories(test_utils PRIVATE ../src) #for version_private (needs refactoring of test)
 celix_deprecated_utils_headers(test_utils)
 
+configure_file(resources/properties.txt ${CMAKE_CURRENT_BINARY_DIR}/resources-test/properties.txt COPYONLY)
+
+
 ####### generating zip file used for testing ##########################################################################
 file(GENERATE OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/zip_content/top.properties" CONTENT "level=1\n")
 file(GENERATE OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/zip_content/subdir/sub.properties" CONTENT "level=2\n")
@@ -87,6 +93,7 @@ if (LINKER_WRAP_SUPPORTED)
             src/IpUtilsErrorInjectionTestSuite.cc
             src/ArrayListErrorInjectionTestSuite.cc
             src/ErrErrorInjectionTestSuite.cc
+            src/VersionErrorInjectionTestSuite.cc
     )
     target_link_libraries(test_utils_with_ei PRIVATE Celix::zip_ei Celix::stdio_ei Celix::stat_ei Celix::fts_ei utils_cut Celix::utils_ei Celix::ifaddrs_ei Celix::threads_ei Celix::malloc_ei GTest::gtest GTest::gtest_main)
     target_include_directories(test_utils_with_ei PRIVATE ../src) #for version_private (needs refactoring of test)

libs/utils/gtest/src/ConvertUtilsErrorInjectionTestSuite.cc

@@ -37,7 +37,7 @@ TEST_F(ConvertUtilsWithErrorInjectionTestSuite, CovertToBoolTest) {
 }
 
 TEST_F(ConvertUtilsWithErrorInjectionTestSuite, ConvertToVersionTest) {
-    celix_version_t* defaultVersion = celix_version_createVersion(1, 2, 3, "B");
+    celix_version_t* defaultVersion = celix_version_create(1, 2, 3, "B");
     celix_ei_expect_celix_utils_writeOrCreateString(CELIX_EI_UNKNOWN_CALLER, 0, nullptr);
     celix_version_t* result = celix_utils_convertStringToVersion("1.2.3", nullptr, nullptr);
     EXPECT_EQ(nullptr, result);