Threaded (#339)

* Fix incorrect param for max threads * Make parallel processing configurable through properties * Hold mockito back because it is compiled with JDK11 in V5
OpenAS2 · Sep 12, 2023 · 672f7d8 · 672f7d8
1 parent 62cd9a3
commit 672f7d8
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/Server/src/config/config.xml b/Server/src/config/config.xml
@@ -81,6 +81,8 @@
                pollerConfigBase.defaults="sender.as2_id=$partnership.sender.as2_id$, receiver.as2_id=$partnership.receiver.as2_id$"
                pollerConfigBase.sendfilename="true"
                pollerConfigBase.mimetype="application/EDI-X12"
+               pollerConfigBase.process_files_in_paralllel="false"
+               pollerConfigBase.max_parallel_files="20"
                partnerships.polling.interval="120"
                messages.polling.interval="120"
              />
@@ -236,7 +238,9 @@
            interval="$properties.pollerConfigBase.interval$"
            defaults="$properties.pollerConfigBase.defaults$"
            sendfilename="$properties.pollerConfigBase.sendfilename$"
-           mimetype="$properties.pollerConfigBase.mimetype$"/>
+           mimetype="$properties.pollerConfigBase.mimetype$"
+           process_files_in_paralllel="$properties.pollerConfigBase.process_files_in_paralllel$"
+           max_parallel_files="$properties.pollerConfigBase.max_parallel_files$"/>
    <partnerships classname="org.openas2.partner.XMLPartnershipFactory"
                  filename="$properties.partnership_file$"
                  interval="$properties.partnerships.polling.interval$"/>

diff --git a/Server/src/main/java/org/openas2/processor/receiver/DirectoryPollingModule.java b/Server/src/main/java/org/openas2/processor/receiver/DirectoryPollingModule.java
@@ -57,7 +57,7 @@ public void init(Session session, Map<String, String> options) throws OpenAS2Exc
                 IOUtil.getDirectoryFile(sentDir);
             }
             processFilesAsThreads = getParameter(PARAM_PROCESS_IN_PARALLEL, "false").equalsIgnoreCase("true");
-            maxProcessingThreads = getParameterInt(PARAM_PROCESS_IN_PARALLEL, false, maxProcessingThreads);
+            maxProcessingThreads = getParameterInt(PARAM_MAX_PARALLEL_FILES, false, maxProcessingThreads);
             if (processFilesAsThreads) {
                 // Create the thread pool
                 executorService = Executors.newFixedThreadPool(maxProcessingThreads);

diff --git a/pom.xml b/pom.xml
@@ -128,14 +128,14 @@
                 <groupId>org.mockito</groupId>
                 <artifactId>mockito-core</artifactId>
 			    <!-- Hold at version 4.x for Java 8 compatibility -->
-			    <version>5.5.0</version>
+			    <version>4.11.0</version>
                 <scope>test</scope>
             </dependency>
 			<dependency>
 			    <groupId>org.mockito</groupId>
 			    <artifactId>mockito-junit-jupiter</artifactId>
 			    <!-- Hold at version 4.x for Java 8 compatibility -->
-			    <version>5.5.0</version>
+			    <version>4.11.0</version>
 			    <scope>test</scope>
 			</dependency>
 			<!-- https://mvnrepository.com/artifact/org.hamcrest/hamcrest -->