REST API call node: cleanup properties in node config

rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/rest/TbHttpClient.java

@@ -130,10 +130,6 @@ public class TbHttpClient {
                     SslContext sslContext = config.getCredentials().initSslContext();
                     httpClient = httpClient.secure(t -> t.sslContext(sslContext));
                 }
-            } else if (config.isUseSimpleClientHttpFactory()) {
-                if (CredentialsType.CERT_PEM == config.getCredentials().getType()) {
-                    throw new TbNodeException("Simple HTTP Factory does not support CERT PEM credentials!");
-                }
             } else {
                 SslContext sslContext = config.getCredentials().initSslContext();
                 httpClient = httpClient.secure(t -> t.sslContext(sslContext));

rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/rest/TbRestApiCallNode.java

@@ -28,7 +28,9 @@ import org.thingsboard.server.common.data.util.TbPair;
 import org.thingsboard.server.common.msg.TbMsg;
 import org.thingsboard.server.dao.exception.DataValidationException;
 
+import java.util.Iterator;
 import java.util.List;
+import java.util.Set;
 
 import static org.thingsboard.server.dao.service.ConstraintValidator.validateFields;
 
@@ -36,7 +38,7 @@ import static org.thingsboard.server.dao.service.ConstraintValidator.validateFie
         type = ComponentType.EXTERNAL,
         name = "rest api call",
         configClazz = TbRestApiCallNodeConfiguration.class,
-        version = 3,
+        version = 4,
         nodeDescription = "Invoke REST API calls to external REST server",
         nodeDetails = "Will invoke REST API call <code>GET | POST | PUT | DELETE</code> to external REST server. " +
                 "Message payload added into Request body. Configured attributes can be added into Headers from Message Metadata." +
@@ -108,6 +110,22 @@ public class TbRestApiCallNode extends TbAbstractExternalNode {
                     ((ObjectNode) oldConfiguration).put(MAX_IN_MEMORY_BUFFER_SIZE_IN_KB, 256);
                 }
                 break;
+            case 3:
+                Set<String> knownProperties = Set.of(
+                        "restEndpointUrlPattern", "requestMethod", "headers",
+                        "readTimeoutMs", "maxParallelRequestsCount", "parseToPlainText",
+                        "enableProxy", "useSystemProxyProperties", "proxyHost", "proxyPort",
+                        "proxyUser", "proxyPassword", "credentials", "ignoreRequestBody",
+                        "maxInMemoryBufferSizeInKb"
+                );
+                Iterator<String> fieldNames = oldConfiguration.fieldNames();
+                while (fieldNames.hasNext()) {
+                    if (!knownProperties.contains(fieldNames.next())) {
+                        hasChanges = true;
+                        fieldNames.remove();
+                    }
+                }
+                break;
             default:
                 break;
         }

rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/rest/TbRestApiCallNodeConfiguration.java

@@ -15,7 +15,6 @@
  */
 package org.thingsboard.rule.engine.rest;
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotNull;
 import lombok.Data;
