This is an automated email from the ASF dual-hosted git repository.
albumenj pushed a commit to branch 3.2
in repository https://gitbox.apache.org/repos/asf/dubbo.git
The following commit(s) were added to refs/heads/3.2 by this push:
new 10082d3fa1 Fix ApplicationConfig.enableFileCache default value is not
true (#10880) (#11008)
10082d3fa1 is described below
commit 10082d3fa146e20b24e4f0fde09a1f8d2f1e5780
Author: 陈精华 <[email protected]>
AuthorDate: Fri Nov 25 14:47:05 2022 +0800
Fix ApplicationConfig.enableFileCache default value is not true (#10880)
(#11008)
---
.../org/apache/dubbo/config/ApplicationConfig.java | 3 +++
.../apache/dubbo/config/ApplicationConfigTest.java | 20 +++++++++++++++++++-
.../src/test/resources/dubbo.properties | 1 -
3 files changed, 22 insertions(+), 2 deletions(-)
diff --git
a/dubbo-common/src/main/java/org/apache/dubbo/config/ApplicationConfig.java
b/dubbo-common/src/main/java/org/apache/dubbo/config/ApplicationConfig.java
index 273ced4f23..d860f4446a 100644
--- a/dubbo-common/src/main/java/org/apache/dubbo/config/ApplicationConfig.java
+++ b/dubbo-common/src/main/java/org/apache/dubbo/config/ApplicationConfig.java
@@ -244,6 +244,9 @@ public class ApplicationConfig extends AbstractConfig {
if (executorManagementMode == null) {
executorManagementMode = EXECUTOR_MANAGEMENT_MODE_DEFAULT;
}
+ if (enableFileCache == null) {
+ enableFileCache = Boolean.TRUE;
+ }
}
@Parameter(key = APPLICATION_KEY, required = true)
diff --git
a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/ApplicationConfigTest.java
b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/ApplicationConfigTest.java
index 5fc3dbe40a..e582d62624 100644
---
a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/ApplicationConfigTest.java
+++
b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/ApplicationConfigTest.java
@@ -29,7 +29,9 @@ import java.util.HashMap;
import java.util.Map;
import static
org.apache.dubbo.common.constants.CommonConstants.APPLICATION_KEY;
+import static org.apache.dubbo.common.constants.CommonConstants.DUBBO;
import static org.apache.dubbo.common.constants.CommonConstants.DUMP_DIRECTORY;
+import static
org.apache.dubbo.common.constants.CommonConstants.EXECUTOR_MANAGEMENT_MODE_DEFAULT;
import static org.apache.dubbo.common.constants.QosConstants.ACCEPT_FOREIGN_IP;
import static org.apache.dubbo.common.constants.QosConstants.QOS_ENABLE;
import static org.hamcrest.MatcherAssert.assertThat;
@@ -333,4 +335,20 @@ class ApplicationConfigTest {
DubboBootstrap.getInstance().destroy();
}
-}
\ No newline at end of file
+
+ @Test
+ void testDefaultValue() {
+ SysProps.setProperty("dubbo.application.NAME", "demo-app");
+
+ DubboBootstrap.getInstance()
+ .initialize();
+
+ ApplicationConfig applicationConfig =
DubboBootstrap.getInstance().getApplication();
+
+ Assertions.assertEquals(DUBBO, applicationConfig.getProtocol());
+ Assertions.assertEquals(EXECUTOR_MANAGEMENT_MODE_DEFAULT,
applicationConfig.getExecutorManagementMode());
+ Assertions.assertEquals(Boolean.TRUE,
applicationConfig.getEnableFileCache());
+
+ DubboBootstrap.getInstance().destroy();
+ }
+}
diff --git a/dubbo-config/dubbo-config-api/src/test/resources/dubbo.properties
b/dubbo-config/dubbo-config-api/src/test/resources/dubbo.properties
index 6a0ada2fba..5cd71b79c2 100644
--- a/dubbo-config/dubbo-config-api/src/test/resources/dubbo.properties
+++ b/dubbo-config/dubbo-config-api/src/test/resources/dubbo.properties
@@ -1,4 +1,3 @@
dubbo.override.key2=properties
dubbo.override.protocol=properties
-dubbo.application.enable-file-cache=false
dubbo.service.shutdown.wait=200