Merge pull request #396 from xdev-software/develop

Release

Author: AB-xdev

.config/pmd/java/ruleset.xml

@@ -42,6 +42,7 @@
 	<rule ref="category/java/codestyle.xml/NoPackage"/>
 	<rule ref="category/java/codestyle.xml/PrematureDeclaration"/>
 	<rule ref="category/java/codestyle.xml/UnnecessarySemicolon"/>
+	<rule ref="category/java/codestyle.xml/VariableCanBeInlined"/>
 
 	<rule ref="category/java/design.xml">
 		<!-- Sometimes abstract classes have just fields -->
@@ -138,6 +139,7 @@
 	<rule ref="category/java/errorprone.xml/AvoidMultipleUnaryOperators"/>
 	<rule ref="category/java/errorprone.xml/AvoidUsingOctalValues"/>
 	<rule ref="category/java/errorprone.xml/BrokenNullCheck"/>
+	<rule ref="category/java/errorprone.xml/CollectionTypeMismatch"/>
 	<rule ref="category/java/errorprone.xml/ComparisonWithNaN"/>
 	<rule ref="category/java/errorprone.xml/DoNotCallGarbageCollectionExplicitly"/>
 	<rule ref="category/java/errorprone.xml/DontImportSun"/>
@@ -155,7 +157,7 @@
 	<rule ref="category/java/errorprone.xml/SingletonClassReturningNewInstance"/>
 	<rule ref="category/java/errorprone.xml/UnconditionalIfStatement"/>
 	<rule ref="category/java/errorprone.xml/UnnecessaryCaseChange"/>
-	<rule ref="category/java/errorprone.xml/UselessOperationOnImmutable"/>
+	<rule ref="category/java/errorprone.xml/UselessPureMethodCall"/>
 
 
 	<rule ref="category/java/multithreading.xml">
@@ -218,6 +220,71 @@
 		</properties>
 	</rule>
 
+	<rule name="AvoidPostConstruct"
+		language="java"
+		message="Avoid @PostConstruct"
+		class="net.sourceforge.pmd.lang.rule.xpath.XPathRule">
+		<description>
+			Using a `@PostConstruct` method is usually only done when field injection is used and initialization needs to be performed after that.
+
+			It's better to do this directly in the constructor with constructor injection, so that all logic will be encapsulated there.
+			This also makes using the bean in environments where JavaEE is not present - for example in tests - a lot easier, as forgetting to call the `@PostConstruct` method is no longer possible.
+		</description>
+		<priority>3</priority>
+		<properties>
+			<property name="xpath">
+				<value>
+					<![CDATA[
+//MethodDeclaration[pmd-java:hasAnnotation('jakarta.annotation.PostConstruct')]
+]]>
+				</value>
+			</property>
+		</properties>
+	</rule>
+
+	<rule name="AvoidPreDestroy"
+		language="java"
+		message="Avoid @PreDestroy"
+		class="net.sourceforge.pmd.lang.rule.xpath.XPathRule">
+		<description>
+			`@PreDestroy` should be replaced by implementing `AutoCloseable` and overwriting the `close` method instead.
+
+			This also makes using the bean in environments where JavaEE is not present - for example in tests - a lot easier, as forgetting to call the `@PreDestroy` method is no much more difficult.
+		</description>
+		<priority>3</priority>
+		<properties>
+			<property name="xpath">
+				<value>
+					<![CDATA[
+//MethodDeclaration[pmd-java:hasAnnotation('jakarta.annotation.PreDestroy')]
+]]>
+				</value>
+			</property>
+		</properties>
+	</rule>
+
+	<rule name="AvoidUnmanagedThreads"
+		language="java"
+		message="Avoid unmanaged threads"
+		class="net.sourceforge.pmd.lang.rule.xpath.XPathRule">
+		<description>
+			Trying to manually manage threads usually gets quickly out of control and may result in various problems like uncontrollable spawning of threads.
+			Threads can also not be cancelled properly.
+
+			Use managed Thread services like `ExecutorService` and `CompletableFuture` instead.
+		</description>
+		<priority>3</priority>
+		<properties>
+			<property name="xpath">
+				<value>
+					<![CDATA[
+//MethodCall[pmd-java:matchesSig('java.lang.Thread#start()') or pmd-java:matchesSig('java.lang.Thread#startVirtualThread(java.lang.Runnable)') or pmd-java:matchesSig('java.lang.Thread$Builder#start(java.lang.Runnable)')]
+]]>
+				</value>
+			</property>
+		</properties>
+	</rule>
+
 	<rule name="JavaObjectSerializationIsUnsafe"
 		language="java"
 		message="Using Java Object (De-)Serialization is unsafe and has led to too many security vulnerabilities"

