Add TrimProperties to trim properties auto (#14289)

* Add TrimProperties to trim properties auto

* add license

Author: zwhzzz0821

iotdb-core/confignode/pom.xml

@@ -154,6 +154,12 @@
             <artifactId>mockito-core</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>com.tngtech.archunit</groupId>
+            <artifactId>archunit</artifactId>
+            <version>1.3.0</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
     <build>
         <plugins>

iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeDescriptor.java

@@ -23,6 +23,7 @@
 import org.apache.iotdb.commons.conf.CommonDescriptor;
 import org.apache.iotdb.commons.conf.ConfigurationFileUtils;
 import org.apache.iotdb.commons.conf.IoTDBConstant;
+import org.apache.iotdb.commons.conf.TrimProperties;
 import org.apache.iotdb.commons.exception.BadNodeUrlException;
 import org.apache.iotdb.commons.schema.SchemaConstant;
 import org.apache.iotdb.commons.utils.NodeUrlUtils;
@@ -46,7 +47,6 @@
 import java.nio.charset.StandardCharsets;
 import java.util.Collections;
 import java.util.Optional;
-import java.util.Properties;
 
 public class ConfigNodeDescriptor {
   private static final Logger LOGGER = LoggerFactory.getLogger(ConfigNodeDescriptor.class);
@@ -118,13 +118,13 @@ else if (!urlString.endsWith(".properties")) {
   }
 
   private void loadProps() {
-    Properties commonProperties = new Properties();
+    TrimProperties trimProperties = new TrimProperties();
     URL url = getPropsUrl(CommonConfig.SYSTEM_CONFIG_NAME);
     if (url != null) {
       try (InputStream inputStream = url.openStream()) {
         LOGGER.info("start reading ConfigNode conf file: {}", url);
-        commonProperties.load(new InputStreamReader(inputStream, StandardCharsets.UTF_8));
-        loadProperties(commonProperties);
+        trimProperties.load(new InputStreamReader(inputStream, StandardCharsets.UTF_8));
+        loadProperties(trimProperties);
       } catch (IOException | BadNodeUrlException e) {
         LOGGER.error("Couldn't load ConfigNode conf file, reject ConfigNode startup.", e);
         System.exit(-1);
@@ -133,7 +133,7 @@ private void loadProps() {
         commonDescriptor
             .getConfig()
             .updatePath(System.getProperty(ConfigNodeConstant.CONFIGNODE_HOME, null));
-        MetricConfigDescriptor.getInstance().loadProps(commonProperties, true);
+        MetricConfigDescriptor.getInstance().loadProps(trimProperties, true);
         MetricConfigDescriptor.getInstance()
             .getMetricConfig()
             .updateRpcInstance(NodeType.CONFIGNODE, SchemaConstant.SYSTEM_DATABASE);
@@ -145,7 +145,7 @@ private void loadProps() {
     }
   }
 
-  private void loadProperties(Properties properties) throws BadNodeUrlException, IOException {
+  private void loadProperties(TrimProperties properties) throws BadNodeUrlException, IOException {
     conf.setClusterName(
         properties.getProperty(IoTDBConstant.CLUSTER_NAME, conf.getClusterName()).trim());
 
@@ -401,7 +401,7 @@ private void loadProperties(Properties properties) throws BadNodeUrlException, I
     loadCQConfig(properties);
   }
 
-  private void loadRatisConsensusConfig(Properties properties) {
+  private void loadRatisConsensusConfig(TrimProperties properties) {
     conf.setDataRegionRatisConsensusLogAppenderBufferSize(
         Long.parseLong(
             properties
@@ -813,7 +813,7 @@ private void loadRatisConsensusConfig(Properties properties) {
                 .trim()));
   }
 
-  private void loadCQConfig(Properties properties) {
+  private void loadCQConfig(TrimProperties properties) {
     int cqSubmitThread =
         Integer.parseInt(
             properties
@@ -871,7 +871,7 @@ public boolean isSeedConfigNode() {
     }
   }
 
-  public void loadHotModifiedProps(Properties properties) {
+  public void loadHotModifiedProps(TrimProperties properties) {
     Optional.ofNullable(properties.getProperty(IoTDBConstant.CLUSTER_NAME))
         .ifPresent(conf::setClusterName);
   }

iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/ConfigManager.java

@@ -42,6 +42,7 @@
 import org.apache.iotdb.commons.conf.CommonDescriptor;
 import org.apache.iotdb.commons.conf.ConfigurationFileUtils;
 import org.apache.iotdb.commons.conf.IoTDBConstant;
+import org.apache.iotdb.commons.conf.TrimProperties;
 import org.apache.iotdb.commons.exception.IllegalPathException;
 import org.apache.iotdb.commons.exception.MetadataException;
 import org.apache.iotdb.commons.path.PartialPath;
@@ -257,7 +258,6 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
-import java.util.Properties;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -1672,7 +1672,7 @@ public TSStatus setConfiguration(TSetConfigurationReq req) {
         return tsStatus;
       }
       File file = new File(url.getFile());
-      Properties properties = new Properties();
+      TrimProperties properties = new TrimProperties();
       properties.putAll(req.getConfigs());
       try {
         ConfigurationFileUtils.updateConfigurationFile(file, properties);

iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/conf/ConfigNodePropertiesTest.java

@@ -0,0 +1,50 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.iotdb.confignode.conf;
+
+import com.tngtech.archunit.core.domain.JavaClasses;
+import com.tngtech.archunit.core.importer.ClassFileImporter;
+import com.tngtech.archunit.core.importer.ImportOption;
+import com.tngtech.archunit.lang.ArchRule;
+import org.junit.Test;
+
+import java.util.Properties;
+
+import static com.tngtech.archunit.lang.syntax.ArchRuleDefinition.noClasses;
+
+public class ConfigNodePropertiesTest {
+  @Test
+  public void TrimPropertiesOnly() {
+    JavaClasses allClasses =
+        new ClassFileImporter()
+            .withImportOption(new ImportOption.DoNotIncludeTests())
+            .importPackages("org.apache.iotdb");
+
+    ArchRule rule =
+        noClasses()
+            .that()
+            .areAssignableTo("org.apache.iotdb.confignode.conf.ConfigNodeDescriptor")
+            .should()
+            .callMethod(Properties.class, "getProperty", String.class)
+            .orShould()
+            .callMethod(Properties.class, "getProperty", String.class, String.class);
+
+    rule.check(allClasses);
+  }
+}