@@ -29,15 +28,15 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
-@JsonIgnoreProperties(ignoreUnknown = true)
 @Data
 public class TbRestApiCallNodeConfiguration implements NodeConfiguration<TbRestApiCallNodeConfiguration> {
 
     private String restEndpointUrlPattern;
     private String requestMethod;
+    // null for legacy configs - triggers different URL encoding logic in TbHttpClient to preserver backward compatibility
+    // all new/modified configs since introduction of this property are forced to have non-null value by UI (and use new encoding logic)
     private List<@NotNull @Valid QueryParam> queryParams;
     private Map<String, String> headers;
-    private boolean useSimpleClientHttpFactory;
     private int readTimeoutMs;
     private int maxParallelRequestsCount;
     private boolean parseToPlainText;
@@ -47,7 +46,6 @@ public class TbRestApiCallNodeConfiguration implements NodeConfiguration<TbRestA
     private int proxyPort;
     private String proxyUser;
     private String proxyPassword;
-    private String proxyScheme;
     private ClientCredentials credentials;
     private boolean ignoreRequestBody;
     private int maxInMemoryBufferSizeInKb;
@@ -59,7 +57,6 @@ public class TbRestApiCallNodeConfiguration implements NodeConfiguration<TbRestA
         configuration.setRequestMethod("POST");
         configuration.setHeaders(Collections.singletonMap(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE));
         configuration.setQueryParams(Collections.emptyList());
-        configuration.setUseSimpleClientHttpFactory(false);
         configuration.setReadTimeoutMs(0);
         configuration.setMaxParallelRequestsCount(0);
         configuration.setParseToPlainText(false);

rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/rest/TbHttpClientTest.java

@@ -143,7 +143,6 @@ public class TbHttpClientTest {
             var config = new TbRestApiCallNodeConfiguration().defaultConfiguration();
             config.setRestEndpointUrlPattern("http://localhost:" + server.getPort() + path);
             config.setRequestMethod("GET");
-            config.setUseSimpleClientHttpFactory(true);
             config.setQueryParams(List.of(
                     new QueryParam("email", "${userEmail}"),              // ${} from metadata
                     new QueryParam("device", "${deviceName}"),            // ${} from metadata

rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/rest/TbRestApiCallNodeTest.java

@@ -184,12 +184,10 @@ public class TbRestApiCallNodeTest extends AbstractRuleNodeUpgradeTest {
                 {
                     "restEndpointUrlPattern": "http://url?param=value",
                     "requestMethod": "GET",
-                    "useSimpleClientHttpFactory": false,
                     "parseToPlainText": false,
                     "ignoreRequestBody": false,
                     "enableProxy": false,
                     "useSystemProxyProperties": false,
-                    "proxyScheme": null,
                     "proxyHost": null,
                     "proxyPort": 0,
                     "proxyUser": null,
@@ -395,7 +393,58 @@ public class TbRestApiCallNodeTest extends AbstractRuleNodeUpgradeTest {
                                 "\"proxyPort\": 0,\"proxyUser\": null,\"proxyPassword\": null,\"readTimeoutMs\": 0," +
                                 "\"maxParallelRequestsCount\": 0,\"headers\": {\"Content-Type\": \"application/json\"}," +
                                 "\"credentials\": {\"type\": \"anonymous\"}," +
-                                "\"maxInMemoryBufferSizeInKb\": 256}")
+                                "\"maxInMemoryBufferSizeInKb\": 256}"),
+                // config for version 4 with upgrade from version 3
+                Arguments.of(3, """
+                                {
+                                    "restEndpointUrlPattern": "http://localhost/api",
+                                    "requestMethod": "POST",
+                                    "useSimpleClientHttpFactory": true,
+                                    "parseToPlainText": false,
+                                    "ignoreRequestBody": false,
+                                    "enableProxy": false,
+                                    "useSystemProxyProperties": false,
+                                    "proxyScheme": null,
+                                    "proxyHost": null,
+                                    "proxyPort": 0,
+                                    "proxyUser": null,
+                                    "proxyPassword": null,
+                                    "readTimeoutMs": 0,
+                                    "maxParallelRequestsCount": 0,
+                                    "headers": {
+                                        "Content-Type": "application/json"
+                                    },
+                                    "credentials": {
+                                        "type": "anonymous"
+                                    },
+                                    "maxInMemoryBufferSizeInKb": 256,
+                                    "trimQueue": true,
+                                    "maxQueueSize": 100,
+                                    "trimDoubleQuotes": false,
+                                    "useRedisQueueForMsgPersistence": false
+                                }""",
+                        true, """
+                                {
+                                    "restEndpointUrlPattern": "http://localhost/api",
+                                    "requestMethod": "POST",
+                                    "parseToPlainText": false,
+                                    "ignoreRequestBody": false,
+                                    "enableProxy": false,
+                                    "useSystemProxyProperties": false,
+                                    "proxyHost": null,
+                                    "proxyPort": 0,
+                                    "proxyUser": null,
+                                    "proxyPassword": null,
+                                    "readTimeoutMs": 0,
+                                    "maxParallelRequestsCount": 0,
+                                    "headers": {
+                                        "Content-Type": "application/json"
+                                    },
+                                    "credentials": {
+                                        "type": "anonymous"
+                                    },
+                                    "maxInMemoryBufferSizeInKb": 256
+                                }""")
         );
     }