diff --git a/src/main/java/com/knecon/fforesight/tenantusermanagement/api/external/TenantsResource.java b/src/main/java/com/knecon/fforesight/tenantusermanagement/api/external/TenantsResource.java index 808514a..5b39e0e 100644 --- a/src/main/java/com/knecon/fforesight/tenantusermanagement/api/external/TenantsResource.java +++ b/src/main/java/com/knecon/fforesight/tenantusermanagement/api/external/TenantsResource.java @@ -17,7 +17,6 @@ import com.fasterxml.jackson.databind.JsonNode; import com.knecon.fforesight.tenantcommons.model.TenantResponse; import com.knecon.fforesight.tenantcommons.model.UpdateDetailsRequest; import com.knecon.fforesight.tenantusermanagement.model.DeploymentKeyResponse; -import com.knecon.fforesight.tenantusermanagement.model.SimpleTenantResponse; import com.knecon.fforesight.tenantusermanagement.model.CreateTenantRequest; import com.knecon.fforesight.tenantusermanagement.model.UpdateTenantRequest; @@ -43,8 +42,7 @@ public interface TenantsResource { @ResponseBody @ResponseStatus(value = HttpStatus.NO_CONTENT) @Operation(summary = "Deletes given tenant", description = "None") - @ApiResponses(value = {@ApiResponse(responseCode = "204", description = "OK"), @ApiResponse(responseCode = "403", description = "Forbidden access, you dont have rights to delete tenants"), @ApiResponse(responseCode = "405", description = "Operation is not allowed."), - @ApiResponse(responseCode = "409", description = "Conflict while deleting tenant.")}) + @ApiResponses(value = {@ApiResponse(responseCode = "204", description = "OK"), @ApiResponse(responseCode = "403", description = "Forbidden access, you dont have rights to delete tenants"), @ApiResponse(responseCode = "405", description = "Operation is not allowed."), @ApiResponse(responseCode = "409", description = "Conflict while deleting tenant.")}) @DeleteMapping(value = TENANTS_TENANT_ID_PATH) void deleteTenant(@PathVariable("tenantId") String tenantId); @@ -73,12 +71,6 @@ public interface TenantsResource { void updateDetails(@PathVariable("tenantId") String tenantId, @RequestBody UpdateDetailsRequest request); - @GetMapping(value = TENANTS_PATH + "/simple", produces = MediaType.APPLICATION_JSON_VALUE) - @Operation(summary = "Gets all existing tenants in a simplified format", description = "None") - @ApiResponses(value = {@ApiResponse(responseCode = "200", description = "OK")}) - List getSimpleTenants(); - - @GetMapping(value = "/deploymentKey" + TENANT_ID_PATH_PARAM, produces = MediaType.APPLICATION_JSON_VALUE) @Operation(summary = "Returns the deployment key for a tenant", description = "None") @ApiResponses(value = {@ApiResponse(responseCode = "200", description = "OK")}) diff --git a/src/main/java/com/knecon/fforesight/tenantusermanagement/api/internal/InternalTenantsResource.java b/src/main/java/com/knecon/fforesight/tenantusermanagement/api/internal/InternalTenantsResource.java index 16edf02..e6719fe 100644 --- a/src/main/java/com/knecon/fforesight/tenantusermanagement/api/internal/InternalTenantsResource.java +++ b/src/main/java/com/knecon/fforesight/tenantusermanagement/api/internal/InternalTenantsResource.java @@ -16,7 +16,6 @@ import com.knecon.fforesight.tenantcommons.TenantApplicationType; import com.knecon.fforesight.tenantcommons.model.TenantResponse; import com.knecon.fforesight.tenantcommons.model.UpdateDetailsRequest; import com.knecon.fforesight.tenantusermanagement.model.DeploymentKeyResponse; -import com.knecon.fforesight.tenantusermanagement.model.SimpleTenantResponse; import com.knecon.fforesight.tenantusermanagement.model.CreateTenantRequest; import com.knecon.fforesight.tenantusermanagement.model.UpdateTenantRequest; @@ -61,12 +60,6 @@ public interface InternalTenantsResource { TenantResponse updateTenant(@PathVariable("tenantId") String tenantId, @RequestBody UpdateTenantRequest tenantRequest); - @GetMapping(value = "/tenants/simple", produces = MediaType.APPLICATION_JSON_VALUE) - @Operation(summary = "Gets all existing tenant in a simplified format", description = "None") - @ApiResponses(value = {@ApiResponse(responseCode = "200", description = "OK")}) - List getSimpleTenants(); - - @GetMapping(value = "/deploymentKey" + TENANT_ID_PATH_PARAM, produces = MediaType.APPLICATION_JSON_VALUE) @Operation(summary = "Returns the deployment key for a tenant", description = "None") @ApiResponses(value = {@ApiResponse(responseCode = "200", description = "OK")}) diff --git a/src/main/java/com/knecon/fforesight/tenantusermanagement/controller/external/TenantsController.java b/src/main/java/com/knecon/fforesight/tenantusermanagement/controller/external/TenantsController.java index 71a4d7f..a437962 100644 --- a/src/main/java/com/knecon/fforesight/tenantusermanagement/controller/external/TenantsController.java +++ b/src/main/java/com/knecon/fforesight/tenantusermanagement/controller/external/TenantsController.java @@ -22,7 +22,6 @@ import com.knecon.fforesight.tenantcommons.model.UpdateDetailsRequest; import com.knecon.fforesight.tenantusermanagement.api.external.PublicResource; import com.knecon.fforesight.tenantusermanagement.api.external.TenantsResource; import com.knecon.fforesight.tenantusermanagement.model.DeploymentKeyResponse; -import com.knecon.fforesight.tenantusermanagement.model.SimpleTenantResponse; import com.knecon.fforesight.tenantusermanagement.model.CreateTenantRequest; import com.knecon.fforesight.tenantusermanagement.model.UpdateTenantRequest; import com.knecon.fforesight.tenantusermanagement.service.DeploymentKeyService; @@ -77,12 +76,6 @@ public class TenantsController implements TenantsResource, PublicResource { } - public List getSimpleTenants() { - - return tenantManagementService.getTenants().stream().map(t -> new SimpleTenantResponse(t.getTenantId(), t.getDisplayName(), t.getGuid())).toList(); - } - - @PreAuthorize("hasAuthority('" + UPDATE_TENANT + "')") public TenantResponse updateTenant(String tenantId, @RequestBody UpdateTenantRequest tenantRequest) { diff --git a/src/main/java/com/knecon/fforesight/tenantusermanagement/controller/internal/InternalTenantsController.java b/src/main/java/com/knecon/fforesight/tenantusermanagement/controller/internal/InternalTenantsController.java index 28251d4..b5fab4b 100644 --- a/src/main/java/com/knecon/fforesight/tenantusermanagement/controller/internal/InternalTenantsController.java +++ b/src/main/java/com/knecon/fforesight/tenantusermanagement/controller/internal/InternalTenantsController.java @@ -16,7 +16,6 @@ import com.knecon.fforesight.tenantusermanagement.api.internal.InternalResource; import com.knecon.fforesight.tenantusermanagement.api.internal.InternalTenantsResource; import com.knecon.fforesight.tenantusermanagement.model.CreateTenantRequest; import com.knecon.fforesight.tenantusermanagement.model.DeploymentKeyResponse; -import com.knecon.fforesight.tenantusermanagement.model.SimpleTenantResponse; import com.knecon.fforesight.tenantusermanagement.model.UpdateTenantRequest; import com.knecon.fforesight.tenantusermanagement.service.DeploymentKeyService; import com.knecon.fforesight.tenantusermanagement.service.TenantManagementService; @@ -68,12 +67,6 @@ public class InternalTenantsController implements InternalTenantsResource, Inter } - public List getSimpleTenants() { - - return tenantManagementService.getTenants().stream().map(t -> new SimpleTenantResponse(t.getTenantId(), t.getDisplayName(), t.getGuid())).toList(); - } - - public DeploymentKeyResponse getDeploymentKey(@PathVariable(TENANT_ID_PARAM) String tenantId) { return new DeploymentKeyResponse(deploymentKeyService.getDeploymentKey(tenantId)); diff --git a/src/main/java/com/knecon/fforesight/tenantusermanagement/model/SimpleTenantResponse.java b/src/main/java/com/knecon/fforesight/tenantusermanagement/model/SimpleTenantResponse.java deleted file mode 100644 index aec15a3..0000000 --- a/src/main/java/com/knecon/fforesight/tenantusermanagement/model/SimpleTenantResponse.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.knecon.fforesight.tenantusermanagement.model; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -@Data -@Builder -@AllArgsConstructor -@NoArgsConstructor -@Schema(description = "Object containing a simplified version of the tenant data.") -public class SimpleTenantResponse { - - @Schema(description = "Parameter containing the ID of the tenant.") - private String tenantId; - @Schema(description = "Parameter containing the display name of the tenant.") - private String displayName; - @Schema(description = "Parameter containing the global unique ID of the tenant.") - private String guid; - -} diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index c27e7da..4cf66c8 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -101,7 +101,7 @@ spring: password: ${REDIS_PASSWORD:} fforesight: keycloak: - ignored-endpoints: [ '/actuator/health', '/actuator/health/**', '/tenant-user-management', '/tenant-user-management/', '/internal/**','/tenant-user-management/docs/**','/tenant-user-management/docs','/tenant-user-management/tenants/simple' ] + ignored-endpoints: [ '/actuator/health', '/actuator/health/**', '/tenant-user-management', '/tenant-user-management/', '/internal/**','/tenant-user-management/docs/**','/tenant-user-management/docs' ] enabled: true springdoc: base-path: '/tenant-user-management' diff --git a/src/test/java/com/knecon/fforesight/tenantusermanagement/tests/StartupTest.java b/src/test/java/com/knecon/fforesight/tenantusermanagement/tests/StartupTest.java index 9dde382..eb730bd 100644 --- a/src/test/java/com/knecon/fforesight/tenantusermanagement/tests/StartupTest.java +++ b/src/test/java/com/knecon/fforesight/tenantusermanagement/tests/StartupTest.java @@ -17,8 +17,8 @@ public class StartupTest extends AbstractTenantUserManagementIntegrationTest { @Test public void testStartup() { - var simpleTenants = internalTenantsClient.getSimpleTenants(); - assertThat(simpleTenants).isNotEmpty(); + var tenants = internalTenantsClient.getTenants(); + assertThat(tenants).isNotEmpty(); } diff --git a/src/test/resources/application.yml b/src/test/resources/application.yml index 52cf20d..34e8af1 100644 --- a/src/test/resources/application.yml +++ b/src/test/resources/application.yml @@ -90,7 +90,7 @@ spring: fforesight: keycloak: - ignored-endpoints: [ '/actuator/health', '/tenant-user-management','/internal/**','/tenant-user-management/docs/**','/tenant-user-management/docs','/tenant-user-management/tenants/simple' ] + ignored-endpoints: [ '/actuator/health', '/tenant-user-management','/internal/**','/tenant-user-management/docs/**','/tenant-user-management/docs' ] enabled: true springdoc: base-path: '/tenant-user-management'