fix: use a domain model from use case to service

Author: benoitgravitee

.aiignore

@@ -68,6 +68,7 @@
 import io.gravitee.apim.core.application.domain_service.ValidateApplicationCRDDomainService;
 import io.gravitee.apim.core.application.domain_service.ValidateApplicationSettingsDomainService;
 import io.gravitee.apim.core.application.use_case.ImportApplicationCRDUseCase;
+import io.gravitee.apim.core.application_certificate.domain_service.ApplicationCertificatesUpdateDomainService;
 import io.gravitee.apim.core.audit.domain_service.AuditDomainService;
 import io.gravitee.apim.core.audit.domain_service.SearchAuditDomainService;
 import io.gravitee.apim.core.audit.query_service.AuditMetadataQueryService;
@@ -990,4 +991,9 @@ public BucketNamesPostProcessor namesPostprocessor() {
     public UserContextLoader userContextLoader() {
         return mock(UserContextLoader.class);
     }
+
+    @Bean
+    public ApplicationCertificatesUpdateDomainService applicationCertificatesUpdateDomainService() {
+        return mock(ApplicationCertificatesUpdateDomainService.class);
+    }
 }

.junie/guidelines.md

@@ -75,6 +75,7 @@
 import io.gravitee.apim.core.application.domain_service.ValidateApplicationCRDDomainService;
 import io.gravitee.apim.core.application.domain_service.ValidateApplicationSettingsDomainService;
 import io.gravitee.apim.core.application.use_case.ValidateApplicationCRDUseCase;
+import io.gravitee.apim.core.application_certificate.domain_service.ApplicationCertificatesUpdateDomainService;
 import io.gravitee.apim.core.audit.domain_service.SearchAuditDomainService;
 import io.gravitee.apim.core.audit.query_service.AuditMetadataQueryService;
 import io.gravitee.apim.core.audit.query_service.AuditQueryService;
@@ -1077,4 +1078,9 @@ public DeletePortalNavigationItemUseCase deletePortalNavigationItemUseCase() {
     public UserContextLoader userContextLoader() {
         return mock(UserContextLoader.class);
     }
+
+    @Bean
+    ApplicationCertificatesUpdateDomainService applicationCertificatesUpdateDomainService() {
+        return mock(ApplicationCertificatesUpdateDomainService.class);
+    }
 }

gravitee-apim-rest-api/gravitee-apim-rest-api-automation/gravitee-apim-rest-api-automation-rest/src/test/java/io/gravitee/apim/rest/api/automation/spring/ResourceContextConfiguration.java

@@ -0,0 +1,42 @@
+/*
+ * Copyright © 2015 The Gravitee team (http://gravitee.io)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.gravitee.rest.api.management.rest.mapper;
+
+import io.gravitee.apim.core.application_certificate.model.ClientCertificate;
+import io.gravitee.apim.core.application_certificate.model.ClientCertificateStatus;
+import io.gravitee.common.data.domain.Page;
+import io.gravitee.rest.api.model.clientcertificate.CreateClientCertificate;
+import io.gravitee.rest.api.model.clientcertificate.UpdateClientCertificate;
+import org.mapstruct.Mapper;
+import org.mapstruct.factory.Mappers;
+
+/**
+ * Mapper for converting between domain model and DTOs for client certificates.
+ *
+ * @author GraviteeSource Team
+ */
+@Mapper
+public interface ClientCertificateMapper {
+    ClientCertificateMapper INSTANCE = Mappers.getMapper(ClientCertificateMapper.class);
+
+    io.gravitee.rest.api.model.clientcertificate.ClientCertificate toDto(ClientCertificate domain);
+
+    ClientCertificate toDomain(CreateClientCertificate dto);
+
+    ClientCertificate toDomain(UpdateClientCertificate dto);
+
+    Page<io.gravitee.rest.api.model.clientcertificate.ClientCertificate> map(Page<ClientCertificate> clientCertificatePage);
+}

gravitee-apim-rest-api/gravitee-apim-rest-api-management-v2/gravitee-apim-rest-api-management-v2-rest/src/test/java/io/gravitee/rest/api/management/v2/rest/spring/ResourceContextConfiguration.java

@@ -19,6 +19,7 @@
 import io.gravitee.apim.core.application_certificate.use_case.GetClientCertificateUseCase;
 import io.gravitee.apim.core.application_certificate.use_case.UpdateClientCertificateUseCase;
 import io.gravitee.common.http.MediaType;
+import io.gravitee.rest.api.management.rest.mapper.ClientCertificateMapper;
 import io.gravitee.rest.api.model.clientcertificate.ClientCertificate;
 import io.gravitee.rest.api.model.clientcertificate.UpdateClientCertificate;
 import io.gravitee.rest.api.model.permissions.RolePermission;
