Remove rabbitMQ and send event through direct request to console by f-necas · Pull Request #264 · georchestra/georchestra-gateway

f-necas · 2026-04-01T14:18:58Z

Require georchestra/georchestra#4644

Needs to be updated: datadir, docker and georchestra migration notes

pmauduit · 2026-04-02T10:24:05Z

Needs to be updated: datadir, docker and georchestra migration notes

reading the PR, it seems that it has been done ?

Disable OAuth2 authentication and comment out related configurations.

f-necas · 2026-04-02T12:26:05Z

Needs to be updated: datadir, docker and georchestra migration notes

reading the PR, it seems that it has been done ?

It was a reminder but I just created them

Copilot

Pull request overview

This PR removes the Gateway’s RabbitMQ-based account creation event mechanism and replaces it with direct HTTP POST dispatch to Console, along with associated test and documentation updates.

Changes:

Drop RabbitMQ configuration, resources, and tests from the Gateway module.
Add HTTP-based AccountCreated event sender + new configuration properties and tests.
Update user/admin documentation and architecture diagrams to remove RabbitMQ references.

Reviewed changes

Copilot reviewed 30 out of 32 changed files in this pull request and generated 7 comments.

Show a summary per file

File	Description
gateway/src/test/resources/test-datadir/default.properties	Removes RabbitMQ test properties from test datadir.
gateway/src/test/resources/application-rabbitmq.yml	Removes the RabbitMQ test profile config.
gateway/src/test/java/org/georchestra/gateway/rabbitmq/SendMessageRabbitmqIT.java	Deletes RabbitMQ integration test.
gateway/src/test/java/org/georchestra/gateway/autoconfigure/accounts/RabbitmqEventsAutoConfigurationTest.java	Deletes RabbitMQ autoconfiguration test.
gateway/src/test/java/org/georchestra/gateway/accounts/events/AccountCreatedEventSenderTest.java	Adds WireMock-based tests for the new HTTP event sender.
gateway/src/test/java/org/georchestra/gateway/accounts/events/AccountCreatedEventsConfigurationPropertiesTest.java	Adds binding tests for the new `accountcreated.url` property.
gateway/src/main/resources/rabbit-sender-context.xml	Removes RabbitMQ sender XML context.
gateway/src/main/resources/rabbit-listener-context.xml	Removes RabbitMQ listener XML context.
gateway/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports	Replaces RabbitMQ auto-config with the new Events auto-config.
gateway/src/main/resources/META-INF/spring.factories	Removes RabbitMQ auto-config from legacy Spring factories list.
gateway/src/main/resources/application.yml	Removes RabbitMQ configuration block and exclusion.
gateway/src/main/java/org/georchestra/gateway/autoconfigure/events/EventsAutoConfiguration.java	Introduces new auto-configuration for HTTP event dispatch.
gateway/src/main/java/org/georchestra/gateway/accounts/events/rabbitmq/RabbitmqEventsListener.java	Deletes RabbitMQ listener implementation.
gateway/src/main/java/org/georchestra/gateway/accounts/events/rabbitmq/RabbitmqEventsConfigurationProperties.java	Deletes RabbitMQ configuration properties class.
gateway/src/main/java/org/georchestra/gateway/accounts/events/rabbitmq/RabbitmqEventsConfiguration.java	Deletes RabbitMQ configuration class.
gateway/src/main/java/org/georchestra/gateway/accounts/events/AccountCreatedEventSender.java	Replaces RabbitMQ sender with HTTP POST sender.
gateway/src/main/java/org/georchestra/gateway/accounts/events/AccountCreatedEventsConfigurationProperties.java	Adds new config properties for the HTTP endpoint.
gateway/pom.xml	Removes some RabbitMQ-related deps (but see review comments re AMQP starter).
docs/user_guide/migration.md	Removes RabbitMQ as a highlighted Gateway capability.
docs/user_guide/installation.md	Updates installation docs to no longer mention RabbitMQ.
docs/user_guide/authentication.md	Documents the new `events.accountcreated.url` configuration.
docs/developer_guide/project_structure.md	Removes RabbitMQ mention from module structure docs.
docs/assets/images/structurizr/structurizr-SystemContext.svg	Updates system context diagram output (removing broker).
docs/assets/images/structurizr/structurizr-Containers.svg	Updates container diagram output (removing broker).
docs/arc42/risks.md	Removes RabbitMQ dependency mention.
docs/arc42/introduction.md	Removes RabbitMQ event handling mention.
docs/arc42/deployment_view.md	Removes RabbitMQ from deployment view (but diagram needs follow-up per review).
docs/arc42/crosscutting.md	Removes RabbitMQ crosscutting description.
docs/arc42/context_view.md	Removes RabbitMQ from context view.
docs/arc42/container_view.md	Removes RabbitMQ from container view.
docs/arc42/architecture_goals.md	Removes RabbitMQ from architecture goals.
datadir/gateway/security.yaml	Replaces RabbitMQ settings with commented example for HTTP dispatch URL.

