Allow existence of non-tenant processors #193

schananas · 2024-04-16T13:56:26Z

In certain cases, users may want to disable multi-tenancy for specific Event Processor which does not have any tenants, such as when users have event processor that is consuming events from external context.
Per default, each event processor is scaled, and duplicated for each tenant.

This PR allows to disable this behavior for a specific processing, you can define specific bean.

This PR also includes slight change that changes addTenant and removeTenant method visibility from protected to public in AxonServerTenantProvicder, as its benefitial for users to be able to access these methods directly.

Bumps `projectreactor.version` from 3.5.11 to 3.6.0. Updates `io.projectreactor:reactor-core` from 3.5.11 to 3.6.0 - [Release notes](https://github.com/reactor/reactor-core/releases) - [Commits](reactor/reactor-core@v3.5.11...v3.6.0) Updates `io.projectreactor:reactor-test` from 3.5.11 to 3.6.0 - [Release notes](https://github.com/reactor/reactor-core/releases) - [Commits](reactor/reactor-core@v3.5.11...v3.6.0) --- updated-dependencies: - dependency-name: io.projectreactor:reactor-core dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: io.projectreactor:reactor-test dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>

…actor.version-3.6.0 Bump projectreactor.version from 3.5.11 to 3.6.0

Bumps [org.testcontainers:testcontainers-bom](https://github.com/testcontainers/testcontainers-java) from 1.19.1 to 1.19.2. - [Release notes](https://github.com/testcontainers/testcontainers-java/releases) - [Changelog](https://github.com/testcontainers/testcontainers-java/blob/main/CHANGELOG.md) - [Commits](testcontainers/testcontainers-java@1.19.1...1.19.2) --- updated-dependencies: - dependency-name: org.testcontainers:testcontainers-bom dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>

…ontainers-testcontainers-bom-1.19.2 Bump org.testcontainers:testcontainers-bom from 1.19.1 to 1.19.2

Bumps `spring.version` from 5.3.30 to 5.3.31. Updates `org.springframework:spring-core` from 5.3.30 to 5.3.31 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](spring-projects/spring-framework@v5.3.30...v5.3.31) Updates `org.springframework:spring-test` from 5.3.30 to 5.3.31 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](spring-projects/spring-framework@v5.3.30...v5.3.31) --- updated-dependencies: - dependency-name: org.springframework:spring-core dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.springframework:spring-test dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>

…rsion-5.3.31 Bump spring.version from 5.3.30 to 5.3.31

Bumps [org.springframework:spring-jdbc](https://github.com/spring-projects/spring-framework) from 5.3.30 to 5.3.31. - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](spring-projects/spring-framework@v5.3.30...v5.3.31) --- updated-dependencies: - dependency-name: org.springframework:spring-jdbc dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>

…gframework-spring-jdbc-5.3.31 Bump org.springframework:spring-jdbc from 5.3.30 to 5.3.31

Bumps [org.testcontainers:testcontainers-bom](https://github.com/testcontainers/testcontainers-java) from 1.19.2 to 1.19.3. - [Release notes](https://github.com/testcontainers/testcontainers-java/releases) - [Changelog](https://github.com/testcontainers/testcontainers-java/blob/main/CHANGELOG.md) - [Commits](testcontainers/testcontainers-java@1.19.2...1.19.3) --- updated-dependencies: - dependency-name: org.testcontainers:testcontainers-bom dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>

…ontainers-testcontainers-bom-1.19.3 Bump org.testcontainers:testcontainers-bom from 1.19.2 to 1.19.3

Bumps [org.springframework.boot:spring-boot-starter-parent](https://github.com/spring-projects/spring-boot) from 3.1.5 to 3.2.0. - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](spring-projects/spring-boot@v3.1.5...v3.2.0) --- updated-dependencies: - dependency-name: org.springframework.boot:spring-boot-starter-parent dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>

…gframework.boot-spring-boot-starter-parent-3.2.0 Bump org.springframework.boot:spring-boot-starter-parent from 3.1.5 to 3.2.0

Bumps `spring.boot.version` from 2.7.17 to 2.7.18. Updates `org.springframework.boot:spring-boot-autoconfigure` from 2.7.17 to 2.7.18 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](spring-projects/spring-boot@v2.7.17...v2.7.18) Updates `org.springframework.boot:spring-boot-test` from 2.7.17 to 2.7.18 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](spring-projects/spring-boot@v2.7.17...v2.7.18) Updates `org.springframework.boot:spring-boot-starter` from 2.7.17 to 2.7.18 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](spring-projects/spring-boot@v2.7.17...v2.7.18) Updates `org.springframework.boot:spring-boot-starter-test` from 2.7.17 to 2.7.18 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](spring-projects/spring-boot@v2.7.17...v2.7.18) Updates `org.springframework.boot:spring-boot-test-autoconfigure` from 2.7.17 to 2.7.18 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](spring-projects/spring-boot@v2.7.17...v2.7.18) --- updated-dependencies: - dependency-name: org.springframework.boot:spring-boot-autoconfigure dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.springframework.boot:spring-boot-test dependency-type: direct:development update-type: version-update:semver-patch - dependency-name: org.springframework.boot:spring-boot-starter dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.springframework.boot:spring-boot-starter-test dependency-type: direct:development update-type: version-update:semver-patch - dependency-name: org.springframework.boot:spring-boot-test-autoconfigure dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>