.github/workflows/release.yml

@@ -87,7 +87,7 @@ jobs:
 
     - name: Create Release
       id: create-release
-      uses: shogo82148/actions-create-release@4661dc54f7b4b564074e9fbf73884d960de569a3 # v1
+      uses: shogo82148/actions-create-release@7b89596097b26731bda0852f1504f813499079ee # v1
       with:
         tag_name: v${{ steps.version.outputs.release }}
         release_name: v${{ steps.version.outputs.release }}

.idea/codeStyles/Project.xml

@@ -1,17 +1,3 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
+wrapperVersion=3.3.4
+distributionType=only-script
 distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.11/apache-maven-3.9.11-bin.zip

.mvn/wrapper/maven-wrapper.properties

@@ -1,3 +1,19 @@
+# 2.7.0
+* ExecutorService creation is now controlled centrally (`ExecutorServiceCreator`)
+  * All created ExecutorServices now use `VirtualThread`s on Java 21+
+* Use explicitly defined `ExecutorService` - wherever possible
+  * _Context_: `CompletableFuture#runAsync`, `CompletableFuture#supplyAsync` and `parallelStream` use Java's common pool.<br/>
+  However calling these methods is usually done (in TCI) for I/O tasks.<br/>
+  This might exhaust the common pool thus negatively impacting performance.<br/>
+  It was therefore decided to use dedicated pools instead.
+  * Stored in `TCIExecutorServiceHolder`
+  * Utilizes a `CachedThreadPool` (for Java `<` 21)
+    * On Java21+ it uses `VirtualThread`s for better scaling
+* Other minor improvements
+  * Add missing timeout when pulling `SeleniumRecordingContainer`
+  * Removed uses of `String.replaceAll("<Regex>", "")` and compiled pattern instead only once
+* Updated dependencies
+
 # 2.6.0
 * ``db-jdbc-spring-*``
   * Added ``DynamicPersistenceClassFinder``

CHANGELOG.md

@@ -1,17 +1,3 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
+wrapperVersion=3.3.4
+distributionType=only-script
 distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.11/apache-maven-3.9.11-bin.zip

advanced-demo/.mvn/wrapper/maven-wrapper.properties

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>software.xdev.tci.demo</groupId>
 		<artifactId>advanced-demo</artifactId>
-		<version>2.6.1-SNAPSHOT</version>
+		<version>2.7.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>entities-metamodel</artifactId>
 

advanced-demo/entities-metamodel/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>software.xdev.tci.demo</groupId>
 		<artifactId>advanced-demo</artifactId>
-		<version>2.6.1-SNAPSHOT</version>
+		<version>2.7.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>entities</artifactId>
 

advanced-demo/entities/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>software.xdev.tci.demo.it</groupId>
 		<artifactId>integration-tests</artifactId>
-		<version>2.6.1-SNAPSHOT</version>
+		<version>2.7.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>persistence-it</artifactId>
 

advanced-demo/integration-tests/persistence-it/pom.xml

@@ -18,6 +18,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import software.xdev.tci.concurrent.TCIExecutorServiceHolder;
 import software.xdev.tci.dao.DAOInjector;
 import software.xdev.tci.db.persistence.TransactionExecutor;
 import software.xdev.tci.demo.persistence.FlywayInfo;
@@ -136,7 +137,7 @@ protected void stopInfra()
 		if(this.dbInfra != null)
 		{
 			final DBTCI fDbInfra = this.dbInfra;
-			CompletableFuture.runAsync(fDbInfra::stop);
+			CompletableFuture.runAsync(fDbInfra::stop, TCIExecutorServiceHolder.instance());
 
 			this.dbInfra = null;
 		}