Fix PMD problems

AB-xdev · AB-xdev · commit d14b1f2f9a5c · 2025-11-26T17:07:45.000+01:00
Mostly nested IF statement hell
diff --git a/client/src/main/java/software/xdev/mockserver/client/MockServerClient.java b/client/src/main/java/software/xdev/mockserver/client/MockServerClient.java
@@ -327,8 +327,7 @@ private NettyHttpClient getNettyHttpClient()
 	@SuppressWarnings({
 		"checkstyle:FinalParameters",
 		"checkstyle:MagicNumber",
-		"PMD.CognitiveComplexity",
-		"PMD.NPathComplexity"})
+		"PMD.CognitiveComplexity"})
 	private HttpResponse sendRequest(
 		HttpRequest request,
 		final boolean ignoreErrors,
diff --git a/core/src/main/java/software/xdev/mockserver/httpclient/NettyHttpClient.java b/core/src/main/java/software/xdev/mockserver/httpclient/NettyHttpClient.java
@@ -157,27 +157,23 @@ public CompletableFuture<HttpResponse> sendRequest(
 			
 			responseFuture
 				.whenComplete((message, throwable) -> {
-					if(throwable == null)
+					if(throwable != null)
 					{
-						if(message != null)
-						{
-							if(this.forwardProxyClient)
-							{
-								httpResponseFuture.complete(HOP_BY_HOP_HEADER_FILTER.onResponse((HttpResponse)message));
-							}
-							else
-							{
-								httpResponseFuture.complete((HttpResponse)message);
-							}
-						}
-						else
-						{
-							httpResponseFuture.complete(response());
-						}
+						httpResponseFuture.completeExceptionally(throwable);
+						return;
+					}
+					if(message == null)
+					{
+						httpResponseFuture.complete(response());
+						return;
+					}
+					if(this.forwardProxyClient)
+					{
+						httpResponseFuture.complete(HOP_BY_HOP_HEADER_FILTER.onResponse((HttpResponse)message));
 					}
 					else
 					{
-						httpResponseFuture.completeExceptionally(throwable);
+						httpResponseFuture.complete((HttpResponse)message);
 					}
 				});
 			
diff --git a/core/src/main/java/software/xdev/mockserver/model/HttpRequest.java b/core/src/main/java/software/xdev/mockserver/model/HttpRequest.java
@@ -1319,7 +1319,6 @@ public HttpRequest update(final HttpRequest requestOverride, final HttpRequestMo
 		return this;
 	}
 	
-	@SuppressWarnings({"PMD.NPathComplexity"})
 	@Override
 	public boolean equals(final Object o)
 	{
diff --git a/core/src/main/java/software/xdev/mockserver/model/KeysToMultiValues.java b/core/src/main/java/software/xdev/mockserver/model/KeysToMultiValues.java
@@ -294,7 +294,7 @@ public List<String> getValues(final String name)
 		}
 	}
 	
-	@SuppressWarnings("PMD.CognitiveComplexity")
+	@SuppressWarnings({"PMD.CognitiveComplexity", "PMD.AvoidDeeplyNestedIfStmts"})
 	String getFirstValue(final String name)
 	{
 		if(!this.isEmpty())
@@ -338,7 +338,7 @@ public boolean containsEntry(final String name, final String value)
 		return this.containsEntry(string(name), string(value));
 	}
 	
-	@SuppressWarnings("PMD.CognitiveComplexity")
+	@SuppressWarnings({"PMD.CognitiveComplexity", "PMD.AvoidDeeplyNestedIfStmts"})
 	boolean containsEntry(final NottableString name, final NottableString value)
 	{
 		if(!this.isEmpty() && name != null && value != null)
diff --git a/core/src/main/java/software/xdev/mockserver/serialization/HttpResponseSerializer.java b/core/src/main/java/software/xdev/mockserver/serialization/HttpResponseSerializer.java
@@ -36,7 +36,6 @@ public class HttpResponseSerializer implements Serializer<HttpResponse>
 	private final ObjectMapper objectMapper = ObjectMapperFactory.createObjectMapper();
 	private final JsonArraySerializer jsonArraySerializer = new JsonArraySerializer();
 	
-	@SuppressWarnings({"PMD.CognitiveComplexity", "PMD.NPathComplexity"})
 	@Override
 	public String serialize(final HttpResponse httpResponse)
 	{
diff --git a/core/src/main/java/software/xdev/mockserver/serialization/WebSocketMessageSerializer.java b/core/src/main/java/software/xdev/mockserver/serialization/WebSocketMessageSerializer.java
@@ -28,7 +28,7 @@
 import software.xdev.mockserver.serialization.model.WebSocketMessageDTO;
 
 
-@SuppressWarnings({"rawtypes", "unchecked", "PMD"})
+@SuppressWarnings({"rawtypes", "unchecked"})
 public class WebSocketMessageSerializer
 {
 	private final ObjectWriter objectWriter = ObjectMapperFactory.createObjectMapper(true, false);
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
@@ -79,7 +79,7 @@ public BodyDTODeserializer()
 		"PMD.CognitiveComplexity",
 		"PMD.NPathComplexity",
 		"PMD.CyclomaticComplexity",
-		"PMD.NcssCount"})
+		"PMD.AvoidDeeplyNestedIfStmts"})
 	@Override
 	public BodyDTO deserialize(final JsonParser jsonParser, final DeserializationContext ctxt) throws IOException
 	{
diff --git a/core/src/main/java/software/xdev/mockserver/serialization/deserializers/body/BodyWithContentTypeDTODeserializer.java b/core/src/main/java/software/xdev/mockserver/serialization/deserializers/body/BodyWithContentTypeDTODeserializer.java
@@ -63,7 +63,6 @@ public BodyWithContentTypeDTODeserializer()
 		"PMD.CognitiveComplexity",
 		"PMD.NPathComplexity",
 		"PMD.CyclomaticComplexity",
-		"PMD.NcssCount",
 		"PMD.AvoidDeeplyNestedIfStmts"})
 	@Override
 	public BodyWithContentTypeDTO deserialize(final JsonParser jsonParser, final DeserializationContext ctxt)