Comments suppressed due to low confidence (2)

gateway/src/main/java/org/georchestra/gateway/accounts/events/AccountCreatedEventSender.java:135

The HTTP response is treated as success only when the status code is exactly 200. This will incorrectly log errors for legitimate success responses like 201/202/204. Consider treating any 2xx response as success (and optionally include the status code in the success log).
gateway/src/main/java/org/georchestra/gateway/accounts/events/AccountCreatedEventSender.java:42
The class Javadoc still contains leftover RabbitMQ wording (e.g. “queue”) and has a couple of grammar issues (“post user to url”, extra space before the period). Updating it to describe the HTTP dispatch behavior will avoid confusion for future maintainers.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Copilot · 2026-04-02T20:22:58Z

gateway/pom.xml

@@ -97,10 +97,6 @@
      <groupId>org.springframework.boot</groupId>
      <artifactId>spring-boot-starter-amqp</artifactId>
    </dependency>


The module still depends on spring-boot-starter-amqp, which transitively pulls in Spring AMQP/Spring Rabbit. If the goal is to remove RabbitMQ support from the Gateway, this dependency should be removed (or replaced with a pure HTTP client dependency) to avoid shipping unused RabbitMQ classes and auto-configuration.

Copilot · 2026-04-02T20:22:58Z

gateway/src/main/resources/application.yml

@@ -30,7 +30,6 @@ spring:
  autoconfigure:
    exclude:
    - org.springframework.boot.autoconfigure.ldap.LdapAutoConfiguration


RabbitAutoConfiguration is no longer excluded. If spring-boot-starter-amqp remains on the classpath, Spring Boot will auto-configure RabbitMQ-related beans/health indicators even though the feature has been removed. Either re-add the exclusion or (preferably) remove the AMQP starter dependency altogether.

Suggested change

- org.springframework.boot.autoconfigure.ldap.LdapAutoConfiguration

- org.springframework.boot.autoconfigure.ldap.LdapAutoConfiguration

- org.springframework.boot.autoconfigure.amqp.RabbitAutoConfiguration

Copilot · 2026-04-02T20:22:59Z

...ava/org/georchestra/gateway/accounts/events/AccountCreatedEventsConfigurationProperties.java

