override bug fix
diff --git a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/common/util/OverrideUtils.java b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/common/util/OverrideUtils.java
index 7c7416b..8afadaf 100644
--- a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/common/util/OverrideUtils.java
+++ b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/common/util/OverrideUtils.java
@@ -78,14 +78,18 @@
configs.add(overrideConfig);
}
}
+ if (configs.size() == 0) {
+ return null;
+ }
dynamicConfigDTO.setConfigs(configs);
if (overrideDTO.getScope().equals(Constants.APPLICATION)) {
dynamicConfigDTO.setApplication(overrideDTO.getKey());
} else {
dynamicConfigDTO.setService(overrideDTO.getKey());
}
- dynamicConfigDTO.setDynamic(overrideDTO.isDynamic());
+ dynamicConfigDTO.setRuntime(overrideDTO.isRuntime());
dynamicConfigDTO.setEnabled(overrideDTO.isEnabled());
+ dynamicConfigDTO.setForce(overrideDTO.isForce());
return dynamicConfigDTO;
}
public static OverrideDTO createFromDynamicConfig(DynamicConfigDTO dynamicConfigDTO) {
diff --git a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/model/dto/DynamicConfigDTO.java b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/model/dto/DynamicConfigDTO.java
index 183ff3c..d3b7000 100644
--- a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/model/dto/DynamicConfigDTO.java
+++ b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/model/dto/DynamicConfigDTO.java
@@ -24,10 +24,18 @@
public class DynamicConfigDTO extends BaseDTO {
private String configVersion;
- private boolean dynamic;
+ private boolean runtime;
private boolean enabled;
+ private boolean force;
private List<OverrideConfig> configs;
+ public boolean isForce() {
+ return force;
+ }
+
+ public void setForce(boolean force) {
+ this.force = force;
+ }
public List<OverrideConfig> getConfigs() {
return configs;
@@ -45,12 +53,12 @@
this.configVersion = configVersion;
}
- public boolean isDynamic() {
- return dynamic;
+ public boolean isRuntime() {
+ return runtime;
}
- public void setDynamic(boolean dynamic) {
- this.dynamic = dynamic;
+ public void setRuntime(boolean runtime) {
+ this.runtime = runtime;
}
public boolean isEnabled() {
diff --git a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/model/store/OverrideDTO.java b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/model/store/OverrideDTO.java
index 0a1862a..ac11c65 100644
--- a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/model/store/OverrideDTO.java
+++ b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/model/store/OverrideDTO.java
@@ -23,10 +23,19 @@
private String key;
private String scope;
private String configVersion;
- private boolean dynamic;
+ private boolean runtime;
private boolean enabled;
+ private boolean force;
private List<OverrideConfig> configs;
+ public boolean isForce() {
+ return force;
+ }
+
+ public void setForce(boolean force) {
+ this.force = force;
+ }
+
public String getKey() {
return key;
}
@@ -51,12 +60,12 @@
this.configVersion = configVersion;
}
- public boolean isDynamic() {
- return dynamic;
+ public boolean isRuntime() {
+ return runtime;
}
- public void setDynamic(boolean dynamic) {
- this.dynamic = dynamic;
+ public void setRuntime(boolean runtime) {
+ this.runtime = runtime;
}
public boolean isEnabled() {
diff --git a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/service/impl/OverrideServiceImpl.java b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/service/impl/OverrideServiceImpl.java
index 95e8533..dc6eb9b 100644
--- a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/service/impl/OverrideServiceImpl.java
+++ b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/service/impl/OverrideServiceImpl.java
@@ -63,6 +63,9 @@
}
}
configs.addAll(override.getConfigs());
+ existOverride.setEnabled(override.isEnabled());
+ existOverride.setRuntime(override.isRuntime());
+ existOverride.setForce(override.isForce());
existOverride.setConfigs(configs);
dynamicConfiguration.setConfig(path, YamlParser.dumpObject(existOverride));
@@ -96,7 +99,7 @@
}
configs.addAll(update.getConfigs());
overrideDTO.setConfigs(configs);
- overrideDTO.setDynamic(update.isDynamic());
+ overrideDTO.setRuntime(update.isRuntime());
overrideDTO.setEnabled(update.isEnabled());
dynamicConfiguration.setConfig(path, YamlParser.dumpObject(overrideDTO));
