Skip to content

Commit 598a290

Browse files
AB-xdevAB-xdev
committed
Fix CS
1 parent 8bfa592 commit 598a290

18 files changed

Lines changed: 170 additions & 181 deletions

‎core/src/main/java/software/xdev/mockserver/model/Body.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,13 +59,13 @@ public byte[] getRawBytes()
5959
}
6060

6161
@JsonIgnore
62-
public Charset getCharset(final Charset defaultIfNotSet)
62+
public Charset getCharset(final Charset defaultCharset)
6363
{
6464
if(this instanceof BodyWithContentType)
6565
{
66-
return this.getCharset(defaultIfNotSet);
66+
return this.getCharset(defaultCharset);
6767
}
68-
return defaultIfNotSet;
68+
return defaultCharset;
6969
}
7070

7171
public String getContentType()

‎core/src/main/java/software/xdev/mockserver/model/BodyWithContentType.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@ Charset determineCharacterSet(final MediaType mediaType, final Charset defaultCh
4848

4949
@Override
5050
@JsonIgnore
51-
public Charset getCharset(final Charset defaultIfNotSet)
51+
public Charset getCharset(final Charset defaultCharset)
5252
{
53-
return this.determineCharacterSet(this.contentType, defaultIfNotSet);
53+
return this.determineCharacterSet(this.contentType, defaultCharset);
5454
}
5555

5656
@Override

‎core/src/main/java/software/xdev/mockserver/model/MediaType.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ public static MediaType parse(final String mediaTypeHeader)
133133
.trim()
134134
.toLowerCase())
135135
.replaceAll("");
136-
Map<String, String> parameterMap = new ConcurrentHashMap<>();
136+
Map<String, String> parameterValues = new ConcurrentHashMap<>();
137137
if(isNotBlank(parameters))
138138
{
139139
try
@@ -145,16 +145,16 @@ public static MediaType parse(final String mediaTypeHeader)
145145
final String value = substringAfter(parameterTrimmed, "=").trim();
146146
if(isNotBlank(key) && isNotBlank(value))
147147
{
148-
parameterMap.put(
148+
parameterValues.put(
149149
key,
150150
value
151151
);
152152
}
153153
}
154-
if(parameterMap.size() > 1)
154+
if(parameterValues.size() > 1)
155155
{
156156
// sort if multiple entries to ensure equals and hashcode is consistent
157-
parameterMap = parameterMap.entrySet()
157+
parameterValues = parameterValues.entrySet()
158158
.stream()
159159
.sorted(Map.Entry.comparingByKey())
160160
.collect(Collectors.toMap(
@@ -174,7 +174,7 @@ public static MediaType parse(final String mediaTypeHeader)
174174
ex);
175175
}
176176
}
177-
return new MediaType(type, subType, parameterMap);
177+
return new MediaType(type, subType, parameterValues);
178178
}
179179