+ * <pre>
+ * georchestra:
+ *   gateway:
+ *     security:
+ *       events:
+ *         accountcreated:
+ *           url: true
+ * </pre>
+ *
+ * @see org.springframework.boot.context.properties.ConfigurationProperties
+ */
+@Data
+@Generated
+@Validated
+@ConfigurationProperties(prefix = AccountCreatedEventsConfigurationProperties.PREFIX)
+public class AccountCreatedEventsConfigurationProperties {
+
+    /** The prefix for accountcretad configuration properties. */
+    public static final String PREFIX = "georchestra.gateway.security.events.accountcreated";


The Javadoc example configuration shows url: true, but url is a String endpoint (e.g. http://...). Also there’s a typo in the comment (“accountcretad”). Please fix the example and spelling so users can configure this correctly.

Copilot · 2026-04-02T20:22:59Z

...ava/org/georchestra/gateway/accounts/events/AccountCreatedEventsConfigurationProperties.java

+    /**
+     * The server endpoint, execute a POST on this url.
+     */
+    public String url;


url is declared as a public field. With Lombok @Data, this should be a private String url; to keep standard encapsulation and avoid exposing mutable state directly.

Suggested change

public String url;

private String url;

Copilot · 2026-04-02T20:22:59Z

...way/src/test/java/org/georchestra/gateway/accounts/events/AccountCreatedEventSenderTest.java

+
+        // Verify JSON structure
+        await().atMost(Duration.ofSeconds(5)).untilAsserted(() -> {
+            String requestBody = wireMockServer.getAllServeEvents().getFirst().getRequest().getBodyAsString();


Inside untilAsserted, the test calls wireMockServer.getAllServeEvents().getFirst() before waiting for any request to arrive. If the list is still empty, this throws (e.g. NoSuchElementException) and Awaitility won’t retry. Verify at least one request first (or wait until getAllServeEvents() is non-empty) before reading the first event body.

Suggested change

String requestBody = wireMockServer.getAllServeEvents().getFirst().getRequest().getBodyAsString();

var serveEvents = wireMockServer.getAllServeEvents();

assertThat(serveEvents).isNotEmpty();

String requestBody = serveEvents.getFirst().getRequest().getBodyAsString();

Copilot · 2026-04-02T20:23:00Z

...way/src/test/java/org/georchestra/gateway/accounts/events/AccountCreatedEventSenderTest.java

+        // Verify - wait a bit to ensure no request is made
+        try {
+            Thread.sleep(500);
+        } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
+        }
+
+        // Should not have sent any request
+        wireMockServer.verify(0, WireMock.postRequestedFor(WireMock.urlEqualTo("/events")));


Using Thread.sleep(500) makes the test slower and can still be flaky on slow CI. Prefer an Awaitility assertion that no requests were received over a short duration (or verify immediately if the send is strictly conditional on OAuth2Provider).

Suggested change

// Verify - wait a bit to ensure no request is made

try {

Thread.sleep(500);

} catch (InterruptedException e) {

Thread.currentThread().interrupt();

}

// Should not have sent any request

wireMockServer.verify(0, WireMock.postRequestedFor(WireMock.urlEqualTo("/events")));

// Should not have sent any request during a short observation window

await().during(Duration.ofMillis(500)).atMost(Duration.ofSeconds(1)).untilAsserted(

() -> wireMockServer.verify(0, WireMock.postRequestedFor(WireMock.urlEqualTo("/events"))));

Copilot · 2026-04-02T20:23:00Z

docs/arc42/deployment_view.md

                analytics[Analytics]:::container
            end

-            subgraph infra["Infrastructure"]
-                ldap[LDAP]:::container
-                postgres[PostgreSQL]:::container  %% Used by other services, not Gateway
-                rabbitmq[RabbitMQ]:::container
-            end
-
            subgraph vol["Volumes"]
                datadir[Data Directory]:::volume


By removing the Infrastructure subgraph here, the Mermaid diagram still references now-undefined nodes elsewhere (infra, ldap, postgres). The diagram will fail to render unless those nodes/links are updated (e.g., keep LDAP/PostgreSQL in infra but drop only RabbitMQ).

github-actions · 2026-04-09T07:37:43Z

💚 All backports created successfully

Status	Branch	Result
✅	3.0.x

Note: Successful backport PRs will be merged automatically after passing CI.

Questions ?

Please refer to the Backport tool documentation and see the Github Action logs for details

[3.0.x] Merge pull request #264 from georchestra/remove-rbmq

f-necas added 4 commits April 1, 2026 09:30

feat: remove rabbitmq

89dc69a

feat: add non-blocking event sending to console

79d7675

feat: update doc

9b74ea8

feat: add tests

05b7058

f-necas requested a review from pierrejego April 1, 2026 14:19

f-necas added 2 commits April 1, 2026 16:26

feat: update comments

dc4896f

feat: update doc

ce368b5

f-necas changed the title ~~Remove rabbitMq and send event through direct request to console~~ Remove rabbitMQ and send event through direct request to console Apr 1, 2026

f-necas mentioned this pull request Apr 2, 2026

Console - Send email from gateway georchestra/georchestra#4601

Closed

pierrejego approved these changes Apr 2, 2026

View reviewed changes

pierrejego mentioned this pull request Apr 2, 2026

Remove rabbitmq and add a endpoint for events georchestra/georchestra#4644

Merged

f-necas added 2 commits April 2, 2026 12:16

add new event configuration

8f23d10

feat: update comments

92f7f65

f-necas mentioned this pull request Apr 2, 2026

feat: drop rabbitMQ variables georchestra/datadir#491

Merged

f-necas added 2 commits April 2, 2026 12:36

Disable OAuth2 and update security configuration

e995d47

Disable OAuth2 authentication and comment out related configurations.

Update security.yaml

9af48f6

f-necas mentioned this pull request Apr 2, 2026

feat: drop rabbitmq georchestra/docker#381

Merged

f-necas requested a review from Copilot April 2, 2026 20:17

Copilot started reviewing on behalf of f-necas April 2, 2026 20:18 View session

Copilot AI reviewed Apr 2, 2026

View reviewed changes

feat: handle copilot review and remove occurences of rabbit and broker

19bcf1d

f-necas added the backport-to-3.0.x label Apr 9, 2026

f-necas merged commit 331c78c into main Apr 9, 2026
3 checks passed

github-actions bot mentioned this pull request Apr 9, 2026

[3.0.x] Merge pull request #264 from georchestra/remove-rbmq #267

Merged

github-actions bot added a commit that referenced this pull request Apr 9, 2026

Merge pull request #267 from georchestra/backport/3.0.x/pr-264

c106512

[3.0.x] Merge pull request #264 from georchestra/remove-rbmq

f-necas deleted the remove-rbmq branch April 9, 2026 07:40

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Remove rabbitMQ and send event through direct request to console#264

Remove rabbitMQ and send event through direct request to console#264
f-necas merged 11 commits intomainfrom
remove-rbmq

f-necas commented Apr 1, 2026 •

edited by pmauduit

Loading

Uh oh!

pmauduit commented Apr 2, 2026

Uh oh!

f-necas commented Apr 2, 2026

Uh oh!

Copilot AI left a comment

Uh oh!

Copilot AI Apr 2, 2026

Uh oh!

Copilot AI Apr 2, 2026

Uh oh!

Copilot AI Apr 2, 2026

Uh oh!

Copilot AI Apr 2, 2026

Uh oh!

Copilot AI Apr 2, 2026

Uh oh!

Copilot AI Apr 2, 2026

Uh oh!

Copilot AI Apr 2, 2026

Uh oh!

Uh oh!

github-actions bot commented Apr 9, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

	- org.springframework.boot.autoconfigure.ldap.LdapAutoConfiguration
	- org.springframework.boot.autoconfigure.ldap.LdapAutoConfiguration
	- org.springframework.boot.autoconfigure.amqp.RabbitAutoConfiguration

-            String requestBody = wireMockServer.getAllServeEvents().getFirst().getRequest().getBodyAsString();
+            var serveEvents = wireMockServer.getAllServeEvents();
+            assertThat(serveEvents).isNotEmpty();
+            String requestBody = serveEvents.getFirst().getRequest().getBodyAsString();

Conversation

f-necas commented Apr 1, 2026 • edited by pmauduit Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

pmauduit commented Apr 2, 2026

Uh oh!

f-necas commented Apr 2, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Copilot AI Apr 2, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Apr 2, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Apr 2, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Apr 2, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Apr 2, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Apr 2, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Apr 2, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

github-actions bot commented Apr 9, 2026

💚 All backports created successfully

Questions ?

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

f-necas commented Apr 1, 2026 •

edited by pmauduit

Loading