From aa74965f014e8b99c759b690f33ee8d343858657 Mon Sep 17 00:00:00 2001 From: Volodymyr Babak Date: Wed, 1 Feb 2023 17:42:41 +0200 Subject: [PATCH] Minor refactoring - renaming params --- .../install/update/DefaultDataUpdateService.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/application/src/main/java/org/thingsboard/server/service/install/update/DefaultDataUpdateService.java b/application/src/main/java/org/thingsboard/server/service/install/update/DefaultDataUpdateService.java index e6c37d0c08..7e42403ce3 100644 --- a/application/src/main/java/org/thingsboard/server/service/install/update/DefaultDataUpdateService.java +++ b/application/src/main/java/org/thingsboard/server/service/install/update/DefaultDataUpdateService.java @@ -768,16 +768,16 @@ public class DefaultDataUpdateService implements DataUpdateService { }, MoreExecutors.directExecutor()); } - private static void updateFilterIfRequired(JsonNode filter, String filterType, String oldParameterName, String newParameterName) { + private static void updateFilterIfRequired(JsonNode filter, String filterType, String singleTypeParamName, String multipleTypesParamName) { if (filter == null || filter.get("type") == null) { return; } if (filterType.equals(filter.get("type").asText())) { - if (filter.get(oldParameterName) != null) { + if (filter.get(singleTypeParamName) != null) { ArrayNode arrayNode = JacksonUtil.OBJECT_MAPPER.createArrayNode(); - arrayNode.add(filter.get(oldParameterName).asText()); - ((ObjectNode) filter).set(newParameterName, arrayNode); - ((ObjectNode) filter).remove(oldParameterName); + arrayNode.add(filter.get(singleTypeParamName).asText()); + ((ObjectNode) filter).set(multipleTypesParamName, arrayNode); + ((ObjectNode) filter).remove(singleTypeParamName); } } }