Release

.config/pmd/java/ruleset.xml

@@ -141,6 +141,7 @@
 		</properties>
 	</rule>
 
+	<rule ref="category/java/errorprone.xml/AssertEqualsArgumentOrder"/>
 	<rule ref="category/java/errorprone.xml/AssignmentToNonFinalStatic"/>
 	<rule ref="category/java/errorprone.xml/AvoidDecimalLiteralsInBigDecimalConstructor"/>
 	<rule ref="category/java/errorprone.xml/AvoidMultipleUnaryOperators"/>

.github/workflows/broken-links.yml

@@ -19,7 +19,7 @@ jobs:
 
       - name: Link Checker
         id: lychee
-        uses: lycheeverse/lychee-action@8646ba30535128ac92d33dfc9133794bfdd9b411 # v2
+        uses: lycheeverse/lychee-action@e7477775783ea5526144ba13e8db5eec57747ce8 # v2
         with:
           args: "--verbose --no-progress './**/*.md'"
           fail: false # Don't fail on broken links, create an issue instead

CHANGELOG.md

@@ -1,3 +1,7 @@
+# 2.52.0
+* Testcontainers: Extract wait strategy constants
+* Updated dependencies
+
 # 2.51.0
 * Updated dependencies
 * Code cleanup and improved error reporting

client/pom.xml

@@ -223,7 +223,7 @@
 							<dependency>
 								<groupId>com.puppycrawl.tools</groupId>
 								<artifactId>checkstyle</artifactId>
-								<version>13.6.0</version>
+								<version>13.8.0</version>
 							</dependency>
 						</dependencies>
 						<configuration>
@@ -261,12 +261,12 @@
 							<dependency>
 								<groupId>net.sourceforge.pmd</groupId>
 								<artifactId>pmd-core</artifactId>
-								<version>7.25.0</version>
+								<version>7.26.0</version>
 							</dependency>
 							<dependency>
 								<groupId>net.sourceforge.pmd</groupId>
 								<artifactId>pmd-java</artifactId>
-								<version>7.25.0</version>
+								<version>7.26.0</version>
 							</dependency>
 						</dependencies>
 					</plugin>

core/pom.xml

@@ -54,7 +54,7 @@
 			<dependency>
 				<groupId>io.netty</groupId>
 				<artifactId>netty-bom</artifactId>
-				<version>4.2.15.Final</version>
+				<version>4.2.16.Final</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
@@ -65,7 +65,7 @@
 		<dependency>
 			<groupId>tools.jackson.core</groupId>
 			<artifactId>jackson-databind</artifactId>
-			<version>3.2.0</version>
+			<version>3.2.1</version>
 		</dependency>
 
 		<dependency>
@@ -271,7 +271,7 @@
 							<dependency>
 								<groupId>com.puppycrawl.tools</groupId>
 								<artifactId>checkstyle</artifactId>
-								<version>13.6.0</version>
+								<version>13.8.0</version>
 							</dependency>
 						</dependencies>
 						<configuration>
@@ -309,12 +309,12 @@
 							<dependency>
 								<groupId>net.sourceforge.pmd</groupId>
 								<artifactId>pmd-core</artifactId>
-								<version>7.25.0</version>
+								<version>7.26.0</version>
 							</dependency>
 							<dependency>
 								<groupId>net.sourceforge.pmd</groupId>
 								<artifactId>pmd-java</artifactId>
-								<version>7.25.0</version>
+								<version>7.26.0</version>
 							</dependency>
 						</dependencies>
 					</plugin>

pom.xml

@@ -69,7 +69,7 @@
 							<dependency>
 								<groupId>com.puppycrawl.tools</groupId>
 								<artifactId>checkstyle</artifactId>
-								<version>13.6.0</version>
+								<version>13.8.0</version>
 							</dependency>
 						</dependencies>
 						<configuration>
@@ -107,12 +107,12 @@
 							<dependency>
 								<groupId>net.sourceforge.pmd</groupId>
 								<artifactId>pmd-core</artifactId>
-								<version>7.25.0</version>
+								<version>7.26.0</version>
 							</dependency>
 							<dependency>
 								<groupId>net.sourceforge.pmd</groupId>
 								<artifactId>pmd-java</artifactId>
-								<version>7.25.0</version>
+								<version>7.26.0</version>
 							</dependency>
 						</dependencies>
 					</plugin>

server/pom.xml

@@ -56,7 +56,7 @@
 			<dependency>
 				<groupId>io.netty</groupId>
 				<artifactId>netty-bom</artifactId>
