NSLCM Statuses are now being offered as an array of Json Nodes

This MR updates the tmf.api to allow for the correct listing of all NSLCM statuses. To this end, we updated the process of adding a new NSLCM status to the list of all status. Before, we were working with string arraylists, which resulted in the incorrect encoding of the JSON NSLCM statuses payloads. Now, we are using the appropriate JSON-appropriate artifacts to manipulate the list of NSLCM statuses and append new statuses. This MR thus fixes the issue of the NSLCM statuses being showned as strings, as it is proven by the image below.

Additionally, the updates were tested with various tests. These can be performed by executing the following command:

docker run -it --rm \
  -v "/home/ubuntu/.m2":/root/.m2 \
  -v "$(pwd)":/opt/maven \
  -w /opt/maven \
  maven:3.9.5-ibm-semeru-17-focal \
  mvn clean verify \
  -Dtest="ServiceRepoServiceTest#testUpdateNSLCMCharacteristicMethodWhenNSLCMValueToUpdateIsNull,ServiceRepoServiceTest#testUpdateNSLCMCharacteristicMethodWhenNSLCMValueToUpdateIsNotNullAndNSLCMDoesntAlreadyExist,ServiceRepoServiceTest#testUpdateNSLCMCharacteristicMethodWhenNSLCMValueToUpdateIsNotNullAndNSLCMAlreadyExists"

Closes #45 (closed)

src/main/java/org/etsi/osl/tmf/sim638/service/ServiceRepoService.java

@@ -32,6 +32,8 @@ import java.util.Optional;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.fasterxml.jackson.datatype.hibernate5.jakarta.Hibernate5JakartaModule;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -760,43 +762,72 @@ public class ServiceRepoService {
         ObjectMapper primitivesObjectMapper = new ObjectMapper();
 
         // Retrieve the service characteristic based on the name
-        Characteristic aNSLCMCharacteristic = service.getServiceCharacteristicByName(n.getName());
-
-        // Retrieve the current value as a string directly from the service characteristic
-        String aNSLCMCharacteristicValue = service.getServiceCharacteristicByName(n.getName()).getValue().getValue();
-
-        // Check if the current service characteristic value is null or explicitly "null" and initialize if needed
-        if (aNSLCMCharacteristicValue == null || "null".equals(aNSLCMCharacteristicValue) || aNSLCMCharacteristicValue.equals("")) {
-            service.getServiceCharacteristicByName(n.getName()).getValue().setValue("[]");
-        }
+        Characteristic aNSLCMStatusesCharacteristic = service.getServiceCharacteristicByName(n.getName());
+
+        // Retrieve the current NSLCM statuses, and extract the new status 
+		// to be appended
+		String aNSLCMStatusesBeforeUpdate = service
+				.getServiceCharacteristicByName(n.getName()).getValue().getValue();
+		String aNSLCMNewStatus = n.getValue().getValue();
+
+        // Check if the current NSLCM statuses value is null or explicitly "null" 
+		// and, if thats the case start an empty JSON array (this takes place when initializing the characteristic)
+        if ( aNSLCMStatusesBeforeUpdate == null ||
+			aNSLCMStatusesBeforeUpdate.isEmpty() ||
+			aNSLCMStatusesBeforeUpdate.equals("null")
+		){
+			try {
+				service.getServiceCharacteristicByName(n.getName()).getValue().setValue(
+					primitivesObjectMapper.writeValueAsString(primitivesObjectMapper.createArrayNode())
+				);
+			} catch (JsonProcessingException e) {
+                e.printStackTrace();
+            }
+		}
 
         // Check if the current characteristic value is not null and not explicitly "null"
-        if (n.getValue().getValue() != null || !"null".equals(n.getValue().getValue())) {
-			aNSLCMCharacteristicValue = service.getServiceCharacteristicByName(n.getName()).getValue().getValue();
+        if ( aNSLCMNewStatus != null &&
+			!aNSLCMNewStatus.isEmpty() &&
+			!aNSLCMNewStatus.equals("null")
+		) {
+            try {
+				// Deserialize the current statuses back to an array list
+				ArrayNode nslcmStatusesJsonArray = (ArrayNode) primitivesObjectMapper.readTree(
+					service.getServiceCharacteristicByName(n.getName()).getValue().getValue()
+				);
 
-            ArrayList<String> arrayList = null;
+				// Map the current status to json
+				JsonNode currenNSLCMStatus = primitivesObjectMapper.readTree(n.getValue().getValue());
 
-            // Deserialize the current value back to an array list
-            try {
-                arrayList = primitivesObjectMapper.readValue(aNSLCMCharacteristicValue, new TypeReference<ArrayList<String>>() {});
+				// Add the new status to the list if it's not already present and is not null
+				if (!containsNode(nslcmStatusesJsonArray, currenNSLCMStatus)) {
+					nslcmStatusesJsonArray.add(currenNSLCMStatus);
+				}
+
+				// Finally, map the statuses list to a Json encoded one
+				aNSLCMStatusesCharacteristic.setValue(
+					new Any(primitivesObjectMapper.writeValueAsString(nslcmStatusesJsonArray), n.getValue().getAlias())
+				);
             } catch (JsonProcessingException e) {
                 e.printStackTrace();
             }
+		}
+		return service;
+    }
 
-            // Add the new value to the list if it's not already present and is not null
-            if (!arrayList.contains(n.getValue().getValue()) && n.getValue().getValue() != null) {
-                arrayList.add(n.getValue().getValue());
-            }
-
-            // Update the characteristic with the newly modified list
-            try {
-                aNSLCMCharacteristic.setValue(new Any(primitivesObjectMapper.writeValueAsString(arrayList), n.getValue().getAlias()));
-            } catch (JsonProcessingException e) {
-                e.printStackTrace();
+	/**
+     * Helper method to check if an ArrayNode contains a specific JsonNode.
+     * This method uses Jackson's `equals()` for deep equality.
+	 * @param arrayNode Array of Json Nodes
+     * @param jsonNode	the object encoded as Jsons
+     */
+    private static boolean containsNode(ArrayNode arrayNode, JsonNode jsonNode) {
+        for (JsonNode node : arrayNode) {
+            if (node.equals(jsonNode)) {
+                return true;
             }
         }
-
-		return service;
+        return false;
     }
 
 
@@ -1248,7 +1279,5 @@ public class ServiceRepoService {
       
     }
     
-    
-    
 	
 }