Merge pull request #235 from xdev-software/develop

AB-xdev · web-flow · commit 56aab1bb82b3 · 2025-06-06T07:57:05.000Z
Release
diff --git a/.config/pmd/java/ruleset.xml b/.config/pmd/java/ruleset.xml
diff --git a/.gitattributes b/.gitattributes
@@ -6,4 +6,4 @@
 
 # Force MVN Wrapper Linux files LF
 mvnw text eol=lf
-.mvn/wrapper/maven-wrapper.properties text eol=lf
+maven-wrapper.properties text eol=lf
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -33,6 +33,15 @@ body:
     validations:
       required: true
 
+  - type: textarea
+    id: description
+    attributes:
+      label: Description of the problem
+      description: |
+        Describe as exactly as possible what is not working.
+    validations:
+      required: true
+
   - type: textarea
     id: steps-to-reproduce
     attributes:
@@ -47,20 +56,6 @@ body:
     validations:
       required: true
 
-  - type: textarea
-    id: expected-behavior
-    attributes:
-      label: Expected behavior
-      description: |
-        Tell us what you expect to happen.
-
-  - type: textarea
-    id: actual-behavior
-    attributes:
-      label: Actual behavior
-      description: |
-        Tell us what happens with the steps given above.
-
   - type: textarea
     id: additional-information
     attributes:
diff --git a/.github/workflows/image-vuln-scan.yml b/.github/workflows/image-vuln-scan.yml
@@ -20,13 +20,13 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Scan - Full
-        uses: aquasecurity/trivy-action@0.30.0
+        uses: aquasecurity/trivy-action@0.31.0
         with:
           image-ref: ${{ env.TRIVYY_IMAGE_REF }}
 
       - name: Scan - Relevant
         id: scan_relevant
-        uses: aquasecurity/trivy-action@0.30.0
+        uses: aquasecurity/trivy-action@0.31.0
         with:
           image-ref: ${{ env.TRIVYY_IMAGE_REF }}
           exit-code: 1
diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties
@@ -14,4 +14,4 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.10/apache-maven-3.9.10-bin.zip
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 1.0.18
+* Updated dependencies
+* Fix ``subString`` matching not working as expected #231
+
 # 1.0.17
 * Migrated deployment to _Sonatype Maven Central Portal_ [#155](https://github.com/xdev-software/standard-maven-template/issues/155)
 * Updated dependencies
diff --git a/README.md b/README.md
@@ -124,11 +124,11 @@ new MockServerClient("localhost", 1080)
 
 </details>
 
-### Further documentation
+### Further related documentation
 * [Original project](https://www.mock-server.com/)
-* [Testcontainers Mockserver module](https://java.testcontainers.org/modules/mockserver/)
+* [Testcontainers (original) Mockserver module](https://java.testcontainers.org/modules/mockserver/)
 
-MockServer also works really well together with a network failure simulation tools such as [ToxiProxy](https://java.testcontainers.org/modules/toxiproxy/).
+Note: MockServer also works really well together with a network failure simulation tools such as [ToxiProxy](https://java.testcontainers.org/modules/toxiproxy/).
 
 ## Installation
 [Installation guide for the latest release](https://github.com/xdev-software/mockserver-neolight/releases/latest#Installation)
diff --git a/client/pom.xml b/client/pom.xml
@@ -217,7 +217,7 @@
 							<dependency>
 								<groupId>com.puppycrawl.tools</groupId>
 								<artifactId>checkstyle</artifactId>
-								<version>10.23.1</version>
+								<version>10.25.0</version>
 							</dependency>
 						</dependencies>
 						<configuration>
@@ -247,19 +247,19 @@
 							<includeTests>true</includeTests>
 							<printFailingErrors>true</printFailingErrors>
 							<rulesets>
-								<ruleset>../.config/pmd/ruleset.xml</ruleset>
+								<ruleset>../.config/pmd/java/ruleset.xml</ruleset>
 							</rulesets>
 						</configuration>
 						<dependencies>
 							<dependency>
 								<groupId>net.sourceforge.pmd</groupId>
 								<artifactId>pmd-core</artifactId>
-								<version>7.13.0</version>
+								<version>7.14.0</version>
 							</dependency>
 							<dependency>
 								<groupId>net.sourceforge.pmd</groupId>
 								<artifactId>pmd-java</artifactId>
-								<version>7.13.0</version>
+								<version>7.14.0</version>
 							</dependency>
 						</dependencies>
 					</plugin>
diff --git a/core/pom.xml b/core/pom.xml
@@ -61,7 +61,7 @@
 			<dependency>
 				<groupId>io.netty</groupId>
 				<artifactId>netty-bom</artifactId>
-				<version>4.2.1.Final</version>
+				<version>4.2.2.Final</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
@@ -275,7 +275,7 @@
 							<dependency>
 								<groupId>com.puppycrawl.tools</groupId>
 								<artifactId>checkstyle</artifactId>
-								<version>10.23.1</version>
+								<version>10.25.0</version>
 							</dependency>
 						</dependencies>
 						<configuration>
@@ -305,19 +305,19 @@
 							<includeTests>true</includeTests>
 							<printFailingErrors>true</printFailingErrors>
 							<rulesets>
-								<ruleset>../.config/pmd/ruleset.xml</ruleset>
+								<ruleset>../.config/pmd/java/ruleset.xml</ruleset>
 							</rulesets>
 						</configuration>
 						<dependencies>
 							<dependency>
 								<groupId>net.sourceforge.pmd</groupId>
 								<artifactId>pmd-core</artifactId>
-								<version>7.13.0</version>
+								<version>7.14.0</version>
 							</dependency>
 							<dependency>
 								<groupId>net.sourceforge.pmd</groupId>
 								<artifactId>pmd-java</artifactId>
-								<version>7.13.0</version>
+								<version>7.14.0</version>
 							</dependency>
 						</dependencies>
 					</plugin>
diff --git a/core/src/main/java/software/xdev/mockserver/mappers/MockServerHttpResponseToFullHttpResponse.java b/core/src/main/java/software/xdev/mockserver/mappers/MockServerHttpResponseToFullHttpResponse.java
@@ -132,7 +132,6 @@ private ByteBuf getBody(final HttpResponse httpResponse)
 			httpResponse.getFirstHeader(CONTENT_TYPE.toString()));
 	}
 	
-	@SuppressWarnings("PMD.CognitiveComplexity")
 	private void setHeaders(final HttpResponse httpResponse, final DefaultHttpResponse response, final ByteBuf body)
 	{
 		if(httpResponse.getHeaderMultimap() != null)
@@ -149,15 +148,26 @@ private void setHeaders(final HttpResponse httpResponse, final DefaultHttpRespon
 				);
 		}
 		
-		// Content-Type
+		setContentTypeHeader(httpResponse, response);
+		setContentLengthHeader(httpResponse, response, body);
+		setHTTP2ExtensionHeaders(httpResponse, response);
+	}
+	
+	protected static void setContentTypeHeader(final HttpResponse httpResponse, final DefaultHttpResponse response)
+	{
 		if(isBlank(httpResponse.getFirstHeader(CONTENT_TYPE.toString()))
 			&& httpResponse.getBody() != null
 			&& httpResponse.getBody().getContentType() != null)
 		{
 			response.headers().set(CONTENT_TYPE, httpResponse.getBody().getContentType());
 		}
-		
-		// Content-Length
+	}
+	
+	protected static void setContentLengthHeader(
+		final HttpResponse httpResponse,
+		final DefaultHttpResponse response,
+		final ByteBuf body)
+	{
 		final ConnectionOptions connectionOptions = httpResponse.getConnectionOptions();
 		if(isBlank(httpResponse.getFirstHeader(CONTENT_LENGTH.toString())))
 		{
@@ -181,8 +191,10 @@ else if(addContentLength && !chunkedEncoding)
 				response.headers().set(HttpHeaderNames.TRANSFER_ENCODING, HttpHeaderValues.CHUNKED);
 			}
 		}
-		
-		// HTTP2 extension headers
+	}
+	
+	protected static void setHTTP2ExtensionHeaders(final HttpResponse httpResponse, final DefaultHttpResponse response)
+	{
 		final Integer streamId = httpResponse.getStreamId();
 		if(streamId != null)
 		{
diff --git a/core/src/main/java/software/xdev/mockserver/serialization/deserializers/body/BodyDTODeserializer.java b/core/src/main/java/software/xdev/mockserver/serialization/deserializers/body/BodyDTODeserializer.java
@@ -166,7 +166,7 @@ public BodyDTO deserialize(final JsonParser jsonParser, final DeserializationCon
 					{
 						optional = Boolean.parseBoolean(String.valueOf(entry.getValue()));
 					}
-					if("optional".equalsIgnoreCase(key))
+					if("subString".equalsIgnoreCase(key))
 					{
 						try
 						{
diff --git a/core/src/main/java/software/xdev/mockserver/serialization/serializers/body/StringBodyDTOSerializer.java b/core/src/main/java/software/xdev/mockserver/serialization/serializers/body/StringBodyDTOSerializer.java
@@ -34,7 +34,7 @@ public StringBodyDTOSerializer(final boolean serialiseDefaultValues)
 		this.serialiseDefaultValues = serialiseDefaultValues;
 	}
 	
-	@SuppressWarnings("PMD.CognitiveComplexity")
+	@SuppressWarnings({"PMD.CognitiveComplexity", "PMD.NPathComplexity"})
 	@Override
 	public void serialize(
 		final StringBodyDTO stringBodyDTO,
diff --git a/core/src/main/java/software/xdev/mockserver/serialization/serializers/body/StringBodySerializer.java b/core/src/main/java/software/xdev/mockserver/serialization/serializers/body/StringBodySerializer.java
@@ -34,6 +34,7 @@ public StringBodySerializer(final boolean serialiseDefaultValues)
 		this.serialiseDefaultValues = serialiseDefaultValues;
 	}
 	
+	@SuppressWarnings("PMD.NPathComplexity")
 	@Override
 	public void serialize(final StringBody stringBody, final JsonGenerator jgen, final SerializerProvider provider)
 		throws IOException
diff --git a/pom.xml b/pom.xml
@@ -68,7 +68,7 @@
 							<dependency>
 								<groupId>com.puppycrawl.tools</groupId>
 								<artifactId>checkstyle</artifactId>
-								<version>10.23.1</version>
+								<version>10.25.0</version>
 							</dependency>
 						</dependencies>
 						<configuration>
@@ -98,19 +98,19 @@
 							<includeTests>true</includeTests>
 							<printFailingErrors>true</printFailingErrors>
 							<rulesets>
-								<ruleset>.config/pmd/ruleset.xml</ruleset>
+								<ruleset>.config/pmd/java/ruleset.xml</ruleset>
 							</rulesets>
 						</configuration>
 						<dependencies>
 							<dependency>
 								<groupId>net.sourceforge.pmd</groupId>
 								<artifactId>pmd-core</artifactId>
-								<version>7.13.0</version>
+								<version>7.14.0</version>
 							</dependency>
 							<dependency>
 								<groupId>net.sourceforge.pmd</groupId>
 								<artifactId>pmd-java</artifactId>
-								<version>7.13.0</version>
+								<version>7.14.0</version>
 							</dependency>
 						</dependencies>
 					</plugin>
diff --git a/server/pom.xml b/server/pom.xml
@@ -56,7 +56,7 @@
 			<dependency>
 				<groupId>io.netty</groupId>
 				<artifactId>netty-bom</artifactId>
-				<version>4.2.1.Final</version>
+				<version>4.2.2.Final</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
@@ -284,7 +284,7 @@
 							<dependency>
 								<groupId>com.puppycrawl.tools</groupId>
 								<artifactId>checkstyle</artifactId>
-								<version>10.23.1</version>
+								<version>10.25.0</version>
 							</dependency>
 						</dependencies>
 						<configuration>
@@ -314,19 +314,19 @@
 							<includeTests>true</includeTests>
 							<printFailingErrors>true</printFailingErrors>
 							<rulesets>
-								<ruleset>../.config/pmd/ruleset.xml</ruleset>
+								<ruleset>../.config/pmd/java/ruleset.xml</ruleset>
 							</rulesets>
 						</configuration>
 						<dependencies>
 							<dependency>
 								<groupId>net.sourceforge.pmd</groupId>
 								<artifactId>pmd-core</artifactId>
-								<version>7.13.0</version>
+								<version>7.14.0</version>
 							</dependency>
 							<dependency>
 								<groupId>net.sourceforge.pmd</groupId>
 								<artifactId>pmd-java</artifactId>
-								<version>7.13.0</version>
+								<version>7.14.0</version>
 							</dependency>
 						</dependencies>
 					</plugin>
diff --git a/server/src/main/java/software/xdev/mockserver/matchers/HttpRequestPropertiesMatcher.java b/server/src/main/java/software/xdev/mockserver/matchers/HttpRequestPropertiesMatcher.java
@@ -166,44 +166,36 @@ private void withBody(final Body body)
 	
 	private BodyMatcher buildBodyMatcher(final Body body)
 	{
-		BodyMatcher bodyMatcher = null;
-		if(body != null)
+		if(body == null)
 		{
-			switch(body.getType())
-			{
-				case STRING:
-					final StringBody stringBody = (StringBody)body;
-					if(stringBody.isSubString())
-					{
-						bodyMatcher = new SubStringMatcher(string(stringBody.getValue()));
-					}
-					else
-					{
-						bodyMatcher = new ExactStringMatcher(string(stringBody.getValue()));
-					}
-					break;
-				case REGEX:
-					final RegexBody regexBody = (RegexBody)body;
-					bodyMatcher = new RegexStringMatcher(string(regexBody.getValue()), this.controlPlaneMatcher);
-					break;
-				case PARAMETERS:
-					final ParameterBody parameterBody = (ParameterBody)body;
-					bodyMatcher =
-						new ParameterStringMatcher(this.configuration, parameterBody.getValue(),
-							this.controlPlaneMatcher);
-					break;
-				case BINARY:
-					final BinaryBody binaryBody = (BinaryBody)body;
-					bodyMatcher = new BinaryMatcher(binaryBody.getValue());
-					break;
-			}
-			if(body.isNot())
-			{
-				// noinspection ConstantConditions
-				bodyMatcher = notMatcher(bodyMatcher);
-			}
+			return null;
 		}
-		return bodyMatcher;
+		
+		final BodyMatcher matcher = this.determineBodyMatcherByType(body);
+		return body.isNot() ? notMatcher(matcher) : matcher;
+	}
+	
+	private BodyMatcher determineBodyMatcherByType(final Body body)
+	{
+		return switch(body.getType())
+		{
+			case STRING:
+				final StringBody stringBody = (StringBody)body;
+				final NottableString string = string(stringBody.getValue());
+				yield stringBody.isSubString() ? new SubStringMatcher(string) : new ExactStringMatcher(string);
+			case REGEX:
+				final RegexBody regexBody = (RegexBody)body;
+				yield new RegexStringMatcher(string(regexBody.getValue()), this.controlPlaneMatcher);
+			case PARAMETERS:
+				final ParameterBody parameterBody = (ParameterBody)body;
+				yield new ParameterStringMatcher(
+					this.configuration,
+					parameterBody.getValue(),
+					this.controlPlaneMatcher);
+			case BINARY:
+				final BinaryBody binaryBody = (BinaryBody)body;
+				yield new BinaryMatcher(binaryBody.getValue());
+		};
 	}
 	
 	private void withHeaders(final Headers headers)
diff --git a/server/src/main/java/software/xdev/mockserver/mock/action/http/HttpActionHandler.java b/server/src/main/java/software/xdev/mockserver/mock/action/http/HttpActionHandler.java
@@ -107,7 +107,9 @@ public HttpActionHandler(
 		"checkstyle:MethodLength",
 		"PMD.NcssCount",
 		"PMD.CognitiveComplexity",
-		"PMD.CyclomaticComplexity"})
+		"PMD.CyclomaticComplexity",
+		"PMD.NPathComplexity"
+	})
 	public void processAction(
 		final HttpRequest request,
 		final ResponseWriter responseWriter,
diff --git a/testcontainers/pom.xml b/testcontainers/pom.xml

Original file line number	Diff line number	Diff line change
`@@ -132,7 +132,6 @@ private ByteBuf getBody(final HttpResponse httpResponse)`
`132`	`132`	`httpResponse.getFirstHeader(CONTENT_TYPE.toString()));`
`133`	`133`	`}`
`134`	`134`
`135`		`- @SuppressWarnings("PMD.CognitiveComplexity")`
`136`	`135`	`private void setHeaders(final HttpResponse httpResponse, final DefaultHttpResponse response, final ByteBuf body)`
`137`	`136`	`{`
`138`	`137`	`if(httpResponse.getHeaderMultimap() != null)`
`@@ -149,15 +148,26 @@ private void setHeaders(final HttpResponse httpResponse, final DefaultHttpRespon`
`149`	`148`	`);`
`150`	`149`	`}`
`151`	`150`
`152`		`- // Content-Type`
	`151`	`+ setContentTypeHeader(httpResponse, response);`
	`152`	`+ setContentLengthHeader(httpResponse, response, body);`
	`153`	`+ setHTTP2ExtensionHeaders(httpResponse, response);`
	`154`	`+ }`
	`155`	`+`
	`156`	`+ protected static void setContentTypeHeader(final HttpResponse httpResponse, final DefaultHttpResponse response)`
	`157`	`+ {`
`153`	`158`	`if(isBlank(httpResponse.getFirstHeader(CONTENT_TYPE.toString()))`
`154`	`159`	`&& httpResponse.getBody() != null`
`155`	`160`	`&& httpResponse.getBody().getContentType() != null)`
`156`	`161`	`{`
`157`	`162`	`response.headers().set(CONTENT_TYPE, httpResponse.getBody().getContentType());`
`158`	`163`	`}`
`159`		`-`
`160`		`- // Content-Length`
	`164`	`+ }`
	`165`	`+`
	`166`	`+ protected static void setContentLengthHeader(`
	`167`	`+ final HttpResponse httpResponse,`
	`168`	`+ final DefaultHttpResponse response,`
	`169`	`+ final ByteBuf body)`
	`170`	`+ {`
`161`	`171`	`final ConnectionOptions connectionOptions = httpResponse.getConnectionOptions();`
`162`	`172`	`if(isBlank(httpResponse.getFirstHeader(CONTENT_LENGTH.toString())))`
`163`	`173`	`{`
`@@ -181,8 +191,10 @@ else if(addContentLength && !chunkedEncoding)`
`181`	`191`	`response.headers().set(HttpHeaderNames.TRANSFER_ENCODING, HttpHeaderValues.CHUNKED);`
`182`	`192`	`}`
`183`	`193`	`}`
`184`		`-`
`185`		`- // HTTP2 extension headers`
	`194`	`+ }`
	`195`	`+`
	`196`	`+ protected static void setHTTP2ExtensionHeaders(final HttpResponse httpResponse, final DefaultHttpResponse response)`
	`197`	`+ {`
`186`	`198`	`final Integer streamId = httpResponse.getStreamId();`
`187`	`199`	`if(streamId != null)`
`188`	`200`	`{`