(james-project) branch master updated: Prevent FluentDataProbe#addDomain from throwing an exception in the event of an existing domain (#2664)

[rcordier]

This is an automated email from the ASF dual-hosted git repository.

rcordier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git


The following commit(s) were added to refs/heads/master by this push:
     new 247ca9f22a Prevent FluentDataProbe#addDomain from throwing an 
exception in the event of an existing domain (#2664)
247ca9f22a is described below

commit 247ca9f22ac181ee8b50fc05e47af4b197a97e6e
Author: Houssem Nasri <houssemnasri2...@gmail.com>
AuthorDate: Wed Mar 5 10:57:59 2025 +0100

    Prevent FluentDataProbe#addDomain from throwing an exception in the event 
of an existing domain (#2664)
---
 .../data-api/src/main/java/org/apache/james/probe/DataProbe.java | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git 
a/server/data/data-api/src/main/java/org/apache/james/probe/DataProbe.java 
b/server/data/data-api/src/main/java/org/apache/james/probe/DataProbe.java
index 24a90ecf57..b5d5514eb6 100644
--- a/server/data/data-api/src/main/java/org/apache/james/probe/DataProbe.java
+++ b/server/data/data-api/src/main/java/org/apache/james/probe/DataProbe.java
@@ -25,10 +25,13 @@ import java.util.Map;
 
 import org.apache.james.core.Username;
 import org.apache.james.rrt.lib.Mappings;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public interface DataProbe {
 
     class FluentDataProbe {
+        private static final Logger LOGGER = 
LoggerFactory.getLogger(FluentDataProbe.class);
 
         private final DataProbe dataProbe;
 
@@ -46,7 +49,11 @@ public interface DataProbe {
         }
 
         public FluentDataProbe addDomain(String domain) throws Exception {
-            dataProbe.addDomain(domain);
+            if (!dataProbe.containsDomain(domain)) {
+                dataProbe.addDomain(domain);
+            } else {
+                LOGGER.info("Domain '{}' already exists", domain);
+            }
             return this;
         }
     }


---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscr...@james.apache.org
For additional commands, e-mail: notifications-h...@james.apache.org