From 63742620a88df74d355c497d4a6ed879ecedb396 Mon Sep 17 00:00:00 2001 From: Timo Bejan Date: Tue, 27 Jun 2023 20:56:30 +0300 Subject: [PATCH] RED-6686 - cleanup for swagger --- .../fforesight/tenantusermanagement/DevConfiguration.java | 2 +- .../api/{ => external}/GeneralSettingsResource.java | 2 +- .../api/{ => external}/SMTPConfigurationResource.java | 2 +- .../api/{ => external}/TenantsResource.java | 2 +- .../api/{ => external}/UserPreferenceResource.java | 2 +- .../tenantusermanagement/api/{ => external}/UserResource.java | 2 +- .../controller/{ => external}/GeneralSettingsController.java | 4 ++-- .../{ => external}/SMTPConfigurationController.java | 4 ++-- .../controller/{ => external}/TenantsController.java | 4 ++-- .../controller/{ => external}/UserController.java | 4 ++-- .../controller/{ => external}/UserPreferenceController.java | 4 ++-- src/main/resources/application-redaction.yaml | 1 + src/main/resources/application.yaml | 3 ++- 13 files changed, 19 insertions(+), 17 deletions(-) rename src/main/java/com/knecon/fforesight/tenantusermanagement/api/{ => external}/GeneralSettingsResource.java (96%) rename src/main/java/com/knecon/fforesight/tenantusermanagement/api/{ => external}/SMTPConfigurationResource.java (97%) rename src/main/java/com/knecon/fforesight/tenantusermanagement/api/{ => external}/TenantsResource.java (97%) rename src/main/java/com/knecon/fforesight/tenantusermanagement/api/{ => external}/UserPreferenceResource.java (97%) rename src/main/java/com/knecon/fforesight/tenantusermanagement/api/{ => external}/UserResource.java (99%) rename src/main/java/com/knecon/fforesight/tenantusermanagement/controller/{ => external}/GeneralSettingsController.java (89%) rename src/main/java/com/knecon/fforesight/tenantusermanagement/controller/{ => external}/SMTPConfigurationController.java (96%) rename src/main/java/com/knecon/fforesight/tenantusermanagement/controller/{ => external}/TenantsController.java (94%) rename src/main/java/com/knecon/fforesight/tenantusermanagement/controller/{ => external}/UserController.java (97%) rename src/main/java/com/knecon/fforesight/tenantusermanagement/controller/{ => external}/UserPreferenceController.java (93%) diff --git a/src/main/java/com/knecon/fforesight/tenantusermanagement/DevConfiguration.java b/src/main/java/com/knecon/fforesight/tenantusermanagement/DevConfiguration.java index 5f20403..44267d6 100644 --- a/src/main/java/com/knecon/fforesight/tenantusermanagement/DevConfiguration.java +++ b/src/main/java/com/knecon/fforesight/tenantusermanagement/DevConfiguration.java @@ -70,7 +70,7 @@ public class DevConfiguration { public void postConstruct() { - var tenant = 1; + var tenant = 99; try { tenantManagementService.getTenant("tenant" + tenant); } catch (Exception e) { diff --git a/src/main/java/com/knecon/fforesight/tenantusermanagement/api/GeneralSettingsResource.java b/src/main/java/com/knecon/fforesight/tenantusermanagement/api/external/GeneralSettingsResource.java similarity index 96% rename from src/main/java/com/knecon/fforesight/tenantusermanagement/api/GeneralSettingsResource.java rename to src/main/java/com/knecon/fforesight/tenantusermanagement/api/external/GeneralSettingsResource.java index 7f3f460..e283ebf 100644 --- a/src/main/java/com/knecon/fforesight/tenantusermanagement/api/GeneralSettingsResource.java +++ b/src/main/java/com/knecon/fforesight/tenantusermanagement/api/external/GeneralSettingsResource.java @@ -1,4 +1,4 @@ -package com.knecon.fforesight.tenantusermanagement.api; +package com.knecon.fforesight.tenantusermanagement.api.external; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; diff --git a/src/main/java/com/knecon/fforesight/tenantusermanagement/api/SMTPConfigurationResource.java b/src/main/java/com/knecon/fforesight/tenantusermanagement/api/external/SMTPConfigurationResource.java similarity index 97% rename from src/main/java/com/knecon/fforesight/tenantusermanagement/api/SMTPConfigurationResource.java rename to src/main/java/com/knecon/fforesight/tenantusermanagement/api/external/SMTPConfigurationResource.java index 64885b0..264a705 100644 --- a/src/main/java/com/knecon/fforesight/tenantusermanagement/api/SMTPConfigurationResource.java +++ b/src/main/java/com/knecon/fforesight/tenantusermanagement/api/external/SMTPConfigurationResource.java @@ -1,4 +1,4 @@ -package com.knecon.fforesight.tenantusermanagement.api; +package com.knecon.fforesight.tenantusermanagement.api.external; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; diff --git a/src/main/java/com/knecon/fforesight/tenantusermanagement/api/TenantsResource.java b/src/main/java/com/knecon/fforesight/tenantusermanagement/api/external/TenantsResource.java similarity index 97% rename from src/main/java/com/knecon/fforesight/tenantusermanagement/api/TenantsResource.java rename to src/main/java/com/knecon/fforesight/tenantusermanagement/api/external/TenantsResource.java index 2d539a6..78e7749 100644 --- a/src/main/java/com/knecon/fforesight/tenantusermanagement/api/TenantsResource.java +++ b/src/main/java/com/knecon/fforesight/tenantusermanagement/api/external/TenantsResource.java @@ -1,4 +1,4 @@ -package com.knecon.fforesight.tenantusermanagement.api; +package com.knecon.fforesight.tenantusermanagement.api.external; import java.util.List; diff --git a/src/main/java/com/knecon/fforesight/tenantusermanagement/api/UserPreferenceResource.java b/src/main/java/com/knecon/fforesight/tenantusermanagement/api/external/UserPreferenceResource.java similarity index 97% rename from src/main/java/com/knecon/fforesight/tenantusermanagement/api/UserPreferenceResource.java rename to src/main/java/com/knecon/fforesight/tenantusermanagement/api/external/UserPreferenceResource.java index 6431f4b..7805122 100644 --- a/src/main/java/com/knecon/fforesight/tenantusermanagement/api/UserPreferenceResource.java +++ b/src/main/java/com/knecon/fforesight/tenantusermanagement/api/external/UserPreferenceResource.java @@ -1,4 +1,4 @@ -package com.knecon.fforesight.tenantusermanagement.api; +package com.knecon.fforesight.tenantusermanagement.api.external; import java.util.List; import java.util.Map; diff --git a/src/main/java/com/knecon/fforesight/tenantusermanagement/api/UserResource.java b/src/main/java/com/knecon/fforesight/tenantusermanagement/api/external/UserResource.java similarity index 99% rename from src/main/java/com/knecon/fforesight/tenantusermanagement/api/UserResource.java rename to src/main/java/com/knecon/fforesight/tenantusermanagement/api/external/UserResource.java index cf71c2f..bc679a9 100644 --- a/src/main/java/com/knecon/fforesight/tenantusermanagement/api/UserResource.java +++ b/src/main/java/com/knecon/fforesight/tenantusermanagement/api/external/UserResource.java @@ -1,4 +1,4 @@ -package com.knecon.fforesight.tenantusermanagement.api; +package com.knecon.fforesight.tenantusermanagement.api.external; import java.util.List; import java.util.Set; diff --git a/src/main/java/com/knecon/fforesight/tenantusermanagement/controller/GeneralSettingsController.java b/src/main/java/com/knecon/fforesight/tenantusermanagement/controller/external/GeneralSettingsController.java similarity index 89% rename from src/main/java/com/knecon/fforesight/tenantusermanagement/controller/GeneralSettingsController.java rename to src/main/java/com/knecon/fforesight/tenantusermanagement/controller/external/GeneralSettingsController.java index 7720880..46b988b 100644 --- a/src/main/java/com/knecon/fforesight/tenantusermanagement/controller/GeneralSettingsController.java +++ b/src/main/java/com/knecon/fforesight/tenantusermanagement/controller/external/GeneralSettingsController.java @@ -1,4 +1,4 @@ -package com.knecon.fforesight.tenantusermanagement.controller; +package com.knecon.fforesight.tenantusermanagement.controller.external; import static com.knecon.fforesight.tenantusermanagement.permissions.UserManagementPermissions.READ_GENERAL_CONFIGURATION; import static com.knecon.fforesight.tenantusermanagement.permissions.UserManagementPermissions.WRITE_GENERAL_CONFIGURATION; @@ -7,7 +7,7 @@ import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; -import com.knecon.fforesight.tenantusermanagement.api.GeneralSettingsResource; +import com.knecon.fforesight.tenantusermanagement.api.external.GeneralSettingsResource; import com.knecon.fforesight.tenantusermanagement.model.GeneralConfigurationModel; import com.knecon.fforesight.tenantusermanagement.service.GeneralConfigurationService; diff --git a/src/main/java/com/knecon/fforesight/tenantusermanagement/controller/SMTPConfigurationController.java b/src/main/java/com/knecon/fforesight/tenantusermanagement/controller/external/SMTPConfigurationController.java similarity index 96% rename from src/main/java/com/knecon/fforesight/tenantusermanagement/controller/SMTPConfigurationController.java rename to src/main/java/com/knecon/fforesight/tenantusermanagement/controller/external/SMTPConfigurationController.java index 9a5d996..9007a4c 100644 --- a/src/main/java/com/knecon/fforesight/tenantusermanagement/controller/SMTPConfigurationController.java +++ b/src/main/java/com/knecon/fforesight/tenantusermanagement/controller/external/SMTPConfigurationController.java @@ -1,4 +1,4 @@ -package com.knecon.fforesight.tenantusermanagement.controller; +package com.knecon.fforesight.tenantusermanagement.controller.external; import static com.knecon.fforesight.tenantusermanagement.permissions.UserManagementPermissions.READ_SMTP_CONFIGURATION; import static com.knecon.fforesight.tenantusermanagement.permissions.UserManagementPermissions.WRITE_SMTP_CONFIGURATION; @@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.RestController; import com.fasterxml.jackson.databind.ObjectMapper; import com.knecon.fforesight.tenantcommons.EncryptionDecryptionService; import com.knecon.fforesight.tenantcommons.TenantContext; -import com.knecon.fforesight.tenantusermanagement.api.SMTPConfigurationResource; +import com.knecon.fforesight.tenantusermanagement.api.external.SMTPConfigurationResource; import com.knecon.fforesight.tenantusermanagement.model.SMTPConfiguration; import com.knecon.fforesight.tenantusermanagement.service.RealmService; diff --git a/src/main/java/com/knecon/fforesight/tenantusermanagement/controller/TenantsController.java b/src/main/java/com/knecon/fforesight/tenantusermanagement/controller/external/TenantsController.java similarity index 94% rename from src/main/java/com/knecon/fforesight/tenantusermanagement/controller/TenantsController.java rename to src/main/java/com/knecon/fforesight/tenantusermanagement/controller/external/TenantsController.java index 9382847..0f9a9b5 100644 --- a/src/main/java/com/knecon/fforesight/tenantusermanagement/controller/TenantsController.java +++ b/src/main/java/com/knecon/fforesight/tenantusermanagement/controller/external/TenantsController.java @@ -1,4 +1,4 @@ -package com.knecon.fforesight.tenantusermanagement.controller; +package com.knecon.fforesight.tenantusermanagement.controller.external; import static com.knecon.fforesight.tenantusermanagement.permissions.UserManagementPermissions.CREATE_TENANT; import static com.knecon.fforesight.tenantusermanagement.permissions.UserManagementPermissions.DEPLOYMENT_INFO; @@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.RestController; import org.springframework.web.server.ResponseStatusException; import com.knecon.fforesight.tenantcommons.model.TenantResponse; -import com.knecon.fforesight.tenantusermanagement.api.TenantsResource; +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.TenantRequest; diff --git a/src/main/java/com/knecon/fforesight/tenantusermanagement/controller/UserController.java b/src/main/java/com/knecon/fforesight/tenantusermanagement/controller/external/UserController.java similarity index 97% rename from src/main/java/com/knecon/fforesight/tenantusermanagement/controller/UserController.java rename to src/main/java/com/knecon/fforesight/tenantusermanagement/controller/external/UserController.java index d852110..49e2252 100644 --- a/src/main/java/com/knecon/fforesight/tenantusermanagement/controller/UserController.java +++ b/src/main/java/com/knecon/fforesight/tenantusermanagement/controller/external/UserController.java @@ -1,4 +1,4 @@ -package com.knecon.fforesight.tenantusermanagement.controller; +package com.knecon.fforesight.tenantusermanagement.controller.external; import static com.knecon.fforesight.tenantusermanagement.permissions.UserManagementPermissions.READ_ALL_USERS; import static com.knecon.fforesight.tenantusermanagement.permissions.UserManagementPermissions.READ_USERS; @@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.server.ResponseStatusException; -import com.knecon.fforesight.tenantusermanagement.api.UserResource; +import com.knecon.fforesight.tenantusermanagement.api.external.UserResource; import com.knecon.fforesight.tenantusermanagement.model.CreateUserRequest; import com.knecon.fforesight.tenantusermanagement.model.ResetPasswordRequest; import com.knecon.fforesight.tenantusermanagement.model.UpdateMyProfileRequest; diff --git a/src/main/java/com/knecon/fforesight/tenantusermanagement/controller/UserPreferenceController.java b/src/main/java/com/knecon/fforesight/tenantusermanagement/controller/external/UserPreferenceController.java similarity index 93% rename from src/main/java/com/knecon/fforesight/tenantusermanagement/controller/UserPreferenceController.java rename to src/main/java/com/knecon/fforesight/tenantusermanagement/controller/external/UserPreferenceController.java index 59dbe73..99e8770 100644 --- a/src/main/java/com/knecon/fforesight/tenantusermanagement/controller/UserPreferenceController.java +++ b/src/main/java/com/knecon/fforesight/tenantusermanagement/controller/external/UserPreferenceController.java @@ -1,4 +1,4 @@ -package com.knecon.fforesight.tenantusermanagement.controller; +package com.knecon.fforesight.tenantusermanagement.controller.external; import java.util.HashMap; import java.util.List; @@ -9,7 +9,7 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RestController; import com.knecon.fforesight.keycloakcommons.security.KeycloakSecurity; -import com.knecon.fforesight.tenantusermanagement.api.UserPreferenceResource; +import com.knecon.fforesight.tenantusermanagement.api.external.UserPreferenceResource; import com.knecon.fforesight.tenantusermanagement.permissions.UserManagementPermissions; import com.knecon.fforesight.tenantusermanagement.service.UserService; diff --git a/src/main/resources/application-redaction.yaml b/src/main/resources/application-redaction.yaml index b133f31..8d2885c 100644 --- a/src/main/resources/application-redaction.yaml +++ b/src/main/resources/application-redaction.yaml @@ -53,3 +53,4 @@ fforesight: springdoc: default-tenant: 'redaction' + packages-to-scan: diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml index 0ecac00..5c06b52 100644 --- a/src/main/resources/application.yaml +++ b/src/main/resources/application.yaml @@ -92,6 +92,7 @@ fforesight: auth-server-url: ${fforesight.tenant-user-management.server-url} 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,5 +107,5 @@ fforesight: user-exchange: name: 'users-exchange' -springdoc.packages-to-scan: [ 'com.knecon.fforesight.keycloakcommons' ] +springdoc.packages-to-scan: