refactor: rename classes

core/identity-hub-api/src/main/java/org/eclipse/edc/identityservice/api/PresentationApiExtension.java

@@ -16,7 +16,7 @@
 
 import org.eclipse.edc.core.transform.transformer.to.JsonValueToGenericTypeTransformer;
 import org.eclipse.edc.iam.identitytrust.transform.to.JsonObjectToPresentationQueryTransformer;
-import org.eclipse.edc.identityhub.spi.generator.PresentationCreationService;
+import org.eclipse.edc.identityhub.spi.generator.VerifiablePresentationService;
 import org.eclipse.edc.identityhub.spi.resolution.CredentialQueryResolver;
 import org.eclipse.edc.identityhub.spi.verification.AccessTokenVerifier;
 import org.eclipse.edc.identityservice.api.v1.PresentationApiController;
@@ -58,7 +58,7 @@ public class PresentationApiExtension implements ServiceExtension {
     private CredentialQueryResolver credentialResolver;
 
     @Inject
-    private PresentationCreationService presentationCreationService;
+    private VerifiablePresentationService verifiablePresentationService;
 
     @Inject
     private JsonLd jsonLd;
@@ -72,7 +72,7 @@ public void initialize(ServiceExtensionContext context) {
         validatorRegistry.register(PresentationQuery.PRESENTATION_QUERY_TYPE_PROPERTY, new PresentationQueryValidator());
 
 
-        var controller = new PresentationApiController(validatorRegistry, typeTransformer, credentialResolver, accessTokenVerifier, presentationCreationService, context.getMonitor());
+        var controller = new PresentationApiController(validatorRegistry, typeTransformer, credentialResolver, accessTokenVerifier, verifiablePresentationService, context.getMonitor());
 
         var jsonLdMapper = typeManager.getMapper(JSON_LD);
         webService.registerResource(RESOLUTION_CONTEXT, new ObjectMapperProvider(jsonLdMapper));

core/identity-hub-api/src/main/java/org/eclipse/edc/identityservice/api/v1/PresentationApiController.java

@@ -22,7 +22,7 @@
 import jakarta.ws.rs.Path;
 import jakarta.ws.rs.Produces;
 import jakarta.ws.rs.core.Response;
-import org.eclipse.edc.identityhub.spi.generator.PresentationCreationService;
+import org.eclipse.edc.identityhub.spi.generator.VerifiablePresentationService;
 import org.eclipse.edc.identityhub.spi.resolution.CredentialQueryResolver;
 import org.eclipse.edc.identityhub.spi.verification.AccessTokenVerifier;
 import org.eclipse.edc.identitytrust.model.credentialservice.PresentationQuery;
@@ -53,16 +53,16 @@ public class PresentationApiController implements PresentationApi {
     private final TypeTransformerRegistry transformerRegistry;
     private final CredentialQueryResolver queryResolver;
     private final AccessTokenVerifier accessTokenVerifier;
-    private final PresentationCreationService presentationCreationService;
+    private final VerifiablePresentationService verifiablePresentationService;
     private final Monitor monitor;
 
     public PresentationApiController(JsonObjectValidatorRegistry validatorRegistry, TypeTransformerRegistry transformerRegistry, CredentialQueryResolver queryResolver,
-                                     AccessTokenVerifier accessTokenVerifier, PresentationCreationService presentationCreationService, Monitor monitor) {
+                                     AccessTokenVerifier accessTokenVerifier, VerifiablePresentationService verifiablePresentationService, Monitor monitor) {
         this.validatorRegistry = validatorRegistry;
         this.transformerRegistry = transformerRegistry;
         this.queryResolver = queryResolver;
         this.accessTokenVerifier = accessTokenVerifier;
-        this.presentationCreationService = presentationCreationService;
+        this.verifiablePresentationService = verifiablePresentationService;
         this.monitor = monitor;
     }
 
@@ -91,7 +91,7 @@ public Response queryPresentation(JsonObject query, @HeaderParam(AUTHORIZATION)
 
         // package the credentials in a VP and sign
         var audience = getAudience(token);
-        var presentationResponse = presentationCreationService.createPresentation(credentials.toList(), presentationQuery.getPresentationDefinition(), audience)
+        var presentationResponse = verifiablePresentationService.createPresentation(credentials.toList(), presentationQuery.getPresentationDefinition(), audience)
                 .orElseThrow(failure -> new EdcException("Error creating VerifiablePresentation: %s".formatted(failure.getFailureDetail())));
         return Response.ok()
                 .entity(presentationResponse)

core/identity-hub-api/src/test/java/org/eclipse/edc/identityservice/api/v1/PresentationApiControllerTest.java

@@ -16,7 +16,7 @@
 
 import com.nimbusds.jwt.JWTClaimsSet;
 import jakarta.json.JsonObject;
-import org.eclipse.edc.identityhub.spi.generator.PresentationCreationService;
+import org.eclipse.edc.identityhub.spi.generator.VerifiablePresentationService;
 import org.eclipse.edc.identityhub.spi.resolution.CredentialQueryResolver;
 import org.eclipse.edc.identityhub.spi.resolution.QueryResult;
 import org.eclipse.edc.identityhub.spi.verification.AccessTokenVerifier;
@@ -71,7 +71,7 @@ class PresentationApiControllerTest extends RestControllerTestBase {
     private final TypeTransformerRegistry typeTransformerRegistry = mock();
     private final CredentialQueryResolver queryResolver = mock();
     private final AccessTokenVerifier accessTokenVerifier = mock();
-    private final PresentationCreationService generator = mock();
+    private final VerifiablePresentationService generator = mock();
 
 
     @Test

core/identity-hub-credentials/src/main/java/org/eclipse/edc/identityhub/core/CoreServicesExtension.java

@@ -17,11 +17,11 @@
 import org.eclipse.edc.iam.did.spi.key.PublicKeyWrapper;
 import org.eclipse.edc.iam.did.spi.resolution.DidPublicKeyResolver;
 import org.eclipse.edc.iam.identitytrust.validation.SelfIssuedIdTokenValidator;
-import org.eclipse.edc.identityhub.core.creators.JwtPresentationCreator;
-import org.eclipse.edc.identityhub.core.creators.LdpPresentationCreator;
+import org.eclipse.edc.identityhub.core.creators.JwtPresentationGenerator;
+import org.eclipse.edc.identityhub.core.creators.LdpPresentationGenerator;
 import org.eclipse.edc.identityhub.spi.ScopeToCriterionTransformer;
-import org.eclipse.edc.identityhub.spi.generator.PresentationCreationService;
 import org.eclipse.edc.identityhub.spi.generator.PresentationCreatorRegistry;
+import org.eclipse.edc.identityhub.spi.generator.VerifiablePresentationService;
 import org.eclipse.edc.identityhub.spi.model.IdentityHubConstants;
 import org.eclipse.edc.identityhub.spi.resolution.CredentialQueryResolver;
 import org.eclipse.edc.identityhub.spi.store.CredentialStore;
@@ -135,18 +135,18 @@ public CredentialQueryResolver createCredentialQueryResolver() {
     public PresentationCreatorRegistry presentationCreatorRegistry(ServiceExtensionContext context) {
         if (presentationCreatorRegistry == null) {
             presentationCreatorRegistry = new PresentationCreatorRegistryImpl();
-            presentationCreatorRegistry.addCreator(new JwtPresentationCreator(privateKeyResolver, clock, getOwnDid(context)), CredentialFormat.JWT);
+            presentationCreatorRegistry.addCreator(new JwtPresentationGenerator(privateKeyResolver, clock, getOwnDid(context)), CredentialFormat.JWT);
 
             var ldpIssuer = LdpIssuer.Builder.newInstance().jsonLd(jsonLd).monitor(context.getMonitor()).build();
-            presentationCreatorRegistry.addCreator(new LdpPresentationCreator(privateKeyResolver, getOwnDid(context), signatureSuiteRegistry, defaultSuite, ldpIssuer, typeManager.getMapper(JSON_LD)),
+            presentationCreatorRegistry.addCreator(new LdpPresentationGenerator(privateKeyResolver, getOwnDid(context), signatureSuiteRegistry, defaultSuite, ldpIssuer, typeManager.getMapper(JSON_LD)),
                     CredentialFormat.JSON_LD);
         }
         return presentationCreatorRegistry;
     }
 
     @Provider
-    public PresentationCreationService presentationGenerator(ServiceExtensionContext context) {
-        return new PresentationCreationServiceImpl(CredentialFormat.JSON_LD, presentationCreatorRegistry(context), context.getMonitor());
+    public VerifiablePresentationService presentationGenerator(ServiceExtensionContext context) {
+        return new VerifiablePresentationServiceImpl(CredentialFormat.JSON_LD, presentationCreatorRegistry(context), context.getMonitor());
     }
 
 

core/identity-hub-credentials/src/main/java/org/eclipse/edc/identityhub/core/PresentationCreatorRegistryImpl.java

@@ -14,8 +14,8 @@
 
 package org.eclipse.edc.identityhub.core;
 
-import org.eclipse.edc.identityhub.spi.generator.PresentationCreator;
 import org.eclipse.edc.identityhub.spi.generator.PresentationCreatorRegistry;
+import org.eclipse.edc.identityhub.spi.generator.PresentationGenerator;
 import org.eclipse.edc.identitytrust.model.CredentialFormat;
 import org.eclipse.edc.identitytrust.model.VerifiableCredentialContainer;
 import org.eclipse.edc.spi.EdcException;
@@ -28,11 +28,11 @@
 
 public class PresentationCreatorRegistryImpl implements PresentationCreatorRegistry {
 
-    private final Map<CredentialFormat, PresentationCreator<?>> creators = new HashMap<>();
+    private final Map<CredentialFormat, PresentationGenerator<?>> creators = new HashMap<>();
     private final Map<CredentialFormat, String> keyIds = new HashMap<>();
 
     @Override
-    public void addCreator(PresentationCreator<?> creator, CredentialFormat format) {
+    public void addCreator(PresentationGenerator<?> creator, CredentialFormat format) {
         creators.put(format, creator);
     }
 
@@ -41,7 +41,7 @@ public <T> T createPresentation(List<VerifiableCredentialContainer> credentials,
         var creator = ofNullable(creators.get(format)).orElseThrow(() -> new EdcException("No PresentationCreator was found for CredentialFormat %s".formatted(format)));
         var keyId = ofNullable(keyIds.get(format)).orElseThrow(() -> new EdcException("No key ID was registered for CredentialFormat %s".formatted(format)));
 
-        return (T) creator.createPresentation(credentials, keyId, additionalData);
+        return (T) creator.generatePresentation(credentials, keyId, additionalData);
     }
 
     @Override

core/identity-hub-credentials/src/main/java/org/eclipse/edc/identityhub/core/PresentationCreationServiceImpl.java → core/identity-hub-credentials/src/main/java/org/eclipse/edc/identityhub/core/VerifiablePresentationServiceImpl.java

@@ -15,8 +15,8 @@
 package org.eclipse.edc.identityhub.core;
 
 import jakarta.json.JsonObject;
-import org.eclipse.edc.identityhub.spi.generator.PresentationCreationService;
 import org.eclipse.edc.identityhub.spi.generator.PresentationCreatorRegistry;
+import org.eclipse.edc.identityhub.spi.generator.VerifiablePresentationService;
 import org.eclipse.edc.identitytrust.model.CredentialFormat;
 import org.eclipse.edc.identitytrust.model.VerifiableCredentialContainer;
 import org.eclipse.edc.identitytrust.model.credentialservice.PresentationResponse;
@@ -33,7 +33,7 @@
 import static java.util.Optional.ofNullable;
 import static org.eclipse.edc.identitytrust.model.CredentialFormat.JSON_LD;
 
-public class PresentationCreationServiceImpl implements PresentationCreationService {
+public class VerifiablePresentationServiceImpl implements VerifiablePresentationService {
     private final CredentialFormat defaultFormatVp;
     private final PresentationCreatorRegistry registry;
     private final Monitor monitor;
@@ -43,7 +43,7 @@ public class PresentationCreationServiceImpl implements PresentationCreationServ
      *
      * @param defaultFormatVp The default format for verifiable presentations.
      */
-    public PresentationCreationServiceImpl(CredentialFormat defaultFormatVp, PresentationCreatorRegistry registry, Monitor monitor) {
+    public VerifiablePresentationServiceImpl(CredentialFormat defaultFormatVp, PresentationCreatorRegistry registry, Monitor monitor) {
         this.defaultFormatVp = defaultFormatVp;
         this.registry = registry;
         this.monitor = monitor;

core/identity-hub-credentials/src/main/java/org/eclipse/edc/identityhub/core/creators/JwtPresentationCreator.java → core/identity-hub-credentials/src/main/java/org/eclipse/edc/identityhub/core/creators/JwtPresentationGenerator.java

@@ -21,7 +21,7 @@
 import jakarta.json.Json;
 import jakarta.json.JsonArrayBuilder;
 import org.eclipse.edc.iam.did.spi.key.PrivateKeyWrapper;
-import org.eclipse.edc.identityhub.spi.generator.PresentationCreator;
+import org.eclipse.edc.identityhub.spi.generator.PresentationGenerator;
 import org.eclipse.edc.identitytrust.model.VerifiableCredentialContainer;
 import org.eclipse.edc.jsonld.spi.JsonLdKeywords;
 import org.eclipse.edc.spi.EdcException;
@@ -46,7 +46,7 @@
  * JwtPresentationCreator is an implementation of the PresentationCreator interface that generates Verifiable Presentations in JWT format.
  * VPs are returned as {@link String}
  */
-public class JwtPresentationCreator implements PresentationCreator<String> {
+public class JwtPresentationGenerator implements PresentationGenerator<String> {
     private final PrivateKeyResolver privateKeyResolver;
     private final Clock clock;
     private final String issuerId;
@@ -58,18 +58,18 @@ public class JwtPresentationCreator implements PresentationCreator<String> {
      * @param clock              The clock used for generating timestamps.
      * @param issuerId           The ID of the issuer for the presentation. Could be a DID.
      */
-    public JwtPresentationCreator(PrivateKeyResolver privateKeyResolver, Clock clock, String issuerId) {
+    public JwtPresentationGenerator(PrivateKeyResolver privateKeyResolver, Clock clock, String issuerId) {
         this.privateKeyResolver = privateKeyResolver;
         this.clock = clock;
         this.issuerId = issuerId;
     }
 
     /**
      * Will always throw an {@link UnsupportedOperationException}.
-     * Please use {@link JwtPresentationCreator#createPresentation(List, String, Map)} instead.
+     * Please use {@link JwtPresentationGenerator#generatePresentation(List, String, Map)} instead.
      */
     @Override
-    public String createPresentation(List<VerifiableCredentialContainer> credentials, String keyId) {
+    public String generatePresentation(List<VerifiableCredentialContainer> credentials, String keyId) {
         throw new UnsupportedOperationException("Must provide additional data: 'aud'");
     }
 
@@ -85,7 +85,7 @@ public String createPresentation(List<VerifiableCredentialContainer> credentials
      * @throws EdcException                  If signing the JWT fails.
      */
     @Override
-    public String createPresentation(List<VerifiableCredentialContainer> credentials, String keyId, Map<String, Object> additionalData) {
+    public String generatePresentation(List<VerifiableCredentialContainer> credentials, String keyId, Map<String, Object> additionalData) {
 
         // check if expected data is there
         if (!additionalData.containsKey("aud")) {

core/identity-hub-credentials/src/main/java/org/eclipse/edc/identityhub/core/creators/LdpPresentationCreator.java → core/identity-hub-credentials/src/main/java/org/eclipse/edc/identityhub/core/creators/LdpPresentationGenerator.java

@@ -25,7 +25,7 @@
 import jakarta.json.JsonArrayBuilder;
 import jakarta.json.JsonObject;
 import org.eclipse.edc.iam.did.spi.key.PrivateKeyWrapper;
-import org.eclipse.edc.identityhub.spi.generator.PresentationCreator;
+import org.eclipse.edc.identityhub.spi.generator.PresentationGenerator;
 import org.eclipse.edc.identitytrust.model.CredentialFormat;
 import org.eclipse.edc.identitytrust.model.VerifiableCredentialContainer;
 import org.eclipse.edc.identitytrust.verification.SignatureSuiteRegistry;
@@ -52,7 +52,7 @@
  * LdpPresentationCreator is a class that implements the PresentationCreator interface to generate Verifiable Presentations based on Verifiable Credential Containers.
  * VPs are represented as {@link JsonObject}.
  */
-public class LdpPresentationCreator implements PresentationCreator<JsonObject> {
+public class LdpPresentationGenerator implements PresentationGenerator<JsonObject> {
 
     public static final String ID_PROPERTY = "id";
     public static final String TYPE_PROPERTY = "type";
@@ -65,8 +65,8 @@ public class LdpPresentationCreator implements PresentationCreator<JsonObject> {
     private final LdpIssuer ldpIssuer;
     private final ObjectMapper mapper;
 
-    public LdpPresentationCreator(PrivateKeyResolver privateKeyResolver, String ownDid,
-                                  SignatureSuiteRegistry signatureSuiteRegistry, String defaultSignatureSuite, LdpIssuer ldpIssuer, ObjectMapper mapper) {
+    public LdpPresentationGenerator(PrivateKeyResolver privateKeyResolver, String ownDid,
+                                    SignatureSuiteRegistry signatureSuiteRegistry, String defaultSignatureSuite, LdpIssuer ldpIssuer, ObjectMapper mapper) {
         this.privateKeyResolver = privateKeyResolver;
         this.issuerId = ownDid;
         this.signatureSuiteRegistry = signatureSuiteRegistry;
@@ -77,10 +77,10 @@ public LdpPresentationCreator(PrivateKeyResolver privateKeyResolver, String ownD
 
     /**
      * Will always throw an {@link UnsupportedOperationException}.
-     * Please use {@link LdpPresentationCreator#createPresentation(List, String, Map)} instead.
+     * Please use {@link LdpPresentationGenerator#generatePresentation(List, String, Map)} instead.
      */
     @Override
-    public JsonObject createPresentation(List<VerifiableCredentialContainer> credentials, String keyId) {
+    public JsonObject generatePresentation(List<VerifiableCredentialContainer> credentials, String keyId) {
         throw new UnsupportedOperationException("Must provide additional data: 'types'");
 
     }
@@ -101,7 +101,7 @@ public JsonObject createPresentation(List<VerifiableCredentialContainer> credent
      *                                  or if one or more VerifiableCredentials cannot be represented in the JSON-LD format.
      */
     @Override
-    public JsonObject createPresentation(List<VerifiableCredentialContainer> credentials, String keyId, Map<String, Object> additionalData) {
+    public JsonObject generatePresentation(List<VerifiableCredentialContainer> credentials, String keyId, Map<String, Object> additionalData) {
         if (!additionalData.containsKey("types")) {
             throw new IllegalArgumentException("Must provide additional data: 'types'");
         }