RED-6686 - cleanup for swagger

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) {

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;

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;

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;
 

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;

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;

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;
 

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;
 

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;

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;

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;
 

src/main/resources/application-redaction.yaml

@@ -53,3 +53,4 @@ fforesight:
 
   springdoc:
     default-tenant: 'redaction'
+    packages-to-scan:

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: