Skip to content

Commit 4a461b3

Browse files
committed
Fix/suppress pmd problems in 7.14
1 parent 9c321b8 commit 4a461b3

File tree

4 files changed

+23
-8
lines changed

4 files changed

+23
-8
lines changed

core/src/main/java/software/xdev/mockserver/mappers/MockServerHttpResponseToFullHttpResponse.java

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,6 @@ private ByteBuf getBody(final HttpResponse httpResponse)
132132
httpResponse.getFirstHeader(CONTENT_TYPE.toString()));
133133
}
134134

135-
@SuppressWarnings("PMD.CognitiveComplexity")
136135
private void setHeaders(final HttpResponse httpResponse, final DefaultHttpResponse response, final ByteBuf body)
137136
{
138137
if(httpResponse.getHeaderMultimap() != null)
@@ -149,15 +148,26 @@ private void setHeaders(final HttpResponse httpResponse, final DefaultHttpRespon
149148
);
150149
}
151150

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+
{
153158
if(isBlank(httpResponse.getFirstHeader(CONTENT_TYPE.toString()))
154159
&& httpResponse.getBody() != null
155160
&& httpResponse.getBody().getContentType() != null)
156161
{
157162
response.headers().set(CONTENT_TYPE, httpResponse.getBody().getContentType());
158163
}
159-
160-
// Content-Length
164+
}
165+
166+
protected static void setContentLengthHeader(
167+
final HttpResponse httpResponse,
168+
final DefaultHttpResponse response,
169+
final ByteBuf body)
170+
{
161171
final ConnectionOptions connectionOptions = httpResponse.getConnectionOptions();
162172
if(isBlank(httpResponse.getFirstHeader(CONTENT_LENGTH.toString())))
163173
{
@@ -181,8 +191,10 @@ else if(addContentLength && !chunkedEncoding)
181191
response.headers().set(HttpHeaderNames.TRANSFER_ENCODING, HttpHeaderValues.CHUNKED);
182192
}
183193
}
184-
185-
// HTTP2 extension headers
194+
}
195+
196+
protected static void setHTTP2ExtensionHeaders(final HttpResponse httpResponse, final DefaultHttpResponse response)
197+
{
186198
final Integer streamId = httpResponse.getStreamId();
187199
if(streamId != null)
188200
{

core/src/main/java/software/xdev/mockserver/serialization/serializers/body/StringBodyDTOSerializer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public StringBodyDTOSerializer(final boolean serialiseDefaultValues)
3434
this.serialiseDefaultValues = serialiseDefaultValues;
3535
}
3636

37-
@SuppressWarnings("PMD.CognitiveComplexity")
37+
@SuppressWarnings({"PMD.CognitiveComplexity", "PMD.NPathComplexity"})
3838
@Override
3939
public void serialize(
4040
final StringBodyDTO stringBodyDTO,

core/src/main/java/software/xdev/mockserver/serialization/serializers/body/StringBodySerializer.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ public StringBodySerializer(final boolean serialiseDefaultValues)
3434
this.serialiseDefaultValues = serialiseDefaultValues;
3535
}
3636

37+
@SuppressWarnings("PMD.NPathComplexity")
3738
@Override
3839
public void serialize(final StringBody stringBody, final JsonGenerator jgen, final SerializerProvider provider)
3940
throws IOException

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,9 @@ public HttpActionHandler(
107107
"checkstyle:MethodLength",
108108
"PMD.NcssCount",
109109
"PMD.CognitiveComplexity",
110-
"PMD.CyclomaticComplexity"})
110+
"PMD.CyclomaticComplexity",
111+
"PMD.NPathComplexity"
112+
})
111113
public void processAction(
112114
final HttpRequest request,
113115
final ResponseWriter responseWriter,

0 commit comments

Comments
 (0)