180180
private static TreeMap<String, String> createParametersMap(final Map<String, String> initialValues)
@@ -204,14 +204,14 @@ private MediaType(
204204
final String type,
205205
final String subtype,
206206
final String charset,
207-
final Map<String, String> parameterMap)
207+
final Map<String, String> parameterValues)
208208
{
209209
this.type = isBlank(type) ? null : type;
210210
this.subtype = isBlank(subtype) ? null : subtype;
211211
this.parameters = new TreeMap<>(String::compareToIgnoreCase);
212-
if(parameterMap != null)
212+
if(parameterValues != null)
213213
{
214-
parameterMap.forEach((key, value) -> this.parameters.put(key.toLowerCase(), value));
214+
parameterValues.forEach((key, value) -> this.parameters.put(key.toLowerCase(), value));
215215
}
216216
Charset parsedCharset = null;
217217
if(isNotBlank(charset))

‎core/src/main/java/software/xdev/mockserver/serialization/ExpectationIdSerializer.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -123,31 +123,31 @@ public ExpectationId[] deserializeArray(final String jsonExpectationIds)
123123
}
124124
else
125125
{
126-
final List<String> jsonRequestList = this.jsonArraySerializer.splitJSONArray(jsonExpectationIds);
127-
if(jsonRequestList.isEmpty())
126+
final List<String> jsonRequests = this.jsonArraySerializer.splitJSONArray(jsonExpectationIds);
127+
if(jsonRequests.isEmpty())
128128
{
129129
throw new IllegalArgumentException(
130130
"1 error:" + NEW_LINE + " - a request or array of request is required");
131131
}
132132
else
133133
{
134-
final List<String> validationErrorsList = new ArrayList<>();
135-
for(final String jsonRequest : jsonRequestList)
134+
final List<String> validationErrors = new ArrayList<>();
135+
for(final String jsonRequest : jsonRequests)
136136
{
137137
try
138138
{
139139
expectationIds.add(this.deserialize(jsonRequest));
140140
}
141141
catch(final IllegalArgumentException iae)
142142
{
143-
validationErrorsList.add(iae.getMessage());
143+
validationErrors.add(iae.getMessage());
144144
}
145145
}
146-
if(!validationErrorsList.isEmpty())
146+
if(!validationErrors.isEmpty())
147147
{
148-
throw new IllegalArgumentException((validationErrorsList.size() > 1 ? "[" : "")
149-
+ String.join("," + NEW_LINE, validationErrorsList)
150-
+ (validationErrorsList.size() > 1 ? "]" : ""));
148+
throw new IllegalArgumentException((validationErrors.size() > 1 ? "[" : "")
149+
+ String.join("," + NEW_LINE, validationErrors)
150+
+ (validationErrors.size() > 1 ? "]" : ""));
151151
}
152152
}
153153
}

‎core/src/main/java/software/xdev/mockserver/serialization/ExpectationSerializer.java‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -134,38 +134,38 @@ public Expectation[] deserializeArray(final String jsonExpectations, final boole
134134

135135
@SuppressWarnings("PMD.CognitiveComplexity")
136136
public Expectation[] deserializeArray(
137-
final String jsonExpectations,
137+
final String strJsonExpectations,
138138
final boolean allowEmpty,
139139
final BiFunction<String, List<Expectation>, List<Expectation>> expectationModifier)
140140
{
141-
if(isBlank(jsonExpectations))
141+
if(isBlank(strJsonExpectations))
142142
{
143143
throw new IllegalArgumentException(
144144
"1 error:" + NEW_LINE + " - an expectation or expectation array is required but value was \""
145-
+ jsonExpectations + "\"");
145+
+ strJsonExpectations + "\"");
146146
}
147147
final List<Expectation> expectations = new ArrayList<>();
148-
final List<String> validationErrorsList = new ArrayList<>();
149-
final List<JsonNode> jsonExpectationList =
150-
this.jsonArraySerializer.splitJSONArrayToJSONNodes(jsonExpectations);
151-
if(!jsonExpectationList.isEmpty())
148+
final List<String> validationErrors = new ArrayList<>();
149+
final List<JsonNode> jsonExpectations =
150+
this.jsonArraySerializer.splitJSONArrayToJSONNodes(strJsonExpectations);
151+
if(!jsonExpectations.isEmpty())
152152
{
153-
for(int i = 0; i < jsonExpectationList.size(); i++)
153+
for(int i = 0; i < jsonExpectations.size(); i++)
154154
{
155-
final String jsonExpectation = JacksonUtils.prettyPrint(jsonExpectationList.get(i));
156-
if(jsonExpectationList.size() > 100)
155+
final String jsonExpectation = JacksonUtils.prettyPrint(jsonExpectations.get(i));
156+
if(jsonExpectations.size() > 100)
157157
{
158158
if(LOG.isDebugEnabled())
159159
{
160160
LOG.debug(
161161
"Processing JSON expectation {} of {}: {}",
162162
i + 1,
163-
jsonExpectationList.size(),
163+
jsonExpectations.size(),
164164
jsonExpectation);
165165
}
166166
else if(LOG.isInfoEnabled())
167167
{
168-
LOG.info("Processing JSON expectation {} of {}", i + 1, jsonExpectationList.size());
168+
LOG.info("Processing JSON expectation {} of {}", i + 1, jsonExpectations.size());
169169
}
170170
}
171171
try
@@ -176,21 +176,21 @@ else if(LOG.isInfoEnabled())
176176
}
177177
catch(final IllegalArgumentException iae)
178178
{
179-
validationErrorsList.add(iae.getMessage());
179+
validationErrors.add(iae.getMessage());
180180
}
181181
}
182-
if(!validationErrorsList.isEmpty())
182+
if(!validationErrors.isEmpty())
183183
{
184-
if(validationErrorsList.size() > 1)
184+
if(validationErrors.size() > 1)
185185
{
186186
throw new IllegalArgumentException(("[" + NEW_LINE
187-
+ String.join("," + NEW_LINE + NEW_LINE, validationErrorsList))
187+
+ String.join("," + NEW_LINE + NEW_LINE, validationErrors))
188188
.replaceAll(NEW_LINE, NEW_LINE + " ")
189189
+ NEW_LINE + "]");
190190
}
191191
else
192192
{
193-
throw new IllegalArgumentException(validationErrorsList.get(0));
193+
throw new IllegalArgumentException(validationErrors.get(0));
194194
}
195195
}
196196
}