diff --git a/core/src/main/java/software/xdev/mockserver/serialization/deserializers/body/StrictBodyDTODeserializer.java b/core/src/main/java/software/xdev/mockserver/serialization/deserializers/body/StrictBodyDTODeserializer.java
@@ -78,7 +78,6 @@ public StrictBodyDTODeserializer()
 		"PMD.CognitiveComplexity",
 		"PMD.NPathComplexity",
 		"PMD.CyclomaticComplexity",
-		"PMD.NcssCount",
 		"PMD.AvoidDeeplyNestedIfStmts"})
 	@Override
 	public BodyDTO deserialize(final JsonParser jsonParser, final DeserializationContext ctxt) throws IOException
diff --git a/core/src/main/java/software/xdev/mockserver/serialization/deserializers/request/RequestDefinitionDTODeserializer.java b/core/src/main/java/software/xdev/mockserver/serialization/deserializers/request/RequestDefinitionDTODeserializer.java
@@ -47,7 +47,6 @@ public RequestDefinitionDTODeserializer()
 		super(RequestDefinitionDTO.class);
 	}
 	
-	@SuppressWarnings("PMD.NcssCount")
 	@Override
 	public RequestDefinitionDTO deserialize(final JsonParser jsonParser, final DeserializationContext ctxt)
 		throws IOException
diff --git a/core/src/main/java/software/xdev/mockserver/serialization/serializers/response/HttpResponseDTOSerializer.java b/core/src/main/java/software/xdev/mockserver/serialization/serializers/response/HttpResponseDTOSerializer.java
@@ -34,7 +34,7 @@ public HttpResponseDTOSerializer()
 		super(HttpResponseDTO.class);
 	}
 	
