From 9c84ddbb2cf56ca61583b6f8c4f93350d111b8b1 Mon Sep 17 00:00:00 2001 From: Thomas Vitale Date: Sat, 27 Jan 2024 16:21:02 +0100 Subject: [PATCH] fix(autoconfigure) Add missing configuration property metadata Signed-off-by: Thomas Vitale --- .../HttpTenantResolutionProperties.java | 10 ++--- ...itional-spring-configuration-metadata.json | 42 +++++++++++++++++++ 2 files changed, 47 insertions(+), 5 deletions(-) create mode 100644 arconia-spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json diff --git a/arconia-spring-boot-autoconfigure/src/main/java/io/arconia/autoconfigure/web/multitenancy/HttpTenantResolutionProperties.java b/arconia-spring-boot-autoconfigure/src/main/java/io/arconia/autoconfigure/web/multitenancy/HttpTenantResolutionProperties.java index 6f890d8..48c2f89 100644 --- a/arconia-spring-boot-autoconfigure/src/main/java/io/arconia/autoconfigure/web/multitenancy/HttpTenantResolutionProperties.java +++ b/arconia-spring-boot-autoconfigure/src/main/java/io/arconia/autoconfigure/web/multitenancy/HttpTenantResolutionProperties.java @@ -25,7 +25,7 @@ public class HttpTenantResolutionProperties { /** * Mode of HTTP resolution. */ - private HttpResolutionMode type = HttpResolutionMode.HEADER; + private HttpResolutionMode resolutionMode = HttpResolutionMode.HEADER; /** * Configuration for HTTP header tenant resolution. @@ -50,12 +50,12 @@ public void setEnabled(boolean enabled) { this.enabled = enabled; } - public HttpResolutionMode getType() { - return type; + public HttpResolutionMode getResolutionMode() { + return resolutionMode; } - public void setType(HttpResolutionMode type) { - this.type = type; + public void setResolutionMode(HttpResolutionMode resolutionMode) { + this.resolutionMode = resolutionMode; } public Header getHeader() { diff --git a/arconia-spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/arconia-spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json new file mode 100644 index 0000000..51d9807 --- /dev/null +++ b/arconia-spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json @@ -0,0 +1,42 @@ +{ + "properties": [ + { + "name": "arconia.multitenancy.management.mdc.key", + "defaultValue": "tenantId" + }, + { + "name": "arconia.multitenancy.management.observations.cardinality", + "defaultValue": "high" + }, + { + "name": "arconia.multitenancy.management.observations.key", + "defaultValue": "tenant.id" + }, + { + "name": "arconia.multitenancy.resolution.fixed.tenant-id", + "defaultValue": "default" + }, + { + "name": "arconia.multitenancy.resolution.http.cookie.cookie-name", + "defaultValue": "TENANT-ID" + }, + { + "name": "arconia.multitenancy.resolution.http.filter.ignore-paths", + "defaultValue": [ + "\/actuator\/**", + "\/webjars\/**", + "\/css\/**", + "\/js\/**", + ".ico" + ] + }, + { + "name": "arconia.multitenancy.resolution.http.header.header-name", + "defaultValue": "X-TenantId" + }, + { + "name": "arconia.multitenancy.resolution.http.resolutionMode", + "defaultValue": "header" + } + ] +}