remove specific fields in DTO
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 8afadaf..dccf1b9 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
@@ -89,7 +89,6 @@
}
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/common/util/RouteRule.java b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/common/util/RouteRule.java
index c583252..6ff7b61 100644
--- a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/common/util/RouteRule.java
+++ b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/common/util/RouteRule.java
@@ -205,7 +205,6 @@
}
}
existRule.setConditions(conditionRoute.getConditions());
- existRule.setDynamic(conditionRoute.isDynamic());
existRule.setEnabled(conditionRoute.isEnabled());
existRule.setForce(conditionRoute.isForce());
existRule.setRuntime(conditionRoute.isRuntime());
@@ -312,7 +311,6 @@
conditionRouteDTO.setEnabled(routingRuleDTO.isEnabled());
conditionRouteDTO.setForce(routingRuleDTO.isForce());
conditionRouteDTO.setRuntime(routingRuleDTO.isRuntime());
- conditionRouteDTO.setDynamic(routingRuleDTO.isDynamic());
return conditionRouteDTO;
}
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 d3b7000..6bc0719 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
@@ -26,17 +26,8 @@
private String configVersion;
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;
}
diff --git a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/model/dto/RouteDTO.java b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/model/dto/RouteDTO.java
index 38ab4e8..0503660 100644
--- a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/model/dto/RouteDTO.java
+++ b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/model/dto/RouteDTO.java
@@ -18,20 +18,11 @@
package org.apache.dubbo.admin.model.dto;
public abstract class RouteDTO extends BaseDTO{
- private boolean dynamic;
private int priority;
private boolean enabled;
private boolean force;
private boolean runtime;
- public boolean isDynamic() {
- return dynamic;
- }
-
- public void setDynamic(boolean dynamic) {
- this.dynamic = dynamic;
- }
-
public int getPriority() {
return priority;
}
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 ac11c65..a917815 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
@@ -25,17 +25,8 @@
private String configVersion;
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;
}
diff --git a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/model/store/RoutingRuleDTO.java b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/model/store/RoutingRuleDTO.java
index 5498a56..70ba2ac 100644
--- a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/model/store/RoutingRuleDTO.java
+++ b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/model/store/RoutingRuleDTO.java
@@ -23,7 +23,6 @@
private String key;
private String scope;
- private boolean dynamic;
private int priority;
private boolean enabled;
private boolean force;
@@ -48,14 +47,6 @@
this.scope = scope;
}
- public boolean isDynamic() {
- return dynamic;
- }
-
- public void setDynamic(boolean dynamic) {
- this.dynamic = dynamic;
- }
-
public int getPriority() {
return priority;
}
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 dc6eb9b..a7774a2 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
@@ -65,7 +65,6 @@
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));
diff --git a/dubbo-admin-frontend/src/components/governance/Overrides.vue b/dubbo-admin-frontend/src/components/governance/Overrides.vue
index 595453a..347031b 100644
--- a/dubbo-admin-frontend/src/components/governance/Overrides.vue
+++ b/dubbo-admin-frontend/src/components/governance/Overrides.vue
@@ -189,7 +189,6 @@
'configVersion: v2.7\n' +
'enabled: true\n' +
'runtime: true\n' +
- 'force: true\n' +
'configs: \n' +
' - addresses: [0.0.0.0] # 0.0.0.0 for all addresses\n' +
' side: consumer # effective side, consumer or addresses\n' +
diff --git a/dubbo-admin-frontend/src/components/governance/RoutingRule.vue b/dubbo-admin-frontend/src/components/governance/RoutingRule.vue
index f3dc83f..9ca652a 100644
--- a/dubbo-admin-frontend/src/components/governance/RoutingRule.vue
+++ b/dubbo-admin-frontend/src/components/governance/RoutingRule.vue
@@ -169,7 +169,7 @@
],
selected: 0,
dropdown_font: [ 'Service', 'App', 'IP' ],
- ruleKeys: ['enabled', 'force', 'dynamic', 'runtime', 'group', 'version', 'rule', 'priority'],
+ ruleKeys: ['enabled', 'force', 'runtime', 'group', 'version', 'rule', 'priority'],
pattern: 'Service',
filter: '',
dialog: false,
