+
+ ${project.groupId}
+ nacos-sys
+ ${project.version}
+ javax.servlet
diff --git a/style/nacos-code-style-for-idea.xml b/style/nacos-code-style-for-idea.xml
index 28846f8ae6b..6bd63a11332 100644
--- a/style/nacos-code-style-for-idea.xml
+++ b/style/nacos-code-style-for-idea.xml
@@ -139,6 +139,7 @@
+
diff --git a/sys/pom.xml b/sys/pom.xml
new file mode 100644
index 00000000000..0ed61ee19d7
--- /dev/null
+++ b/sys/pom.xml
@@ -0,0 +1,90 @@
+
+
+
+
+
+ com.alibaba.nacos
+ nacos-all
+ 1.4.0-SNAPSHOT
+ ../pom.xml
+
+ 4.0.0
+
+ nacos-sys
+ jar
+ nacos-sys ${project.version}
+ http://nacos.io
+
+
+ UTF-8
+
+
+
+
+ ${project.groupId}
+ nacos-common
+
+
+
+ org.springframework.boot
+ spring-boot-starter
+
+
+
+ org.springframework.boot
+ spring-boot-starter-test
+ test
+
+
+ org.junit.vintage
+ junit-vintage-engine
+
+
+
+
+
+ junit
+ junit
+ test
+
+
+
+ org.springframework
+ spring-test
+
+
+
+ org.springframework.boot
+ spring-boot-test
+
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-compiler-plugin
+
+ 8
+ 8
+
+
+
+
+
\ No newline at end of file
diff --git a/core/src/main/java/com/alibaba/nacos/core/utils/Constants.java b/sys/src/main/java/com/alibaba/nacos/sys/env/Constants.java
similarity index 98%
rename from core/src/main/java/com/alibaba/nacos/core/utils/Constants.java
rename to sys/src/main/java/com/alibaba/nacos/sys/env/Constants.java
index 00baab7a12a..20addac2c70 100644
--- a/core/src/main/java/com/alibaba/nacos/core/utils/Constants.java
+++ b/sys/src/main/java/com/alibaba/nacos/sys/env/Constants.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.alibaba.nacos.core.utils;
+package com.alibaba.nacos.sys.env;
/**
* Nacos common constants.
diff --git a/sys/src/main/java/com/alibaba/nacos/sys/env/NacosAutoRefreshPropertySourceLoader.java b/sys/src/main/java/com/alibaba/nacos/sys/env/NacosAutoRefreshPropertySourceLoader.java
new file mode 100644
index 00000000000..a82919b5469
--- /dev/null
+++ b/sys/src/main/java/com/alibaba/nacos/sys/env/NacosAutoRefreshPropertySourceLoader.java
@@ -0,0 +1,94 @@
+/*
+ * Copyright 1999-2018 Alibaba Group Holding Ltd.
+ *
+ * Licensed 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 com.alibaba.nacos.sys.env;
+
+import com.alibaba.nacos.api.exception.NacosException;
+import com.alibaba.nacos.common.JustForTest;
+import com.alibaba.nacos.sys.file.FileChangeEvent;
+import com.alibaba.nacos.sys.file.FileWatcher;
+import com.alibaba.nacos.sys.file.WatchFileCenter;
+import com.alibaba.nacos.sys.utils.ApplicationUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.boot.env.OriginTrackedMapPropertySource;
+import org.springframework.boot.env.PropertySourceLoader;
+import org.springframework.core.env.PropertySource;
+import org.springframework.core.io.Resource;
+
+import java.io.IOException;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * Support for configuring automatic refresh and loading into the Environment.
+ *
+ * @author liaochuntao
+ */
+public class NacosAutoRefreshPropertySourceLoader implements PropertySourceLoader {
+
+ private final Map properties = new ConcurrentHashMap<>(16);
+
+ private Resource holder = null;
+
+ @Override
+ public String[] getFileExtensions() {
+ return new String[] {"properties"};
+ }
+
+ @Override
+ public List> load(String name, Resource resource) throws IOException {
+ holder = resource;
+ Map tmp = loadProperties(resource);
+ properties.putAll(tmp);
+
+ try {
+ WatchFileCenter.registerWatcher(ApplicationUtils.getConfFilePath(), new FileWatcher() {
+ @Override
+ public void onChange(FileChangeEvent event) {
+ try {
+ Map tmp1 = loadProperties(holder);
+ properties.putAll(tmp1);
+ } catch (IOException ignore) {
+
+ }
+ }
+
+ @Override
+ public boolean interest(String context) {
+ return StringUtils.contains(context, "application.properties");
+ }
+ });
+ } catch (NacosException ignore) {
+
+ }
+
+ if (properties.isEmpty()) {
+ return Collections.emptyList();
+ }
+ return Collections.singletonList(new OriginTrackedMapPropertySource("nacos_application_conf", properties));
+ }
+
+ private Map loadProperties(Resource resource) throws IOException {
+ return new OriginTrackedPropertiesLoader(resource).load();
+ }
+
+ @JustForTest
+ protected Map getProperties() {
+ return properties;
+ }
+}
diff --git a/core/src/main/java/com/alibaba/nacos/core/env/NacosDefaultPropertySourceEnvironmentPostProcessor.java b/sys/src/main/java/com/alibaba/nacos/sys/env/NacosDefaultPropertySourceEnvironmentPostProcessor.java
similarity index 94%
rename from core/src/main/java/com/alibaba/nacos/core/env/NacosDefaultPropertySourceEnvironmentPostProcessor.java
rename to sys/src/main/java/com/alibaba/nacos/sys/env/NacosDefaultPropertySourceEnvironmentPostProcessor.java
index 026431ed614..ce9d156ef2c 100644
--- a/core/src/main/java/com/alibaba/nacos/core/env/NacosDefaultPropertySourceEnvironmentPostProcessor.java
+++ b/sys/src/main/java/com/alibaba/nacos/sys/env/NacosDefaultPropertySourceEnvironmentPostProcessor.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.alibaba.nacos.core.env;
+package com.alibaba.nacos.sys.env;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.env.EnvironmentPostProcessor;
@@ -34,8 +34,6 @@
import java.io.IOException;
-import static org.springframework.core.io.support.ResourcePatternResolver.CLASSPATH_ALL_URL_PREFIX;
-
/**
* A lowest precedence {@link EnvironmentPostProcessor} implementation to append Nacos default {@link PropertySource}
* with lowest order in {@link Environment}.
@@ -43,6 +41,7 @@
* @author Mercy
* @since 0.2.2
*/
+@Deprecated
public class NacosDefaultPropertySourceEnvironmentPostProcessor implements EnvironmentPostProcessor, Ordered {
/**
@@ -56,7 +55,7 @@ public class NacosDefaultPropertySourceEnvironmentPostProcessor implements Envir
* @see ResourcePatternResolver#CLASSPATH_ALL_URL_PREFIX
*/
public static final String RESOURCE_LOCATION_PATTERN =
- CLASSPATH_ALL_URL_PREFIX + "META-INF/nacos-default.properties";
+ ResourcePatternResolver.CLASSPATH_ALL_URL_PREFIX + "META-INF/nacos-default.properties";
private static final String FILE_ENCODING = "UTF-8";
@@ -114,6 +113,6 @@ private void appendPropertySource(CompositePropertySource propertySource, Resour
@Override
public int getOrder() {
- return LOWEST_PRECEDENCE;
+ return Ordered.LOWEST_PRECEDENCE;
}
}
diff --git a/sys/src/main/java/com/alibaba/nacos/sys/env/OriginTrackedPropertiesLoader.java b/sys/src/main/java/com/alibaba/nacos/sys/env/OriginTrackedPropertiesLoader.java
new file mode 100644
index 00000000000..47e77e1b993
--- /dev/null
+++ b/sys/src/main/java/com/alibaba/nacos/sys/env/OriginTrackedPropertiesLoader.java
@@ -0,0 +1,259 @@
+/*
+ * Copyright 1999-2018 Alibaba Group Holding Ltd.
+ *
+ * Licensed 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 com.alibaba.nacos.sys.env;
+
+import org.springframework.boot.origin.Origin;
+import org.springframework.boot.origin.OriginTrackedValue;
+import org.springframework.boot.origin.TextResourceOrigin;
+import org.springframework.core.io.Resource;
+import org.springframework.util.Assert;
+
+import java.io.Closeable;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.LineNumberReader;
+import java.nio.charset.StandardCharsets;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+/**
+ * copy from springboot to load properties file.
+ *
+ * @author liaochuntao
+ */
+@SuppressWarnings("PMD.UndefineMagicConstantRule")
+public class OriginTrackedPropertiesLoader {
+
+ private final Resource resource;
+
+ /**
+ * Create a new {@link OriginTrackedPropertiesLoader} instance.
+ *
+ * @param resource the resource of the {@code .properties} data
+ */
+ OriginTrackedPropertiesLoader(Resource resource) {
+ Assert.notNull(resource, "Resource must not be null");
+ this.resource = resource;
+ }
+
+ /**
+ * Load {@code .properties} data and return a map of {@code String} -> {@link OriginTrackedValue}.
+ *
+ * @return the loaded properties
+ * @throws IOException on read error
+ */
+ public Map load() throws IOException {
+ return load(true);
+ }
+
+ /**
+ * Load {@code .properties} data and return a map of {@code String} -> {@link OriginTrackedValue}.
+ *
+ * @param expandLists if list {@code name[]=a,b,c} shortcuts should be expanded
+ * @return the loaded properties
+ * @throws IOException on read error
+ */
+ public Map load(boolean expandLists) throws IOException {
+ try (OriginTrackedPropertiesLoader.CharacterReader reader = new CharacterReader(this.resource)) {
+ Map result = new LinkedHashMap<>();
+ StringBuilder buffer = new StringBuilder();
+ while (reader.read()) {
+ String key = loadKey(buffer, reader).trim();
+ if (expandLists && key.endsWith("[]")) {
+ key = key.substring(0, key.length() - 2);
+ int index = 0;
+ do {
+ OriginTrackedValue value = loadValue(buffer, reader, true);
+ put(result, key + "[" + (index++) + "]", value);
+ if (!reader.isEndOfLine()) {
+ reader.read();
+ }
+ } while (!reader.isEndOfLine());
+ } else {
+ OriginTrackedValue value = loadValue(buffer, reader, false);
+ put(result, key, value);
+ }
+ }
+ return result;
+ }
+ }
+
+ private void put(Map result, String key, OriginTrackedValue value) {
+ if (!key.isEmpty()) {
+ result.put(key, value);
+ }
+ }
+
+ private String loadKey(StringBuilder buffer, OriginTrackedPropertiesLoader.CharacterReader reader)
+ throws IOException {
+ buffer.setLength(0);
+ boolean previousWhitespace = false;
+ while (!reader.isEndOfLine()) {
+ if (reader.isPropertyDelimiter()) {
+ reader.read();
+ return buffer.toString();
+ }
+ if (!reader.isWhiteSpace() && previousWhitespace) {
+ return buffer.toString();
+ }
+ previousWhitespace = reader.isWhiteSpace();
+ buffer.append(reader.getCharacter());
+ reader.read();
+ }
+ return buffer.toString();
+ }
+
+ private OriginTrackedValue loadValue(StringBuilder buffer, OriginTrackedPropertiesLoader.CharacterReader reader,
+ boolean splitLists) throws IOException {
+ buffer.setLength(0);
+ while (reader.isWhiteSpace() && !reader.isEndOfLine()) {
+ reader.read();
+ }
+ TextResourceOrigin.Location location = reader.getLocation();
+ while (!reader.isEndOfLine() && !(splitLists && reader.isListDelimiter())) {
+ buffer.append(reader.getCharacter());
+ reader.read();
+ }
+ Origin origin = new TextResourceOrigin(this.resource, location);
+ return OriginTrackedValue.of(buffer.toString(), origin);
+ }
+
+ /**
+ * Reads characters from the source resource, taking care of skipping comments, handling multi-line values and
+ * tracking {@code '\'} escapes.
+ */
+ private static class CharacterReader implements Closeable {
+
+ private final String[] escapes = {"trnf", "\t\r\n\f"};
+
+ private final LineNumberReader reader;
+
+ private int columnNumber = -1;
+
+ private boolean escaped;
+
+ private int character;
+
+ CharacterReader(Resource resource) throws IOException {
+ this.reader = new LineNumberReader(
+ new InputStreamReader(resource.getInputStream(), StandardCharsets.ISO_8859_1));
+ }
+
+ @Override
+ public void close() throws IOException {
+ this.reader.close();
+ }
+
+ public boolean read() throws IOException {
+ return read(false);
+ }
+
+ public boolean read(boolean wrappedLine) throws IOException {
+ this.escaped = false;
+ this.character = this.reader.read();
+ this.columnNumber++;
+ if (this.columnNumber == 0) {
+ skipLeadingWhitespace();
+ if (!wrappedLine) {
+ skipComment();
+ }
+ }
+ if (this.character == '\\') {
+ this.escaped = true;
+ readEscaped();
+ } else if (this.character == '\n') {
+ this.columnNumber = -1;
+ }
+ return !isEndOfFile();
+ }
+
+ private void skipLeadingWhitespace() throws IOException {
+ while (isWhiteSpace()) {
+ this.character = this.reader.read();
+ this.columnNumber++;
+ }
+ }
+
+ private void skipComment() throws IOException {
+ if (this.character == '#' || this.character == '!') {
+ while (this.character != '\n' && this.character != -1) {
+ this.character = this.reader.read();
+ }
+ this.columnNumber = -1;
+ read();
+ }
+ }
+
+ private void readEscaped() throws IOException {
+ this.character = this.reader.read();
+ int escapeIndex = escapes[0].indexOf(this.character);
+ if (escapeIndex != -1) {
+ this.character = escapes[1].charAt(escapeIndex);
+ } else if (this.character == '\n') {
+ this.columnNumber = -1;
+ read(true);
+ } else if (this.character == 'u') {
+ readUnicode();
+ }
+ }
+
+ private void readUnicode() throws IOException {
+ this.character = 0;
+ for (int i = 0; i < 4; i++) {
+ int digit = this.reader.read();
+ if (digit >= '0' && digit <= '9') {
+ this.character = (this.character << 4) + digit - '0';
+ } else if (digit >= 'a' && digit <= 'f') {
+ this.character = (this.character << 4) + digit - 'a' + 10;
+ } else if (digit >= 'A' && digit <= 'F') {
+ this.character = (this.character << 4) + digit - 'A' + 10;
+ } else {
+ throw new IllegalStateException("Malformed \\uxxxx encoding.");
+ }
+ }
+ }
+
+ public boolean isWhiteSpace() {
+ return !this.escaped && (this.character == ' ' || this.character == '\t' || this.character == '\f');
+ }
+
+ public boolean isEndOfFile() {
+ return this.character == -1;
+ }
+
+ public boolean isEndOfLine() {
+ return this.character == -1 || (!this.escaped && this.character == '\n');
+ }
+
+ public boolean isListDelimiter() {
+ return !this.escaped && this.character == ',';
+ }
+
+ public boolean isPropertyDelimiter() {
+ return !this.escaped && (this.character == '=' || this.character == ':');
+ }
+
+ public char getCharacter() {
+ return (char) this.character;
+ }
+
+ public TextResourceOrigin.Location getLocation() {
+ return new TextResourceOrigin.Location(this.reader.getLineNumber(), this.columnNumber);
+ }
+
+ }
+}
diff --git a/core/src/main/java/com/alibaba/nacos/core/file/FileChangeEvent.java b/sys/src/main/java/com/alibaba/nacos/sys/file/FileChangeEvent.java
similarity index 98%
rename from core/src/main/java/com/alibaba/nacos/core/file/FileChangeEvent.java
rename to sys/src/main/java/com/alibaba/nacos/sys/file/FileChangeEvent.java
index 3cdabf500bd..e7f62f37e74 100644
--- a/core/src/main/java/com/alibaba/nacos/core/file/FileChangeEvent.java
+++ b/sys/src/main/java/com/alibaba/nacos/sys/file/FileChangeEvent.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.alibaba.nacos.core.file;
+package com.alibaba.nacos.sys.file;
import java.io.Serializable;
diff --git a/core/src/main/java/com/alibaba/nacos/core/file/FileWatcher.java b/sys/src/main/java/com/alibaba/nacos/sys/file/FileWatcher.java
similarity index 97%
rename from core/src/main/java/com/alibaba/nacos/core/file/FileWatcher.java
rename to sys/src/main/java/com/alibaba/nacos/sys/file/FileWatcher.java
index b51b4526c8c..465a4984fb4 100644
--- a/core/src/main/java/com/alibaba/nacos/core/file/FileWatcher.java
+++ b/sys/src/main/java/com/alibaba/nacos/sys/file/FileWatcher.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.alibaba.nacos.core.file;
+package com.alibaba.nacos.sys.file;
import java.nio.file.WatchEvent;
import java.util.concurrent.Executor;
diff --git a/core/src/main/java/com/alibaba/nacos/core/file/WatchFileCenter.java b/sys/src/main/java/com/alibaba/nacos/sys/file/WatchFileCenter.java
similarity index 99%
rename from core/src/main/java/com/alibaba/nacos/core/file/WatchFileCenter.java
rename to sys/src/main/java/com/alibaba/nacos/sys/file/WatchFileCenter.java
index 97849bb91c5..7d6b1de3de2 100644
--- a/core/src/main/java/com/alibaba/nacos/core/file/WatchFileCenter.java
+++ b/sys/src/main/java/com/alibaba/nacos/sys/file/WatchFileCenter.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.alibaba.nacos.core.file;
+package com.alibaba.nacos.sys.file;
import com.alibaba.nacos.api.exception.NacosException;
import com.alibaba.nacos.common.executor.ExecutorFactory;
@@ -176,7 +176,7 @@ public WatchDirJob(String paths) throws NacosException {
}
this.callBackExecutor = ExecutorFactory
- .newSingleExecutorService(new NameThreadFactory("com.alibaba.nacos.core.file.watch-" + paths));
+ .newSingleExecutorService(new NameThreadFactory("com.alibaba.nacos.sys.file.watch-" + paths));
try {
WatchService service = FILE_SYSTEM.newWatchService();
diff --git a/core/src/main/java/com/alibaba/nacos/core/utils/ApplicationUtils.java b/sys/src/main/java/com/alibaba/nacos/sys/utils/ApplicationUtils.java
similarity index 94%
rename from core/src/main/java/com/alibaba/nacos/core/utils/ApplicationUtils.java
rename to sys/src/main/java/com/alibaba/nacos/sys/utils/ApplicationUtils.java
index 7b8004570e4..9b744b6697f 100644
--- a/core/src/main/java/com/alibaba/nacos/core/utils/ApplicationUtils.java
+++ b/sys/src/main/java/com/alibaba/nacos/sys/utils/ApplicationUtils.java
@@ -14,11 +14,12 @@
* limitations under the License.
*/
-package com.alibaba.nacos.core.utils;
+package com.alibaba.nacos.sys.utils;
import com.alibaba.nacos.common.JustForTest;
import com.alibaba.nacos.common.utils.IoUtils;
import com.alibaba.nacos.common.utils.StringUtils;
+import com.alibaba.nacos.sys.env.Constants;
import com.sun.management.OperatingSystemMXBean;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.BeanFactory;
@@ -53,9 +54,6 @@
import java.util.Objects;
import java.util.function.Consumer;
-import static com.alibaba.nacos.core.utils.Constants.FUNCTION_MODE_PROPERTY_NAME;
-import static com.alibaba.nacos.core.utils.Constants.STANDALONE_MODE_PROPERTY_NAME;
-
/**
* Nacos global tool class.
*
@@ -91,6 +89,9 @@ public class ApplicationUtils implements ApplicationContextInitializer getPropertyList(String key) {
+ List valueList = new ArrayList<>();
+
+ for (int i = 0; i < Integer.MAX_VALUE; i++) {
+ String value = environment.getProperty(key + "[" + i + "]");
+ if (org.apache.commons.lang3.StringUtils.isBlank(value)) {
+ break;
+ }
+
+ valueList.add(value);
+ }
+
+ return valueList;
+ }
+
public static String getLocalAddress() {
if (StringUtils.isBlank(localAddress)) {
localAddress = InetUtils.getSelfIp() + ":" + getPort();
@@ -378,7 +394,7 @@ public static void setIsStandalone(Boolean isStandalone) {
*/
public static boolean getStandaloneMode() {
if (Objects.isNull(isStandalone)) {
- isStandalone = Boolean.getBoolean(STANDALONE_MODE_PROPERTY_NAME);
+ isStandalone = Boolean.getBoolean(Constants.STANDALONE_MODE_PROPERTY_NAME);
}
return isStandalone;
}
@@ -388,7 +404,7 @@ public static boolean getStandaloneMode() {
*/
public static String getFunctionMode() {
if (StringUtils.isEmpty(functionModeType)) {
- functionModeType = System.getProperty(FUNCTION_MODE_PROPERTY_NAME);
+ functionModeType = System.getProperty(Constants.FUNCTION_MODE_PROPERTY_NAME);
}
return functionModeType;
}
@@ -446,7 +462,15 @@ public static float getMem() {
}
public static String getConfFilePath() {
- return Paths.get(getNacosHome(), "conf").toString();
+ if (StringUtils.isNotBlank(ApplicationUtils.confPath)) {
+ return ApplicationUtils.confPath;
+ }
+ ApplicationUtils.confPath = Paths.get(getNacosHome(), "conf").toString();
+ return confPath;
+ }
+
+ public static void setConfFilePath(final String confPath) {
+ ApplicationUtils.confPath = confPath;
}
public static String getClusterConfFilePath() {
diff --git a/core/src/main/java/com/alibaba/nacos/core/utils/DiskUtils.java b/sys/src/main/java/com/alibaba/nacos/sys/utils/DiskUtils.java
similarity index 78%
rename from core/src/main/java/com/alibaba/nacos/core/utils/DiskUtils.java
rename to sys/src/main/java/com/alibaba/nacos/sys/utils/DiskUtils.java
index cd9c33e5dd3..42a8b38d7e4 100644
--- a/core/src/main/java/com/alibaba/nacos/core/utils/DiskUtils.java
+++ b/sys/src/main/java/com/alibaba/nacos/sys/utils/DiskUtils.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.alibaba.nacos.core.utils;
+package com.alibaba.nacos.sys.utils;
import com.alibaba.nacos.common.utils.ByteUtils;
import com.alibaba.nacos.common.utils.Objects;
@@ -91,75 +91,48 @@ public static void touch(File file) throws IOException {
}
/**
- * Creates a new empty file in the specified directory, using the given
- * prefix and suffix strings to generate its name. The resulting
- * {@code Path} is associated with the same {@code FileSystem} as the given
- * directory.
+ * Creates a new empty file in the specified directory, using the given prefix and suffix strings to generate its
+ * name. The resulting {@code Path} is associated with the same {@code FileSystem} as the given directory.
*
*
The details as to how the name of the file is constructed is
- * implementation dependent and therefore not specified. Where possible
- * the {@code prefix} and {@code suffix} are used to construct candidate
- * names in the same manner as the {@link
- * java.io.File#createTempFile(String,String,File)} method.
+ * implementation dependent and therefore not specified. Where possible the {@code prefix} and {@code suffix} are
+ * used to construct candidate names in the same manner as the {@link java.io.File#createTempFile(String, String, File)}
+ * method.
*
- *
- * @param dir
- * the path to directory in which to create the file
- * @param prefix
- * the prefix string to be used in generating the file's name;
- * may be {@code null}
- * @param suffix
- * the suffix string to be used in generating the file's name;
- * may be {@code null}, in which case "{@code .tmp}" is used
- *
- * @return the path to the newly created file that did not exist before
- * this method was invoked
- *
- * @throws IllegalArgumentException
- * if the prefix or suffix parameters cannot be used to generate
- * a candidate file name
- * @throws UnsupportedOperationException
- * if the array contains an attribute that cannot be set atomically
- * when creating the directory
- * @throws IOException
- * if an I/O error occurs or {@code dir} does not exist
- * @throws SecurityException
- * In the case of the default provider, and a security manager is
- * installed, the {@link SecurityManager#checkWrite(String) checkWrite}
- * method is invoked to check write access to the file.
+ * @param dir the path to directory in which to create the file
+ * @param prefix the prefix string to be used in generating the file's name; may be {@code null}
+ * @param suffix the suffix string to be used in generating the file's name; may be {@code null}, in which case
+ * "{@code .tmp}" is used
+ * @return the path to the newly created file that did not exist before this method was invoked
+ * @throws IllegalArgumentException if the prefix or suffix parameters cannot be used to generate a candidate
+ * file name
+ * @throws UnsupportedOperationException if the array contains an attribute that cannot be set atomically when
+ * creating the directory
+ * @throws IOException if an I/O error occurs or {@code dir} does not exist
+ * @throws SecurityException In the case of the default provider, and a security manager is installed,
+ * the {@link SecurityManager#checkWrite(String) checkWrite} method is invoked
+ * to check write access to the file.
*/
public static File createTmpFile(String dir, String prefix, String suffix) throws IOException {
return Files.createTempFile(Paths.get(dir), prefix, suffix).toFile();
}
/**
- * Creates an empty file in the default temporary-file directory, using
- * the given prefix and suffix to generate its name. The resulting {@code
- * Path} is associated with the default {@code FileSystem}.
+ * Creates an empty file in the default temporary-file directory, using the given prefix and suffix to generate its
+ * name. The resulting {@code Path} is associated with the default {@code FileSystem}.
*
- * @param prefix
- * the prefix string to be used in generating the file's name;
- * may be {@code null}
- * @param suffix
- * the suffix string to be used in generating the file's name;
- * may be {@code null}, in which case "{@code .tmp}" is used
- *
- * @return the path to the newly created file that did not exist before
- * this method was invoked
- *
- * @throws IllegalArgumentException
- * if the prefix or suffix parameters cannot be used to generate
- * a candidate file name
- * @throws UnsupportedOperationException
- * if the array contains an attribute that cannot be set atomically
- * when creating the directory
- * @throws IOException
- * if an I/O error occurs or the temporary-file directory does not
- * exist
- * @throws SecurityException
- * In the case of the default provider, and a security manager is
- * installed, the {@link SecurityManager#checkWrite(String) checkWrite}
- * method is invoked to check write access to the file.
+ * @param prefix the prefix string to be used in generating the file's name; may be {@code null}
+ * @param suffix the suffix string to be used in generating the file's name; may be {@code null}, in which case
+ * "{@code .tmp}" is used
+ * @return the path to the newly created file that did not exist before this method was invoked
+ * @throws IllegalArgumentException if the prefix or suffix parameters cannot be used to generate a candidate
+ * file name
+ * @throws UnsupportedOperationException if the array contains an attribute that cannot be set atomically when
+ * creating the directory
+ * @throws IOException if an I/O error occurs or the temporary-file directory does not exist
+ * @throws SecurityException In the case of the default provider, and a security manager is installed,
+ * the {@link SecurityManager#checkWrite(String) checkWrite} method is invoked
+ * to check write access to the file.
*/
public static File createTmpFile(String prefix, String suffix) throws IOException {
return Files.createTempFile(prefix, suffix).toFile();
@@ -380,8 +353,8 @@ public static File openFile(String path, String fileName, boolean rewrite) {
*/
public static void compress(final String rootDir, final String sourceDir, final String outputFile,
final Checksum checksum) throws IOException {
- try (final FileOutputStream fos = new FileOutputStream(
- outputFile); final CheckedOutputStream cos = new CheckedOutputStream(fos, checksum);
+ try (final FileOutputStream fos = new FileOutputStream(outputFile);
+ final CheckedOutputStream cos = new CheckedOutputStream(fos, checksum);
final ZipOutputStream zos = new ZipOutputStream(new BufferedOutputStream(cos))) {
compressDirectoryToZipFile(rootDir, sourceDir, zos);
zos.flush();
@@ -401,8 +374,8 @@ private static void compressDirectoryToZipFile(final String rootDir, final Strin
compressDirectoryToZipFile(rootDir, child, zos);
} else {
zos.putNextEntry(new ZipEntry(child));
- try (final FileInputStream fis = new FileInputStream(
- file); final BufferedInputStream bis = new BufferedInputStream(fis)) {
+ try (final FileInputStream fis = new FileInputStream(file);
+ final BufferedInputStream bis = new BufferedInputStream(fis)) {
IOUtils.copy(bis, zos);
}
}
@@ -421,16 +394,16 @@ private static void compressDirectoryToZipFile(final String rootDir, final Strin
*/
public static void decompress(final String sourceFile, final String outputDir, final Checksum checksum)
throws IOException {
- try (final FileInputStream fis = new FileInputStream(
- sourceFile); final CheckedInputStream cis = new CheckedInputStream(fis, checksum);
+ try (final FileInputStream fis = new FileInputStream(sourceFile);
+ final CheckedInputStream cis = new CheckedInputStream(fis, checksum);
final ZipInputStream zis = new ZipInputStream(new BufferedInputStream(cis))) {
ZipEntry entry;
while ((entry = zis.getNextEntry()) != null) {
final String fileName = entry.getName();
final File entryFile = new File(Paths.get(outputDir, fileName).toString());
FileUtils.forceMkdir(entryFile.getParentFile());
- try (final FileOutputStream fos = new FileOutputStream(
- entryFile); final BufferedOutputStream bos = new BufferedOutputStream(fos)) {
+ try (final FileOutputStream fos = new FileOutputStream(entryFile);
+ final BufferedOutputStream bos = new BufferedOutputStream(fos)) {
IOUtils.copy(zis, bos);
bos.flush();
fos.getFD().sync();
@@ -447,11 +420,10 @@ public static void decompress(final String sourceFile, final String outputDir, f
/**
* Returns an Iterator for the lines in a File.
*
- * This method opens an InputStream for the file.
- * When you have finished with the iterator you should close the stream
- * to free internal resources. This can be done by calling the
- * {@link org.apache.commons.io.LineIterator#close()} or
- * {@link org.apache.commons.io.LineIterator#closeQuietly(org.apache.commons.io.LineIterator)} method.
+ * This method opens an InputStream for the file. When you have finished with the iterator you should
+ * close the stream to free internal resources. This can be done by calling the {@link
+ * org.apache.commons.io.LineIterator#close()} or {@link org.apache.commons.io.LineIterator#closeQuietly(org.apache.commons.io.LineIterator)}
+ * method.
*
* The recommended usage pattern is:
*
@@ -466,12 +438,11 @@ public static void decompress(final String sourceFile, final String outputDir, f
* }
*
*
- * If an exception occurs during the creation of the iterator, the
- * underlying stream is closed.
+ * If an exception occurs during the creation of the iterator, the underlying stream is closed.
*
*
- * @param file the file to open for input, must not be null
- * @param encoding the encoding to use, null means platform default
+ * @param file the file to open for input, must not be null
+ * @param encoding the encoding to use, null means platform default
* @return an Iterator of the lines in the file, never null
* @throws IOException in case of an I/O error (file closed)
* @since 1.2
@@ -483,20 +454,20 @@ public static LineIterator lineIterator(File file, String encoding) throws IOExc
/**
* Returns an Iterator for the lines in a File using the default encoding for the VM.
*
- * @param file the file to open for input, must not be null
+ * @param file the file to open for input, must not be null
* @return an Iterator of the lines in the file, never null
* @throws IOException in case of an I/O error (file closed)
- * @since 1.3
* @see #lineIterator(File, String)
+ * @since 1.3
*/
public static LineIterator lineIterator(File file) throws IOException {
return new LineIterator(FileUtils.lineIterator(file, null));
}
public static class LineIterator implements AutoCloseable {
-
+
private final org.apache.commons.io.LineIterator target;
-
+
/**
* Constructs an iterator of the lines for a Reader.
*
@@ -505,7 +476,7 @@ public static class LineIterator implements AutoCloseable {
LineIterator(org.apache.commons.io.LineIterator target) {
this.target = target;
}
-
+
public boolean hasNext() {
return target.hasNext();
}
@@ -513,20 +484,20 @@ public boolean hasNext() {
public String next() {
return target.next();
}
-
+
public String nextLine() {
return target.nextLine();
}
-
+
@Override
public void close() {
target.close();
}
-
+
public void remove() {
target.remove();
}
-
+
public void forEachRemaining(Consumer action) {
target.forEachRemaining(action);
}
diff --git a/core/src/main/java/com/alibaba/nacos/core/utils/InetUtils.java b/sys/src/main/java/com/alibaba/nacos/sys/utils/InetUtils.java
similarity index 64%
rename from core/src/main/java/com/alibaba/nacos/core/utils/InetUtils.java
rename to sys/src/main/java/com/alibaba/nacos/sys/utils/InetUtils.java
index e9241e825f0..93f6dc36deb 100644
--- a/core/src/main/java/com/alibaba/nacos/core/utils/InetUtils.java
+++ b/sys/src/main/java/com/alibaba/nacos/sys/utils/InetUtils.java
@@ -14,10 +14,11 @@
* limitations under the License.
*/
-package com.alibaba.nacos.core.utils;
+package com.alibaba.nacos.sys.utils;
import com.alibaba.nacos.common.notify.NotifyCenter;
import com.alibaba.nacos.common.notify.SlowEvent;
+import com.alibaba.nacos.sys.env.Constants;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -34,13 +35,11 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import static com.alibaba.nacos.core.utils.Constants.IGNORED_INTERFACES;
-import static com.alibaba.nacos.core.utils.Constants.IP_ADDRESS;
-import static com.alibaba.nacos.core.utils.Constants.NACOS_SERVER_IP;
-import static com.alibaba.nacos.core.utils.Constants.PREFERRED_NETWORKS;
-import static com.alibaba.nacos.core.utils.Constants.PREFER_HOSTNAME_OVER_IP;
-import static com.alibaba.nacos.core.utils.Constants.SYSTEM_PREFER_HOSTNAME_OVER_IP;
-import static com.alibaba.nacos.core.utils.Constants.USE_ONLY_SITE_INTERFACES;
+import static com.alibaba.nacos.sys.env.Constants.IP_ADDRESS;
+import static com.alibaba.nacos.sys.env.Constants.NACOS_SERVER_IP;
+import static com.alibaba.nacos.sys.env.Constants.PREFER_HOSTNAME_OVER_IP;
+import static com.alibaba.nacos.sys.env.Constants.SYSTEM_PREFER_HOSTNAME_OVER_IP;
+import static com.alibaba.nacos.sys.env.Constants.USE_ONLY_SITE_INTERFACES;
/**
* Network card operation tool class.
@@ -63,75 +62,71 @@ public class InetUtils {
private static boolean preferHostnameOverIp = false;
- private static List preferredNetworks = new ArrayList();
+ private static final List PREFERRED_NETWORKS = new ArrayList();
- private static List ignoredInterfaces = new ArrayList();
+ private static final List IGNORED_INTERFACES = new ArrayList();
static {
NotifyCenter.registerToSharePublisher(IPChangeEvent.class);
- useOnlySiteLocalInterface = Boolean.parseBoolean(PropertyUtil.getProperty(USE_ONLY_SITE_INTERFACES));
+ useOnlySiteLocalInterface = Boolean.parseBoolean(ApplicationUtils.getProperty(USE_ONLY_SITE_INTERFACES));
- List networks = PropertyUtil.getPropertyList(PREFERRED_NETWORKS);
- preferredNetworks.addAll(networks);
+ List networks = ApplicationUtils.getPropertyList(Constants.PREFERRED_NETWORKS);
+ PREFERRED_NETWORKS.addAll(networks);
- List interfaces = PropertyUtil.getPropertyList(IGNORED_INTERFACES);
- ignoredInterfaces.addAll(interfaces);
+ List interfaces = ApplicationUtils.getPropertyList(Constants.IGNORED_INTERFACES);
+ IGNORED_INTERFACES.addAll(interfaces);
final long delayMs = Long.getLong("nacos.core.inet.auto-refresh", 30_000L);
Runnable ipAutoRefresh = new Runnable() {
@Override
public void run() {
- try {
- String nacosIp = System.getProperty(NACOS_SERVER_IP);
- if (StringUtils.isBlank(nacosIp)) {
- nacosIp = PropertyUtil.getProperty(IP_ADDRESS);
- }
+ String nacosIp = System.getProperty(NACOS_SERVER_IP);
+ if (StringUtils.isBlank(nacosIp)) {
+ nacosIp = ApplicationUtils.getProperty(IP_ADDRESS);
+ }
+
+ if (!StringUtils.isBlank(nacosIp) && !isIP(nacosIp)) {
+ throw new RuntimeException("nacos address " + nacosIp + " is not ip");
+ }
+ String tmpSelfIp = nacosIp;
+ if (StringUtils.isBlank(tmpSelfIp)) {
+ preferHostnameOverIp = Boolean.getBoolean(SYSTEM_PREFER_HOSTNAME_OVER_IP);
- if (!StringUtils.isBlank(nacosIp) && !isIP(nacosIp)) {
- throw new RuntimeException("nacos address " + nacosIp + " is not ip");
+ if (!preferHostnameOverIp) {
+ preferHostnameOverIp = Boolean
+ .parseBoolean(ApplicationUtils.getProperty(PREFER_HOSTNAME_OVER_IP));
}
- String tmpSelfIp = nacosIp;
- if (StringUtils.isBlank(tmpSelfIp)) {
- preferHostnameOverIp = Boolean.getBoolean(SYSTEM_PREFER_HOSTNAME_OVER_IP);
-
- if (!preferHostnameOverIp) {
- preferHostnameOverIp = Boolean
- .parseBoolean(PropertyUtil.getProperty(PREFER_HOSTNAME_OVER_IP));
- }
-
- if (preferHostnameOverIp) {
- InetAddress inetAddress;
- try {
- inetAddress = InetAddress.getLocalHost();
- if (inetAddress.getHostName().equals(inetAddress.getCanonicalHostName())) {
- tmpSelfIp = inetAddress.getHostName();
- } else {
- tmpSelfIp = inetAddress.getCanonicalHostName();
- }
- } catch (UnknownHostException ignore) {
- LOG.warn("Unable to retrieve localhost");
+
+ if (preferHostnameOverIp) {
+ InetAddress inetAddress;
+ try {
+ inetAddress = InetAddress.getLocalHost();
+ if (inetAddress.getHostName().equals(inetAddress.getCanonicalHostName())) {
+ tmpSelfIp = inetAddress.getHostName();
+ } else {
+ tmpSelfIp = inetAddress.getCanonicalHostName();
}
- } else {
- tmpSelfIp = Objects.requireNonNull(findFirstNonLoopbackAddress()).getHostAddress();
+ } catch (UnknownHostException ignore) {
+ LOG.warn("Unable to retrieve localhost");
}
+ } else {
+ tmpSelfIp = Objects.requireNonNull(findFirstNonLoopbackAddress()).getHostAddress();
}
-
- if (!Objects.equals(selfIp, tmpSelfIp) && Objects.nonNull(selfIp)) {
- IPChangeEvent event = new IPChangeEvent();
- event.setOldIp(selfIp);
- event.setNewIp(tmpSelfIp);
- NotifyCenter.publishEvent(event);
- }
- selfIp = tmpSelfIp;
- } finally {
- GlobalExecutor.scheduleByCommon(this, delayMs);
}
+
+ if (!Objects.equals(selfIp, tmpSelfIp) && Objects.nonNull(selfIp)) {
+ IPChangeEvent event = new IPChangeEvent();
+ event.setOldIp(selfIp);
+ event.setNewIp(tmpSelfIp);
+ NotifyCenter.publishEvent(event);
+ }
+ selfIp = tmpSelfIp;
}
};
- GlobalExecutor.runWithoutThread(ipAutoRefresh);
+ ipAutoRefresh.run();
}
public static String getSelfIp() {
@@ -196,10 +191,10 @@ private static boolean isPreferredAddress(InetAddress address) {
}
return siteLocalAddress;
}
- if (preferredNetworks.isEmpty()) {
+ if (PREFERRED_NETWORKS.isEmpty()) {
return true;
}
- for (String regex : preferredNetworks) {
+ for (String regex : PREFERRED_NETWORKS) {
final String hostAddress = address.getHostAddress();
if (hostAddress.matches(regex) || hostAddress.startsWith(regex)) {
return true;
@@ -210,7 +205,7 @@ private static boolean isPreferredAddress(InetAddress address) {
}
private static boolean ignoreInterface(String interfaceName) {
- for (String regex : ignoredInterfaces) {
+ for (String regex : IGNORED_INTERFACES) {
if (interfaceName.matches(regex)) {
LOG.debug("Ignoring interface: " + interfaceName);
return true;
diff --git a/core/src/main/resources/META-INF/nacos-default.properties b/sys/src/main/resources/META-INF/nacos-default.properties
similarity index 85%
rename from core/src/main/resources/META-INF/nacos-default.properties
rename to sys/src/main/resources/META-INF/nacos-default.properties
index 0eda3de14d1..6e081a98e80 100644
--- a/core/src/main/resources/META-INF/nacos-default.properties
+++ b/sys/src/main/resources/META-INF/nacos-default.properties
@@ -32,5 +32,5 @@ spring.messages.encoding=UTF-8
## Exclude Spring Boot Auto-Configuration class(es)
spring.autoconfigure.exclude=\
-org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration,\
-org.springframework.boot.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration
+ org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration,\
+ org.springframework.boot.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration
\ No newline at end of file
diff --git a/sys/src/main/resources/META-INF/spring.factories b/sys/src/main/resources/META-INF/spring.factories
new file mode 100644
index 00000000000..71a4ccbfced
--- /dev/null
+++ b/sys/src/main/resources/META-INF/spring.factories
@@ -0,0 +1,9 @@
+# PropertySource Loaders
+org.springframework.boot.env.PropertySourceLoader=\
+ com.alibaba.nacos.sys.env.NacosAutoRefreshPropertySourceLoader
+# EnvironmentPostProcessor
+org.springframework.boot.env.EnvironmentPostProcessor=\
+com.alibaba.nacos.sys.env.NacosDefaultPropertySourceEnvironmentPostProcessor
+# ApplicationContextInitializer
+org.springframework.context.ApplicationContextInitializer=\
+ com.alibaba.nacos.sys.utils.ApplicationUtils
\ No newline at end of file
diff --git a/sys/src/test/java/com/alibaba/nacos/sys/env/NacosAutoRefreshPropertySourceLoaderTest.java b/sys/src/test/java/com/alibaba/nacos/sys/env/NacosAutoRefreshPropertySourceLoaderTest.java
new file mode 100644
index 00000000000..e41c7a1fa54
--- /dev/null
+++ b/sys/src/test/java/com/alibaba/nacos/sys/env/NacosAutoRefreshPropertySourceLoaderTest.java
@@ -0,0 +1,91 @@
+/*
+ * Copyright 1999-2018 Alibaba Group Holding Ltd.
+ *
+ * Licensed 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 com.alibaba.nacos.sys.env;
+
+import com.alibaba.nacos.api.exception.NacosException;
+import com.alibaba.nacos.common.utils.ByteUtils;
+import com.alibaba.nacos.common.utils.ThreadUtils;
+import com.alibaba.nacos.sys.file.FileChangeEvent;
+import com.alibaba.nacos.sys.file.FileWatcher;
+import com.alibaba.nacos.sys.file.WatchFileCenter;
+import com.alibaba.nacos.sys.utils.ApplicationUtils;
+import com.alibaba.nacos.sys.utils.DiskUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.junit.AfterClass;
+import org.junit.Assert;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.core.env.ConfigurableEnvironment;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import java.io.File;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.util.concurrent.CountDownLatch;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = NacosAutoRefreshPropertySourceLoaderTest.class, webEnvironment = SpringBootTest.WebEnvironment.NONE)
+public class NacosAutoRefreshPropertySourceLoaderTest {
+
+ @Autowired
+ private ConfigurableEnvironment environment;
+
+ private static String oldConfPath = "";
+
+ @BeforeClass
+ public static void before() throws URISyntaxException {
+ oldConfPath = ApplicationUtils.getConfFilePath();
+ ApplicationUtils.setConfFilePath(new File(ClassLoader.getSystemResource("application.properties").toURI()).getParent());
+ }
+
+ @AfterClass
+ public static void after() {
+ ApplicationUtils.setConfFilePath(oldConfPath);
+ }
+
+ @Test
+ public void testConfigFileAutoRefresh() throws URISyntaxException, InterruptedException, NacosException {
+ final URL url = ClassLoader.getSystemResource("application.properties");
+ ApplicationUtils.setContextPath(url.getPath());
+ final String val1 = environment.getProperty("name");
+ Assert.assertEquals("test-1", val1);
+ final File file = new File(url.toURI());
+ final String newKey = "nacos.config.refresh-" + System.currentTimeMillis();
+ final String newVal = System.currentTimeMillis() + "-lessspring";
+ DiskUtils.writeFile(file, ByteUtils.toBytes("\n" + newKey + "=" + newVal), true);
+ CountDownLatch latch = new CountDownLatch(1);
+ WatchFileCenter.registerWatcher(ApplicationUtils.getConfFilePath(), new FileWatcher() {
+ @Override
+ public void onChange(FileChangeEvent event) {
+ latch.countDown();
+ }
+
+ @Override
+ public boolean interest(String context) {
+ return StringUtils.contains(context, "application.properties");
+ }
+ });
+ latch.await();
+ ThreadUtils.sleep(10_000);
+ final String val2 = environment.getProperty(newKey);
+ Assert.assertEquals(newVal, val2);
+ }
+
+}
\ No newline at end of file
diff --git a/core/src/test/java/com/alibaba/nacos/core/env/NacosDefaultPropertySourceEnvironmentPostProcessorTest.java b/sys/src/test/java/com/alibaba/nacos/sys/env/NacosDefaultPropertySourceEnvironmentPostProcessorTest.java
similarity index 93%
rename from core/src/test/java/com/alibaba/nacos/core/env/NacosDefaultPropertySourceEnvironmentPostProcessorTest.java
rename to sys/src/test/java/com/alibaba/nacos/sys/env/NacosDefaultPropertySourceEnvironmentPostProcessorTest.java
index ef984624044..2223cf864cc 100644
--- a/core/src/test/java/com/alibaba/nacos/core/env/NacosDefaultPropertySourceEnvironmentPostProcessorTest.java
+++ b/sys/src/test/java/com/alibaba/nacos/sys/env/NacosDefaultPropertySourceEnvironmentPostProcessorTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.alibaba.nacos.core.env;
+package com.alibaba.nacos.sys.env;
import org.junit.Assert;
import org.junit.Test;
@@ -29,8 +29,8 @@
import java.util.HashSet;
-import static com.alibaba.nacos.core.env.NacosDefaultPropertySourceEnvironmentPostProcessor.PROPERTY_SOURCE_NAME;
-import static com.alibaba.nacos.core.env.NacosDefaultPropertySourceEnvironmentPostProcessor.RESOURCE_LOCATION_PATTERN;
+import static com.alibaba.nacos.sys.env.NacosDefaultPropertySourceEnvironmentPostProcessor.PROPERTY_SOURCE_NAME;
+import static com.alibaba.nacos.sys.env.NacosDefaultPropertySourceEnvironmentPostProcessor.RESOURCE_LOCATION_PATTERN;
import static java.util.Arrays.asList;
/**
diff --git a/sys/src/test/resources/application.properties b/sys/src/test/resources/application.properties
new file mode 100644
index 00000000000..aaba4fabc49
--- /dev/null
+++ b/sys/src/test/resources/application.properties
@@ -0,0 +1,17 @@
+#
+# Copyright 1999-2018 Alibaba Group Holding Ltd.
+#
+# Licensed 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.
+#
+
+name=test-1
\ No newline at end of file
diff --git a/test/src/test/java/com/alibaba/nacos/test/common/WatchFileCenter_ITCase.java b/test/src/test/java/com/alibaba/nacos/test/common/WatchFileCenter_ITCase.java
index 89be3bb7d28..909fbe64e59 100644
--- a/test/src/test/java/com/alibaba/nacos/test/common/WatchFileCenter_ITCase.java
+++ b/test/src/test/java/com/alibaba/nacos/test/common/WatchFileCenter_ITCase.java
@@ -16,12 +16,12 @@
package com.alibaba.nacos.test.common;
-import com.alibaba.nacos.core.file.FileChangeEvent;
-import com.alibaba.nacos.core.file.FileWatcher;
-import com.alibaba.nacos.core.file.WatchFileCenter;
+import com.alibaba.nacos.sys.file.FileChangeEvent;
+import com.alibaba.nacos.sys.file.FileWatcher;
+import com.alibaba.nacos.sys.file.WatchFileCenter;
import com.alibaba.nacos.common.utils.ByteUtils;
import com.alibaba.nacos.common.utils.ConcurrentHashSet;
-import com.alibaba.nacos.core.utils.DiskUtils;
+import com.alibaba.nacos.sys.utils.DiskUtils;
import com.alibaba.nacos.common.utils.ThreadUtils;
import org.apache.commons.lang3.StringUtils;
import org.junit.AfterClass;
@@ -45,142 +45,138 @@
* @author liaochuntao
*/
public class WatchFileCenter_ITCase {
-
- static final String path = Paths
- .get(System.getProperty("user.home"), "/watch_file_change_test").toString();
-
- final Object monitor = new Object();
-
- static final Executor executor = Executors.newFixedThreadPool(32);
-
- @BeforeClass
- public static void beforeCls() throws Exception {
- DiskUtils.deleteDirThenMkdir(path);
- }
-
- @AfterClass
- public static void afterCls() throws Exception {
- DiskUtils.deleteDirectory(path);
- }
-
- // The last file change must be notified
-
- @Test
- public void test_high_concurrency_modify() throws Exception {
- AtomicInteger count = new AtomicInteger(0);
- Set set = new ConcurrentHashSet<>();
-
- final String fileName = "test2_file_change";
- final File file = Paths.get(path, fileName).toFile();
-
- func(fileName, file, content -> {
- set.add(content);
- count.incrementAndGet();
- });
-
- ThreadUtils.sleep(5_000L);
- }
-
- @Test
- public void test_modify_file_much() throws Exception {
- final String fileName = "modify_file_much";
- final File file = Paths.get(path, fileName).toFile();
-
- CountDownLatch latch = new CountDownLatch(3);
- AtomicInteger count = new AtomicInteger(0);
-
- WatchFileCenter.registerWatcher(path, new FileWatcher() {
- @Override
- public void onChange(FileChangeEvent event) {
- try {
- System.out.println(event);
- System.out.println(DiskUtils.readFile(file));
- count.incrementAndGet();
- } finally {
- latch.countDown();
- }
- }
-
- @Override
- public boolean interest(String context) {
- return StringUtils.contains(context, fileName);
- }
- });
-
- for (int i = 0; i < 3; i ++) {
- DiskUtils.writeFile(file, ByteUtils.toBytes(("test_modify_file_" + i)), false);
- ThreadUtils.sleep(10_000L);
- }
-
- latch.await(10_000L, TimeUnit.MILLISECONDS);
-
- Assert.assertEquals(3, count.get());
- }
-
- @Test
- public void test_multi_file_modify() throws Exception {
- CountDownLatch latch = new CountDownLatch(10);
- for (int i = 0; i < 10; i++) {
- AtomicInteger count = new AtomicInteger(0);
- Set set = new ConcurrentHashSet<>();
-
- final String fileName = "test2_file_change_" + i;
- final File file = Paths.get(path, fileName).toFile();
-
- executor.execute(() -> {
- try {
- func(fileName, file, content -> {
- set.add(content);
- count.incrementAndGet();
- });
- } catch (Throwable ex) {
- ex.printStackTrace();
- } finally {
- latch.countDown();
- }
- });
- }
- latch.await(10_000L, TimeUnit.MILLISECONDS);
-
- ThreadUtils.sleep(5_000L);
- }
-
- private void func(final String fileName, final File file,
- final Consumer consumer) throws Exception {
- CountDownLatch latch = new CountDownLatch(100);
- DiskUtils.touch(file);
- WatchFileCenter.registerWatcher(path, new FileWatcher() {
- @Override
- public void onChange(FileChangeEvent event) {
- final File file = Paths.get(path, fileName).toFile();
- final String content = DiskUtils.readFile(file);
- consumer.accept(content);
- }
-
- @Override
- public boolean interest(String context) {
- return StringUtils.contains(context, fileName);
- }
- });
-
- final AtomicInteger id = new AtomicInteger(0);
- final AtomicReference finalContent = new AtomicReference<>(null);
- for (int i = 0; i < 100; i++) {
- executor.execute(() -> {
- final String j = fileName + "_" + id.incrementAndGet();
- try {
- final File file1 = Paths.get(path, fileName).toFile();
- synchronized (monitor) {
- finalContent.set(j);
- DiskUtils.writeFile(file1, j.getBytes(StandardCharsets.UTF_8),
- false);
- }
- }
- finally {
- latch.countDown();
- }
- });
- }
- }
-
+
+ static final String path = Paths.get(System.getProperty("user.home"), "/watch_file_change_test").toString();
+
+ final Object monitor = new Object();
+
+ static final Executor executor = Executors.newFixedThreadPool(32);
+
+ @BeforeClass
+ public static void beforeCls() throws Exception {
+ DiskUtils.deleteDirThenMkdir(path);
+ }
+
+ @AfterClass
+ public static void afterCls() throws Exception {
+ DiskUtils.deleteDirectory(path);
+ }
+
+ // The last file change must be notified
+
+ @Test
+ public void test_high_concurrency_modify() throws Exception {
+ AtomicInteger count = new AtomicInteger(0);
+ Set set = new ConcurrentHashSet<>();
+
+ final String fileName = "test2_file_change";
+ final File file = Paths.get(path, fileName).toFile();
+
+ func(fileName, file, content -> {
+ set.add(content);
+ count.incrementAndGet();
+ });
+
+ ThreadUtils.sleep(5_000L);
+ }
+
+ @Test
+ public void test_modify_file_much() throws Exception {
+ final String fileName = "modify_file_much";
+ final File file = Paths.get(path, fileName).toFile();
+
+ CountDownLatch latch = new CountDownLatch(3);
+ AtomicInteger count = new AtomicInteger(0);
+
+ WatchFileCenter.registerWatcher(path, new FileWatcher() {
+ @Override
+ public void onChange(FileChangeEvent event) {
+ try {
+ System.out.println(event);
+ System.out.println(DiskUtils.readFile(file));
+ count.incrementAndGet();
+ } finally {
+ latch.countDown();
+ }
+ }
+
+ @Override
+ public boolean interest(String context) {
+ return StringUtils.contains(context, fileName);
+ }
+ });
+
+ for (int i = 0; i < 3; i++) {
+ DiskUtils.writeFile(file, ByteUtils.toBytes(("test_modify_file_" + i)), false);
+ ThreadUtils.sleep(10_000L);
+ }
+
+ latch.await(10_000L, TimeUnit.MILLISECONDS);
+
+ Assert.assertEquals(3, count.get());
+ }
+
+ @Test
+ public void test_multi_file_modify() throws Exception {
+ CountDownLatch latch = new CountDownLatch(10);
+ for (int i = 0; i < 10; i++) {
+ AtomicInteger count = new AtomicInteger(0);
+ Set set = new ConcurrentHashSet<>();
+
+ final String fileName = "test2_file_change_" + i;
+ final File file = Paths.get(path, fileName).toFile();
+
+ executor.execute(() -> {
+ try {
+ func(fileName, file, content -> {
+ set.add(content);
+ count.incrementAndGet();
+ });
+ } catch (Throwable ex) {
+ ex.printStackTrace();
+ } finally {
+ latch.countDown();
+ }
+ });
+ }
+ latch.await(10_000L, TimeUnit.MILLISECONDS);
+
+ ThreadUtils.sleep(5_000L);
+ }
+
+ private void func(final String fileName, final File file, final Consumer consumer) throws Exception {
+ CountDownLatch latch = new CountDownLatch(100);
+ DiskUtils.touch(file);
+ WatchFileCenter.registerWatcher(path, new FileWatcher() {
+ @Override
+ public void onChange(FileChangeEvent event) {
+ final File file = Paths.get(path, fileName).toFile();
+ final String content = DiskUtils.readFile(file);
+ consumer.accept(content);
+ }
+
+ @Override
+ public boolean interest(String context) {
+ return StringUtils.contains(context, fileName);
+ }
+ });
+
+ final AtomicInteger id = new AtomicInteger(0);
+ final AtomicReference finalContent = new AtomicReference<>(null);
+ for (int i = 0; i < 100; i++) {
+ executor.execute(() -> {
+ final String j = fileName + "_" + id.incrementAndGet();
+ try {
+ final File file1 = Paths.get(path, fileName).toFile();
+ synchronized (monitor) {
+ finalContent.set(j);
+ DiskUtils.writeFile(file1, j.getBytes(StandardCharsets.UTF_8), false);
+ }
+ } finally {
+ latch.countDown();
+ }
+ });
+ }
+ }
+
}
diff --git a/test/src/test/java/com/alibaba/nacos/test/config/ConfigCleanUtils.java b/test/src/test/java/com/alibaba/nacos/test/config/ConfigCleanUtils.java
index ffc652a4e89..5bb1081a2e7 100644
--- a/test/src/test/java/com/alibaba/nacos/test/config/ConfigCleanUtils.java
+++ b/test/src/test/java/com/alibaba/nacos/test/config/ConfigCleanUtils.java
@@ -17,7 +17,7 @@
package com.alibaba.nacos.test.config;
import com.alibaba.nacos.client.config.impl.LocalConfigInfoProcessor;
-import com.alibaba.nacos.core.utils.DiskUtils;
+import com.alibaba.nacos.sys.utils.DiskUtils;
import java.io.IOException;
diff --git a/test/src/test/java/com/alibaba/nacos/test/config/ConfigDerbyImport_CITCase.java b/test/src/test/java/com/alibaba/nacos/test/config/ConfigDerbyImport_CITCase.java
index 0f14a13dc15..b3c3a98c109 100644
--- a/test/src/test/java/com/alibaba/nacos/test/config/ConfigDerbyImport_CITCase.java
+++ b/test/src/test/java/com/alibaba/nacos/test/config/ConfigDerbyImport_CITCase.java
@@ -23,11 +23,8 @@
import com.alibaba.nacos.config.server.model.ConfigInfo;
import com.alibaba.nacos.config.server.service.repository.PersistService;
import com.alibaba.nacos.config.server.service.repository.embedded.DatabaseOperate;
-import com.alibaba.nacos.core.utils.ApplicationUtils;
-import com.alibaba.nacos.core.utils.DiskUtils;
-import org.junit.AfterClass;
+import com.alibaba.nacos.sys.utils.DiskUtils;
import org.junit.Assert;
-import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
@@ -36,7 +33,6 @@
import org.springframework.test.context.junit4.SpringRunner;
import java.io.File;
-import java.nio.file.Paths;
import java.util.concurrent.CompletableFuture;
/**
diff --git a/test/src/test/java/com/alibaba/nacos/test/config/ConfigDerbyRaft_DITCase.java b/test/src/test/java/com/alibaba/nacos/test/config/ConfigDerbyRaft_DITCase.java
index 322494a4a7b..6afce7ee66e 100644
--- a/test/src/test/java/com/alibaba/nacos/test/config/ConfigDerbyRaft_DITCase.java
+++ b/test/src/test/java/com/alibaba/nacos/test/config/ConfigDerbyRaft_DITCase.java
@@ -32,7 +32,7 @@
import com.alibaba.nacos.core.distributed.id.IdGeneratorManager;
import com.alibaba.nacos.core.distributed.raft.utils.JRaftConstants;
import com.alibaba.nacos.core.utils.GenericType;
-import com.alibaba.nacos.core.utils.InetUtils;
+import com.alibaba.nacos.sys.utils.InetUtils;
import com.alibaba.nacos.test.core.BaseClusterTest;
import org.junit.Assert;
diff --git a/test/src/test/java/com/alibaba/nacos/test/core/BaseClusterTest.java b/test/src/test/java/com/alibaba/nacos/test/core/BaseClusterTest.java
index c1f79663ce2..cf1c2fead83 100644
--- a/test/src/test/java/com/alibaba/nacos/test/core/BaseClusterTest.java
+++ b/test/src/test/java/com/alibaba/nacos/test/core/BaseClusterTest.java
@@ -21,18 +21,17 @@
import com.alibaba.nacos.api.config.ConfigService;
import com.alibaba.nacos.api.naming.NamingService;
import com.alibaba.nacos.common.http.HttpClientBeanHolder;
-import com.alibaba.nacos.common.http.NSyncHttpClient;
import com.alibaba.nacos.common.http.client.NacosRestTemplate;
import com.alibaba.nacos.common.notify.Event;
import com.alibaba.nacos.common.notify.NotifyCenter;
import com.alibaba.nacos.common.notify.listener.Subscriber;
-import com.alibaba.nacos.core.utils.DiskUtils;
import com.alibaba.nacos.config.server.model.event.RaftDbErrorEvent;
import com.alibaba.nacos.config.server.service.repository.embedded.DistributedDatabaseOperateImpl;
import com.alibaba.nacos.consistency.cp.CPProtocol;
import com.alibaba.nacos.consistency.cp.MetadataKey;
-import com.alibaba.nacos.core.utils.ApplicationUtils;
-import com.alibaba.nacos.core.utils.InetUtils;
+import com.alibaba.nacos.sys.utils.ApplicationUtils;
+import com.alibaba.nacos.sys.utils.DiskUtils;
+import com.alibaba.nacos.sys.utils.InetUtils;
import com.alibaba.nacos.test.base.HttpClient4Test;
import org.junit.AfterClass;
diff --git a/test/src/test/java/com/alibaba/nacos/test/core/InetUtils_ITCase.java b/test/src/test/java/com/alibaba/nacos/test/core/InetUtils_ITCase.java
index 1b219072b6b..1e912809e5f 100644
--- a/test/src/test/java/com/alibaba/nacos/test/core/InetUtils_ITCase.java
+++ b/test/src/test/java/com/alibaba/nacos/test/core/InetUtils_ITCase.java
@@ -19,7 +19,7 @@
import com.alibaba.nacos.common.notify.Event;
import com.alibaba.nacos.common.notify.NotifyCenter;
import com.alibaba.nacos.common.notify.listener.Subscriber;
-import com.alibaba.nacos.core.utils.InetUtils;
+import com.alibaba.nacos.sys.utils.InetUtils;
import org.junit.Assert;
import org.junit.Test;
@@ -28,7 +28,8 @@
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicReference;
-import static com.alibaba.nacos.core.utils.Constants.NACOS_SERVER_IP;
+import static com.alibaba.nacos.sys.env.Constants.NACOS_SERVER_IP;
+
/**
* @author liaochuntao
diff --git a/test/src/test/java/com/alibaba/nacos/test/core/SnowFlowerIdGenerator_ITCase.java b/test/src/test/java/com/alibaba/nacos/test/core/SnowFlowerIdGenerator_ITCase.java
index 002695ecd41..573b7c61cfa 100644
--- a/test/src/test/java/com/alibaba/nacos/test/core/SnowFlowerIdGenerator_ITCase.java
+++ b/test/src/test/java/com/alibaba/nacos/test/core/SnowFlowerIdGenerator_ITCase.java
@@ -17,7 +17,7 @@
package com.alibaba.nacos.test.core;
import com.alibaba.nacos.core.distributed.id.SnowFlowerIdGenerator;
-import com.alibaba.nacos.core.utils.ApplicationUtils;
+import com.alibaba.nacos.sys.utils.ApplicationUtils;
import org.junit.Assert;
import org.junit.Test;
import org.springframework.core.env.StandardEnvironment;
diff --git a/test/src/test/java/com/alibaba/nacos/test/core/auth/NamingAuth_ITCase.java b/test/src/test/java/com/alibaba/nacos/test/core/auth/NamingAuth_ITCase.java
index 8c959fbfa4b..707feea32c5 100644
--- a/test/src/test/java/com/alibaba/nacos/test/core/auth/NamingAuth_ITCase.java
+++ b/test/src/test/java/com/alibaba/nacos/test/core/auth/NamingAuth_ITCase.java
@@ -21,7 +21,7 @@
import com.alibaba.nacos.api.exception.NacosException;
import com.alibaba.nacos.api.naming.NamingService;
import com.alibaba.nacos.api.naming.pojo.Instance;
-import com.alibaba.nacos.core.utils.ApplicationUtils;
+import com.alibaba.nacos.sys.utils.ApplicationUtils;
import org.apache.http.HttpStatus;
import org.junit.After;
import org.junit.Assert;
diff --git a/test/src/test/java/com/alibaba/nacos/test/core/cluster/MemberLookup_ITCase.java b/test/src/test/java/com/alibaba/nacos/test/core/cluster/MemberLookup_ITCase.java
index 485bd42fae9..033343c9981 100644
--- a/test/src/test/java/com/alibaba/nacos/test/core/cluster/MemberLookup_ITCase.java
+++ b/test/src/test/java/com/alibaba/nacos/test/core/cluster/MemberLookup_ITCase.java
@@ -17,7 +17,6 @@
package com.alibaba.nacos.test.core.cluster;
import com.alibaba.nacos.api.exception.NacosException;
-import com.alibaba.nacos.core.utils.DiskUtils;
import com.alibaba.nacos.core.cluster.Member;
import com.alibaba.nacos.core.cluster.ServerMemberManager;
import com.alibaba.nacos.core.cluster.lookup.AddressServerMemberLookup;
@@ -25,8 +24,9 @@
import com.alibaba.nacos.core.cluster.lookup.LookupFactory;
import com.alibaba.nacos.core.cluster.MemberLookup;
import com.alibaba.nacos.core.cluster.lookup.StandaloneMemberLookup;
-import com.alibaba.nacos.core.utils.ApplicationUtils;
-import com.alibaba.nacos.core.utils.InetUtils;
+import com.alibaba.nacos.sys.utils.ApplicationUtils;
+import com.alibaba.nacos.sys.utils.DiskUtils;
+import com.alibaba.nacos.sys.utils.InetUtils;
import com.alibaba.nacos.test.BaseTest;
import org.apache.commons.lang3.StringUtils;
import org.junit.After;
diff --git a/test/src/test/java/com/alibaba/nacos/test/core/cluster/ServerMemberManager_ITCase.java b/test/src/test/java/com/alibaba/nacos/test/core/cluster/ServerMemberManager_ITCase.java
index 9579c742ef1..2955715690c 100644
--- a/test/src/test/java/com/alibaba/nacos/test/core/cluster/ServerMemberManager_ITCase.java
+++ b/test/src/test/java/com/alibaba/nacos/test/core/cluster/ServerMemberManager_ITCase.java
@@ -24,8 +24,8 @@
import com.alibaba.nacos.core.cluster.MemberUtils;
import com.alibaba.nacos.core.cluster.NodeState;
import com.alibaba.nacos.core.cluster.ServerMemberManager;
-import com.alibaba.nacos.core.utils.ApplicationUtils;
-import com.alibaba.nacos.core.utils.Constants;
+import com.alibaba.nacos.sys.utils.ApplicationUtils;
+import com.alibaba.nacos.sys.env.Constants;
import org.junit.After;
import org.junit.AfterClass;
import org.junit.Assert;
diff --git a/test/src/test/java/com/alibaba/nacos/test/naming/AutoDeregisterInstance_ITCase.java b/test/src/test/java/com/alibaba/nacos/test/naming/AutoDeregisterInstance_ITCase.java
index 68982265149..5053ee2c5fd 100644
--- a/test/src/test/java/com/alibaba/nacos/test/naming/AutoDeregisterInstance_ITCase.java
+++ b/test/src/test/java/com/alibaba/nacos/test/naming/AutoDeregisterInstance_ITCase.java
@@ -22,7 +22,7 @@
import com.alibaba.nacos.api.naming.pojo.Instance;
import com.alibaba.nacos.client.naming.NacosNamingService;
import com.alibaba.nacos.client.naming.beat.BeatInfo;
-import com.alibaba.nacos.core.utils.ApplicationUtils;
+import com.alibaba.nacos.sys.utils.ApplicationUtils;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
diff --git a/test/src/test/java/com/alibaba/nacos/test/naming/ClientBeat_ITCase.java b/test/src/test/java/com/alibaba/nacos/test/naming/ClientBeat_ITCase.java
index 06e8adea359..6e5cefe02db 100644
--- a/test/src/test/java/com/alibaba/nacos/test/naming/ClientBeat_ITCase.java
+++ b/test/src/test/java/com/alibaba/nacos/test/naming/ClientBeat_ITCase.java
@@ -21,7 +21,7 @@
import com.alibaba.nacos.api.naming.NamingFactory;
import com.alibaba.nacos.api.naming.NamingService;
import com.alibaba.nacos.api.naming.pojo.Instance;
-import com.alibaba.nacos.core.utils.ApplicationUtils;
+import com.alibaba.nacos.sys.utils.ApplicationUtils;
import com.alibaba.nacos.test.base.Params;
import org.apache.commons.lang3.StringUtils;
import org.junit.Assert;
diff --git a/test/src/test/java/com/alibaba/nacos/test/naming/DeregisterInstance_ITCase.java b/test/src/test/java/com/alibaba/nacos/test/naming/DeregisterInstance_ITCase.java
index cb873b2c804..179c007cccc 100644
--- a/test/src/test/java/com/alibaba/nacos/test/naming/DeregisterInstance_ITCase.java
+++ b/test/src/test/java/com/alibaba/nacos/test/naming/DeregisterInstance_ITCase.java
@@ -19,7 +19,7 @@
import com.alibaba.nacos.api.naming.NamingFactory;
import com.alibaba.nacos.api.naming.NamingService;
import com.alibaba.nacos.api.naming.pojo.Instance;
-import com.alibaba.nacos.core.utils.ApplicationUtils;
+import com.alibaba.nacos.sys.utils.ApplicationUtils;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/test/src/test/java/com/alibaba/nacos/test/naming/MultiTenant_ITCase.java b/test/src/test/java/com/alibaba/nacos/test/naming/MultiTenant_ITCase.java
index 418e11b9a7d..1d4178bf8f7 100644
--- a/test/src/test/java/com/alibaba/nacos/test/naming/MultiTenant_ITCase.java
+++ b/test/src/test/java/com/alibaba/nacos/test/naming/MultiTenant_ITCase.java
@@ -26,7 +26,7 @@
import com.alibaba.nacos.api.naming.listener.NamingEvent;
import com.alibaba.nacos.api.naming.pojo.Instance;
import com.alibaba.nacos.api.naming.pojo.ListView;
-import com.alibaba.nacos.core.utils.ApplicationUtils;
+import com.alibaba.nacos.sys.utils.ApplicationUtils;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/test/src/test/java/com/alibaba/nacos/test/naming/NamingMaintainService_ITCase.java b/test/src/test/java/com/alibaba/nacos/test/naming/NamingMaintainService_ITCase.java
index 0ab4df76020..047d40c23fb 100644
--- a/test/src/test/java/com/alibaba/nacos/test/naming/NamingMaintainService_ITCase.java
+++ b/test/src/test/java/com/alibaba/nacos/test/naming/NamingMaintainService_ITCase.java
@@ -27,7 +27,7 @@
import com.alibaba.nacos.api.naming.pojo.Service;
import com.alibaba.nacos.api.selector.ExpressionSelector;
import com.alibaba.nacos.api.selector.NoneSelector;
-import com.alibaba.nacos.core.utils.ApplicationUtils;
+import com.alibaba.nacos.sys.utils.ApplicationUtils;
import com.alibaba.nacos.test.BaseTest;
import org.junit.Assert;
import org.junit.Before;
diff --git a/test/src/test/java/com/alibaba/nacos/test/naming/RegisterInstance_ITCase.java b/test/src/test/java/com/alibaba/nacos/test/naming/RegisterInstance_ITCase.java
index 0df3dbbc7dd..0227f3a608a 100644
--- a/test/src/test/java/com/alibaba/nacos/test/naming/RegisterInstance_ITCase.java
+++ b/test/src/test/java/com/alibaba/nacos/test/naming/RegisterInstance_ITCase.java
@@ -22,7 +22,7 @@
import com.alibaba.nacos.api.naming.NamingService;
import com.alibaba.nacos.api.naming.PreservedMetadataKeys;
import com.alibaba.nacos.api.naming.pojo.Instance;
-import com.alibaba.nacos.core.utils.ApplicationUtils;
+import com.alibaba.nacos.sys.utils.ApplicationUtils;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/test/src/test/java/com/alibaba/nacos/test/naming/SelectInstances_ITCase.java b/test/src/test/java/com/alibaba/nacos/test/naming/SelectInstances_ITCase.java
index a55c8afdb67..4b78ef75f42 100644
--- a/test/src/test/java/com/alibaba/nacos/test/naming/SelectInstances_ITCase.java
+++ b/test/src/test/java/com/alibaba/nacos/test/naming/SelectInstances_ITCase.java
@@ -22,7 +22,7 @@
import com.alibaba.nacos.api.naming.pojo.Instance;
import com.alibaba.nacos.api.naming.pojo.ListView;
import com.alibaba.nacos.api.selector.ExpressionSelector;
-import com.alibaba.nacos.core.utils.ApplicationUtils;
+import com.alibaba.nacos.sys.utils.ApplicationUtils;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/test/src/test/java/com/alibaba/nacos/test/naming/SelectOneHealthyInstance_ITCase.java b/test/src/test/java/com/alibaba/nacos/test/naming/SelectOneHealthyInstance_ITCase.java
index f9331e46efd..16104ebf07b 100644
--- a/test/src/test/java/com/alibaba/nacos/test/naming/SelectOneHealthyInstance_ITCase.java
+++ b/test/src/test/java/com/alibaba/nacos/test/naming/SelectOneHealthyInstance_ITCase.java
@@ -19,7 +19,7 @@
import com.alibaba.nacos.api.naming.NamingFactory;
import com.alibaba.nacos.api.naming.NamingService;
import com.alibaba.nacos.api.naming.pojo.Instance;
-import com.alibaba.nacos.core.utils.ApplicationUtils;
+import com.alibaba.nacos.sys.utils.ApplicationUtils;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/test/src/test/java/com/alibaba/nacos/test/naming/ServiceListTest_ITCase.java b/test/src/test/java/com/alibaba/nacos/test/naming/ServiceListTest_ITCase.java
index 31963a4e7b8..4a58b3fed26 100644
--- a/test/src/test/java/com/alibaba/nacos/test/naming/ServiceListTest_ITCase.java
+++ b/test/src/test/java/com/alibaba/nacos/test/naming/ServiceListTest_ITCase.java
@@ -25,7 +25,7 @@
import com.alibaba.nacos.api.naming.pojo.Instance;
import com.alibaba.nacos.api.naming.pojo.ListView;
import com.alibaba.nacos.api.naming.pojo.ServiceInfo;
-import com.alibaba.nacos.core.utils.ApplicationUtils;
+import com.alibaba.nacos.sys.utils.ApplicationUtils;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/test/src/test/java/com/alibaba/nacos/test/naming/SubscribeCluster_ITCase.java b/test/src/test/java/com/alibaba/nacos/test/naming/SubscribeCluster_ITCase.java
index ff1a42f39e3..86c13f8096a 100644
--- a/test/src/test/java/com/alibaba/nacos/test/naming/SubscribeCluster_ITCase.java
+++ b/test/src/test/java/com/alibaba/nacos/test/naming/SubscribeCluster_ITCase.java
@@ -22,7 +22,7 @@
import com.alibaba.nacos.api.naming.listener.EventListener;
import com.alibaba.nacos.api.naming.listener.NamingEvent;
import com.alibaba.nacos.api.naming.pojo.Instance;
-import com.alibaba.nacos.core.utils.ApplicationUtils;
+import com.alibaba.nacos.sys.utils.ApplicationUtils;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/test/src/test/java/com/alibaba/nacos/test/naming/Unsubscribe_ITCase.java b/test/src/test/java/com/alibaba/nacos/test/naming/Unsubscribe_ITCase.java
index 11454bb2a80..a04c200d705 100644
--- a/test/src/test/java/com/alibaba/nacos/test/naming/Unsubscribe_ITCase.java
+++ b/test/src/test/java/com/alibaba/nacos/test/naming/Unsubscribe_ITCase.java
@@ -22,7 +22,7 @@
import com.alibaba.nacos.api.naming.listener.EventListener;
import com.alibaba.nacos.api.naming.listener.NamingEvent;
import com.alibaba.nacos.api.naming.pojo.Instance;
-import com.alibaba.nacos.core.utils.ApplicationUtils;
+import com.alibaba.nacos.sys.utils.ApplicationUtils;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;