…ot.version-2.7.18 Bump spring.boot.version from 2.7.17 to 2.7.18

Manually upgrade maven-javadoc version. Required as a result of the revert on the 4.9.x branch, which we by default merge back into main after a release. #release/4.9.2

Bumps [actions/setup-java](https://github.com/actions/setup-java) from 3.13.0 to 4.0.0. - [Release notes](https://github.com/actions/setup-java/releases) - [Commits](actions/setup-java@v3.13.0...v4.0.0) --- updated-dependencies: - dependency-name: actions/setup-java dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>

…actions/setup-java-4.0.0 Bump actions/setup-java from 3.13.0 to 4.0.0

Bumps `junit.jupiter.version` from 5.10.0 to 5.10.1. Updates `org.junit.jupiter:junit-jupiter` from 5.10.0 to 5.10.1 - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](junit-team/junit5@r5.10.0...r5.10.1) Updates `org.junit.jupiter:junit-jupiter-api` from 5.10.0 to 5.10.1 - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](junit-team/junit5@r5.10.0...r5.10.1) --- updated-dependencies: - dependency-name: org.junit.jupiter:junit-jupiter dependency-type: direct:development update-type: version-update:semver-patch - dependency-name: org.junit.jupiter:junit-jupiter-api dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>

Bumps [org.jacoco:jacoco-maven-plugin](https://github.com/jacoco/jacoco) from 0.8.10 to 0.8.11. - [Release notes](https://github.com/jacoco/jacoco/releases) - [Commits](jacoco/jacoco@v0.8.10...v0.8.11) --- updated-dependencies: - dependency-name: org.jacoco:jacoco-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>

Bumps [org.apache.maven.plugins:maven-javadoc-plugin](https://github.com/apache/maven-javadoc-plugin) from 3.6.2 to 3.6.3. - [Release notes](https://github.com/apache/maven-javadoc-plugin/releases) - [Commits](apache/maven-javadoc-plugin@maven-javadoc-plugin-3.6.2...maven-javadoc-plugin-3.6.3) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-javadoc-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>

…iter.version-5.10.1 Bump junit.jupiter.version from 5.10.0 to 5.10.1

…o-jacoco-maven-plugin-0.8.11 Bump org.jacoco:jacoco-maven-plugin from 0.8.10 to 0.8.11

…e.maven.plugins-maven-javadoc-plugin-3.6.3 Bump org.apache.maven.plugins:maven-javadoc-plugin from 3.6.2 to 3.6.3

Jump to 4.9.1-SNAPSHOT of AF to get the new connector. In doing so, we ensure that Spring's version of Netty and the Connector's are compatible with one another. #dependency-upgrade/transitive-axonserver-connector

Drop container version, as the container sets this itself #dependency-upgrade/transitive-axonserver-connector

Disable Console warning for tests #dependency-upgrade/transitive-axonserver-connector

Bumps `projectreactor.version` from 3.6.0 to 3.6.1. Updates `io.projectreactor:reactor-core` from 3.6.0 to 3.6.1 - [Release notes](https://github.com/reactor/reactor-core/releases) - [Commits](reactor/reactor-core@v3.6.0...v3.6.1) Updates `io.projectreactor:reactor-test` from 3.6.0 to 3.6.1 - [Release notes](https://github.com/reactor/reactor-core/releases) - [Commits](reactor/reactor-core@v3.6.0...v3.6.1) --- updated-dependencies: - dependency-name: io.projectreactor:reactor-core dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.projectreactor:reactor-test dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>

…actor.version-3.6.1 Bump projectreactor.version from 3.6.0 to 3.6.1

- Schedule PRs weekly on Sunday - Group dependencies - Adjust reviewers #enhancement/dependabot-configuration

abuijze

Some missing Javadoc and unused imports

...main/java/org/axonframework/extensions/multitenancy/autoconfig/AxonServerTenantProvider.java

.../axonframework/extensions/multitenancy/configuration/MultiTenantEventProcessorPredicate.java

...xonframework/extensions/multitenancy/configuration/MultiTenantEventProcessingModuleTest.java

smcvb

Nothing major concerning comments. Some renames, some small suggestion, but one question around the default context makes me curious. That's the only reason why I'm not approving yet.

Ow, and be sure to point this PR to the axon-multitenancy-4.9.x! By pointing it to main, this PR becomes a solution for 4.10.0 instead of 4.9.3.

README.md

...xonframework/extensions/multitenancy/autoconfig/MultiTenantEventProcessorControlService.java

.../axonframework/extensions/multitenancy/configuration/MultiTenantEventProcessorPredicate.java

...rg/axonframework/extensions/multitenancy/configuration/MultiTenantEventProcessingModule.java

...xonframework/extensions/multitenancy/configuration/MultiTenantEventProcessingModuleTest.java

Co-authored-by: Steven van Beelen <steven.vanbeelen@axoniq.io>

sonarcloud · 2024-04-26T11:07:17Z

Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
95.6% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarCloud

abuijze

There is one minor recommendation to avoid unnecessary use of an ArgumentCaptor in a test, but nothing that would block a merge imo.

abuijze · 2024-04-29T06:42:28Z

...ramework/extensions/multitenancy/autoconfig/MultiTenantEventProcessorControlServiceTest.java

@@ -97,7 +110,18 @@ private void mockConnectionManager() {
        when(connectionTenant2.adminChannel()).thenReturn(adminTenant2);
        ArgumentCaptor<String> contextCapture = ArgumentCaptor.forClass(String.class);
        when(axonServerConnectionManager.getConnection(contextCapture.capture()))
-                .thenAnswer(a -> contextCapture.getValue().equals("tenant-1") ? connectionTenant1 : connectionTenant2);
+                .thenAnswer(a -> {


Instead of using an ArgumentCaptor, you can just get the actual arguments from the a parameter instead. It makes it easier to read the test.

Add missing JavaDoc #193

Copy over documentation from README.md to *.adoc #193

dependabot bot and others added 30 commits November 14, 2023 22:53

Merge pull request #159 from AxonFramework/dependabot/maven/projectre…

1b7a218

…actor.version-3.6.0 Bump projectreactor.version from 3.5.11 to 3.6.0

Merge pull request #161 from AxonFramework/dependabot/maven/org.testc…

0e6d939

…ontainers-testcontainers-bom-1.19.2 Bump org.testcontainers:testcontainers-bom from 1.19.1 to 1.19.2

Merge pull request #162 from AxonFramework/dependabot/maven/spring.ve…

4680e26

…rsion-5.3.31 Bump spring.version from 5.3.30 to 5.3.31

Merge pull request #163 from AxonFramework/dependabot/maven/org.sprin…

3fbb3eb

…gframework-spring-jdbc-5.3.31 Bump org.springframework:spring-jdbc from 5.3.30 to 5.3.31

Merge pull request #164 from AxonFramework/dependabot/maven/org.testc…

5407f00

…ontainers-testcontainers-bom-1.19.3 Bump org.testcontainers:testcontainers-bom from 1.19.2 to 1.19.3

Merge pull request #165 from AxonFramework/dependabot/maven/org.sprin…

f458e97

…gframework.boot-spring-boot-starter-parent-3.2.0 Bump org.springframework.boot:spring-boot-starter-parent from 3.1.5 to 3.2.0

Merge pull request #166 from AxonFramework/dependabot/maven/spring.bo…

f879eb1

…ot.version-2.7.18 Bump spring.boot.version from 2.7.17 to 2.7.18

Merge branch 'axon-multitenancy-4.9.x'

b06c7a9

Manually upgrade maven-javadoc version

56f9b86

Manually upgrade maven-javadoc version. Required as a result of the revert on the 4.9.x branch, which we by default merge back into main after a release. #release/4.9.2

Merge pull request #167 from AxonFramework/dependabot/github_actions/…

2c5baaf

…actions/setup-java-4.0.0 Bump actions/setup-java from 3.13.0 to 4.0.0

Merge pull request #168 from AxonFramework/dependabot/maven/junit.jup…

a26879b

…iter.version-5.10.1 Bump junit.jupiter.version from 5.10.0 to 5.10.1

Merge pull request #169 from AxonFramework/dependabot/maven/org.jacoc…

a128b60

…o-jacoco-maven-plugin-0.8.11 Bump org.jacoco:jacoco-maven-plugin from 0.8.10 to 0.8.11

Merge pull request #170 from AxonFramework/dependabot/maven/org.apach…

195da83

…e.maven.plugins-maven-javadoc-plugin-3.6.3 Bump org.apache.maven.plugins:maven-javadoc-plugin from 3.6.2 to 3.6.3

Jump to 4.9.1-SNAPSHOT of AF to get the new connector

c313089

Jump to 4.9.1-SNAPSHOT of AF to get the new connector. In doing so, we ensure that Spring's version of Netty and the Connector's are compatible with one another. #dependency-upgrade/transitive-axonserver-connector

Drop container version, as the container sets this itself

f3f7796

Drop container version, as the container sets this itself #dependency-upgrade/transitive-axonserver-connector

Disable Console warning for tests

362c6c8

Disable Console warning for tests #dependency-upgrade/transitive-axonserver-connector

Merge pull request #171 from AxonFramework/dependabot/maven/projectre…

ece968c

…actor.version-3.6.1 Bump projectreactor.version from 3.6.0 to 3.6.1

Adjust the dependabot configuration

b1a33e3

- Schedule PRs weekly on Sunday - Group dependencies - Adjust reviewers #enhancement/dependabot-configuration

schananas added Priority 1: Must CVSS: Medium labels Apr 16, 2024

schananas requested review from CodeDrivenMitch and smcvb April 16, 2024 13:56

schananas self-assigned this Apr 16, 2024

schananas added 2 commits April 16, 2024 16:39

open remove tenant for free usage

a26001f

open add tenant for free usage

16ff52a

schananas requested a review from abuijze April 17, 2024 06:57

abuijze requested changes Apr 17, 2024

View reviewed changes

PR comments

7e5b5c3

schananas requested a review from abuijze April 17, 2024 13:44

smcvb added Status: In Progress Type: Enhancement and removed CVSS: Medium labels Apr 19, 2024

smcvb added this to the Release 4.9.3 milestone Apr 19, 2024

smcvb reviewed Apr 19, 2024

View reviewed changes

Update README.md

c322139

Co-authored-by: Steven van Beelen <steven.vanbeelen@axoniq.io>

schananas changed the base branch from main to axon-multitenancy-4.9.x April 26, 2024 10:33

schananas and others added 3 commits April 26, 2024 12:34

Update README.md

023a4f9

Co-authored-by: Steven van Beelen <steven.vanbeelen@axoniq.io>

Update README.md

87d2680

Co-authored-by: Steven van Beelen <steven.vanbeelen@axoniq.io>

PR comments

9aa13be

schananas requested a review from smcvb April 26, 2024 11:04

abuijze approved these changes Apr 29, 2024

View reviewed changes

schananas merged commit d7347ea into axon-multitenancy-4.9.x May 8, 2024
7 checks passed

schananas deleted the feature/event-processor-predicate branch May 8, 2024 08:51

smcvb added Status: Resolved and removed Status: In Progress labels Jul 18, 2024

smcvb added a commit that referenced this pull request Jul 18, 2024

Add missing JavaDoc

64a43d9

Add missing JavaDoc #193

smcvb added a commit that referenced this pull request Jul 18, 2024

Copy over documentation from README.md to *.adoc

3aa1b58

Copy over documentation from README.md to *.adoc #193

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Allow existence of non-tenant processors #193

Allow existence of non-tenant processors #193

schananas commented Apr 16, 2024 •

edited

Loading

abuijze left a comment

smcvb left a comment

sonarcloud bot commented Apr 26, 2024

abuijze left a comment

abuijze Apr 29, 2024

Allow existence of non-tenant processors #193

Allow existence of non-tenant processors #193

Conversation

schananas commented Apr 16, 2024 • edited Loading

abuijze left a comment

Choose a reason for hiding this comment

smcvb left a comment

Choose a reason for hiding this comment

sonarcloud bot commented Apr 26, 2024

Quality Gate passed

abuijze left a comment

Choose a reason for hiding this comment

abuijze Apr 29, 2024

Choose a reason for hiding this comment

schananas commented Apr 16, 2024 •

edited

Loading