[ Dispatcher] Refacto : migration des maps de configuration vers un objet de configuration client by bou3108 · Pull Request #603 · ansforge/SAMU-Hub-Sante

bou3108 · 2026-06-12T12:26:59Z

🔎 Détails

suppression du csv loader dans HubConfiguration
suppression des maps de conf éclatées
migration vers les ClientProperties de la ClientPropertiesRegistry
pour limiter la refacto, la ClientPropertiesRegistry est migrée dans HubConfiguration (hubConfig.getClientVersionsForPerimeter devient hubConfig.getClientPropertiesRegistry().getClientVersionsForPerimeter, même signature).

Ce ne peut être qu'un état transitoire (on préfèrerait gérer la ClientPropertiesRegistry comme un Bean accessible en direct) mais cela évite de trop modifier la classe ConversionUtils

🔗Ticket associé

2. [ Dispatcher ] appeler directement la map de config client plutôt que les maps intermédiaires

…clients.yaml

github-actions · 2026-06-12T12:30:02Z

File	Coverage [90.57%]	🍏
ConversionUtils.java	98.77%	🍏
HubConfiguration.java	94.89%	🍏
ClientPropertiesRegistry.java	92.31%	🍏
MessageHandler.java	91.48%	🍏
MessageUtils.java	81.22%	🍏

Total Project Coverage	88.98%	🍏

github-actions · 2026-06-12T12:41:06Z

File	Coverage [90.23%]	🍏
ConversionUtils.java	98.77%	🍏
HubConfiguration.java	95.17%	🍏
ClientPropertiesRegistry.java	92.31%	🍏
MessageHandler.java	91.48%	🍏
MessageUtils.java	81.22%	🍏

Total Project Coverage	88.69%	🍏

github-actions · 2026-06-12T12:53:41Z

File	Coverage [90.23%]	🍏
ConversionUtils.java	98.77%	🍏
HubConfiguration.java	95.17%	🍏
ClientPropertiesRegistry.java	92.31%	🍏
MessageHandler.java	91.48%	🍏
MessageUtils.java	81.22%	🍏

Total Project Coverage	88.69%	🍏

Clemsazert · 2026-06-30T13:39:15Z

            Message errorAmqpMessage;