‎core/src/main/java/software/xdev/mockserver/serialization/HttpRequestAndHttpResponseSerializer.java‎

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -139,33 +139,31 @@ public HttpRequestAndHttpResponse[] deserializeArray(final String jsonHttpReques
139139
}
140140
else
141141
{
142-
final List<String> jsonRequestList = this.jsonArraySerializer.splitJSONArray(jsonHttpRequests);
143-
if(jsonRequestList.isEmpty())
142+
final List<String> jsonRequests = this.jsonArraySerializer.splitJSONArray(jsonHttpRequests);
143+
if(jsonRequests.isEmpty())
144144
{
145145
throw new IllegalArgumentException(
146146
"1 error:" + NEW_LINE + " - a request or array of request is required");
147147
}
148-
else
148+
149+
final List<String> validationErrors = new ArrayList<>();
150+
for(final String jsonRequest : jsonRequests)
149151
{
150-
final List<String> validationErrorsList = new ArrayList<>();
151-
for(final String jsonRequest : jsonRequestList)
152+
try
152153
{
153-
try
154-
{
155-
httpRequests.add(this.deserialize(jsonRequest));
156-
}
157-
catch(final IllegalArgumentException iae)
158-
{
159-
validationErrorsList.add(iae.getMessage());
160-
}
154+
httpRequests.add(this.deserialize(jsonRequest));
161155
}
162-
if(!validationErrorsList.isEmpty())
156+
catch(final IllegalArgumentException iae)
163157
{
164-
throw new IllegalArgumentException((validationErrorsList.size() > 1 ? "[" : "")
165-
+ String.join("," + NEW_LINE, validationErrorsList)
166-
+ (validationErrorsList.size() > 1 ? "]" : ""));
158+
validationErrors.add(iae.getMessage());
167159
}
168160
}
161+
if(!validationErrors.isEmpty())
162+
{
163+
throw new IllegalArgumentException((validationErrors.size() > 1 ? "[" : "")
164+
+ String.join("," + NEW_LINE, validationErrors)
165+
+ (validationErrors.size() > 1 ? "]" : ""));
166+
}
169167
}
170168
return httpRequests.toArray(new HttpRequestAndHttpResponse[0]);
171169
}

