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 ec0978810654eac8d49714ed2d626f19832210f1 Author: Maksim Meliashchuk <[email protected]> AuthorDate: Sat Sep 23 12:49:14 2023 +0300 JAMES-2156 add JPAConfiguration bean --- .../jpa/src/main/resources/META-INF/spring/mailbox-jpa.xml | 2 ++ .../org/apache/james/modules/data/JPAConfiguration.java | 14 ++++++++++++++ 2 files changed, 16 insertions(+) diff --git a/mailbox/jpa/src/main/resources/META-INF/spring/mailbox-jpa.xml b/mailbox/jpa/src/main/resources/META-INF/spring/mailbox-jpa.xml index c673f3bc97..16a268cf98 100644 --- a/mailbox/jpa/src/main/resources/META-INF/spring/mailbox-jpa.xml +++ b/mailbox/jpa/src/main/resources/META-INF/spring/mailbox-jpa.xml @@ -57,6 +57,7 @@ <constructor-arg index="0" ref="entityManagerFactory"/> <constructor-arg index="1" ref="jpa-uidProvider"/> <constructor-arg index="2" ref="jpa-modSeqProvider"/> + <constructor-arg index="3" ref="jpa-configuration"/> </bean> <bean id="jpa-uidProvider" class="org.apache.james.mailbox.jpa.mail.JPAUidProvider"> <constructor-arg index="0" ref="entityManagerFactory"/> @@ -104,4 +105,5 @@ <bean id="jpaCurrentQuotaManager" class="org.apache.james.mailbox.jpa.quota.JpaCurrentQuotaManager"> <constructor-arg index="0" ref="entityManagerFactory"/> </bean> + <bean id="jpa-configuration" class="org.apache.james.modules.data.JPAConfiguration"/> </beans> diff --git a/server/container/guice/jpa-common/src/main/java/org/apache/james/modules/data/JPAConfiguration.java b/server/container/guice/jpa-common/src/main/java/org/apache/james/modules/data/JPAConfiguration.java index 07733020b1..6870e64fad 100644 --- a/server/container/guice/jpa-common/src/main/java/org/apache/james/modules/data/JPAConfiguration.java +++ b/server/container/guice/jpa-common/src/main/java/org/apache/james/modules/data/JPAConfiguration.java @@ -60,6 +60,20 @@ public class JPAConfiguration { static { } + public JPAConfiguration() { + this.driverName = ""; + this.driverURL = ""; + this.credential = Optional.empty(); + this.testOnBorrow = Optional.empty(); + this.multithreaded = Optional.empty(); + this.validationQueryTimeoutSec = Optional.empty(); + this.validationQuery = Optional.empty(); + this.maxConnections = Optional.empty(); + this.customDatasourceProperties = Map.of(); + this.customOpenjpaProperties = Map.of(); + this.attachmentStorage = Optional.empty(); + } + public static class Credential { private static final Logger LOGGER = LoggerFactory.getLogger(Credential.class); static final Optional<Credential> NO_CREDENTIAL = Optional.empty(); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
