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.

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

fix: resolve mapping annotation for feign client #711

Merged
merged 1 commit into from
Mar 11, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,6 @@ import org.apache.commons.lang.StringUtils.lowerCase
@ConditionOnClass(SpringFeignClassName.REQUEST_LINE_ANNOTATION)
@ConditionOnSetting("feignEnable")
open class FeignRequestClassExporter : SpringRequestClassExporter() {
override fun processClass(cls: PsiClass, classExportContext: ClassExportContext) {
//NOP
}

override fun hasApi(psiClass: PsiClass): Boolean {
return annotationHelper.hasAnn(psiClass, SpringFeignClassName.FEIGN_CLIENT_ANNOTATION)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -129,12 +129,14 @@ internal class FeignRequestClassExporterTest : PluginContextLightCodeInsightFixt
})
(classExporter as Worker).waitCompleted()
requests[0].let { request ->
assertEquals("/user/index", request.path!!.url())
assertEquals("say hello", request.name)
assertEquals("not update anything", request.desc)
assertEquals("GET", request.method)
assertEquals(userClientPsiClass.methods[0], (request.resource as PsiResource).resource())
}
requests[1].let { request ->
assertEquals("/user/get/{id}", request.path!!.url())
assertEquals("get user info", request.name)
assertTrue(request.desc.isNullOrEmpty())
assertEquals("GET", request.method)
Expand All @@ -153,6 +155,7 @@ internal class FeignRequestClassExporterTest : PluginContextLightCodeInsightFixt
})
(classExporter as Worker).waitCompleted()
requests[0].let { request ->
assertEquals("/user", request.path!!.url())
assertEquals("create an user", request.name)
assertTrue(request.desc.isNullOrEmpty())
assertEquals("POST", request.method)
Expand All @@ -165,6 +168,7 @@ internal class FeignRequestClassExporterTest : PluginContextLightCodeInsightFixt
)
}
requests[1].let { request ->
assertEquals("/user/list/{type}", request.path!!.url())
assertEquals("list users", request.name)
assertTrue(request.desc.isNullOrEmpty())
assertEquals("POST", request.method)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ internal class YapiFeignRequestClassExporterTest : YapiSpringClassExporterBaseTe
})
(classExporter as Worker).waitCompleted()
requests[0].let { request ->
assertEquals("/user/index", request.path!!.url())
assertEquals("say hello", request.name)
assertEquals("not update anything", request.desc)
assertEquals("GET", request.method)
Expand All @@ -73,6 +74,7 @@ internal class YapiFeignRequestClassExporterTest : YapiSpringClassExporterBaseTe
assertTrue(request.isOpen())
}
requests[1].let { request ->
assertEquals("/user/get/{id}", request.path!!.url())
assertEquals("get user info", request.name)
assertTrue(request.desc.isNullOrEmpty())
assertEquals("GET", request.method)
Expand Down
1 change: 1 addition & 0 deletions idea-plugin/src/test/resources/api/feign/UserClient.java
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
import org.springframework.web.bind.annotation.RequestParam;

@FeignClient("user")
@RequestMapping(value = "/user")
public interface UserClient {

/**
Expand Down