From 3afe05c3cd18be3735a236536a9c332b08bd5bca Mon Sep 17 00:00:00 2001
From: Enrico Risa <enrico.risa@gmail.com>
Date: Tue, 20 Jun 2023 14:12:13 +0200
Subject: [PATCH] fix after review

---
 .../edc/iam/ssi/identity/SsiIdentityServiceExtension.java  | 2 +-
 .../iam/ssi/identity/rule/SsiAudienceValidationRule.java   | 2 +-
 .../ssi/identity/rule/SsiAudienceValidationRuleTest.java   | 2 +-
 .../edc/iam/ssi/spi/jsonld/JsonLdFieldExtractor.java       | 7 +++++--
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/edc-extensions/ssi/ssi-identity-core/src/main/java/org/eclipse/tractusx/edc/iam/ssi/identity/SsiIdentityServiceExtension.java b/edc-extensions/ssi/ssi-identity-core/src/main/java/org/eclipse/tractusx/edc/iam/ssi/identity/SsiIdentityServiceExtension.java
index 402993985..ca69eb878 100644
--- a/edc-extensions/ssi/ssi-identity-core/src/main/java/org/eclipse/tractusx/edc/iam/ssi/identity/SsiIdentityServiceExtension.java
+++ b/edc-extensions/ssi/ssi-identity-core/src/main/java/org/eclipse/tractusx/edc/iam/ssi/identity/SsiIdentityServiceExtension.java
@@ -31,7 +31,7 @@ public class SsiIdentityServiceExtension implements ServiceExtension {
 
     public static final String EXTENSION_NAME = "SSI Identity Service";
 
-    @Setting(value = "SSI Endpoint audience")
+    @Setting(value = "SSI Endpoint audience of this connector")
     public static final String ENDPOINT_AUDIENCE = "tx.ssi.endpoint.audience";
 
     @Inject
diff --git a/edc-extensions/ssi/ssi-identity-core/src/main/java/org/eclipse/tractusx/edc/iam/ssi/identity/rule/SsiAudienceValidationRule.java b/edc-extensions/ssi/ssi-identity-core/src/main/java/org/eclipse/tractusx/edc/iam/ssi/identity/rule/SsiAudienceValidationRule.java
index 43b2c0a9e..dc3c7eae9 100644
--- a/edc-extensions/ssi/ssi-identity-core/src/main/java/org/eclipse/tractusx/edc/iam/ssi/identity/rule/SsiAudienceValidationRule.java
+++ b/edc-extensions/ssi/ssi-identity-core/src/main/java/org/eclipse/tractusx/edc/iam/ssi/identity/rule/SsiAudienceValidationRule.java
@@ -38,7 +38,7 @@ public Result<Void> checkRule(@NotNull ClaimToken toVerify, @Nullable Map<String
         if (audiences.isEmpty()) {
             return Result.failure("Required audience (aud) claim is missing in token");
         } else if (!audiences.contains(endpointAudience)) {
-            return Result.failure("Token audience (aud) claim did not contain connector audience: " + endpointAudience);
+            return Result.failure("Token audience (aud) claim did not contain audience: " + endpointAudience);
         }
         return Result.success();
     }
diff --git a/edc-extensions/ssi/ssi-identity-core/src/test/java/org/eclipse/tractusx/edc/iam/ssi/identity/rule/SsiAudienceValidationRuleTest.java b/edc-extensions/ssi/ssi-identity-core/src/test/java/org/eclipse/tractusx/edc/iam/ssi/identity/rule/SsiAudienceValidationRuleTest.java
index 5c1b452b3..d6a1567e7 100644
--- a/edc-extensions/ssi/ssi-identity-core/src/test/java/org/eclipse/tractusx/edc/iam/ssi/identity/rule/SsiAudienceValidationRuleTest.java
+++ b/edc-extensions/ssi/ssi-identity-core/src/test/java/org/eclipse/tractusx/edc/iam/ssi/identity/rule/SsiAudienceValidationRuleTest.java
@@ -50,7 +50,7 @@ void validationKoBecauseAudienceNotRespected() {
 
         assertThat(result.succeeded()).isFalse();
         assertThat(result.getFailureMessages()).hasSize(1)
-                .contains("Token audience (aud) claim did not contain connector audience: test-audience");
+                .contains("Token audience (aud) claim did not contain audience: test-audience");
     }
 
     @Test
diff --git a/spi/ssi-spi/src/main/java/org/eclipse/tractusx/edc/iam/ssi/spi/jsonld/JsonLdFieldExtractor.java b/spi/ssi-spi/src/main/java/org/eclipse/tractusx/edc/iam/ssi/spi/jsonld/JsonLdFieldExtractor.java
index 6c1bb2ce6..12cae7254 100644
--- a/spi/ssi-spi/src/main/java/org/eclipse/tractusx/edc/iam/ssi/spi/jsonld/JsonLdFieldExtractor.java
+++ b/spi/ssi-spi/src/main/java/org/eclipse/tractusx/edc/iam/ssi/spi/jsonld/JsonLdFieldExtractor.java
@@ -23,6 +23,9 @@
 import static jakarta.json.JsonValue.ValueType.OBJECT;
 import static java.lang.String.format;
 
+/**
+ * Extractor for field from a {@link JsonObject} with a customizable error reporting
+ */
 public class JsonLdFieldExtractor {
 
     private String fieldAlias;
@@ -53,7 +56,7 @@ public Result<JsonObject> extract(JsonObject root) {
 
     public static class Builder {
 
-        JsonLdFieldExtractor extractor;
+        private final JsonLdFieldExtractor extractor;
 
         private Builder(JsonLdFieldExtractor extractor) {
             this.extractor = extractor;
@@ -77,7 +80,7 @@ public Builder errorPrefix(String errorPrefix) {
             this.extractor.errorPrefix = errorPrefix;
             return this;
         }
-        
+
         public JsonLdFieldExtractor build() {
             Objects.requireNonNull(extractor.field);
             Objects.requireNonNull(extractor.fieldAlias);