You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by rc...@apache.org on 2020/03/17 10:51:12 UTC

[james-project] 02/17: JAMES-3115 Do not catch then retrow configuration exceptions

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

commit fff7ae2041501a26e3cea6065d6fa8779ca67447
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Fri Mar 13 18:28:30 2020 +0700

    JAMES-3115 Do not catch then retrow configuration exceptions
---
 .../org/apache/james/modules/data/CassandraDomainListModule.java  | 8 ++------
 .../java/org/apache/james/modules/data/JPADomainListModule.java   | 8 ++------
 .../main/java/org/apache/james/modules/data/MemoryDataModule.java | 8 ++------
 3 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/data/CassandraDomainListModule.java b/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/data/CassandraDomainListModule.java
index 578d745..c854d8d 100644
--- a/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/data/CassandraDomainListModule.java
+++ b/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/data/CassandraDomainListModule.java
@@ -45,12 +45,8 @@ public class CassandraDomainListModule extends AbstractModule {
 
     @Provides
     @Singleton
-    public DomainListConfiguration provideDomainListConfiguration(ConfigurationProvider configurationProvider) {
-        try {
-            return DomainListConfiguration.from(configurationProvider.getConfiguration("domainlist"));
-        } catch (ConfigurationException e) {
-            throw new RuntimeException(e);
-        }
+    public DomainListConfiguration provideDomainListConfiguration(ConfigurationProvider configurationProvider) throws ConfigurationException {
+        return DomainListConfiguration.from(configurationProvider.getConfiguration("domainlist"));
     }
 
     @ProvidesIntoSet
diff --git a/server/container/guice/jpa-common-guice/src/main/java/org/apache/james/modules/data/JPADomainListModule.java b/server/container/guice/jpa-common-guice/src/main/java/org/apache/james/modules/data/JPADomainListModule.java
index b675f70..544807b 100644
--- a/server/container/guice/jpa-common-guice/src/main/java/org/apache/james/modules/data/JPADomainListModule.java
+++ b/server/container/guice/jpa-common-guice/src/main/java/org/apache/james/modules/data/JPADomainListModule.java
@@ -41,12 +41,8 @@ public class JPADomainListModule extends AbstractModule {
 
     @Provides
     @Singleton
-    public DomainListConfiguration provideDomainListConfiguration(ConfigurationProvider configurationProvider) {
-        try {
-            return DomainListConfiguration.from(configurationProvider.getConfiguration("domainlist"));
-        } catch (ConfigurationException e) {
-            throw new RuntimeException(e);
-        }
+    public DomainListConfiguration provideDomainListConfiguration(ConfigurationProvider configurationProvider) throws ConfigurationException {
+        return DomainListConfiguration.from(configurationProvider.getConfiguration("domainlist"));
     }
 
     @ProvidesIntoSet
diff --git a/server/container/guice/memory-guice/src/main/java/org/apache/james/modules/data/MemoryDataModule.java b/server/container/guice/memory-guice/src/main/java/org/apache/james/modules/data/MemoryDataModule.java
index a99a408..cf65a71 100644
--- a/server/container/guice/memory-guice/src/main/java/org/apache/james/modules/data/MemoryDataModule.java
+++ b/server/container/guice/memory-guice/src/main/java/org/apache/james/modules/data/MemoryDataModule.java
@@ -95,12 +95,8 @@ public class MemoryDataModule extends AbstractModule {
 
     @Provides
     @Singleton
-    public DomainListConfiguration provideDomainListConfiguration(ConfigurationProvider configurationProvider) {
-        try {
-            return DomainListConfiguration.from(configurationProvider.getConfiguration("domainlist"));
-        } catch (ConfigurationException e) {
-            throw new RuntimeException(e);
-        }
+    public DomainListConfiguration provideDomainListConfiguration(ConfigurationProvider configurationProvider) throws ConfigurationException {
+        return DomainListConfiguration.from(configurationProvider.getConfiguration("domainlist"));
     }
 
     @ProvidesIntoSet


---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org