@@ -171,7 +171,7 @@ public String registerDefault(final RuleDTO ruleDTO) {
171171 return "" ;
172172 }
173173 validateRuleHandle (ruleDTO );
174- validateDivideHandle (ruleDTO .getSelectorId (), ruleDTO .getHandle ());
174+ validateCanaryAndStickyConfig (ruleDTO .getSelectorId (), ruleDTO .getHandle ());
175175 RuleDO ruleDO = RuleDO .buildRuleDO (ruleDTO );
176176 if (StringUtils .isEmpty (ruleDTO .getId ())) {
177177 ruleMapper .insertSelective (ruleDO );
@@ -197,7 +197,7 @@ public int createOrUpdate(final RuleDTO ruleDTO) {
197197 @ Override
198198 public int create (final RuleDTO ruleDTO ) {
199199 validateRuleHandle (ruleDTO );
200- validateDivideHandle (ruleDTO .getSelectorId (), ruleDTO .getHandle ());
200+ validateCanaryAndStickyConfig (ruleDTO .getSelectorId (), ruleDTO .getHandle ());
201201 RuleDO ruleDO = RuleDO .buildRuleDO (ruleDTO );
202202 final int ruleCount = ruleMapper .insertSelective (ruleDO );
203203 addCondition (ruleDO , ruleDTO .getRuleConditions ());
@@ -212,7 +212,7 @@ public int update(final RuleDTO ruleDTO) {
212212 validateRuleHandle (ruleDTO );
213213 final RuleDO before = ruleMapper .selectById (ruleDTO .getId ());
214214 Assert .notNull (before , "the updated rule is not found" );
215- validateDivideHandle (StringUtils .defaultIfBlank (ruleDTO .getSelectorId (), before .getSelectorId ()), ruleDTO .getHandle ());
215+ validateCanaryAndStickyConfig (StringUtils .defaultIfBlank (ruleDTO .getSelectorId (), before .getSelectorId ()), ruleDTO .getHandle ());
216216 RuleDO ruleDO = RuleDO .buildRuleDO (ruleDTO );
217217 final int ruleCount = ruleMapper .updateSelective (ruleDO );
218218
@@ -248,7 +248,7 @@ public int update(final RuleDTO ruleDTO) {
248248 return ruleCount ;
249249 }
250250
251- private void validateDivideHandle (final String selectorId , final String handle ) {
251+ private void validateCanaryAndStickyConfig (final String selectorId , final String handle ) {
252252 if (StringUtils .isBlank (handle )) {
253253 return ;
254254 }
@@ -262,13 +262,11 @@ private void validateDivideHandle(final String selectorId, final String handle)
262262 }
263263 try {
264264 DivideRuleHandle divide = CanaryConfigValidator .parseHandle (handle );
265- if (Objects .nonNull (divide ) && Objects . nonNull ( divide .getCanary ())) {
265+ if (Objects .nonNull (divide .getCanary ())) {
266266 CanaryConfigValidator .validateExtensions (divide .getCanary (),
267267 name -> validateCanaryDictionary ("paramType" , name ), name -> validateCanaryDictionary ("operator" , name ));
268268 }
269- if (Objects .nonNull (divide )) {
270- StickySessionConfigValidator .validate (divide .getSticky ());
271- }
269+ StickySessionConfigValidator .validate (divide .getSticky ());
272270 } catch (IllegalArgumentException ex ) {
273271 throw new ShenyuAdminException (ex .getMessage (), ex );
274272 }
@@ -365,7 +363,7 @@ public ConfigImportResult importData(final List<RuleDTO> ruleList) {
365363 return ConfigImportResult .success ();
366364 }
367365
368- ruleList .forEach (rule -> validateDivideHandle (rule .getSelectorId (), rule .getHandle ()));
366+ ruleList .forEach (rule -> validateCanaryAndStickyConfig (rule .getSelectorId (), rule .getHandle ()));
369367 Map <String , List <RuleDO >> selectorRuleMap = ruleMapper
370368 .selectAll ()
371369 .stream ()
@@ -412,7 +410,7 @@ public ConfigImportResult importData(final String namespace, final List<RuleDTO>
412410 }
413411 Map <String , String > selectorIdMapping = context .getSelectorIdMapping ();
414412 ruleList .stream ().filter (rule -> selectorIdMapping .containsKey (rule .getSelectorId ()))
415- .forEach (rule -> validateDivideHandle (selectorIdMapping .get (rule .getSelectorId ()), rule .getHandle ()));
413+ .forEach (rule -> validateCanaryAndStickyConfig (selectorIdMapping .get (rule .getSelectorId ()), rule .getHandle ()));
416414 Map <String , Set <String >> selectorRuleMap = ruleMapper
417415 .selectAllByNamespaceId (namespace )
418416 .stream ()
0 commit comments