crabapples
/
Sentinel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update javadoc and code refinement for AbstractRule 

Signed-off-by: Eric Zhao <sczyh16@gmail.com>
This commit is contained in:
Eric Zhao 2018-11-01 10:36:49 +08:00
parent e0328d412a
commit df84b6b41e
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
sentinel-core/src/main/java/com/alibaba/csp/sentinel/slots/block/AbstractRule.java
View File

@ -15,7 +15,9 @@
*/ */
package com.alibaba.csp.sentinel.slots.block; package com.alibaba.csp.sentinel.slots.block;
/*** /**
* Abstract rule entity.
*
* @author youji.zj * @author youji.zj
* @author Eric Zhao * @author Eric Zhao
*/ */
@ -29,10 +31,11 @@ public abstract class AbstractRule implements Rule {
/** /**
* <p> * <p>
* Application name that will be limited by origin. * Application name that will be limited by origin.
* Multiple application name can be separated with comma (','). * The default limitApp is {@code default}, which means allowing all origin apps.
* </p>
* <p>
* For authority rules, multiple origin name can be separated with comma (',').
* </p> * </p>
* <p>The default limitApp is `default`, which means allowing all origin apps.</p>
* <p>For example: limitApp = `appA,appB` will limit requests from appA and appB.</p>
*/ */
private String limitApp; private String limitApp;
@ -68,8 +71,6 @@ public abstract class AbstractRule implements Rule {
if (resource != null ? !resource.equals(that.resource) : that.resource != null) { if (resource != null ? !resource.equals(that.resource) : that.resource != null) {
return false; return false;
} }
// if (limitApp != null ? !limitApp.equals(that.limitApp) :
// that.limitApp != null) { return false; }
if (!limitAppEquals(limitApp, that.limitApp)) { if (!limitAppEquals(limitApp, that.limitApp)) {
return false; return false;
} }
@ -78,12 +79,12 @@ public abstract class AbstractRule implements Rule {
private boolean limitAppEquals(String str1, String str2) { private boolean limitAppEquals(String str1, String str2) {
if ("".equals(str1)) { if ("".equals(str1)) {
return "default".equals(str2); return RuleConstant.LIMIT_APP_DEFAULT.equals(str2);
} else if ("default".equals(str1)) { } else if (RuleConstant.LIMIT_APP_DEFAULT.equals(str1)) {
return "".equals(str2) || str2 == null || str1.equals(str2); return "".equals(str2) || str2 == null || str1.equals(str2);
} }
if (str1 == null) { if (str1 == null) {
return str2 == null || "default".equals(str2); return str2 == null || RuleConstant.LIMIT_APP_DEFAULT.equals(str2);
} }
return str1.equals(str2); return str1.equals(str2);
} }
@ -95,8 +96,7 @@ public abstract class AbstractRule implements Rule {
@Override @Override
public int hashCode() { public int hashCode() {
int result = resource != null ? resource.hashCode() : 0; int result = resource != null ? resource.hashCode() : 0;
// result = 31 * result + (limitApp != null ? limitApp.hashCode() : 0); if (!("".equals(limitApp) || RuleConstant.LIMIT_APP_DEFAULT.equals(limitApp) || limitApp == null)) {
if (!("".equals(limitApp) || "default".equals(limitApp) || limitApp == null)) {
result = 31 * result + limitApp.hashCode(); result = 31 * result + limitApp.hashCode();
} }
return result; return result;