-				<version>4.2.15.Final</version>
+				<version>4.2.16.Final</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
@@ -290,7 +290,7 @@
 							<dependency>
 								<groupId>com.puppycrawl.tools</groupId>
 								<artifactId>checkstyle</artifactId>
-								<version>13.6.0</version>
+								<version>13.8.0</version>
 							</dependency>
 						</dependencies>
 						<configuration>
@@ -328,12 +328,12 @@
 							<dependency>
 								<groupId>net.sourceforge.pmd</groupId>
 								<artifactId>pmd-core</artifactId>
-								<version>7.25.0</version>
+								<version>7.26.0</version>
 							</dependency>
 							<dependency>
 								<groupId>net.sourceforge.pmd</groupId>
 								<artifactId>pmd-java</artifactId>
-								<version>7.25.0</version>
+								<version>7.26.0</version>
 							</dependency>
 						</dependencies>
 					</plugin>

server/src/main/java/software/xdev/mockserver/matchers/RegexStringMatcher.java

@@ -71,11 +71,9 @@ private boolean matchesByNottedStrings(
 			// mutual notted control plane match
 			return this.matchesByStrings(context, matcher, matched);
 		}
-		else
-		{
-			// data plane & control plan match
-			return (matcher.isNot() || matched.isNot()) ^ this.matchesByStrings(context, matcher, matched);
-		}
+
+		// data plane & control plan match
+		return (matcher.isNot() || matched.isNot()) ^ this.matchesByStrings(context, matcher, matched);
 	}
 
 	@SuppressWarnings({"PMD.CognitiveComplexity"})
