Switch app identifier to option

Author: MatKuhr

cloudplatform/connectivity-ztis/src/main/java/com/sap/cloud/sdk/cloudplatform/connectivity/ZeroTrustIdentityService.java

@@ -32,6 +32,7 @@
 import io.spiffe.workloadapi.X509Source;
 import io.vavr.Lazy;
 import io.vavr.NotImplementedError;
+import io.vavr.control.Option;
 import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
@@ -149,9 +150,16 @@ public String getSpiffeId()
      * @return The app identifier.
      */
     @Nonnull
-    public String getAppIdentifier()
+    public Option<String> getAppIdentifier()
     {
-        return credentials.get().getMapView("parameters").getString("app-identifier");
+        final TypedMapView mapView = credentials.get();
+        return Option
+            .some(mapView)
+            .filter(m -> m.containsKey("parameters"))
+            .map(m -> m.getMapView("parameters"))
+            .filter(m -> m.containsKey("app-identifier"))
+            .map(m -> m.getString("app-identifier"))
+            .filter(s -> !s.isBlank());
     }
 
     /**

cloudplatform/connectivity-ztis/src/test/java/com/sap/cloud/sdk/cloudplatform/connectivity/ZeroTrustIdentityServiceTest.java

@@ -20,6 +20,7 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
+import com.sap.cloud.environment.servicebinding.api.DefaultServiceBinding;
 import com.sap.cloud.environment.servicebinding.api.DefaultServiceBindingBuilder;
 import com.sap.cloud.environment.servicebinding.api.ServiceBinding;
 import com.sap.cloud.environment.servicebinding.api.exception.ServiceBindingAccessException;
@@ -91,7 +92,22 @@ void testSpiffeId()
     @Test
     void testAppIdentifier()
     {
-        assertThat(sut.getAppIdentifier()).isEqualTo("test-app");
+        assertThat(sut.getAppIdentifier()).contains("test-app");
+
+        final DefaultServiceBinding emptyBinding =
+            new DefaultServiceBindingBuilder().withServiceIdentifier(ZTIS_IDENTIFIER).build();
+
+        sut = new ZeroTrustIdentityService(emptyBinding);
+        assertThat(sut.getAppIdentifier()).isEmpty();
+
+        final DefaultServiceBinding emptyValue =
+            new DefaultServiceBindingBuilder()
+                .withServiceIdentifier(ZTIS_IDENTIFIER)
+                .withCredentials(Map.of("parameters", Map.of("app-identifier", "")))
+                .build();
+
+        sut = new ZeroTrustIdentityService(emptyValue);
+        assertThat(sut.getAppIdentifier()).isEmpty();
     }
 
     @Test