Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add a boolean property to 4 components to know if it is a multi tenancy instance. #81

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Add a boolean property to 4 components to know if it is a multi tenancy instance. #81

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
03fb18e
Add a boolean property to 4 components to know if it is a multi tenan…
Aug 8, 2024
9779e40
Update console-framework-client-api/src/main/java/io/axoniq/console/f…
Aug 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions ...ramework-client-api/src/main/java/io/axoniq/console/framework/api/clientIdentification.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@ data class CommandBusInformation(
val handlerInterceptors: List<InterceptorInformation> = emptyList(),
val dispatchInterceptors: List<InterceptorInformation> = emptyList(),
val messageSerializer: SerializerInformation?,
val multiTenant: Boolean? = false,
)

data class QueryBusInformation(
Expand All @@ -127,6 +128,7 @@ data class QueryBusInformation(
val dispatchInterceptors: List<InterceptorInformation> = emptyList(),
val messageSerializer: SerializerInformation?,
val serializer: SerializerInformation?,
val multiTenant: Boolean = false,
)

data class EventStoreInformation(
Expand All @@ -137,6 +139,7 @@ data class EventStoreInformation(
val eventSerializer: SerializerInformation?,
val snapshotSerializer: SerializerInformation?,
val approximateSize: Long? = null,
val multiTenant: Boolean = false,
)


Expand All @@ -149,6 +152,7 @@ data class EventProcessorInformation(
val streamingInformation: StreamingEventProcessorInformation? = null,
val trackingInformation: TrackingEventProcessorInformation? = null,
val pooledStreamingInformation: PooledStreamingEventProcessorInformation? = null,
val multiTenant: Boolean = false,

@Deprecated("Deprecated since version 1.6.0 due to new processor structure")
val messageSourceType: String? = null,
Expand Down
17 changes: 14 additions & 3 deletions ...-framework-client/src/main/java/io/axoniq/console/framework/client/SetupPayloadCreator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,8 @@ class SetupPayloadCreator(
commonProcessorInformation = commonProcessorInformation(processor),
subscribingProcessorInformation = SubscribingProcessorInformation(
processingStrategy = processor.getPropertyType("processingStrategy")
)
),
multiTenant = processor.javaClass.name == MULTI_TENANT_PROCESSOR_CLASS
)
}

Expand Down Expand Up @@ -257,6 +258,7 @@ class SetupPayloadCreator(
dispatchInterceptors = dispatchInterceptors,
messageSerializer = messageSerializer,
serializer = serializer,
multiTenant = bus.javaClass.name == MULTI_TENANT_QUERY_BUS_CLASS,
)
}

Expand All @@ -275,7 +277,8 @@ class SetupPayloadCreator(
dispatchInterceptors = dispatchInterceptors,
eventSerializer = bus.getPropertyValue<Any>("storageEngine")?.getSerializerType("eventSerializer"),
snapshotSerializer = bus.getPropertyValue<Any>("storageEngine")?.getSerializerType("snapshotSerializer"),
approximateSize = getApproximateSize(bus)
approximateSize = getApproximateSize(bus),
multiTenant = bus.javaClass.name == MULTI_TENANT_EVENT_STORE_CLASS,
)
}

Expand Down Expand Up @@ -322,7 +325,8 @@ class SetupPayloadCreator(
context = context,
handlerInterceptors = handlerInterceptors,
dispatchInterceptors = dispatchInterceptors,
messageSerializer = serializer
messageSerializer = serializer,
multiTenant = bus.javaClass.name == MULTI_TENANT_COMMAND_BUS_CLASS,
)
}

Expand Down Expand Up @@ -380,6 +384,13 @@ class SetupPayloadCreator(
}
return SerializerInformation(serializer::class.java.name, false)
}

companion object {
private const val MULTI_TENANT_COMMAND_BUS_CLASS = "org.axonframework.extensions.multitenancy.components.commandhandeling.MultiTenantCommandBus"
private const val MULTI_TENANT_QUERY_BUS_CLASS = "org.axonframework.extensions.multitenancy.components.queryhandeling.MultiTenantQueryBus"
private const val MULTI_TENANT_EVENT_STORE_CLASS = "org.axonframework.extensions.multitenancy.components.eventstore.MultiTenantEventStore"
private const val MULTI_TENANT_PROCESSOR_CLASS = "org.axonframework.extensions.multitenancy.components.eventhandeling.MultiTenantEventProcessor"
}
}


2 changes: 1 addition & 1 deletion ...client/src/main/java/io/axoniq/console/framework/eventprocessor/ProcessorReportCreator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ class ProcessorReportCreator(
private val metricsRegistry: ProcessorMetricsRegistry,
) {
companion object {
const val MULTI_TENANT_PROCESSOR_CLASS = "org.axonframework.extensions.multitenancy.components.eventhandeling.MultiTenantEventProcessor"
private const val MULTI_TENANT_PROCESSOR_CLASS = "org.axonframework.extensions.multitenancy.components.eventhandeling.MultiTenantEventProcessor"
}

fun createReport() = ProcessorStatusReport(
Expand Down
Loading