This is an automated email from the ASF dual-hosted git repository.
liuhongyu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shenyu.git
The following commit(s) were added to refs/heads/master by this push:
new f6a09ec9fb feat:refactor selector reserved keyword fields (#6141)
f6a09ec9fb is described below
commit f6a09ec9fb8c22d78eb2d3de0bec1e974f26bfaf
Author: Wweiei <45253632+wwe...@users.noreply.github.com>
AuthorDate: Wed Sep 10 12:18:32 2025 +0800
feat:refactor selector reserved keyword fields (#6141)
* feat:refactor selector reserved keyword fields
* feat:refactor selector reserved keyword fields. change 'name', 'sort'
fields.
* feat:refactor selector reserved keyword fields. update init sql.
* feat:refactor selector reserved keyword fields. update init sql error.
* feat:refactor selector reserved keyword fields. update init sql error.
* feat:refactor selector reserved keyword fields. update xml.
---------
Co-authored-by: aias00 <liuhon...@apache.org>
---
db/init/mysql/schema.sql | 8 +-
db/init/ob/schema.sql | 6 +-
db/init/og/create-table.sql | 14 +--
db/init/oracle/schema.sql | 14 +--
db/init/pg/create-table.sql | 14 +--
db/upgrade/2.7.0-upgrade-2.7.1-mysql.sql | 3 +
db/upgrade/2.7.0-upgrade-2.7.1-ob.sql | 5 +-
db/upgrade/2.7.0-upgrade-2.7.1-og.sql | 5 +-
db/upgrade/2.7.0-upgrade-2.7.1-oracle.sql | 5 +-
db/upgrade/2.7.0-upgrade-2.7.1-pg.sql | 5 +-
.../apache/shenyu/admin/mapper/SelectorMapper.java | 3 +-
.../shenyu/admin/model/entity/SelectorDO.java | 122 ++++++++++-----------
.../event/selector/BatchSelectorDeletedEvent.java | 2 +-
.../model/event/selector/SelectorChangedEvent.java | 16 +--
.../admin/model/vo/DataPermissionPageVO.java | 2 +-
.../apache/shenyu/admin/model/vo/SelectorVO.java | 6 +-
.../admin/service/impl/DiscoveryServiceImpl.java | 4 +-
.../service/impl/DiscoveryUpstreamServiceImpl.java | 4 +-
.../service/impl/ProxySelectorServiceImpl.java | 2 +-
.../admin/service/impl/SelectorServiceImpl.java | 9 +-
.../admin/service/impl/UpstreamCheckService.java | 2 +-
.../AbstractShenyuClientRegisterServiceImpl.java | 4 +-
.../ShenyuClientRegisterDivideServiceImpl.java | 2 +-
.../ShenyuClientRegisterGrpcServiceImpl.java | 2 +-
.../ShenyuClientRegisterWebSocketServiceImpl.java | 2 +-
.../src/main/resources/mappers/selector-sqlmap.xml | 88 +++++++--------
.../src/main/resources/sql-script/h2/schema.sql | 6 +-
.../shenyu/admin/mapper/SelectorMapperTest.java | 14 +--
.../selector/BatchSelectorDeletedEventTest.java | 2 +-
.../event/selector/SelectorChangedEventTest.java | 17 +--
.../service/DiscoveryUpstreamServiceTest.java | 2 +-
.../admin/service/UpstreamCheckServiceTest.java | 8 +-
32 files changed, 207 insertions(+), 191 deletions(-)
diff --git a/db/init/mysql/schema.sql b/db/init/mysql/schema.sql
index e86c4d76b0..67847dcc40 100644
--- a/db/init/mysql/schema.sql
+++ b/db/init/mysql/schema.sql
@@ -2100,10 +2100,10 @@ DROP TABLE IF EXISTS `selector`;
CREATE TABLE `selector` (
`id` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL
COMMENT 'primary key id varchar',
`plugin_id` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci
NOT NULL COMMENT 'plugin id',
- `name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL
COMMENT 'selector name',
+ `selector_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci
NOT NULL COMMENT 'selector name',
`match_mode` int(0) NOT NULL COMMENT 'matching mode (0 and 1 or)',
- `type` int(0) NOT NULL COMMENT 'type (0, full flow, 1 custom flow)',
- `sort` int(0) NOT NULL COMMENT 'sort',
+ `selector_type` int(0) NOT NULL COMMENT 'type (0, full flow, 1 custom flow)',
+ `sort_code` int(0) NOT NULL COMMENT 'sort',
`handle` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL
DEFAULT NULL COMMENT 'processing logic (here for different plug-ins, there will
be different fields to identify different processes, all data in JSON format is
stored)',
`enabled` tinyint(0) NOT NULL COMMENT 'whether to open (0 close, 1 open) ',
`loged` tinyint(0) NOT NULL COMMENT 'whether to print the log (0 no print, 1
print) ',
@@ -2687,7 +2687,7 @@ CREATE TABLE IF NOT EXISTS `namespace_user_rel` (
`date_updated` timestamp NOT NULL
DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT 'date_updated'
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci
COMMENT='namespace user relation ';
-INSERT INTO `selector` (`id`, `plugin_id`, `name`, `match_mode`, `type`,
`sort`, `handle`, `enabled`, `loged`, `continued`, `match_restful`,
`namespace_id`) VALUES ('1913785244204204032', '61', 'mcpServer', 0, 0, 1,
NULL, 1, 1, 1, 0, '649330b6-c2d7-4edc-be8e-8a54df9eb385');
+INSERT INTO `selector` (`id`, `plugin_id`, `selector_name`, `match_mode`,
`selector_type`, `sort_code`, `handle`, `enabled`, `loged`, `continued`,
`match_restful`, `namespace_id`) VALUES ('1913785244204204032', '61',
'mcpServer', 0, 0, 1, NULL, 1, 1, 1, 0, '649330b6-c2d7-4edc-be8e-8a54df9eb385');
DROP TABLE IF EXISTS `instance_info`;
diff --git a/db/init/ob/schema.sql b/db/init/ob/schema.sql
index 2a86382b22..b8be57a216 100644
--- a/db/init/ob/schema.sql
+++ b/db/init/ob/schema.sql
@@ -2028,10 +2028,10 @@ DROP TABLE IF EXISTS `selector`;
CREATE TABLE `selector` (
`id` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL
COMMENT 'primary key id varchar',
`plugin_id` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci
NOT NULL COMMENT 'plugin id',
- `name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL
COMMENT 'selector name',
+ `selector_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci
NOT NULL COMMENT 'selector name',
`match_mode` int(0) NOT NULL COMMENT 'matching mode (0 and 1 or)',
- `type` int(0) NOT NULL COMMENT 'type (0, full flow, 1 custom flow)',
- `sort` int(0) NOT NULL COMMENT 'sort',
+ `selector_type` int(0) NOT NULL COMMENT 'type (0, full flow, 1 custom flow)',
+ `sort_code` int(0) NOT NULL COMMENT 'sort',
`handle` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL
DEFAULT NULL COMMENT 'processing logic (here for different plug-ins, there will
be different fields to identify different processes, all data in JSON format is
stored)',
`enabled` tinyint(0) NOT NULL COMMENT 'whether to open (0 close, 1 open) ',
`loged` tinyint(0) NOT NULL COMMENT 'whether to print the log (0 no print, 1
print) ',
diff --git a/db/init/og/create-table.sql b/db/init/og/create-table.sql
index bc2863dfc2..355ffc22d3 100644
--- a/db/init/og/create-table.sql
+++ b/db/init/og/create-table.sql
@@ -1975,10 +1975,10 @@ DROP TABLE IF EXISTS "public"."selector";
CREATE TABLE "public"."selector" (
"id" varchar(128) COLLATE "pg_catalog"."default" NOT NULL,
"plugin_id" varchar(128) COLLATE "pg_catalog"."default" NOT NULL,
- "name" varchar(64) COLLATE "pg_catalog"."default" NOT NULL,
+ "selector_name" varchar(64) COLLATE "pg_catalog"."default" NOT NULL,
"match_mode" int4 NOT NULL,
- "type" int4 NOT NULL,
- "sort" int4 NOT NULL,
+ "selector_type" int4 NOT NULL,
+ "sort_code" int4 NOT NULL,
"handle" varchar(1024) COLLATE "pg_catalog"."default",
"enabled" int2 NOT NULL,
"loged" int2 NOT NULL,
@@ -1991,10 +1991,10 @@ CREATE TABLE "public"."selector" (
;
COMMENT ON COLUMN "public"."selector"."id" IS 'primary key id varchar';
COMMENT ON COLUMN "public"."selector"."plugin_id" IS 'plugin id';
-COMMENT ON COLUMN "public"."selector"."name" IS 'selector name';
+COMMENT ON COLUMN "public"."selector"."selector_name" IS 'selector name';
COMMENT ON COLUMN "public"."selector"."match_mode" IS 'matching mode (0 and 1
or)';
-COMMENT ON COLUMN "public"."selector"."type" IS 'type (0, full flow, 1 custom
flow)';
-COMMENT ON COLUMN "public"."selector"."sort" IS 'sort';
+COMMENT ON COLUMN "public"."selector"."selector_type" IS 'type (0, full flow,
1 custom flow)';
+COMMENT ON COLUMN "public"."selector"."sort_code" IS 'sort';
COMMENT ON COLUMN "public"."selector"."handle" IS 'processing logic (here for
different plug-ins, there will be different fields to identify different
processes, all data in JSON format is stored)';
COMMENT ON COLUMN "public"."selector"."enabled" IS 'whether to open (0 close,
1 open) ';
COMMENT ON COLUMN "public"."selector"."loged" IS 'whether to print the log (0
no print, 1 print) ';
@@ -3037,7 +3037,7 @@ COMMENT ON COLUMN "public"."registry_config"."address" IS
'address';
COMMENT ON COLUMN "public"."registry_config"."username" IS 'username';
COMMENT ON COLUMN "public"."registry_config"."password" IS 'password';
COMMENT ON COLUMN "public"."registry_config"."namespace" IS 'namespace';
-COMMENT ON COLUMN "public"."registry_config"."group" IS 'group';
+COMMENT ON COLUMN "public"."registry_config"."registry_group" IS 'group';
COMMENT ON COLUMN "public"."registry_config"."date_created" IS 'create time';
COMMENT ON COLUMN "public"."registry_config"."date_updated" IS 'update time';
diff --git a/db/init/oracle/schema.sql b/db/init/oracle/schema.sql
index fd02a8501f..19d9a251e4 100644
--- a/db/init/oracle/schema.sql
+++ b/db/init/oracle/schema.sql
@@ -116,10 +116,10 @@ create table selector
(
id VARCHAR2(128) not null primary key,
plugin_id VARCHAR2(128) not null,
- name VARCHAR2(64) not null,
+ selector_name VARCHAR2(64) not null,
match_mode NUMBER(10) not null,
- type NUMBER(10) not null,
- sort NUMBER(10) not null,
+ selector_type NUMBER(10) not null,
+ sort_code NUMBER(10) not null,
handle VARCHAR2(1024),
enabled NUMBER(3) not null,
loged NUMBER(3) not null,
@@ -134,13 +134,13 @@ comment on column SELECTOR.id
is 'primary key id varchar';
comment on column SELECTOR.plugin_id
is 'plugin id';
-comment on column SELECTOR.name
+comment on column SELECTOR.selector_name
is 'selector name';
comment on column SELECTOR.match_mode
is 'matching mode (0 and 1 or)';
-comment on column SELECTOR.type
+comment on column SELECTOR.selector_type
is 'type (0 full flow, 1 custom flow)';
-comment on column SELECTOR.sort
+comment on column SELECTOR.sort_code
is 'sort';
comment on column SELECTOR.handle
is 'processing logic (here for different plugins, there will be different
fields to identify different processes, all data in JSON format is stored)';
@@ -3630,7 +3630,7 @@ COMMENT ON COLUMN registry_config.address IS 'address';
COMMENT ON COLUMN registry_config.username IS 'username';
COMMENT ON COLUMN registry_config.password IS 'password';
COMMENT ON COLUMN registry_config.namespace IS 'namespace';
-COMMENT ON COLUMN registry_config.group IS 'group';
+COMMENT ON COLUMN registry_config.registry_group IS 'group';
COMMENT ON COLUMN registry_config.date_created IS 'create time';
COMMENT ON COLUMN registry_config.date_updated IS 'update time';
diff --git a/db/init/pg/create-table.sql b/db/init/pg/create-table.sql
index ce388bf0fc..a6658be2e4 100644
--- a/db/init/pg/create-table.sql
+++ b/db/init/pg/create-table.sql
@@ -2103,10 +2103,10 @@ DROP TABLE IF EXISTS "public"."selector";
CREATE TABLE "public"."selector" (
"id" varchar(128) COLLATE "pg_catalog"."default" NOT NULL,
"plugin_id" varchar(128) COLLATE "pg_catalog"."default" NOT NULL,
- "name" varchar(64) COLLATE "pg_catalog"."default" NOT NULL,
+ "selector_name" varchar(64) COLLATE "pg_catalog"."default" NOT NULL,
"match_mode" int4 NOT NULL,
- "type" int4 NOT NULL,
- "sort" int4 NOT NULL,
+ "selector_type" int4 NOT NULL,
+ "sort_code" int4 NOT NULL,
"handle" varchar(1024) COLLATE "pg_catalog"."default",
"enabled" int2 NOT NULL,
"loged" int2 NOT NULL,
@@ -2119,10 +2119,10 @@ CREATE TABLE "public"."selector" (
;
COMMENT ON COLUMN "public"."selector"."id" IS 'primary key id varchar';
COMMENT ON COLUMN "public"."selector"."plugin_id" IS 'plugin id';
-COMMENT ON COLUMN "public"."selector"."name" IS 'selector name';
+COMMENT ON COLUMN "public"."selector"."selector_name" IS 'selector name';
COMMENT ON COLUMN "public"."selector"."match_mode" IS 'matching mode (0 and 1
or)';
-COMMENT ON COLUMN "public"."selector"."type" IS 'type (0, full flow, 1 custom
flow)';
-COMMENT ON COLUMN "public"."selector"."sort" IS 'sort';
+COMMENT ON COLUMN "public"."selector"."selector_type" IS 'type (0, full flow,
1 custom flow)';
+COMMENT ON COLUMN "public"."selector"."sort_code" IS 'sort';
COMMENT ON COLUMN "public"."selector"."handle" IS 'processing logic (here for
different plug-ins, there will be different fields to identify different
processes, all data in JSON format is stored)';
COMMENT ON COLUMN "public"."selector"."enabled" IS 'whether to open (0 close,
1 open) ';
COMMENT ON COLUMN "public"."selector"."loged" IS 'whether to print the log (0
no print, 1 print) ';
@@ -3171,7 +3171,7 @@ COMMENT ON COLUMN "public"."registry_config"."address" IS
'address';
COMMENT ON COLUMN "public"."registry_config"."username" IS 'username';
COMMENT ON COLUMN "public"."registry_config"."password" IS 'password';
COMMENT ON COLUMN "public"."registry_config"."namespace" IS 'namespace';
-COMMENT ON COLUMN "public"."registry_config"."group" IS 'group';
+COMMENT ON COLUMN "public"."registry_config"."registry_group" IS 'group';
COMMENT ON COLUMN "public"."registry_config"."date_created" IS 'create time';
COMMENT ON COLUMN "public"."registry_config"."date_updated" IS 'update time';
diff --git a/db/upgrade/2.7.0-upgrade-2.7.1-mysql.sql
b/db/upgrade/2.7.0-upgrade-2.7.1-mysql.sql
index fbd17de958..343d4fc0f1 100755
--- a/db/upgrade/2.7.0-upgrade-2.7.1-mysql.sql
+++ b/db/upgrade/2.7.0-upgrade-2.7.1-mysql.sql
@@ -267,3 +267,6 @@ INSERT INTO `permission` (`id`, `object_id`, `resource_id`,
`date_created`, `dat
INSERT INTO `permission` (`id`, `object_id`, `resource_id`, `date_created`,
`date_updated`) VALUES ('1953049887387303905', '1346358560427216896',
'1953048313980116904', '2025-08-06 17:00:00.000', '2025-08-06 17:00:00.000');
ALTER TABLE `rule` MODIFY COLUMN `handle` text;
+ALTER TABLE `selector` CHANGE COLUMN `type` `selector_type` int(0) NOT NULL
COMMENT 'type (0, full flow, 1 custom flow)';
+ALTER TABLE `selector` CHANGE COLUMN `sort` `sort_code` int(0) NOT NULL
COMMENT 'sort';
+ALTER TABLE `selector` CHANGE COLUMN `name` `selector_name` varchar(64)
CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'selector
name';
diff --git a/db/upgrade/2.7.0-upgrade-2.7.1-ob.sql
b/db/upgrade/2.7.0-upgrade-2.7.1-ob.sql
index 50c519f01a..3329bb5da1 100755
--- a/db/upgrade/2.7.0-upgrade-2.7.1-ob.sql
+++ b/db/upgrade/2.7.0-upgrade-2.7.1-ob.sql
@@ -259,4 +259,7 @@ INSERT INTO `permission` (`id`, `object_id`, `resource_id`,
`date_created`, `dat
INSERT INTO `permission` (`id`, `object_id`, `resource_id`, `date_created`,
`date_updated`) VALUES ('1953049887387303904', '1346358560427216896',
'1953048313980116903', '2025-08-06 17:00:00.000', '2025-08-06 17:00:00.000');
INSERT INTO `permission` (`id`, `object_id`, `resource_id`, `date_created`,
`date_updated`) VALUES ('1953049887387303905', '1346358560427216896',
'1953048313980116904', '2025-08-06 17:00:00.000', '2025-08-06 17:00:00.000');
-ALTER TABLE `rule` MODIFY COLUMN `handle` text;
\ No newline at end of file
+ALTER TABLE `rule` MODIFY COLUMN `handle` text;
+ALTER TABLE `selector` CHANGE COLUMN `type` `selector_type` int(0) NOT NULL
COMMENT 'type (0, full flow, 1 custom flow)';
+ALTER TABLE `selector` CHANGE COLUMN `sort` `sort_code` int(0) NOT NULL
COMMENT 'sort';
+ALTER TABLE `selector` CHANGE COLUMN `name` `selector_name` varchar(64)
CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'selector
name';
\ No newline at end of file
diff --git a/db/upgrade/2.7.0-upgrade-2.7.1-og.sql
b/db/upgrade/2.7.0-upgrade-2.7.1-og.sql
index 041d8ba605..00e09fcdaa 100644
--- a/db/upgrade/2.7.0-upgrade-2.7.1-og.sql
+++ b/db/upgrade/2.7.0-upgrade-2.7.1-og.sql
@@ -283,4 +283,7 @@ INSERT INTO "public"."permission" VALUES
('1953049887387303903', '13463585604272
INSERT INTO "public"."permission" VALUES ('1953049887387303904',
'1346358560427216896', '1953048313980116903', '2025-08-06 17:00:00.000',
'2025-08-06 17:00:00.000');
INSERT INTO "public"."permission" VALUES ('1953049887387303905',
'1346358560427216896', '1953048313980116904', '2025-08-06 17:00:00.000',
'2025-08-06 17:00:00.000');
-ALTER TABLE "public"."rule" ALTER COLUMN "handle" TYPE text;
\ No newline at end of file
+ALTER TABLE "public"."rule" ALTER COLUMN "handle" TYPE text;
+ALTER TABLE "public"."selector" RENAME COLUMN "type" TO "selector_type";
+ALTER TABLE "public"."selector" RENAME COLUMN "sort" TO "sort_code";
+ALTER TABLE "public"."selector" RENAME COLUMN "name" TO "selector_name";
diff --git a/db/upgrade/2.7.0-upgrade-2.7.1-oracle.sql
b/db/upgrade/2.7.0-upgrade-2.7.1-oracle.sql
index 16a3cbd7e3..e74f112ce3 100755
--- a/db/upgrade/2.7.0-upgrade-2.7.1-oracle.sql
+++ b/db/upgrade/2.7.0-upgrade-2.7.1-oracle.sql
@@ -573,4 +573,7 @@ ALTER TABLE rule ADD (handle_new CLOB);
UPDATE rule SET handle_new = handle;
COMMIT;
ALTER TABLE rule DROP COLUMN handle;
-ALTER TABLE rule RENAME COLUMN handle_new TO handle;
\ No newline at end of file
+ALTER TABLE rule RENAME COLUMN handle_new TO handle;
+ALTER TABLE selector RENAME COLUMN "type" TO "selector_type";
+ALTER TABLE selector RENAME COLUMN "sort" TO "sort_code";
+ALTER TABLE selector RENAME COLUMN "name" TO "selector_name";
\ No newline at end of file
diff --git a/db/upgrade/2.7.0-upgrade-2.7.1-pg.sql
b/db/upgrade/2.7.0-upgrade-2.7.1-pg.sql
index 9daa2ee16f..3cd33cdf72 100755
--- a/db/upgrade/2.7.0-upgrade-2.7.1-pg.sql
+++ b/db/upgrade/2.7.0-upgrade-2.7.1-pg.sql
@@ -281,4 +281,7 @@ INSERT INTO "public"."permission" VALUES
('1953049887387303903', '13463585604272
INSERT INTO "public"."permission" VALUES ('1953049887387303904',
'1346358560427216896', '1953048313980116903', '2025-08-06 17:00:00.000',
'2025-08-06 17:00:00.000');
INSERT INTO "public"."permission" VALUES ('1953049887387303905',
'1346358560427216896', '1953048313980116904', '2025-08-06 17:00:00.000',
'2025-08-06 17:00:00.000');
-ALTER TABLE "public"."rule" ALTER COLUMN "handle" TYPE text;
\ No newline at end of file
+ALTER TABLE "public"."rule" ALTER COLUMN "handle" TYPE text;
+ALTER TABLE "public"."selector" RENAME COLUMN "type" TO "selector_type";
+ALTER TABLE "public"."selector" RENAME COLUMN "sort" TO "sort_code";
+ALTER TABLE "public"."selector" RENAME COLUMN "name" TO "selector_name";
\ No newline at end of file
diff --git
a/shenyu-admin/src/main/java/org/apache/shenyu/admin/mapper/SelectorMapper.java
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/mapper/SelectorMapper.java
index f1072eab1c..ecac4cca50 100644
---
a/shenyu-admin/src/main/java/org/apache/shenyu/admin/mapper/SelectorMapper.java
+++
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/mapper/SelectorMapper.java
@@ -22,7 +22,6 @@ import org.apache.ibatis.annotations.Param;
import org.apache.shenyu.admin.model.entity.SelectorDO;
import org.apache.shenyu.admin.model.query.SelectorQuery;
import org.apache.shenyu.admin.model.query.SelectorQueryCondition;
-import org.apache.shenyu.admin.model.vo.SelectorVO;
import org.apache.shenyu.admin.validation.ExistProvider;
import java.io.Serializable;
@@ -208,7 +207,7 @@ public interface SelectorMapper extends ExistProvider {
* @param condition condition
* @return view data list
*/
- List<SelectorVO> selectByCondition(@Param("condition")
SelectorQueryCondition condition);
+ List<SelectorDO> selectByCondition(@Param("condition")
SelectorQueryCondition condition);
/**
* selectByDiscoveryHandlerId.
diff --git
a/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/entity/SelectorDO.java
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/entity/SelectorDO.java
index e31f97c032..190d100669 100644
---
a/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/entity/SelectorDO.java
+++
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/entity/SelectorDO.java
@@ -46,7 +46,7 @@ public final class SelectorDO extends BaseDO {
/**
* selector name.
*/
- private String name;
+ private String selectorName;
/**
* match mode.
@@ -56,12 +56,12 @@ public final class SelectorDO extends BaseDO {
/**
* selector type.
*/
- private Integer type;
+ private Integer selectorType;
/**
- * sort type.
+ * sort code.
*/
- private Integer sort;
+ private Integer sortCode;
/**
* whether enabled.
@@ -97,10 +97,10 @@ public final class SelectorDO extends BaseDO {
}
public SelectorDO(final String pluginId,
- final String name,
+ final String selectorName,
final Integer matchMode,
- final Integer type,
- final Integer sort,
+ final Integer selectorType,
+ final Integer sortCode,
final Boolean enabled,
final Boolean loged,
final Boolean continued,
@@ -108,10 +108,10 @@ public final class SelectorDO extends BaseDO {
final Boolean matchRestful,
final String namespaceId) {
this.pluginId = pluginId;
- this.name = name;
+ this.selectorName = selectorName;
this.matchMode = matchMode;
- this.type = type;
- this.sort = sort;
+ this.selectorType = selectorType;
+ this.sortCode = sortCode;
this.enabled = enabled;
this.loged = loged;
this.continued = continued;
@@ -140,21 +140,21 @@ public final class SelectorDO extends BaseDO {
}
/**
- * Gets the value of name.
+ * Gets the value of selectorName.
*
- * @return the value of name
+ * @return the value of selectorName
*/
- public String getName() {
- return name;
+ public String getSelectorName() {
+ return selectorName;
}
/**
- * Sets the name.
+ * Sets the selectorName.
*
- * @param name name
+ * @param selectorName selectorName
*/
- public void setName(final String name) {
- this.name = name;
+ public void setSelectorName(final String selectorName) {
+ this.selectorName = selectorName;
}
/**
@@ -176,39 +176,39 @@ public final class SelectorDO extends BaseDO {
}
/**
- * Gets the value of type.
+ * Gets the value of selectorType.
*
- * @return the value of type
+ * @return the value of selectorType
*/
- public Integer getType() {
- return type;
+ public Integer getSelectorType() {
+ return selectorType;
}
/**
- * Sets the type.
+ * Sets the selectorType.
*
- * @param type type
+ * @param selectorType selectorType
*/
- public void setType(final Integer type) {
- this.type = type;
+ public void setSelectorType(final Integer selectorType) {
+ this.selectorType = selectorType;
}
/**
- * Gets the value of sort.
+ * Gets the value of sortCode.
*
- * @return the value of sort
+ * @return the value of sortCode
*/
- public Integer getSort() {
- return sort;
+ public Integer getSortCode() {
+ return sortCode;
}
/**
- * Sets the sort.
+ * Sets the sortCode.
*
- * @param sort sort
+ * @param sortCode sortCode
*/
- public void setSort(final Integer sort) {
- this.sort = sort;
+ public void setSortCode(final Integer sortCode) {
+ this.sortCode = sortCode;
}
/**
@@ -341,10 +341,10 @@ public final class SelectorDO extends BaseDO {
}
SelectorDO that = (SelectorDO) o;
return Objects.equals(pluginId, that.pluginId)
- && Objects.equals(name, that.name)
+ && Objects.equals(selectorName, that.selectorName)
&& Objects.equals(matchMode, that.matchMode)
- && Objects.equals(type, that.type)
- && Objects.equals(sort, that.sort)
+ && Objects.equals(selectorType, that.selectorType)
+ && Objects.equals(sortCode, that.sortCode)
&& Objects.equals(enabled, that.enabled)
&& Objects.equals(loged, that.loged)
&& Objects.equals(continued, that.continued)
@@ -355,7 +355,7 @@ public final class SelectorDO extends BaseDO {
@Override
public int hashCode() {
- return Objects.hash(super.hashCode(), pluginId, name, matchMode, type,
sort, enabled, loged, continued, handle, matchRestful, namespaceId);
+ return Objects.hash(super.hashCode(), pluginId, selectorName,
matchMode, selectorType, sortCode, enabled, loged, continued, handle,
matchRestful, namespaceId);
}
/**
@@ -368,15 +368,15 @@ public final class SelectorDO extends BaseDO {
return Optional.ofNullable(selectorDTO).map(item -> {
Timestamp currentTime = new Timestamp(System.currentTimeMillis());
SelectorDO selectorDO = SelectorDO.builder()
- .type(item.getType())
- .sort(item.getSort())
+ .selectorType(item.getType())
+ .sortCode(item.getSort())
.enabled(item.getEnabled())
.loged(item.getLoged())
.continued(item.getContinued())
.dateUpdated(currentTime)
.handle(item.getHandle())
.pluginId(item.getPluginId())
- .name(item.getName())
+ .selectorName(item.getName())
.matchRestful(item.getMatchRestful())
.namespaceId(item.getNamespaceId())
.build();
@@ -410,10 +410,10 @@ public final class SelectorDO extends BaseDO {
.id(selectorDO.getId())
.pluginId(selectorDO.getPluginId())
.pluginName(pluginName)
- .name(selectorDO.getName())
+ .name(selectorDO.getSelectorName())
.matchMode(selectorDO.getMatchMode())
- .type(selectorDO.getType())
- .sort(selectorDO.getSort())
+ .type(selectorDO.getSelectorType())
+ .sort(selectorDO.getSortCode())
.enabled(selectorDO.getEnabled())
.logged(selectorDO.getLoged())
.continued(selectorDO.getContinued())
@@ -447,13 +447,13 @@ public final class SelectorDO extends BaseDO {
private String pluginId;
- private String name;
+ private String selectorName;
private Integer matchMode;
- private Integer type;
+ private Integer selectorType;
- private Integer sort;
+ private Integer sortCode;
private Boolean enabled;
@@ -515,13 +515,13 @@ public final class SelectorDO extends BaseDO {
}
/**
- * name.
+ * selectorName.
*
- * @param name the name.
+ * @param selectorName the selectorName.
* @return SelectorDOBuilder.
*/
- public SelectorDOBuilder name(final String name) {
- this.name = name;
+ public SelectorDOBuilder selectorName(final String selectorName) {
+ this.selectorName = selectorName;
return this;
}
@@ -539,22 +539,22 @@ public final class SelectorDO extends BaseDO {
/**
* type.
*
- * @param type the type.
+ * @param selectorType the type.
* @return SelectorDOBuilder.
*/
- public SelectorDOBuilder type(final Integer type) {
- this.type = type;
+ public SelectorDOBuilder selectorType(final Integer selectorType) {
+ this.selectorType = selectorType;
return this;
}
/**
- * sort.
+ * sortCode.
*
- * @param sort the sort.
+ * @param sortCode the sortCode.
* @return SelectorDOBuilder.
*/
- public SelectorDOBuilder sort(final Integer sort) {
- this.sort = sort;
+ public SelectorDOBuilder sortCode(final Integer sortCode) {
+ this.sortCode = sortCode;
return this;
}
@@ -635,10 +635,10 @@ public final class SelectorDO extends BaseDO {
selectorDO.setDateCreated(dateCreated);
selectorDO.setDateUpdated(dateUpdated);
selectorDO.setPluginId(pluginId);
- selectorDO.setName(name);
+ selectorDO.setSelectorName(selectorName);
selectorDO.setMatchMode(matchMode);
- selectorDO.setType(type);
- selectorDO.setSort(sort);
+ selectorDO.setSelectorType(selectorType);
+ selectorDO.setSortCode(sortCode);
selectorDO.setEnabled(enabled);
selectorDO.setLoged(loged);
selectorDO.setContinued(continued);
diff --git
a/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/event/selector/BatchSelectorDeletedEvent.java
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/event/selector/BatchSelectorDeletedEvent.java
index 7112b1d252..c812779201 100644
---
a/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/event/selector/BatchSelectorDeletedEvent.java
+++
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/event/selector/BatchSelectorDeletedEvent.java
@@ -66,7 +66,7 @@ public class BatchSelectorDeletedEvent extends
BatchChangedEvent {
public String buildContext() {
final String selector = ((Collection<?>) getSource())
.stream()
- .map(s -> ((SelectorDO) s).getName())
+ .map(s -> ((SelectorDO) s).getSelectorName())
.collect(Collectors.joining(","));
final String namespaceId = ((Collection<?>) getSource())
.stream()
diff --git
a/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/event/selector/SelectorChangedEvent.java
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/event/selector/SelectorChangedEvent.java
index 8562a81cd0..45898f425e 100644
---
a/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/event/selector/SelectorChangedEvent.java
+++
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/event/selector/SelectorChangedEvent.java
@@ -47,9 +47,9 @@ public class SelectorChangedEvent extends
AdminDataModelChangedEvent {
public String buildContext() {
final SelectorDO after = (SelectorDO) getAfter();
if (Objects.isNull(getBefore())) {
- return String.format("the namespace [%s] selector [%s] is %s",
after.getNamespaceId(), after.getName(),
StringUtils.lowerCase(getType().getType().toString()));
+ return String.format("the namespace [%s] selector [%s] is %s",
after.getNamespaceId(), after.getSelectorName(),
StringUtils.lowerCase(getType().getType().toString()));
}
- return String.format("the namespace [%s] selector [%s] is %s : %s",
after.getNamespaceId(), after.getName(),
StringUtils.lowerCase(getType().getType().toString()), contrast());
+ return String.format("the namespace [%s] selector [%s] is %s : %s",
after.getNamespaceId(), after.getSelectorName(),
StringUtils.lowerCase(getType().getType().toString()), contrast());
}
@@ -62,20 +62,20 @@ public class SelectorChangedEvent extends
AdminDataModelChangedEvent {
return "it no change";
}
final StringBuilder builder = new StringBuilder();
- if (!Objects.equals(before.getName(), after.getName())) {
- builder.append(String.format("name[%s => %s] ", before.getName(),
after.getName()));
+ if (!Objects.equals(before.getSelectorName(),
after.getSelectorName())) {
+ builder.append(String.format("name[%s => %s] ",
before.getSelectorName(), after.getSelectorName()));
}
if (!Objects.equals(before.getHandle(), after.getHandle())) {
builder.append(String.format("handle[%s => %s] ",
before.getHandle(), after.getHandle()));
}
- if (!Objects.equals(before.getType(), after.getType())) {
- builder.append(String.format("type[%s => %s] ", before.getType(),
after.getType()));
+ if (!Objects.equals(before.getSelectorType(),
after.getSelectorType())) {
+ builder.append(String.format("type[%s => %s] ",
before.getSelectorType(), after.getSelectorType()));
}
if (!Objects.equals(before.getEnabled(), after.getEnabled())) {
builder.append(String.format("enable[%s => %s] ",
before.getEnabled(), after.getEnabled()));
}
- if (!Objects.equals(before.getSort(), after.getSort())) {
- builder.append(String.format("sort[%s => %s] ", before.getSort(),
after.getSort()));
+ if (!Objects.equals(before.getSortCode(), after.getSortCode())) {
+ builder.append(String.format("sort[%s => %s] ",
before.getSortCode(), after.getSortCode()));
}
if (!Objects.equals(before.getLoged(), after.getLoged())) {
builder.append(String.format("loged[%s => %s] ",
before.getLoged(), after.getLoged()));
diff --git
a/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/vo/DataPermissionPageVO.java
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/vo/DataPermissionPageVO.java
index 66ae6aaf90..10c83127d3 100644
---
a/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/vo/DataPermissionPageVO.java
+++
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/vo/DataPermissionPageVO.java
@@ -117,7 +117,7 @@ public class DataPermissionPageVO implements Serializable {
*/
public static DataPermissionPageVO buildPageVOBySelector(final SelectorDO
selectorDO, final Boolean isChecked) {
return Optional.ofNullable(selectorDO)
- .map(item -> new DataPermissionPageVO(item.getId(),
item.getName(), isChecked))
+ .map(item -> new DataPermissionPageVO(item.getId(),
item.getSelectorName(), isChecked))
.orElse(null);
}
diff --git
a/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/vo/SelectorVO.java
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/vo/SelectorVO.java
index 02f51d2292..091c31c69a 100644
---
a/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/vo/SelectorVO.java
+++
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/vo/SelectorVO.java
@@ -553,9 +553,9 @@ public class SelectorVO implements Serializable {
*/
public static SelectorVO buildSelectorVO(final SelectorDO selectorDO,
final List<SelectorConditionVO>
selectorConditions) {
- return new SelectorVO(selectorDO.getId(), selectorDO.getPluginId(),
selectorDO.getName(), selectorDO.getMatchMode(),
- MatchModeEnum.getMatchModeByCode(selectorDO.getMatchMode()),
selectorDO.getType(),
- SelectorTypeEnum.getSelectorTypeByCode(selectorDO.getType()),
selectorDO.getSort(),
+ return new SelectorVO(selectorDO.getId(), selectorDO.getPluginId(),
selectorDO.getSelectorName(), selectorDO.getMatchMode(),
+ MatchModeEnum.getMatchModeByCode(selectorDO.getMatchMode()),
selectorDO.getSelectorType(),
+
SelectorTypeEnum.getSelectorTypeByCode(selectorDO.getSelectorType()),
selectorDO.getSortCode(),
selectorDO.getEnabled(), selectorDO.getLoged(),
selectorDO.getContinued(),
selectorDO.getMatchRestful(), selectorDO.getHandle(),
selectorConditions,
DateUtils.localDateTimeToString(selectorDO.getDateCreated().toLocalDateTime()),
diff --git
a/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/impl/DiscoveryServiceImpl.java
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/impl/DiscoveryServiceImpl.java
index 99bc75d6da..f253c89abc 100644
---
a/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/impl/DiscoveryServiceImpl.java
+++
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/impl/DiscoveryServiceImpl.java
@@ -143,7 +143,7 @@ public class DiscoveryServiceImpl implements
DiscoveryService {
private void bindingDiscovery(final DiscoveryConfigRegisterDTO
discoveryConfigRegisterDTO, final SelectorDO selectorDO) {
ProxySelectorDTO proxySelectorDTO = new ProxySelectorDTO();
- proxySelectorDTO.setName(selectorDO.getName());
+ proxySelectorDTO.setName(selectorDO.getSelectorName());
proxySelectorDTO.setId(selectorDO.getId());
proxySelectorDTO.setPluginName(discoveryConfigRegisterDTO.getPluginName());
proxySelectorDTO.setNamespaceId(selectorDO.getNamespaceId());
@@ -258,7 +258,7 @@ public class DiscoveryServiceImpl implements
DiscoveryService {
for (SelectorDO selectorDO : selectorDOS) {
ProxySelectorDTO proxySelectorDTO = new ProxySelectorDTO();
proxySelectorDTO.setPluginName(d.getPluginName());
- proxySelectorDTO.setName(selectorDO.getName());
+ proxySelectorDTO.setName(selectorDO.getSelectorName());
proxySelectorDTO.setId(selectorDO.getId());
proxySelectorDTO.setNamespaceId(selectorDO.getNamespaceId());
DiscoveryHandlerDO discoveryHandlerDO =
discoveryHandlerMapper.selectBySelectorId(selectorDO.getId());
diff --git
a/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/impl/DiscoveryUpstreamServiceImpl.java
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/impl/DiscoveryUpstreamServiceImpl.java
index c31ae18023..2f1e9be86c 100644
---
a/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/impl/DiscoveryUpstreamServiceImpl.java
+++
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/impl/DiscoveryUpstreamServiceImpl.java
@@ -156,7 +156,7 @@ public class DiscoveryUpstreamServiceImpl implements
DiscoveryUpstreamService {
String selectorId = discoveryRelDO.getSelectorId();
discoverySyncData.setSelectorId(selectorId);
SelectorDO selectorDO = selectorMapper.selectById(selectorId);
- discoverySyncData.setSelectorName(selectorDO.getName());
+
discoverySyncData.setSelectorName(selectorDO.getSelectorName());
} else {
String proxySelectorId = discoveryRelDO.getProxySelectorId();
discoverySyncData.setSelectorId(proxySelectorId);
@@ -340,7 +340,7 @@ public class DiscoveryUpstreamServiceImpl implements
DiscoveryUpstreamService {
proxySelectorDTO = new ProxySelectorDTO();
proxySelectorDTO.setId(selectorDO.getId());
proxySelectorDTO.setPluginName(pluginMapper.selectById(selectorDO.getPluginId()).getName());
- proxySelectorDTO.setName(selectorDO.getName());
+ proxySelectorDTO.setName(selectorDO.getSelectorName());
proxySelectorDTO.setNamespaceId(selectorDO.getNamespaceId());
} else {
proxySelectorDTO =
DiscoveryTransfer.INSTANCE.mapToDTO(proxySelectorDO);
diff --git
a/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/impl/ProxySelectorServiceImpl.java
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/impl/ProxySelectorServiceImpl.java
index 6a938b7c6a..ec0d932c49 100644
---
a/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/impl/ProxySelectorServiceImpl.java
+++
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/impl/ProxySelectorServiceImpl.java
@@ -406,7 +406,7 @@ public class ProxySelectorServiceImpl implements
ProxySelectorService {
if (Objects.nonNull(selectorDO)) {
ProxySelectorDTO proxySelectorDTO = new ProxySelectorDTO();
proxySelectorDTO.setPluginName(discoveryDO.getPluginName());
- proxySelectorDTO.setName(selectorDO.getName());
+ proxySelectorDTO.setName(selectorDO.getSelectorName());
proxySelectorDTO.setId(selectorDO.getId());
proxySelectorDTO.setNamespaceId(selectorDO.getNamespaceId());
discoveryProcessorHolder.chooseProcessor(discoveryDO.getType()).fetchAll(discoveryHandlerDTO,
proxySelectorDTO);
diff --git
a/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/impl/SelectorServiceImpl.java
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/impl/SelectorServiceImpl.java
index 11abc1a77b..84027f7cab 100644
---
a/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/impl/SelectorServiceImpl.java
+++
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/impl/SelectorServiceImpl.java
@@ -152,7 +152,8 @@ public class SelectorServiceImpl implements SelectorService
{
@Override
public List<SelectorVO> searchByCondition(final SelectorQueryCondition
condition) {
condition.init();
- final List<SelectorVO> list =
selectorMapper.selectByCondition(condition);
+ final List<SelectorDO> dolist =
selectorMapper.selectByCondition(condition);
+ List<SelectorVO> list =
dolist.stream().map(SelectorVO::buildSelectorVO).collect(Collectors.toList());
for (SelectorVO selector : list) {
selector.setMatchModeName(MatchModeEnum.getMatchModeByCode(selector.getMatchMode()));
selector.setTypeName(SelectorTypeEnum.getSelectorTypeByCode(selector.getType()));
@@ -297,7 +298,7 @@ public class SelectorServiceImpl implements SelectorService
{
final DiscoveryProcessor discoveryProcessor =
discoveryProcessorHolder.chooseProcessor(discoveryDO.getType());
ProxySelectorDTO proxySelectorDTO = new ProxySelectorDTO();
proxySelectorDTO.setId(selector.getId());
- proxySelectorDTO.setName(selector.getName());
+ proxySelectorDTO.setName(selector.getSelectorName());
proxySelectorDTO.setPluginName(pluginMap.getOrDefault(selector.getPluginId(),
""));
proxySelectorDTO.setNamespaceId(selector.getNamespaceId());
discoveryProcessor.removeProxySelector(DiscoveryTransfer.INSTANCE.mapToDTO(discoveryHandlerDO),
proxySelectorDTO);
@@ -470,7 +471,7 @@ public class SelectorServiceImpl implements SelectorService
{
.ofNullable(pluginSelectorMap.get(pluginId))
.orElseGet(Lists::newArrayList)
.stream()
- .map(SelectorDO::getName)
+ .map(SelectorDO::getSelectorName)
.collect(Collectors.toSet());
for (SelectorDTO selectorDTO : selectorDTOList) {
@@ -522,7 +523,7 @@ public class SelectorServiceImpl implements SelectorService
{
.ofNullable(pluginSelectorMap.get(pluginId))
.orElseGet(Lists::newArrayList)
.stream()
- .collect(Collectors.toMap(SelectorDO::getName,
SelectorDO::getId));
+ .collect(Collectors.toMap(SelectorDO::getSelectorName,
SelectorDO::getId));
for (SelectorDTO selectorDTO : selectorDTOList) {
// filter by selectorName
diff --git
a/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/impl/UpstreamCheckService.java
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/impl/UpstreamCheckService.java
index 100738c9a0..a370be0a90 100644
---
a/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/impl/UpstreamCheckService.java
+++
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/impl/UpstreamCheckService.java
@@ -432,7 +432,7 @@ public class UpstreamCheckService {
discoverySyncData.setUpstreamDataList(discoveryUpstreamDataList);
discoverySyncData.setPluginName(pluginName);
discoverySyncData.setSelectorId(selectorId);
- discoverySyncData.setSelectorName(selectorDO.getName());
+ discoverySyncData.setSelectorName(selectorDO.getSelectorName());
discoverySyncData.setNamespaceId(selectorDO.getNamespaceId());
LOG.debug("UpstreamCacheManager update selectorId={}|json={}",
selectorId, GsonUtils.getGson().toJson(discoverySyncData));
eventPublisher.publishEvent(new
DataChangedEvent(ConfigGroupEnum.DISCOVER_UPSTREAM, DataEventTypeEnum.UPDATE,
Collections.singletonList(discoverySyncData)));
diff --git
a/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/register/AbstractShenyuClientRegisterServiceImpl.java
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/register/AbstractShenyuClientRegisterServiceImpl.java
index 429ec642b5..73bd76a2ec 100644
---
a/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/register/AbstractShenyuClientRegisterServiceImpl.java
+++
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/register/AbstractShenyuClientRegisterServiceImpl.java
@@ -251,7 +251,7 @@ public abstract class
AbstractShenyuClientRegisterServiceImpl extends FallbackSh
LOG.info("change alive selectorId={}|url={}", selectorId,
discoveryUpstreamDTO.getUrl());
discoveryUpstreamService.changeStatusBySelectorIdAndUrl(selectorId,
discoveryUpstreamDTO.getUrl(), Boolean.TRUE);
});
- DiscoverySyncData discoverySyncData = fetch(selectorId,
selectorDO.getName(), pluginName, namespaceId);
+ DiscoverySyncData discoverySyncData = fetch(selectorId,
selectorDO.getSelectorName(), pluginName, namespaceId);
eventPublisher.publishEvent(new
DataChangedEvent(ConfigGroupEnum.DISCOVER_UPSTREAM, DataEventTypeEnum.REFRESH,
Collections.singletonList(discoverySyncData)));
return ShenyuResultMessage.SUCCESS;
@@ -265,7 +265,7 @@ public abstract class
AbstractShenyuClientRegisterServiceImpl extends FallbackSh
discoveryUpstreamDTO.setDiscoveryHandlerId(discoveryHandlerId);
discoveryUpstreamService.nativeCreateOrUpdate(discoveryUpstreamDTO);
}
- DiscoverySyncData discoverySyncData = fetch(selectorDO.getId(),
selectorDO.getName(), pluginName, selectorDO.getNamespaceId());
+ DiscoverySyncData discoverySyncData = fetch(selectorDO.getId(),
selectorDO.getSelectorName(), pluginName, selectorDO.getNamespaceId());
eventPublisher.publishEvent(new
DataChangedEvent(ConfigGroupEnum.DISCOVER_UPSTREAM, DataEventTypeEnum.UPDATE,
Collections.singletonList(discoverySyncData)));
}
diff --git
a/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/register/ShenyuClientRegisterDivideServiceImpl.java
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/register/ShenyuClientRegisterDivideServiceImpl.java
index 33216d68ff..b83de054b7 100644
---
a/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/register/ShenyuClientRegisterDivideServiceImpl.java
+++
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/register/ShenyuClientRegisterDivideServiceImpl.java
@@ -139,7 +139,7 @@ public class ShenyuClientRegisterDivideServiceImpl extends
AbstractContextPathRe
for (DivideUpstream divideUpstream : needToRemove) {
removeDiscoveryUpstream(selectorDO.getId(),
divideUpstream.getUpstreamUrl());
}
- DiscoverySyncData discoverySyncData = fetch(selectorDO.getId(),
selectorDO.getName(), pluginName, selectorDO.getNamespaceId());
+ DiscoverySyncData discoverySyncData = fetch(selectorDO.getId(),
selectorDO.getSelectorName(), pluginName, selectorDO.getNamespaceId());
getEventPublisher().publishEvent(new
DataChangedEvent(ConfigGroupEnum.DISCOVER_UPSTREAM, DataEventTypeEnum.UPDATE,
Collections.singletonList(discoverySyncData)));
}
diff --git
a/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/register/ShenyuClientRegisterGrpcServiceImpl.java
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/register/ShenyuClientRegisterGrpcServiceImpl.java
index 29c93c76a1..d6983bcd13 100644
---
a/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/register/ShenyuClientRegisterGrpcServiceImpl.java
+++
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/register/ShenyuClientRegisterGrpcServiceImpl.java
@@ -137,7 +137,7 @@ public class ShenyuClientRegisterGrpcServiceImpl extends
AbstractShenyuClientReg
GrpcUpstream grpcUpstream =
CommonUpstreamUtils.buildDefaultGrpcUpstream(offlineUrl.getHost(),
offlineUrl.getPort(), offlineUrl.getNamespaceId());
removeDiscoveryUpstream(selectorDO.getId(),
grpcUpstream.getUpstreamUrl());
}
- DiscoverySyncData discoverySyncData = fetch(selectorDO.getId(),
selectorDO.getName(), pluginName, selectorDO.getNamespaceId());
+ DiscoverySyncData discoverySyncData = fetch(selectorDO.getId(),
selectorDO.getSelectorName(), pluginName, selectorDO.getNamespaceId());
if (LOG.isDebugEnabled()) {
LOG.debug("grpc offline discoverySyncData:{}",
GsonUtils.getInstance().toJson(discoverySyncData));
}
diff --git
a/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/register/ShenyuClientRegisterWebSocketServiceImpl.java
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/register/ShenyuClientRegisterWebSocketServiceImpl.java
index 3d77d1c90d..7787bc73a5 100644
---
a/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/register/ShenyuClientRegisterWebSocketServiceImpl.java
+++
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/register/ShenyuClientRegisterWebSocketServiceImpl.java
@@ -117,7 +117,7 @@ public class ShenyuClientRegisterWebSocketServiceImpl
extends AbstractContextPat
WebSocketUpstream webSocketUpstream =
CommonUpstreamUtils.buildWebSocketUpstream(offlineUrl.getProtocol(),
offlineUrl.getHost(), offlineUrl.getPort(), offlineUrl.getNamespaceId());
removeDiscoveryUpstream(selectorDO.getId(),
webSocketUpstream.getUrl());
}
- DiscoverySyncData discoverySyncData = fetch(selectorDO.getId(),
selectorDO.getName(), pluginName, selectorDO.getNamespaceId());
+ DiscoverySyncData discoverySyncData = fetch(selectorDO.getId(),
selectorDO.getSelectorName(), pluginName, selectorDO.getNamespaceId());
getEventPublisher().publishEvent(new
DataChangedEvent(ConfigGroupEnum.DISCOVER_UPSTREAM, DataEventTypeEnum.UPDATE,
Collections.singletonList(discoverySyncData)));
}
return Constants.SUCCESS;
diff --git a/shenyu-admin/src/main/resources/mappers/selector-sqlmap.xml
b/shenyu-admin/src/main/resources/mappers/selector-sqlmap.xml
index 96cee1fe85..86a2673f8f 100644
--- a/shenyu-admin/src/main/resources/mappers/selector-sqlmap.xml
+++ b/shenyu-admin/src/main/resources/mappers/selector-sqlmap.xml
@@ -23,10 +23,10 @@
<result column="date_created" jdbcType="TIMESTAMP"
property="dateCreated"/>
<result column="date_updated" jdbcType="TIMESTAMP"
property="dateUpdated"/>
<result column="plugin_id" jdbcType="VARCHAR" property="pluginId"/>
- <result column="name" jdbcType="VARCHAR" property="name"/>
+ <result column="selector_name" jdbcType="VARCHAR"
property="selectorName"/>
<result column="match_mode" jdbcType="INTEGER" property="matchMode"/>
- <result column="type" jdbcType="INTEGER" property="type"/>
- <result column="sort" jdbcType="INTEGER" property="sort"/>
+ <result column="selector_type" jdbcType="INTEGER"
property="selectorType"/>
+ <result column="sort_code" jdbcType="INTEGER" property="sortCode"/>
<result column="enabled" jdbcType="TINYINT" property="enabled"/>
<result column="loged" jdbcType="TINYINT" property="loged"/>
<result column="continued" jdbcType="TINYINT" property="continued"/>
@@ -40,10 +40,10 @@
date_created,
date_updated,
plugin_id,
- name,
+ selector_name,
match_mode,
- type,
- sort,
+ selector_type,
+ sort_code,
enabled,
loged,
continued,
@@ -57,10 +57,10 @@
${alis}.date_created,
${alis}.date_updated,
${alis}.plugin_id,
- ${alis}.name,
+ ${alis}.selector_name,
${alis}.match_mode,
- ${alis}.type,
- ${alis}.sort,
+ ${alis}.selector_type,
+ ${alis}.sort_code,
${alis}.enabled,
${alis}.loged,
${alis}.continued,
@@ -91,7 +91,7 @@
SELECT
<include refid="Base_Column_List"/>
FROM selector
- WHERE name = #{name, jdbcType=VARCHAR}
+ WHERE selector_name = #{name, jdbcType=VARCHAR}
AND namespace_id = #{namespaceId, jdbcType=VARCHAR}
</select>
@@ -99,7 +99,7 @@
SELECT
<include refid="Base_Column_List"/>
FROM selector
- WHERE name = #{name, jdbcType=VARCHAR}
+ WHERE selector_name = #{name, jdbcType=VARCHAR}
AND plugin_id = #{pluginId, jdbcType=VARCHAR}
AND namespace_id = #{namespaceId, jdbcType=VARCHAR}
</select>
@@ -122,7 +122,7 @@
</if>
<if test="name != null and name != ''">
<bind name="nameLike" value="('%' + name + '%')"/>
- AND name LIKE #{nameLike, jdbcType=VARCHAR}
+ AND selector_name LIKE #{nameLike, jdbcType=VARCHAR}
</if>
<if test="filterIds != null">
AND id IN
@@ -131,7 +131,7 @@
</foreach>
</if>
</where>
- ORDER BY sort
+ ORDER BY sort_code
</select>
<select id="findByPluginIdAndNamespaceId" parameterType="java.lang.String"
resultMap="BaseResultMap">
@@ -172,7 +172,7 @@
plugin_id = #{pluginId, jdbcType=VARCHAR}
</if>
<if test="name != null and name != ''">
- AND name = #{name, jdbcType=VARCHAR}
+ AND selector_name = #{name, jdbcType=VARCHAR}
</if>
<if test="filterIds != null">
AND id IN
@@ -213,18 +213,18 @@
LIMIT 1
</select>
- <select id="selectByCondition"
resultType="org.apache.shenyu.admin.model.vo.SelectorVO">
+ <select id="selectByCondition"
resultType="org.apache.shenyu.admin.model.entity.SelectorDO"
resultMap="BaseResultMap">
SELECT
<include refid="Base_Column_List"/>
FROM selector
<where>
<if test="condition.keyword != null and condition.keyword != ''">
<bind name="keyword" value="('%' + condition.keyword + '%')"/>
- AND name LIKE #{keyword, jdbcType=VARCHAR}
+ AND selector_name LIKE #{keyword, jdbcType=VARCHAR}
</if>
<if test="condition.excluded != null and condition.excluded != ''">
<bind name="excluded" value="('%' + condition.excluded +
'%')"/>
- AND name NOT LIKE #{excluded, jdbcType=VARCHAR}
+ AND selector_name NOT LIKE #{excluded, jdbcType=VARCHAR}
</if>
<if test="condition.switchStatus != null">
AND enabled = #{condition.switchStatus, jdbcType=BOOLEAN}
@@ -276,10 +276,10 @@
date_created,
date_updated,
plugin_id,
- name,
+ selector_name,
match_mode,
- type,
- sort,
+ selector_type,
+ sort_code,
enabled,
loged,
continued,
@@ -291,10 +291,10 @@
#{dateCreated, jdbcType=TIMESTAMP},
#{dateUpdated, jdbcType=TIMESTAMP},
#{pluginId, jdbcType=VARCHAR},
- #{name, jdbcType=VARCHAR},
+ #{selectorName, jdbcType=VARCHAR},
#{matchMode, jdbcType=INTEGER},
- #{type, jdbcType=INTEGER},
- #{sort, jdbcType=INTEGER},
+ #{selectorType, jdbcType=INTEGER},
+ #{sortCode, jdbcType=INTEGER},
#{enabled, jdbcType=TINYINT},
#{loged, jdbcType=TINYINT},
#{continued, jdbcType=TINYINT},
@@ -316,17 +316,17 @@
<if test="pluginId != null">
plugin_id,
</if>
- <if test="name != null">
- name,
+ <if test="selectorName != null">
+ selector_name,
</if>
<if test="matchMode != null">
match_mode,
</if>
- <if test="type != null">
- type,
+ <if test="selectorType != null">
+ selector_type,
</if>
- <if test="sort != null">
- sort,
+ <if test="sortCode != null">
+ sort_code,
</if>
<if test="enabled != null">
enabled,
@@ -358,17 +358,17 @@
<if test="pluginId != null">
#{pluginId, jdbcType=VARCHAR},
</if>
- <if test="name != null">
- #{name, jdbcType=VARCHAR},
+ <if test="selectorName != null">
+ #{selectorName, jdbcType=VARCHAR},
</if>
<if test="matchMode != null">
#{matchMode, jdbcType=INTEGER},
</if>
- <if test="type != null">
- #{type, jdbcType=INTEGER},
+ <if test="selectorType != null">
+ #{selectorType, jdbcType=INTEGER},
</if>
- <if test="sort != null">
- #{sort, jdbcType=INTEGER},
+ <if test="sortCode != null">
+ #{sortCode, jdbcType=INTEGER},
</if>
<if test="enabled != null">
#{enabled, jdbcType=TINYINT},
@@ -397,10 +397,10 @@
date_created = #{dateCreated, jdbcType=TIMESTAMP},
date_updated = #{dateUpdated, jdbcType=TIMESTAMP},
plugin_id = #{pluginId, jdbcType=VARCHAR},
- name = #{name, jdbcType=VARCHAR},
+ selector_name = #{selectorName, jdbcType=VARCHAR},
match_mode = #{matchMode, jdbcType=INTEGER},
- type = #{type, jdbcType=INTEGER},
- sort = #{sort, jdbcType=INTEGER},
+ selector_type = #{selectorType, jdbcType=INTEGER},
+ sort_code = #{sortCode, jdbcType=INTEGER},
enabled = #{enabled, jdbcType=TINYINT},
loged = #{loged, jdbcType=TINYINT},
continued = #{continued, jdbcType=TINYINT},
@@ -421,17 +421,17 @@
<if test="pluginId != null">
plugin_id = #{pluginId, jdbcType=VARCHAR},
</if>
- <if test="name != null">
- name = #{name, jdbcType=VARCHAR},
+ <if test="selectorName != null">
+ selector_name = #{selectorName, jdbcType=VARCHAR},
</if>
<if test="matchMode != null">
match_mode = #{matchMode, jdbcType=INTEGER},
</if>
- <if test="type != null">
- type = #{type, jdbcType=INTEGER},
+ <if test="selectorType != null">
+ selector_type = #{selectorType, jdbcType=INTEGER},
</if>
- <if test="sort != null">
- sort = #{sort, jdbcType=INTEGER},
+ <if test="sortCode != null">
+ sort_code = #{sortCode, jdbcType=INTEGER},
</if>
<if test="enabled != null">
enabled = #{enabled, jdbcType=TINYINT},
diff --git a/shenyu-admin/src/main/resources/sql-script/h2/schema.sql
b/shenyu-admin/src/main/resources/sql-script/h2/schema.sql
index 1bd941c1ec..5bd7575052 100644
--- a/shenyu-admin/src/main/resources/sql-script/h2/schema.sql
+++ b/shenyu-admin/src/main/resources/sql-script/h2/schema.sql
@@ -60,10 +60,10 @@ CREATE TABLE IF NOT EXISTS `plugin_handle` (
CREATE TABLE IF NOT EXISTS `selector` (
`id` varchar(128) NOT NULL COMMENT 'primary key id varchar' primary key,
`plugin_id` varchar(128) NOT NULL COMMENT 'plugin id',
- `name` varchar(64) NOT NULL COMMENT 'selector name',
+ `selector_name` varchar(64) NOT NULL COMMENT 'selector name',
`match_mode` int(2) NOT NULL COMMENT 'matching mode (0 and 1 or)',
- `type` int(4) NOT NULL COMMENT 'type (0, full flow, 1 custom flow)',
- `sort` int(4) NOT NULL COMMENT 'sort',
+ `selector_type` int(4) NOT NULL COMMENT 'type (0, full flow, 1 custom flow)',
+ `sort_code` int(4) NOT NULL COMMENT 'sort',
`handle` varchar(1024) DEFAULT NULL COMMENT 'processing logic (here for
different plug-ins, there will be different fields to identify different
processes, all data in JSON format is stored)',
`enabled` tinyint(4) NOT NULL COMMENT 'whether to open',
`loged` tinyint(4) NOT NULL COMMENT 'whether to print the log',
diff --git
a/shenyu-admin/src/test/java/org/apache/shenyu/admin/mapper/SelectorMapperTest.java
b/shenyu-admin/src/test/java/org/apache/shenyu/admin/mapper/SelectorMapperTest.java
index d8240cdca3..62a78ac26a 100644
---
a/shenyu-admin/src/test/java/org/apache/shenyu/admin/mapper/SelectorMapperTest.java
+++
b/shenyu-admin/src/test/java/org/apache/shenyu/admin/mapper/SelectorMapperTest.java
@@ -84,7 +84,7 @@ public final class SelectorMapperTest extends
AbstractSpringIntegrationTest {
int insert = selectorMapper.insert(selectorDO);
assertEquals(1, insert);
- SelectorQuery query = new SelectorQuery(selectorDO.getPluginId(),
selectorDO.getName(), new PageParameter(), SYS_DEFAULT_NAMESPACE_ID);
+ SelectorQuery query = new SelectorQuery(selectorDO.getPluginId(),
selectorDO.getSelectorName(), new PageParameter(), SYS_DEFAULT_NAMESPACE_ID);
List<SelectorDO> list = selectorMapper.selectByQuery(query);
assertNotNull(list);
assertEquals(list.size(), 1);
@@ -114,10 +114,10 @@ public final class SelectorMapperTest extends
AbstractSpringIntegrationTest {
SelectorDO selectorDO = buildSelectorDO();
int insert = selectorMapper.insert(selectorDO);
assertEquals(1, insert);
- List<SelectorDO> doList =
selectorMapper.selectByNameAndNamespaceId(selectorDO.getName(),
SYS_DEFAULT_NAMESPACE_ID);
+ List<SelectorDO> doList =
selectorMapper.selectByNameAndNamespaceId(selectorDO.getSelectorName(),
SYS_DEFAULT_NAMESPACE_ID);
assertEquals(doList.size(), 1);
assertNotNull(doList.get(0));
- assertEquals(selectorDO.getName(), doList.get(0).getName());
+ assertEquals(selectorDO.getSelectorName(),
doList.get(0).getSelectorName());
int delete = selectorMapper.delete(selectorDO.getId());
assertEquals(1, delete);
@@ -129,7 +129,7 @@ public final class SelectorMapperTest extends
AbstractSpringIntegrationTest {
int insert = selectorMapper.insert(selectorDO);
assertEquals(1, insert);
- SelectorQuery query = new SelectorQuery(selectorDO.getPluginId(),
selectorDO.getName(), new PageParameter(), SYS_DEFAULT_NAMESPACE_ID);
+ SelectorQuery query = new SelectorQuery(selectorDO.getPluginId(),
selectorDO.getSelectorName(), new PageParameter(), SYS_DEFAULT_NAMESPACE_ID);
Integer count = selectorMapper.countByQuery(query);
assertNotNull(count);
assertEquals(Integer.valueOf(1), count);
@@ -228,10 +228,10 @@ public final class SelectorMapperTest extends
AbstractSpringIntegrationTest {
.dateCreated(currentTime)
.dateUpdated(currentTime)
.pluginId("test-plugin-id")
- .name("test-name")
+ .selectorName("test-name")
.matchMode(1)
- .type(1)
- .sort(1)
+ .selectorType(1)
+ .sortCode(1)
.enabled(Boolean.TRUE)
.loged(Boolean.TRUE)
.matchRestful(false)
diff --git
a/shenyu-admin/src/test/java/org/apache/shenyu/admin/model/event/selector/BatchSelectorDeletedEventTest.java
b/shenyu-admin/src/test/java/org/apache/shenyu/admin/model/event/selector/BatchSelectorDeletedEventTest.java
index ad9de2f655..ad4c53ee8c 100644
---
a/shenyu-admin/src/test/java/org/apache/shenyu/admin/model/event/selector/BatchSelectorDeletedEventTest.java
+++
b/shenyu-admin/src/test/java/org/apache/shenyu/admin/model/event/selector/BatchSelectorDeletedEventTest.java
@@ -67,7 +67,7 @@ public final class BatchSelectorDeletedEventTest {
@Test
void buildContext() {
String expectMsg = String.format("the namespace [%s] selector[%s] is
%s", selectorDO.getNamespaceId(),
- selectorDO.getName(),
StringUtils.lowerCase(batchSelectorDeletedEvent.getType().getType().toString()));
+ selectorDO.getSelectorName(),
StringUtils.lowerCase(batchSelectorDeletedEvent.getType().getType().toString()));
String actualMsg = batchSelectorDeletedEvent.buildContext();
diff --git
a/shenyu-admin/src/test/java/org/apache/shenyu/admin/model/event/selector/SelectorChangedEventTest.java
b/shenyu-admin/src/test/java/org/apache/shenyu/admin/model/event/selector/SelectorChangedEventTest.java
index b8d2f5b901..06891b1fc9 100644
---
a/shenyu-admin/src/test/java/org/apache/shenyu/admin/model/event/selector/SelectorChangedEventTest.java
+++
b/shenyu-admin/src/test/java/org/apache/shenyu/admin/model/event/selector/SelectorChangedEventTest.java
@@ -50,7 +50,8 @@ public final class SelectorChangedEventTest {
= new SelectorChangedEvent(before, null,
EventTypeEnum.SELECTOR_CREATE, "test-operator");
SelectorDO after = (SelectorDO) selectorChangedEvent.getAfter();
- String expectMsg = String.format("the namespace [%s] selector [%s] is
%s", after.getNamespaceId(), after.getName(),
StringUtils.lowerCase(selectorChangedEvent.getType().getType().toString()));
+ String expectMsg = String.format("the namespace [%s] selector [%s] is
%s",
+ after.getNamespaceId(), after.getSelectorName(),
StringUtils.lowerCase(selectorChangedEvent.getType().getType().toString()));
String actualMsg = selectorChangedEvent.buildContext();
@@ -64,7 +65,7 @@ public final class SelectorChangedEventTest {
String changeMsg = "it no change";
SelectorDO after = (SelectorDO) selectorChangedEvent.getAfter();
- String expectMsg = String.format("the namespace [%s] selector [%s] is
%s : %s", after.getNamespaceId(), after.getName(),
+ String expectMsg = String.format("the namespace [%s] selector [%s] is
%s : %s", after.getNamespaceId(), after.getSelectorName(),
StringUtils.lowerCase(selectorChangedEvent.getType().getType().toString()),
changeMsg);
String actualMsg = selectorChangedEvent.buildContext();
@@ -81,15 +82,15 @@ public final class SelectorChangedEventTest {
SelectorDO after = (SelectorDO) selectorChangedEvent.getAfter();
final StringBuilder builder = new StringBuilder();
- builder.append(String.format("name[%s => %s] ", before.getName(),
after.getName()));
+ builder.append(String.format("name[%s => %s] ",
before.getSelectorName(), after.getSelectorName()));
builder.append(String.format("handle[%s => %s] ", before.getHandle(),
after.getHandle()));
- builder.append(String.format("type[%s => %s] ", before.getType(),
after.getType()));
+ builder.append(String.format("type[%s => %s] ",
before.getSelectorType(), after.getSelectorType()));
builder.append(String.format("enable[%s => %s] ", before.getEnabled(),
after.getEnabled()));
- builder.append(String.format("sort[%s => %s] ", before.getSort(),
after.getSort()));
+ builder.append(String.format("sort[%s => %s] ", before.getSortCode(),
after.getSortCode()));
builder.append(String.format("loged[%s => %s] ", before.getLoged(),
after.getLoged()));
String changeMsg = builder.toString();
- String expectMsg = String.format("the namespace [%s] selector [%s] is
%s : %s", after.getNamespaceId(), after.getName(),
+ String expectMsg = String.format("the namespace [%s] selector [%s] is
%s : %s", after.getNamespaceId(), after.getSelectorName(),
StringUtils.lowerCase(selectorChangedEvent.getType().getType().toString()),
changeMsg);
String actualMsg = selectorChangedEvent.buildContext();
@@ -122,7 +123,7 @@ public final class SelectorChangedEventTest {
selectorDO.setDateCreated(now);
selectorDO.setDateUpdated(now);
selectorDO.setEnabled(true);
- selectorDO.setSort(0);
+ selectorDO.setSortCode(0);
selectorDO.setLoged(true);
return selectorDO;
}
@@ -140,7 +141,7 @@ public final class SelectorChangedEventTest {
selectorDO.setDateCreated(now);
selectorDO.setDateUpdated(now);
selectorDO.setEnabled(false);
- selectorDO.setSort(1);
+ selectorDO.setSortCode(1);
selectorDO.setLoged(false);
return selectorDO;
}
diff --git
a/shenyu-admin/src/test/java/org/apache/shenyu/admin/service/DiscoveryUpstreamServiceTest.java
b/shenyu-admin/src/test/java/org/apache/shenyu/admin/service/DiscoveryUpstreamServiceTest.java
index 9cdd7da89b..236822a339 100644
---
a/shenyu-admin/src/test/java/org/apache/shenyu/admin/service/DiscoveryUpstreamServiceTest.java
+++
b/shenyu-admin/src/test/java/org/apache/shenyu/admin/service/DiscoveryUpstreamServiceTest.java
@@ -275,7 +275,7 @@ public final class DiscoveryUpstreamServiceTest {
private SelectorDO buildSelectorDO() {
SelectorDO selectorDO = new SelectorDO();
selectorDO.setId("selector_1");
- selectorDO.setName("selector_1");
+ selectorDO.setSelectorName("selector_1");
return selectorDO;
}
diff --git
a/shenyu-admin/src/test/java/org/apache/shenyu/admin/service/UpstreamCheckServiceTest.java
b/shenyu-admin/src/test/java/org/apache/shenyu/admin/service/UpstreamCheckServiceTest.java
index 11bca0a5b6..04de274923 100644
---
a/shenyu-admin/src/test/java/org/apache/shenyu/admin/service/UpstreamCheckServiceTest.java
+++
b/shenyu-admin/src/test/java/org/apache/shenyu/admin/service/UpstreamCheckServiceTest.java
@@ -151,12 +151,12 @@ public final class UpstreamCheckServiceTest {
.build();
SelectorDO selectorDOWithUrlError = SelectorDO.builder()
.pluginId(MOCK_PLUGIN_ID)
- .name("UrlError")
+ .selectorName("UrlError")
.handle("[{\"upstreamHost\":\"localhost\",\"protocol\":\"http://\",\"upstreamUrl\":\"divide-upstream-50\",\"weight\":50}]";)
.build();
SelectorDO selectorDOWithUrlReachable = SelectorDO.builder()
.pluginId(MOCK_PLUGIN_ID)
- .name("UrlReachable")
+ .selectorName("UrlReachable")
.handle("[{\"upstreamHost\":\"localhost\",\"protocol\":\"http://\",\"localhost\":\"divide-upstream-60\",\"weight\":60}]";)
.build();
try (MockedStatic<UpstreamCheckUtils> mocked =
mockStatic(UpstreamCheckUtils.class)) {
@@ -239,13 +239,13 @@ public final class UpstreamCheckServiceTest {
SelectorDO selectorDOWithUrlError = SelectorDO.builder()
.pluginId(MOCK_PLUGIN_ID)
.id(MOCK_SELECTOR_NAME)
- .name(MOCK_SELECTOR_NAME)
+ .selectorName(MOCK_SELECTOR_NAME)
.handle("[{\"upstreamHost\":\"localhost\",\"protocol\":\"http://\",\"upstreamUrl\":\"divide-upstream-50\",\"weight\":50}]";)
.build();
SelectorDO selectorDOWithUrlReachable = SelectorDO.builder()
.pluginId(MOCK_PLUGIN_ID)
.id(MOCK_SELECTOR_NAME_OTHER)
- .name(MOCK_SELECTOR_NAME_OTHER)
+ .selectorName(MOCK_SELECTOR_NAME_OTHER)
.handle("[{\"upstreamHost\":\"localhost\",\"protocol\":\"http://\",\"localhost\":\"divide-upstream-60\",\"weight\":60}]";)
.build();
DiscoveryUpstreamData discoveryUpstreamData =
DiscoveryUpstreamData.builder()
