|
42 | 42 | * @author Soeren Unruh |
43 | 43 | * @author Raylax Grey |
44 | 44 | * @author Artem Bilan |
| 45 | + * @author Ngoc Nhan |
45 | 46 | * |
46 | 47 | * @since 1.0 |
47 | 48 | */ |
@@ -275,27 +276,24 @@ private Object convertLongString(LongString longString, String charset) { |
275 | 276 | * @return the converted string. |
276 | 277 | */ |
277 | 278 | private Object convertLongStringIfNecessary(Object valueArg, String charset) { |
278 | | - Object value = valueArg; |
279 | | - if (value instanceof LongString longStr) { |
280 | | - value = convertLongString(longStr, charset); |
| 279 | + if (valueArg instanceof LongString longStr) { |
| 280 | + return convertLongString(longStr, charset); |
281 | 281 | } |
282 | | - else if (value instanceof List<?>) { |
283 | | - List<Object> convertedList = new ArrayList<>(((List<?>) value).size()); |
284 | | - for (Object listValue : (List<?>) value) { |
285 | | - convertedList.add(this.convertLongStringIfNecessary(listValue, charset)); |
286 | | - } |
287 | | - value = convertedList; |
| 282 | + |
| 283 | + if (valueArg instanceof List<?> values) { |
| 284 | + List<Object> convertedList = new ArrayList<>(values.size()); |
| 285 | + values.forEach(value -> convertedList.add(this.convertLongStringIfNecessary(value, charset))); |
| 286 | + return convertedList; |
288 | 287 | } |
289 | | - else if (value instanceof Map<?, ?>) { |
290 | | - @SuppressWarnings("unchecked") |
291 | | - Map<String, Object> originalMap = (Map<String, Object>) value; |
| 288 | + |
| 289 | + if (valueArg instanceof Map<?, ?> originalMap) { |
292 | 290 | Map<String, Object> convertedMap = new HashMap<>(); |
293 | | - for (Map.Entry<String, Object> entry : originalMap.entrySet()) { |
294 | | - convertedMap.put(entry.getKey(), this.convertLongStringIfNecessary(entry.getValue(), charset)); |
295 | | - } |
296 | | - value = convertedMap; |
| 291 | + originalMap.forEach( |
| 292 | + (key, value) -> convertedMap.put((String) key, this.convertLongStringIfNecessary(value, charset))); |
| 293 | + return convertedMap; |
297 | 294 | } |
298 | | - return value; |
| 295 | + |
| 296 | + return valueArg; |
299 | 297 | } |
300 | 298 |
|
301 | 299 | } |
0 commit comments