‎core/src/main/java/software/xdev/mockserver/serialization/HttpRequestSerializer.java‎

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -173,33 +173,31 @@ public HttpRequest[] deserializeArray(final String jsonHttpRequests)
173173
}
174174
else
175175
{
176-
final List<String> jsonRequestList = this.jsonArraySerializer.splitJSONArray(jsonHttpRequests);
177-
if(jsonRequestList.isEmpty())
176+
final List<String> jsonRequests = this.jsonArraySerializer.splitJSONArray(jsonHttpRequests);
177+
if(jsonRequests.isEmpty())
178178
{
179179
throw new IllegalArgumentException(
180180
"1 error:" + NEW_LINE + " - a request or array of request is required");
181181
}
182-
else
182+
183+
final List<String> validationErrors = new ArrayList<>();
184+
for(final String jsonRequest : jsonRequests)
183185
{
184-
final List<String> validationErrorsList = new ArrayList<>();
185-
for(final String jsonRequest : jsonRequestList)
186+
try
186187
{
187-
try
188-
{
189-
httpRequests.add(this.deserialize(jsonRequest));
190-
}
191-
catch(final IllegalArgumentException iae)
192-
{
193-
validationErrorsList.add(iae.getMessage());
194-
}
188+
httpRequests.add(this.deserialize(jsonRequest));
195189
}
196-
if(!validationErrorsList.isEmpty())
190+
catch(final IllegalArgumentException iae)
197191
{
198-
throw new IllegalArgumentException((validationErrorsList.size() > 1 ? "[" : "")
199-
+ String.join("," + NEW_LINE, validationErrorsList)
200-
+ (validationErrorsList.size() > 1 ? "]" : ""));
192+
validationErrors.add(iae.getMessage());
201193
}
202194
}
195+
if(!validationErrors.isEmpty())
196+
{
197+
throw new IllegalArgumentException((validationErrors.size() > 1 ? "[" : "")
198+
+ String.join("," + NEW_LINE, validationErrors)
199+
+ (validationErrors.size() > 1 ? "]" : ""));
200+
}
203201
}
204202
return httpRequests.toArray(new HttpRequest[0]);
205203
}

‎core/src/main/java/software/xdev/mockserver/serialization/HttpResponseSerializer.java‎

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -140,33 +140,31 @@ public HttpResponse[] deserializeArray(final String jsonHttpResponses)
140140
}
141141
else
142142
{
143-
final List<String> jsonResponseList = this.jsonArraySerializer.splitJSONArray(jsonHttpResponses);
144-
if(jsonResponseList.isEmpty())
143+
final List<String> jsonResponses = this.jsonArraySerializer.splitJSONArray(jsonHttpResponses);
144+
if(jsonResponses.isEmpty())
145145
{
146146
throw new IllegalArgumentException(
147147
"1 error:" + NEW_LINE + " - a response or array of response is required");
148148
}
149-
else
149+
150+
final List<String> validationErrors = new ArrayList<>();
151+
for(final String jsonExpectation : jsonResponses)
150152
{
151-
final List<String> validationErrorsList = new ArrayList<>();
152-
for(final String jsonExpectation : jsonResponseList)
153+
try
153154
{
154-
try
155-
{
156-
httpResponses.add(this.deserialize(jsonExpectation));
157-
}
158-
catch(final IllegalArgumentException iae)
159-
{
160-
validationErrorsList.add(iae.getMessage());
161-
}
155+
httpResponses.add(this.deserialize(jsonExpectation));
162156
}
163-
if(!validationErrorsList.isEmpty())
157+
catch(final IllegalArgumentException iae)
164158
{
165-
throw new IllegalArgumentException((validationErrorsList.size() > 1 ? "[" : "")
166-
+ String.join("," + NEW_LINE, validationErrorsList)
167-
+ (validationErrorsList.size() > 1 ? "]" : ""));
159+
validationErrors.add(iae.getMessage());
168160
}
169161
}
162+
if(!validationErrors.isEmpty())
163+
{
164+
throw new IllegalArgumentException((validationErrors.size() > 1 ? "[" : "")
165+
+ String.join("," + NEW_LINE, validationErrors)
166+
+ (validationErrors.size() > 1 ? "]" : ""));
167+
}
170168
}
171169
return httpResponses.toArray(new HttpResponse[0]);
172170
}

0 commit comments

Comments
 (0)