@@ -81,7 +82,8 @@ public class ApplicationClientCertificateResource extends AbstractResource {
     @ApiResponse(responseCode = "500", description = "Internal server error")
     @Permissions({ @Permission(value = RolePermission.APPLICATION_DEFINITION, acls = RolePermissionAction.READ) })
     public ClientCertificate getApplicationClientCertificate() {
-        return getClientCertificateUseCase.execute(new GetClientCertificateUseCase.Input(certId)).clientCertificate();
+        var clientCertificate = getClientCertificateUseCase.execute(new GetClientCertificateUseCase.Input(certId)).clientCertificate();
+        return ClientCertificateMapper.INSTANCE.toDto(clientCertificate);
     }
 
     @PUT
@@ -100,10 +102,10 @@ public ClientCertificate getApplicationClientCertificate() {
     @ApiResponse(responseCode = "500", description = "Internal server error")
     @Permissions({ @Permission(value = RolePermission.APPLICATION_DEFINITION, acls = RolePermissionAction.UPDATE) })
     public Response updateApplicationClientCertificate(@Valid @NotNull final UpdateClientCertificate updateClientCertificate) {
-        ClientCertificate updated = updateClientCertificateUseCase
-            .execute(new UpdateClientCertificateUseCase.Input(certId, updateClientCertificate))
+        var updated = updateClientCertificateUseCase
+            .execute(new UpdateClientCertificateUseCase.Input(certId, ClientCertificateMapper.INSTANCE.toDomain(updateClientCertificate)))
             .clientCertificate();
-        return Response.ok(updated).build();
+        return Response.ok(ClientCertificateMapper.INSTANCE.toDto(updated)).build();
     }
 
     @DELETE

gravitee-apim-rest-api/gravitee-apim-rest-api-management/gravitee-apim-rest-api-management-rest/src/main/java/io/gravitee/rest/api/management/rest/mapper/ClientCertificateMapper.java

@@ -19,6 +19,7 @@
 import io.gravitee.apim.core.application_certificate.use_case.GetClientCertificatesUseCase;
 import io.gravitee.common.data.domain.Page;
 import io.gravitee.common.http.MediaType;
+import io.gravitee.rest.api.management.rest.mapper.ClientCertificateMapper;
 import io.gravitee.rest.api.management.rest.model.Pageable;
 import io.gravitee.rest.api.management.rest.model.PagedResult;
 import io.gravitee.rest.api.model.clientcertificate.ClientCertificate;
@@ -81,9 +82,11 @@ public class ApplicationClientCertificatesResource extends AbstractResource {
     @ApiResponse(responseCode = "500", description = "Internal server error")
     @Permissions({ @Permission(value = RolePermission.APPLICATION_DEFINITION, acls = RolePermissionAction.READ) })
     public PagedResult<ClientCertificate> getApplicationClientCertificates(@Valid @BeanParam Pageable pageable) {
-        Page<ClientCertificate> page = getClientCertificatesUseCase
-            .execute(new GetClientCertificatesUseCase.Input(application, pageable.toPageable()))
-            .clientCertificates();
+        Page<ClientCertificate> page = ClientCertificateMapper.INSTANCE.map(
+            getClientCertificatesUseCase
+                .execute(new GetClientCertificatesUseCase.Input(application, pageable.toPageable()))
+                .clientCertificates()
+        );
         return new PagedResult<>(page, pageable.getSize());
     }
 
@@ -102,10 +105,12 @@ public PagedResult<ClientCertificate> getApplicationClientCertificates(@Valid @B
     @ApiResponse(responseCode = "500", description = "Internal server error")
     @Permissions({ @Permission(value = RolePermission.APPLICATION_DEFINITION, acls = RolePermissionAction.CREATE) })
     public Response createApplicationClientCertificate(@Valid @NotNull final CreateClientCertificate createClientCertificate) {
-        ClientCertificate created = createClientCertificateUseCase
-            .execute(new CreateClientCertificateUseCase.Input(application, createClientCertificate))
+        var created = createClientCertificateUseCase
+            .execute(
+                new CreateClientCertificateUseCase.Input(application, ClientCertificateMapper.INSTANCE.toDomain(createClientCertificate))
+            )
             .clientCertificate();
-        return Response.created(this.getLocationHeader(created.id())).entity(created).build();
+        return Response.created(this.getLocationHeader(created.getId())).entity(ClientCertificateMapper.INSTANCE.toDto(created)).build();
     }
 
     @Path("{certId}")

gravitee-apim-rest-api/gravitee-apim-rest-api-management/gravitee-apim-rest-api-management-rest/src/main/java/io/gravitee/rest/api/management/rest/resource/ApplicationClientCertificateResource.java

@@ -23,11 +23,11 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
+import io.gravitee.apim.core.application_certificate.model.ClientCertificate;
 import io.gravitee.apim.core.application_certificate.use_case.DeleteClientCertificateUseCase;
 import io.gravitee.apim.core.application_certificate.use_case.GetClientCertificateUseCase;
 import io.gravitee.apim.core.application_certificate.use_case.UpdateClientCertificateUseCase;
 import io.gravitee.common.http.HttpStatusCode;
-import io.gravitee.rest.api.model.clientcertificate.ClientCertificate;
 import io.gravitee.rest.api.model.clientcertificate.UpdateClientCertificate;
 import io.gravitee.rest.api.service.exceptions.ClientCertificateNotFoundException;
 import jakarta.ws.rs.client.Entity;
@@ -56,7 +56,7 @@ public void setUp() throws Exception {
 
     @Test
     public void should_get_client_certificate() {
-        ClientCertificate certificate = createClientCertificate(CERT_ID, "My Certificate");
+        var certificate = createClientCertificate(CERT_ID, "My Certificate");
 
         when(getClientCertificateUseCase.execute(any(GetClientCertificateUseCase.Input.class))).thenReturn(
             new GetClientCertificateUseCase.Output(certificate)
@@ -66,7 +66,7 @@ public void should_get_client_certificate() {
 
         SoftAssertions.assertSoftly(soft -> {
             soft.assertThat(response.getStatus()).isEqualTo(HttpStatusCode.OK_200);
-            ClientCertificate result = response.readEntity(ClientCertificate.class);
+            var result = response.readEntity(io.gravitee.rest.api.model.clientcertificate.ClientCertificate.class);
             soft.assertThat(result.id()).isEqualTo(CERT_ID);
             soft.assertThat(result.name()).isEqualTo("My Certificate");
         });
@@ -102,7 +102,7 @@ public void should_update_client_certificate() {
 
         SoftAssertions.assertSoftly(soft -> {
             soft.assertThat(response.getStatus()).isEqualTo(HttpStatusCode.OK_200);
-            ClientCertificate result = response.readEntity(ClientCertificate.class);
+            var result = response.readEntity(io.gravitee.rest.api.model.clientcertificate.ClientCertificate.class);
             soft.assertThat(result.name()).isEqualTo("Updated Certificate Name");
         });
         verify(updateClientCertificateUseCase).execute(any(UpdateClientCertificateUseCase.Input.class));

gravitee-apim-rest-api/gravitee-apim-rest-api-management/gravitee-apim-rest-api-management-rest/src/main/java/io/gravitee/rest/api/management/rest/resource/ApplicationClientCertificatesResource.java

@@ -20,11 +20,11 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
+import io.gravitee.apim.core.application_certificate.model.ClientCertificate;
 import io.gravitee.apim.core.application_certificate.use_case.CreateClientCertificateUseCase;
 import io.gravitee.apim.core.application_certificate.use_case.GetClientCertificatesUseCase;
 import io.gravitee.common.data.domain.Page;
 import io.gravitee.common.http.HttpStatusCode;
-import io.gravitee.rest.api.model.clientcertificate.ClientCertificate;
 import io.gravitee.rest.api.model.clientcertificate.CreateClientCertificate;
 import jakarta.ws.rs.client.Entity;
 import jakarta.ws.rs.core.Response;

gravitee-apim-rest-api/gravitee-apim-rest-api-management/gravitee-apim-rest-api-management-rest/src/test/java/io/gravitee/rest/api/management/rest/resource/ApplicationClientCertificateResourceTest.java

@@ -56,6 +56,7 @@
 import io.gravitee.apim.core.api.use_case.RollbackApiUseCase;
 import io.gravitee.apim.core.apim.service_provider.ApimProductInfo;
 import io.gravitee.apim.core.application.domain_service.ValidateApplicationSettingsDomainService;
+import io.gravitee.apim.core.application_certificate.domain_service.ApplicationCertificatesUpdateDomainService;
 import io.gravitee.apim.core.audit.domain_service.SearchAuditDomainService;
 import io.gravitee.apim.core.audit.query_service.AuditMetadataQueryService;
 import io.gravitee.apim.core.audit.query_service.AuditQueryService;
@@ -1086,4 +1087,9 @@ public BucketNamesPostProcessor namesPostprocessor() {
     public UserContextLoader userContextLoader() {
         return mock(UserContextLoader.class);
     }
+
+    @Bean
+    ApplicationCertificatesUpdateDomainService applicationCertificatesUpdateDomainService() {
+        return mock(ApplicationCertificatesUpdateDomainService.class);
+    }
 }