-	@SuppressWarnings({"PMD.CognitiveComplexity", "PMD.NPathComplexity"})
+	@SuppressWarnings({"PMD.NPathComplexity"})
 	@Override
 	public void serialize(
 		final HttpResponseDTO httpResponseDTO,
diff --git a/server/src/main/java/software/xdev/mockserver/cli/Main.java b/server/src/main/java/software/xdev/mockserver/cli/Main.java
@@ -44,7 +44,6 @@
 import software.xdev.mockserver.netty.MockServer;
 
 
-@SuppressWarnings("PMD.GodClass")
 public final class Main
 {
 	private static final Logger LOG = LoggerFactory.getLogger(Main.class);
diff --git a/server/src/main/java/software/xdev/mockserver/event/EventBus.java b/server/src/main/java/software/xdev/mockserver/event/EventBus.java
@@ -515,7 +515,7 @@ public void verify(final Verification verification, final Consumer<String> resul
 		}
 	}
 	
-	@SuppressWarnings("PMD.CognitiveComplexity")
+	@SuppressWarnings({"PMD.CognitiveComplexity", "PMD.AvoidDeeplyNestedIfStmts"})
 	public void verify(final VerificationSequence verificationSequence, final Consumer<String> resultConsumer)
 	{
 		if(verificationSequence != null)
@@ -632,7 +632,6 @@ public void verify(final VerificationSequence verificationSequence, final Consum
 		}
 	}
 	
-	@SuppressWarnings("PMD.UnusedFormalParameter")
 	private void verificationSequenceSuccessMessage(
 		final VerificationSequence verificationSequence,
 		final Consumer<String> resultConsumer,
@@ -645,7 +644,6 @@ private void verificationSequenceSuccessMessage(
 		resultConsumer.accept(failureMessage);
 	}
 	
-	@SuppressWarnings("PMD.UnusedFormalParameter")
 	private String verificationSequenceFailureMessage(
 		final VerificationSequence verificationSequence,
 		final List<RequestDefinition> allRequests)
@@ -682,7 +680,6 @@ private String verificationSequenceFailureMessage(
 		return failureMessage;
 	}
 	
-	@SuppressWarnings("PMD.UnusedFormalParameter")
 	private void verificationSequenceExceptionHandler(
 		final VerificationSequence verificationSequence,
 		final Consumer<String> resultConsumer,
diff --git a/server/src/main/java/software/xdev/mockserver/exception/ExceptionHandling.java b/server/src/main/java/software/xdev/mockserver/exception/ExceptionHandling.java
@@ -67,7 +67,7 @@ public static void closeOnFlush(final Channel ch)
 	/**
 	 * returns true is the exception was caused by the connection being closed
 	 */
-	@SuppressWarnings({"java:S1872", "PMD.CognitiveComplexity", "PMD.NPathComplexity"}) // Not always given
+	@SuppressWarnings({"java:S1872", "PMD.CognitiveComplexity"}) // Not always given
 	public static boolean connectionClosedException(final Throwable throwable)
 	{
 		// is ssl exception
diff --git a/server/src/main/java/software/xdev/mockserver/lifecycle/LifeCycle.java b/server/src/main/java/software/xdev/mockserver/lifecycle/LifeCycle.java
@@ -77,7 +77,6 @@ protected LifeCycle(final ServerConfiguration configuration)
 		this.httpState = new HttpState(this.configuration, this.scheduler);
 	}
 	
-	@SuppressWarnings("PMD.CognitiveComplexity")
 	public CompletableFuture<Void> stopAsync()
 	{
 		if(!this.stopFuture.isDone() && this.stopping.compareAndSet(false, true))
diff --git a/server/src/main/java/software/xdev/mockserver/matchers/HttpRequestPropertiesMatcher.java b/server/src/main/java/software/xdev/mockserver/matchers/HttpRequestPropertiesMatcher.java
@@ -257,7 +257,7 @@ public boolean matches(final MatchDifference context, final RequestDefinition re
 		"PMD.CognitiveComplexity",
 		"PMD.NPathComplexity",
 		"PMD.CyclomaticComplexity",
-		"PMD.NcssCount"})
+		"PMD.AvoidDeeplyNestedIfStmts"})
 	private boolean matches(
 		final MatchDifference context,
 		final HttpRequest request,
@@ -550,7 +550,7 @@ private static boolean combinedResultAreTrue(final boolean... inputs)
 		return count % 2 != 0;
 	}
 	
-	@SuppressWarnings("PMD.CognitiveComplexity")
+	@SuppressWarnings({"PMD.CognitiveComplexity", "PMD.AvoidDeeplyNestedIfStmts"})
 	private boolean bodyMatches(final MatchDifference context, final HttpRequest request)
 	{
 		boolean bodyMatches;
diff --git a/server/src/main/java/software/xdev/mockserver/matchers/RegexStringMatcher.java b/server/src/main/java/software/xdev/mockserver/matchers/RegexStringMatcher.java
@@ -78,7 +78,7 @@ private boolean matchesByNottedStrings(
 		}
 	}
 	
-	@SuppressWarnings({"PMD.CognitiveComplexity", "PMD.NPathComplexity"})
+	@SuppressWarnings({"PMD.CognitiveComplexity"})
 	private boolean matchesByStrings(
 		final MatchDifference context,
 		final NottableString matcher,
diff --git a/server/src/main/java/software/xdev/mockserver/mock/HttpState.java b/server/src/main/java/software/xdev/mockserver/mock/HttpState.java
@@ -277,11 +277,8 @@ public void postProcess(final Expectation expectation)
 	@SuppressWarnings({
 		"checkstyle:MethodLength",
 		"checkstyle:MagicNumber",
-		"PMD.NcssCount",
 		"PMD.CognitiveComplexity",
-		"PMD.CyclomaticComplexity",
-		"PMD.PreserveStackTrace",
-		"PMD.SwitchDensity"})
+		"PMD.PreserveStackTrace"})
 	public HttpResponse retrieve(final HttpRequest request)
 	{
 		final String logCorrelationId = UUIDService.getUUID();
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
@@ -105,7 +105,6 @@ public HttpActionHandler(
 	
 	@SuppressWarnings({
 		"checkstyle:MethodLength",
-		"PMD.NcssCount",
 		"PMD.CognitiveComplexity",
 		"PMD.CyclomaticComplexity",
 		"PMD.NPathComplexity"
diff --git a/server/src/main/java/software/xdev/mockserver/netty/HttpRequestHandler.java b/server/src/main/java/software/xdev/mockserver/netty/HttpRequestHandler.java
@@ -114,7 +114,11 @@ private static Set<String> getLocalAddresses(final ChannelHandlerContext ctx)
 		return new HashSet<>();
 	}
 	
-	@SuppressWarnings({"checkstyle:MagicNumber", "PMD.CognitiveComplexity", "PMD.AvoidUnmanagedThreads"})
+	@SuppressWarnings({
+		"checkstyle:MagicNumber",
+		"PMD.CognitiveComplexity",
+		"PMD.AvoidUnmanagedThreads",
+		"PMD.AvoidDeeplyNestedIfStmts"})
 	@Override
 	protected void channelRead0(final ChannelHandlerContext ctx, final HttpRequest request)
 	{
diff --git a/server/src/main/java/software/xdev/mockserver/responsewriter/ResponseWriter.java b/server/src/main/java/software/xdev/mockserver/responsewriter/ResponseWriter.java
@@ -72,7 +72,7 @@ public void writeResponse(
 		this.writeResponse(request, response, true);
 	}
 	
-	@SuppressWarnings({"checkstyle:FinalParameters", "PMD.NPathComplexity"})
+	@SuppressWarnings({"checkstyle:FinalParameters"})
 	public void writeResponse(final HttpRequest request, HttpResponse response, final boolean apiResponse)
 	{
 		if(response == null)

Original file line number	Diff line number	Diff line change
`@@ -1319,7 +1319,6 @@ public HttpRequest update(final HttpRequest requestOverride, final HttpRequestMo`
`1319`	`1319`	`return this;`
`1320`	`1320`	`}`
`1321`	`1321`
`1322`		`- @SuppressWarnings({"PMD.NPathComplexity"})`
`1323`	`1322`	`@Override`
`1324`	`1323`	`public boolean equals(final Object o)`
`1325`	`1324`	`{`
Original file line number	Diff line number	Diff line change
`@@ -294,7 +294,7 @@ public List<String> getValues(final String name)`
`294`	`294`	`}`
`295`	`295`	`}`
`296`	`296`
`297`		`- @SuppressWarnings("PMD.CognitiveComplexity")`
	`297`	`+ @SuppressWarnings({"PMD.CognitiveComplexity", "PMD.AvoidDeeplyNestedIfStmts"})`
`298`	`298`	`String getFirstValue(final String name)`
`299`	`299`	`{`
`300`	`300`	`if(!this.isEmpty())`
`@@ -338,7 +338,7 @@ public boolean containsEntry(final String name, final String value)`
`338`	`338`	`return this.containsEntry(string(name), string(value));`
`339`	`339`	`}`
`340`	`340`
`341`		`- @SuppressWarnings("PMD.CognitiveComplexity")`
	`341`	`+ @SuppressWarnings({"PMD.CognitiveComplexity", "PMD.AvoidDeeplyNestedIfStmts"})`
`342`	`342`	`boolean containsEntry(final NottableString name, final NottableString value)`
`343`	`343`	`{`
`344`	`344`	`if(!this.isEmpty() && name != null && value != null)`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,6 @@ public class HttpResponseSerializer implements Serializer<HttpResponse>`
`36`	`36`	`private final ObjectMapper objectMapper = ObjectMapperFactory.createObjectMapper();`
`37`	`37`	`private final JsonArraySerializer jsonArraySerializer = new JsonArraySerializer();`
`38`	`38`
`39`		`- @SuppressWarnings({"PMD.CognitiveComplexity", "PMD.NPathComplexity"})`
`40`	`39`	`@Override`
`41`	`40`	`public String serialize(final HttpResponse httpResponse)`
`42`	`41`	`{`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@`
`28`	`28`	`import software.xdev.mockserver.serialization.model.WebSocketMessageDTO;`
`29`	`29`
`30`	`30`
`31`		`-@SuppressWarnings({"rawtypes", "unchecked", "PMD"})`
	`31`	`+@SuppressWarnings({"rawtypes", "unchecked"})`
`32`	`32`	`public class WebSocketMessageSerializer`
`33`	`33`	`{`
`34`	`34`	`private final ObjectWriter objectWriter = ObjectMapperFactory.createObjectMapper(true, false);`
Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ public BodyDTODeserializer()`
`79`	`79`	`"PMD.CognitiveComplexity",`
`80`	`80`	`"PMD.NPathComplexity",`
`81`	`81`	`"PMD.CyclomaticComplexity",`
`82`		`- "PMD.NcssCount"})`
	`82`	`+ "PMD.AvoidDeeplyNestedIfStmts"})`
`83`	`83`	`@Override`
`84`	`84`	`public BodyDTO deserialize(final JsonParser jsonParser, final DeserializationContext ctxt) throws IOException`
`85`	`85`	`{`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,6 @@ public RequestDefinitionDTODeserializer()`
`47`	`47`	`super(RequestDefinitionDTO.class);`
`48`	`48`	`}`
`49`	`49`
`50`		`- @SuppressWarnings("PMD.NcssCount")`
`51`	`50`	`@Override`
`52`	`51`	`public RequestDefinitionDTO deserialize(final JsonParser jsonParser, final DeserializationContext ctxt)`
`53`	`52`	`throws IOException`