refactor: use Optional to handle non existing IDENTIFYING attributes

flyisland · Oct 26, 2021 · e0ebd80 · e0ebd80
1 parent 52ed45e
commit e0ebd80
Showing 1 changed file with 3 additions and 10 deletions.
diff --git a/src/main/java/com/solace/tools/solconfig/model/ConfigObject.java b/src/main/java/com/solace/tools/solconfig/model/ConfigObject.java
@@ -129,16 +129,9 @@ private StringBuilder childrenToJsonString(int level) {
      */
     public String getObjectId() {
         var idList = sempSpec.getAttributeNames(AttributeType.IDENTIFYING).stream()
-                .map(id -> {
-                    var idObj =attributes.get(id);
-                    // Identifying attributes might not be required attributes, like "/msgVpns/bridges/remoteMsgVpns"
-                    if (Objects.isNull(idObj)) {
-                        return "";
-                    } else {
-                        return idObj.toString();
-                    }
-                })
-                .map(s -> percentEncoding(s))
+                // Identifying attributes might not be required attributes, like "/msgVpns/bridges/remoteMsgVpns"
+                .map(id -> Optional.ofNullable(attributes.get(id)).orElse("").toString())
+                .map(ConfigObject::percentEncoding)
                 .collect(Collectors.toList());
         return String.join(",", idList);
     }