Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Annotation supports method name as default resource name #187

Merged
merged 6 commits into from
Oct 24, 2018
Merged

Annotation supports method name as default resource name #187

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9154b07
@SentinelResource value Not required, Use the current method name whe…
waveng Oct 15, 2018
182bd46
Merge pull request #1 from alibaba/master
waveng Oct 15, 2018
e9e1b4b
Merge pull request #2 from alibaba/master
waveng Oct 16, 2018
4e32344
Merge pull request #3 from alibaba/master
waveng Oct 17, 2018
40e101a
Merge pull request #4 from alibaba/master
waveng Oct 19, 2018
17d435f
Merge pull request #5 from alibaba/master
waveng Oct 23, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion sentinel-core/src/main/java/com/alibaba/csp/sentinel/annotation/SentinelResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
/**
* @return name of the Sentinel resource
*/
String value();
String value() default "";;

/**
* @return the entry type (inbound or outbound), outbound by default
Expand Down
25 changes: 23 additions & 2 deletions ...ctj/src/main/java/com/alibaba/csp/sentinel/annotation/aspectj/SentinelResourceAspect.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ public Object invokeResourceWithSentinel(ProceedingJoinPoint pjp) throws Throwab
// Should not go through here.
throw new IllegalStateException("Wrong state for SentinelResource annotation");
}
String resourceName = annotation.value();
String resourceName = getResourceName(annotation.value(), originMethod);
EntryType entryType = annotation.entryType();
Entry entry = null;
try {
Expand All @@ -76,7 +76,28 @@ public Object invokeResourceWithSentinel(ProceedingJoinPoint pjp) throws Throwab
ContextUtil.exit();
}
}


private String getResourceName(String resourceName, Method method) {
if(StringUtil.isNotBlank(resourceName)){
return resourceName;
}
StringBuilder buf = new StringBuilder(64);
buf.append(method.getDeclaringClass().getName())
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Here you can just use MethodUtil.getMethodName(method) to get its method representation, which will cache the method name for better performance.

Suggested change
buf.append(method.getDeclaringClass().getName())
return MethodUtil.getMethodName(method);

.append(":")
.append(method.getName())
.append("(");
boolean isFirst = true;
for (Class<?> clazz : method.getParameterTypes()) {
if (!isFirst) {
buf.append(",");
}
buf.append(clazz.getName());
isFirst = false;
}
buf.append(")");
return buf.toString();
}

private Object handleBlockException(ProceedingJoinPoint pjp, SentinelResource annotation, BlockException ex)
throws Exception {
// Execute fallback for degrading if configured.
Expand Down