From 884f75b6e9ea9a6164e96da0dd0c276576a2b199 Mon Sep 17 00:00:00 2001 From: Jaret Hendrickson Date: Tue, 3 Feb 2026 10:17:16 -0600 Subject: [PATCH 1/3] client code --- .../io.fusionauth.domain.SystemConfiguration.json | 6 ++++++ .../io.fusionauth.domain.SystemConfiguration.json | 10 +++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/src/main/domain/io.fusionauth.domain.SystemConfiguration.json b/src/main/domain/io.fusionauth.domain.SystemConfiguration.json index 0f32c1d6e..3cc346d0e 100644 --- a/src/main/domain/io.fusionauth.domain.SystemConfiguration.json +++ b/src/main/domain/io.fusionauth.domain.SystemConfiguration.json @@ -14,6 +14,9 @@ "auditLogConfiguration" : { "type" : "AuditLogConfiguration" }, + "brandName" : { + "type" : "String" + }, "corsConfiguration" : { "type" : "CORSConfiguration" }, @@ -40,6 +43,9 @@ "reportTimezone" : { "type" : "ZoneId" }, + "tenantManagerAttributeFormId" : { + "type" : "UUID" + }, "trustedProxyConfiguration" : { "type" : "SystemTrustedProxyConfiguration" }, diff --git a/src/main/domainNG/io.fusionauth.domain.SystemConfiguration.json b/src/main/domainNG/io.fusionauth.domain.SystemConfiguration.json index 0b2451b8e..6ce562003 100644 --- a/src/main/domainNG/io.fusionauth.domain.SystemConfiguration.json +++ b/src/main/domainNG/io.fusionauth.domain.SystemConfiguration.json @@ -9,6 +9,10 @@ "className" : "io.fusionauth.domain.SystemConfiguration$AuditLogConfiguration", "type" : "SystemConfiguration$AuditLogConfiguration" }, + "brandName" : { + "className" : "java.lang.String", + "type" : "String" + }, "cookieEncryptionKey" : { "className" : "java.lang.String", "type" : "String" @@ -48,6 +52,10 @@ "className" : "java.time.ZoneId", "type" : "ZoneId" }, + "tenantManagerAttributeFormId" : { + "className" : "java.util.UUID", + "type" : "UUID" + }, "trustedProxyConfiguration" : { "className" : "io.fusionauth.domain.SystemTrustedProxyConfiguration", "type" : "SystemTrustedProxyConfiguration" @@ -65,7 +73,7 @@ "type" : "WebhookEventLogConfiguration" } }, - "imports" : [ "io.fusionauth.domain.Buildable", "com.inversoft.mybatis.JSONColumnable", "io.fusionauth.domain.SystemConfiguration$AuditLogConfiguration", "java.lang.String", "io.fusionauth.domain.CORSConfiguration", "java.util.Map", "io.fusionauth.domain.SystemConfiguration$EventLogConfiguration", "java.time.ZonedDateTime", "io.fusionauth.domain.SystemConfiguration$LoginRecordConfiguration", "java.time.ZoneId", "io.fusionauth.domain.SystemTrustedProxyConfiguration", "io.fusionauth.domain.SystemConfiguration$UIConfiguration", "io.fusionauth.domain.UsageDataConfiguration", "io.fusionauth.domain.WebhookEventLogConfiguration" ], + "imports" : [ "io.fusionauth.domain.Buildable", "com.inversoft.mybatis.JSONColumnable", "io.fusionauth.domain.SystemConfiguration$AuditLogConfiguration", "java.lang.String", "io.fusionauth.domain.CORSConfiguration", "java.util.Map", "io.fusionauth.domain.SystemConfiguration$EventLogConfiguration", "java.time.ZonedDateTime", "io.fusionauth.domain.SystemConfiguration$LoginRecordConfiguration", "java.time.ZoneId", "java.util.UUID", "io.fusionauth.domain.SystemTrustedProxyConfiguration", "io.fusionauth.domain.SystemConfiguration$UIConfiguration", "io.fusionauth.domain.UsageDataConfiguration", "io.fusionauth.domain.WebhookEventLogConfiguration" ], "interfaces" : [ { "className" : "io.fusionauth.domain.Buildable", "type" : "Buildable", From 05d328e18e06b8e2b6679f2a0c4a3832627f05eb Mon Sep 17 00:00:00 2001 From: Jaret Hendrickson Date: Wed, 4 Feb 2026 13:27:33 -0600 Subject: [PATCH 2/3] PR Feedback; move TM Config into inner class --- .../io.fusionauth.domain.SystemConfiguration.json | 7 ++----- .../io.fusionauth.domain.SystemConfiguration.json | 12 ++++-------- 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/src/main/domain/io.fusionauth.domain.SystemConfiguration.json b/src/main/domain/io.fusionauth.domain.SystemConfiguration.json index 3cc346d0e..54d439a46 100644 --- a/src/main/domain/io.fusionauth.domain.SystemConfiguration.json +++ b/src/main/domain/io.fusionauth.domain.SystemConfiguration.json @@ -14,9 +14,6 @@ "auditLogConfiguration" : { "type" : "AuditLogConfiguration" }, - "brandName" : { - "type" : "String" - }, "corsConfiguration" : { "type" : "CORSConfiguration" }, @@ -43,8 +40,8 @@ "reportTimezone" : { "type" : "ZoneId" }, - "tenantManagerAttributeFormId" : { - "type" : "UUID" + "tenantManagerConfiguration" : { + "type" : "TenantManagerConfiguration" }, "trustedProxyConfiguration" : { "type" : "SystemTrustedProxyConfiguration" diff --git a/src/main/domainNG/io.fusionauth.domain.SystemConfiguration.json b/src/main/domainNG/io.fusionauth.domain.SystemConfiguration.json index 6ce562003..0b6b600ac 100644 --- a/src/main/domainNG/io.fusionauth.domain.SystemConfiguration.json +++ b/src/main/domainNG/io.fusionauth.domain.SystemConfiguration.json @@ -9,10 +9,6 @@ "className" : "io.fusionauth.domain.SystemConfiguration$AuditLogConfiguration", "type" : "SystemConfiguration$AuditLogConfiguration" }, - "brandName" : { - "className" : "java.lang.String", - "type" : "String" - }, "cookieEncryptionKey" : { "className" : "java.lang.String", "type" : "String" @@ -52,9 +48,9 @@ "className" : "java.time.ZoneId", "type" : "ZoneId" }, - "tenantManagerAttributeFormId" : { - "className" : "java.util.UUID", - "type" : "UUID" + "tenantManagerConfiguration" : { + "className" : "io.fusionauth.domain.SystemConfiguration$TenantManagerConfiguration", + "type" : "SystemConfiguration$TenantManagerConfiguration" }, "trustedProxyConfiguration" : { "className" : "io.fusionauth.domain.SystemTrustedProxyConfiguration", @@ -73,7 +69,7 @@ "type" : "WebhookEventLogConfiguration" } }, - "imports" : [ "io.fusionauth.domain.Buildable", "com.inversoft.mybatis.JSONColumnable", "io.fusionauth.domain.SystemConfiguration$AuditLogConfiguration", "java.lang.String", "io.fusionauth.domain.CORSConfiguration", "java.util.Map", "io.fusionauth.domain.SystemConfiguration$EventLogConfiguration", "java.time.ZonedDateTime", "io.fusionauth.domain.SystemConfiguration$LoginRecordConfiguration", "java.time.ZoneId", "java.util.UUID", "io.fusionauth.domain.SystemTrustedProxyConfiguration", "io.fusionauth.domain.SystemConfiguration$UIConfiguration", "io.fusionauth.domain.UsageDataConfiguration", "io.fusionauth.domain.WebhookEventLogConfiguration" ], + "imports" : [ "io.fusionauth.domain.Buildable", "com.inversoft.mybatis.JSONColumnable", "io.fusionauth.domain.SystemConfiguration$AuditLogConfiguration", "java.lang.String", "io.fusionauth.domain.CORSConfiguration", "java.util.Map", "io.fusionauth.domain.SystemConfiguration$EventLogConfiguration", "java.time.ZonedDateTime", "io.fusionauth.domain.SystemConfiguration$LoginRecordConfiguration", "java.time.ZoneId", "io.fusionauth.domain.SystemConfiguration$TenantManagerConfiguration", "io.fusionauth.domain.SystemTrustedProxyConfiguration", "io.fusionauth.domain.SystemConfiguration$UIConfiguration", "io.fusionauth.domain.UsageDataConfiguration", "io.fusionauth.domain.WebhookEventLogConfiguration" ], "interfaces" : [ { "className" : "io.fusionauth.domain.Buildable", "type" : "Buildable", From 963c5d64c495daf5d701464ccc4cd59e106e2601 Mon Sep 17 00:00:00 2001 From: Jaret Hendrickson Date: Wed, 4 Feb 2026 14:25:08 -0600 Subject: [PATCH 3/3] PR Feedback; move TM Config into inner class --- ...figuration$TenantManagerConfiguration.json | 18 ++++++++++++ ...figuration$TenantManagerConfiguration.json | 29 +++++++++++++++++++ 2 files changed, 47 insertions(+) create mode 100644 src/main/domain/io.fusionauth.domain.SystemConfiguration$TenantManagerConfiguration.json create mode 100644 src/main/domainNG/io.fusionauth.domain.SystemConfiguration$TenantManagerConfiguration.json diff --git a/src/main/domain/io.fusionauth.domain.SystemConfiguration$TenantManagerConfiguration.json b/src/main/domain/io.fusionauth.domain.SystemConfiguration$TenantManagerConfiguration.json new file mode 100644 index 000000000..84581f84d --- /dev/null +++ b/src/main/domain/io.fusionauth.domain.SystemConfiguration$TenantManagerConfiguration.json @@ -0,0 +1,18 @@ +{ + "packageName" : "io.fusionauth.domain", + "type" : "TenantManagerConfiguration", + "implements" : [ { + "type" : "Buildable", + "typeArguments" : [ { + "type" : "TenantManagerConfiguration" + } ] + } ], + "fields" : { + "attributeFormId" : { + "type" : "UUID" + }, + "brandName" : { + "type" : "String" + } + } +} \ No newline at end of file diff --git a/src/main/domainNG/io.fusionauth.domain.SystemConfiguration$TenantManagerConfiguration.json b/src/main/domainNG/io.fusionauth.domain.SystemConfiguration$TenantManagerConfiguration.json new file mode 100644 index 000000000..67414f418 --- /dev/null +++ b/src/main/domainNG/io.fusionauth.domain.SystemConfiguration$TenantManagerConfiguration.json @@ -0,0 +1,29 @@ +{ + "className" : "io.fusionauth.domain.SystemConfiguration$TenantManagerConfiguration", + "extends" : { + "className" : "java.lang.Object", + "type" : "Object" + }, + "fields" : { + "attributeFormId" : { + "className" : "java.util.UUID", + "type" : "UUID" + }, + "brandName" : { + "className" : "java.lang.String", + "type" : "String" + } + }, + "imports" : [ "io.fusionauth.domain.Buildable", "java.util.UUID", "java.lang.String" ], + "interfaces" : [ { + "className" : "io.fusionauth.domain.Buildable", + "type" : "Buildable", + "typeArguments" : [ { + "className" : "io.fusionauth.domain.SystemConfiguration$TenantManagerConfiguration", + "type" : "SystemConfiguration$TenantManagerConfiguration" + } ] + } ], + "objectType" : "Object", + "packageName" : "io.fusionauth.domain", + "type" : "SystemConfiguration$TenantManagerConfiguration" +} \ No newline at end of file