refactoring

application/src/main/java/org/thingsboard/server/actors/calculatedField/CalculatedFieldEntityMessageProcessor.java

@@ -643,11 +643,9 @@ public class CalculatedFieldEntityMessageProcessor extends AbstractContextAwareM
                 if (geofencingArgNames.contains(argName)) {
                     arguments.put(argName, new GeofencingArgumentEntry());
                 } else {
-                    Argument argument = configArguments.get(argName);
+                    String defaultValue = getDefaultValue(configArguments, argName);
-                    String defaultValue = (argument != null) ? argument.getDefaultValue() : null;
+                    SingleValueArgumentEntry argumentEntry = buildSingleValue(removedKey, defaultValue, System.currentTimeMillis());
-                    arguments.put(argName, StringUtils.isNotEmpty(defaultValue)
+                    arguments.put(argName, new SingleValueArgumentEntry(argumentEntry));
-                            ? new SingleValueArgumentEntry(System.currentTimeMillis(), new StringDataEntry(removedKey, defaultValue), null)
-                            : new SingleValueArgumentEntry());
                 }
             });
         }