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

Jump to bottom

[type:fix][ISSUE #5004] Fix build error apiPath. #5006

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Open

[type:fix][ISSUE #5004] Fix build error apiPath. #5006

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
bc61b86
fix client-http : fix build error apiPath when method without annotat…
Aug 14, 2023
db00e8a
fix client-http : fix build error apiPath when method without annotat…
Aug 14, 2023
85635a2
Merge branch 'master' into dev-branch
li-keguo Aug 16, 2023
0bb6c47
Merge branch 'master' into dev-branch
yu199195 Aug 17, 2023
054e04f
Merge branch 'master' into dev-branch
loongs-zhang Aug 24, 2023
d7d2659
Merge branch 'master' into dev-branch
loongs-zhang Aug 31, 2023
360cc14
Merge branch 'master' into dev-branch
loongs-zhang Jan 17, 2024
8910681
Merge branch 'master' into dev-branch
loongs-zhang Feb 20, 2024
aa336ef
Merge branch 'master' into dev-branch
loongs-zhang Feb 20, 2024
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
8 changes: 4 additions & 4 deletions ...c/src/main/java/org/apache/shenyu/client/springmvc/init/SpringMvcClientEventListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,11 +182,11 @@ protected void handleMethod(final Object bean, final Class<?> clazz,
final Method method, final String superPath) {
final RequestMapping requestMapping = AnnotatedElementUtils.findMergedAnnotation(method, RequestMapping.class);
ShenyuSpringMvcClient methodShenyuClient = AnnotatedElementUtils.findMergedAnnotation(method, ShenyuSpringMvcClient.class);
methodShenyuClient = Objects.isNull(methodShenyuClient) ? beanShenyuClient : methodShenyuClient;
ShenyuSpringMvcClient shenyuClient = Objects.isNull(methodShenyuClient) ? beanShenyuClient : methodShenyuClient;
// the result of ReflectionUtils#getUniqueDeclaredMethods contains method such as hashCode, wait, toSting
// add Objects.nonNull(requestMapping) to make sure not register wrong method
if (Objects.nonNull(methodShenyuClient) && Objects.nonNull(requestMapping)) {
final MetaDataRegisterDTO metaData = buildMetaDataDTO(bean, methodShenyuClient,
if (Objects.nonNull(shenyuClient) && Objects.nonNull(requestMapping)) {
final MetaDataRegisterDTO metaData = buildMetaDataDTO(bean, shenyuClient,
buildApiPath(method, superPath, methodShenyuClient), clazz, method);
getPublisher().publishEvent(metaData);
getMetaDataMap().put(method, metaData);
Expand All @@ -197,7 +197,7 @@ protected void handleMethod(final Object bean, final Class<?> clazz,
protected String buildApiPath(final Method method, final String superPath,
@NonNull final ShenyuSpringMvcClient methodShenyuClient) {
String contextPath = getContextPath();
if (StringUtils.isNotBlank(methodShenyuClient.path())) {
if (Objects.nonNull(methodShenyuClient) && StringUtils.isNotBlank(methodShenyuClient.path())) {
return pathJoin(contextPath, superPath, methodShenyuClient.path());
}
final String path = getPathByMethod(method);
Expand Down
Loading