@@ -93,56 +91,54 @@ private boolean matchesByStrings(
 		{
 			return true;
 		}
-		else
+
+		if(matched != null)
 		{
-			if(matched != null)
+			final String matchedValue = matched.getValue();
+			if(matchedValue != null)
 			{
-				final String matchedValue = matched.getValue();
-				if(matchedValue != null)
+				// match as exact string
+				if(matchedValue.equals(matcherValue) || matchedValue.equalsIgnoreCase(matcherValue))
 				{
-					// match as exact string
-					if(matchedValue.equals(matcherValue) || matchedValue.equalsIgnoreCase(matcherValue))
+					return true;
+				}
+
+				// match as regex - matcher -> matched (data plane or control plane)
+				try
+				{
+					if(matcher.matches(matchedValue))
 					{
 						return true;
 					}
-
-					// match as regex - matcher -> matched (data plane or control plane)
-					try
+				}
+				catch(final PatternSyntaxException pse)
+				{
+					if(LOG.isDebugEnabled())
 					{
-						if(matcher.matches(matchedValue))
-						{
-							return true;
-						}
+						LOG.debug("Error while matching regex [{}] for string [{}]", matcher, matched, pse);
 					}
-					catch(final PatternSyntaxException pse)
+				}
+				// match as regex - matched -> matcher (control plane only)
+				try
+				{
+					if(this.controlPlaneMatcher && matched.matches(matcherValue))
 					{
-						if(LOG.isDebugEnabled())
-						{
-							LOG.debug("Error while matching regex [{}] for string [{}]", matcher, matched, pse);
-						}
+						return true;
 					}
-					// match as regex - matched -> matcher (control plane only)
-					try
+					else if(LOG.isDebugEnabled() && matched.matches(matcherValue))
 					{
-						if(this.controlPlaneMatcher && matched.matches(matcherValue))
-						{
-							return true;
-						}
-						else if(LOG.isDebugEnabled() && matched.matches(matcherValue))
-						{
-							LOG.debug(
-								"Matcher {} would match {} if matcher was used for control plane",
-								matcher,
-								matched);
-						}
+						LOG.debug(
+							"Matcher {} would match {} if matcher was used for control plane",
+							matcher,
+							matched);
 					}
-					catch(final PatternSyntaxException pse)
+				}
+				catch(final PatternSyntaxException pse)
+				{
+					if(this.controlPlaneMatcher
+						&& LOG.isDebugEnabled())
 					{
-						if(this.controlPlaneMatcher
-							&& LOG.isDebugEnabled())
-						{
-							LOG.debug("Error while matching regex [{}] for string [{}]", matcher, matched, pse);
-						}
+						LOG.debug("Error while matching regex [{}] for string [{}]", matcher, matched, pse);
 					}
 				}
 			}

server/src/main/java/software/xdev/mockserver/mock/action/http/HttpActionHandler.java

@@ -107,8 +107,8 @@ public HttpActionHandler(
 		"checkstyle:MethodLength",
 		"PMD.CognitiveComplexity",
 		"PMD.CyclomaticComplexity",
-		"PMD.NPathComplexity"
-	})
+		"PMD.NPathComplexity",
+		"PMD.AvoidDeeplyNestedIfStmts"})
 	public void processAction(
 		final HttpRequest request,
 		final ResponseWriter responseWriter,
@@ -138,7 +138,6 @@ public void processAction(
 
 		if(expectation != null && expectation.getAction() != null)
 		{
-
 			final Action action = expectation.getAction();
 			switch(action.getType())
 			{
@@ -292,7 +291,6 @@ public void processAction(
 		else if(CORSHeaders.isPreflightRequest(this.configuration, request) && (this.configuration.enableCORSForAPI()
 			|| this.configuration.enableCORSForAllResponses()))
 		{
-
 			responseWriter.writeResponse(request, OK);
 			if(LOG.isInfoEnabled())
 			{
@@ -301,13 +299,11 @@ else if(CORSHeaders.isPreflightRequest(this.configuration, request) && (this.con
 		}
 		else if(proxyingRequest || potentiallyHttpProxy)
 		{
-
 			if(request.getHeaders() != null && request.getHeaders()
 				.containsEntry(
 					this.httpStateHandler.getUniqueLoopPreventionHeaderName(),
 					this.httpStateHandler.getUniqueLoopPreventionHeaderValue()))
 			{
-
 				if(LOG.isTraceEnabled())
 				{
 					LOG.trace(
@@ -347,7 +343,6 @@ else if(proxyingRequest || potentiallyHttpProxy)
 				}
 				else
 				{
-
 					final InetSocketAddress remoteAddress = getRemoteAddress(ctx);
 					final HttpRequest clonedRequest = this.hopByHopHeaderFilter.onRequest(request)
 						.withHeader(
@@ -451,7 +446,6 @@ else if(!connectionClosedException(ex))
 		}
 		else
 		{
-
 			this.returnNotFound(responseWriter, request, null);
 		}
 	}

testcontainers/pom.xml

@@ -78,13 +78,13 @@
 		<dependency>
 			<groupId>tools.jackson.core</groupId>
 			<artifactId>jackson-databind</artifactId>
-			<version>3.2.0</version>
+			<version>3.2.1</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>
 			<artifactId>junit-jupiter</artifactId>
-			<version>6.1.0</version>
+			<version>6.1.2</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
@@ -96,7 +96,7 @@
 		<dependency>
 			<groupId>software.xdev</groupId>
 			<artifactId>testcontainers-advanced-imagebuilder</artifactId>
-			<version>2.5.0</version>
+			<version>4.1.2</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
@@ -282,7 +282,7 @@
 							<dependency>
 								<groupId>com.puppycrawl.tools</groupId>
 								<artifactId>checkstyle</artifactId>
-								<version>13.6.0</version>
+								<version>13.8.0</version>
 							</dependency>
 						</dependencies>
 						<configuration>
@@ -320,12 +320,12 @@
 							<dependency>
 								<groupId>net.sourceforge.pmd</groupId>
 								<artifactId>pmd-core</artifactId>
-								<version>7.25.0</version>
+								<version>7.26.0</version>
 							</dependency>
 							<dependency>
 								<groupId>net.sourceforge.pmd</groupId>
 								<artifactId>pmd-java</artifactId>
-								<version>7.25.0</version>
+								<version>7.26.0</version>
 							</dependency>
 						</dependencies>
 					</plugin>

testcontainers/src/main/java/software/xdev/testcontainers/mockserver/containers/MockServerContainer.java

@@ -28,20 +28,21 @@ public class MockServerContainer extends GenericContainer<MockServerContainer>
 	public static final String DEFAULT_IMAGE = "xdevsoftware/mockserver";
 	public static final String DEFAULT_TAG = MockServerUtils.DEFAULT_VERSION;
 	public static final int PORT = 1080;
+	public static final String LOG_MSG_WAIT_STRATEGY_REGEX = ".*started on port: " + PORT + ".*";
 
 	public MockServerContainer(final RemoteDockerImage image)
 	{
 		super(image);
 
-		this.waitingFor(Wait.forLogMessage(".*started on port: " + PORT + ".*", 1));
+		this.waitingFor(Wait.forLogMessage(LOG_MSG_WAIT_STRATEGY_REGEX, 1));
 		this.addExposedPort(PORT);
 	}
 
 	public MockServerContainer(final DockerImageName dockerImageName)
 	{
 		super(dockerImageName);
 
-		this.waitingFor(Wait.forLogMessage(".*started on port: " + PORT + ".*", 1));
+		this.waitingFor(Wait.forLogMessage(LOG_MSG_WAIT_STRATEGY_REGEX, 1));
 		this.addExposedPort(PORT);
 	}