From fc701ffb042b51a9c6f9dfe02e7d485ddefa6fc8 Mon Sep 17 00:00:00 2001 From: Timo Bejan Date: Thu, 29 Jun 2023 09:21:49 +0300 Subject: [PATCH] Springdoc fixes --- .../service/TenantManagementService.java | 6 +++--- src/main/resources/application.yaml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/knecon/fforesight/tenantusermanagement/service/TenantManagementService.java b/src/main/java/com/knecon/fforesight/tenantusermanagement/service/TenantManagementService.java index fc29c53..d879524 100644 --- a/src/main/java/com/knecon/fforesight/tenantusermanagement/service/TenantManagementService.java +++ b/src/main/java/com/knecon/fforesight/tenantusermanagement/service/TenantManagementService.java @@ -82,7 +82,7 @@ public class TenantManagementService implements TenantProvider { @SneakyThrows public TenantResponse createTenant(TenantRequest tenantRequest) { - log.info("Tenants are: {}",tenantRepository.findAll().stream().map(t-> t.getTenantId()).collect(Collectors.toList())); + log.info("Tenants are: {}", tenantRepository.findAll().stream().map(t -> t.getTenantId()).collect(Collectors.toList())); log.info("Requested to create tenant for: {}", tenantRequest.getTenantId()); try { @@ -161,8 +161,8 @@ public class TenantManagementService implements TenantProvider { } catch (Exception e) { if (!(e instanceof ResponseStatusException)) { throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "Tenant creation failed: " + e.getMessage(), e); - }else{ - throw e; + } else { + throw e; } } } diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml index 1f27750..340174b 100644 --- a/src/main/resources/application.yaml +++ b/src/main/resources/application.yaml @@ -89,10 +89,9 @@ fforesight: enabled: true springdoc: base-path: '/tenant-user-management' - auth-server-url: ${fforesight.tenant-user-management.server-url} + auth-server-url: '/auth' enabled: true default-client-id: 'swagger-ui-client' - packages-to-scan: [ 'com.knecon.fforesight.tenantusermanagement.controller.external' ] jobs: datasource: url: jdbc:postgresql://${PSQL_HOST:localhost}:${PSQL_PORT:5432}/${PSQL_DATABASE:master}?cachePrepStmts=true&useServerPrepStmts=true&rewriteBatchedStatements=true @@ -106,4 +105,5 @@ fforesight: name: 'tenants-exchange' user-exchange: name: 'users-exchange' - +springdoc: + packages-to-scan: [ 'com.knecon.fforesight.tenantusermanagement.controller.external' ]