-            if (convertToXML(sender, hubConfig.getUseXmlPreferences().get(sender))) {
+            Boolean useXML =
+                    hubConfig.getClientPropertiesRegistry().get(sender) != null


On peut ajouter un helper comme getClientVersionsForPerimeter pour éviter d'avoir à gérer le cas où le client est inconnu.

Clemsazert · 2026-06-30T13:39:31Z

        try {
-            if (convertToXML(recipientId, hubConfig.getUseXmlPreferences().get(recipientId))) {
+            Boolean useXML =
+                    hubConfig.getClientPropertiesRegistry().get(recipientId) != null


Idem, helper à réutiliser.

Clemsazert · 2026-06-30T13:40:04Z

+        String recipientId = getRecipientID(edxlMessage);
+        String useCase = EdxlUtils.getUseCaseFromMessage(edxlMessage.getFirstContentMessage());
+        ClientProperties clientProperties =
+                hubConfig.getClientPropertiesRegistry().get(recipientId);


Idem, on peut créer un helper pour inhibitedUseCases.

Clemsazert · 2026-06-30T13:41:30Z

-                        .getOrDefault(healthActor, DEFAULT_DIRECT_CISU_PREFERENCE);
-        return directCisuPreference != null && directCisuPreference;
+
+        ClientProperties healthActorProperties =


On peut ici aussi créer un helper.

Clemsazert · 2026-06-30T13:43:26Z

@@ -155,13 +155,10 @@ public static void checkMessageClassNameSupported(
    public static void checkMessageNotInhibited(


Est ce qu'on peut refacto cette méthode pour ne pas avoir à lui passer la liste de usecase ? Comme ça évite de la potentielle desynchronisation entre le recipient ID passé en entrée et la liste associé (qui est get grace au recipientId lui aussi).

Clemsazert · 2026-06-30T13:46:24Z

    private String getEditorFromSender(String sender) {
-        return hubConfig.getClientsEditorMap().getOrDefault(sender, UNKNOWN);
+        ClientProperties clientProperties = hubConfig.getClientPropertiesRegistry().get(sender);
+        return clientProperties != null ? clientProperties.editor() : UNKNOWN;


editor est optionnel dans le schéma de la configuration client. Ici on pourrait renvoyer null (ce qui causerait un crash de la publication des métriques notamment).

github-actions · 2026-07-01T14:11:23Z

File	Coverage [90.22%]	🍏
ConversionUtils.java	98.77%	🍏
HubConfiguration.java	95.17%	🍏
ClientPropertiesRegistry.java	93.2%	🍏
MessageHandler.java	91.37%	🍏
MessageUtils.java	80.23%	🍏

Total Project Coverage	88.68%	🍏

Clemsazert · 2026-07-01T15:56:43Z

 clients:
-  - client_id: fr.health.test.samu-v1
-    common_name: fr.health.test.samu-v1.fr
+  - client_id: fr.health.samuA


On ne peut pas rester sur samu-v1 dans les tests comme actuellement ? C'est plus descriptif et à la cible avec un seul périmètre par client.

Clemsazert · 2026-07-01T16:01:56Z

+        return perimeter.versions().toArray(String[]::new);
+    }
+
+    public Boolean getClientAcceptedMediaType(String clientId) {


C'est un peu étrange qu'on renvoie un booléen ici. Avec ce naming je m'attendrais à un enum avec JSON ou XML. On peut garder quelque chose comme en l'état getClientUseXML sinon ?

github-actions · 2026-07-02T09:42:08Z

File	Coverage [90.22%]	🍏
ConversionUtils.java	98.77%	🍏
HubConfiguration.java	95.17%	🍏
ClientPropertiesRegistry.java	93.2%	🍏
MessageHandler.java	91.37%	🍏
MessageUtils.java	80.23%	🍏

Total Project Coverage	88.68%	🍏

github-actions · 2026-07-02T13:38:02Z

File	Coverage [90.34%]	🍏
ConversionUtils.java	98.72%	🍏
HubConfiguration.java	95.17%	🍏
Constants.java	95.16%	🍏
ClientPropertiesRegistry.java	93.41%	🍏
MessageHandler.java	91.37%	🍏
MessageUtils.java	80.23%	🍏

Total Project Coverage	88.68%	🍏

feat (dispatcher/tests): migrate data from client.preferences.csv to …

32e17db

…clients.yaml

bou3108 added 2 commits June 12, 2026 14:50

feat (dispatcher): migrate hub config maps to ClientProperties map

1efc31b

feat (dispatcher): clean up old config file references

869e947

bou3108 force-pushed the feat/dispatcher/migrate-to-client-config-map branch from b2b0a3d to 869e947 Compare June 12, 2026 12:51

bou3108 changed the title ~~Feat/dispatcher/migrate to client config map~~ [ Dispatcher] Refacto : migration des maps de configuration vers un objet de configuration client Jun 12, 2026

bou3108 marked this pull request as ready for review June 12, 2026 13:58

Clemsazert reviewed Jun 30, 2026

View reviewed changes

bou3108 added 2 commits July 1, 2026 14:13

feat (dispatcher): add registry helpers

597082b

feat (dispatcher): renew test certificates

343efca

Clemsazert reviewed Jul 1, 2026

View reviewed changes

feat (dispatcher): rename method

1d44b98

feat (dispatcher): add directCisu helper

9744c6b

Clemsazert approved these changes Jul 2, 2026

View reviewed changes

bou3108 merged commit 97bf0f7 into feat/dispatcher/clients-conf-refacto Jul 2, 2026
2 checks passed

bou3108 deleted the feat/dispatcher/migrate-to-client-config-map branch July 2, 2026 14:46

		@@ -155,13 +155,10 @@ public static void checkMessageClassNameSupported(
		public static void checkMessageNotInhibited(

Uh oh!

Conversation

bou3108 commented Jun 12, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

🔎 Détails

🔗Ticket associé

Uh oh!

github-actions Bot commented Jun 12, 2026

Uh oh!

github-actions Bot commented Jun 12, 2026

Uh oh!

github-actions Bot commented Jun 12, 2026

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

github-actions Bot commented Jul 1, 2026

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

github-actions Bot commented Jul 2, 2026

Uh oh!

github-actions Bot commented Jul 2, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

bou3108 commented Jun 12, 2026 •

edited

Loading