feat: Support customizing baseUrl in CoApiProperties and override. (

#50)

spring-boot-starter/src/main/kotlin/me/ahoo/coapi/spring/boot/starter/CoApiProperties.kt

@@ -32,6 +32,10 @@ data class CoApiProperties(
  const val COAPI_BASE_PACKAGES = "$COAPI_PREFIX.base-packages"
  }
 
+ override fun getBaseUri(coApiName: String): String {
+ return clients[coApiName]?.baseUrl.orEmpty()
+ }
+
  override fun getFilter(coApiName: String): ClientProperties.FilterDefinition {
  return clients[coApiName]?.reactive?.filter ?: ClientProperties.FilterDefinition()
  }
@@ -42,6 +46,7 @@ data class CoApiProperties(
 }
 
 data class ClientDefinition(
+ var baseUrl: String = "",
  var reactive: ReactiveClientDefinition = ReactiveClientDefinition(),
  var sync: SyncClientDefinition = SyncClientDefinition()
 )

spring-boot-starter/src/test/kotlin/me/ahoo/coapi/spring/boot/starter/CoApiPropertiesTest.kt

@@ -35,6 +35,24 @@ class CoApiPropertiesTest {
  assertThat(properties.enabled, equalTo(true))
  }
 
+ @Test
+ fun getBaseUrl() {
+ val properties = CoApiProperties()
+ assertThat(properties.getBaseUri(""), equalTo(""))
+ }
+
+ @Test
+ fun setBaseUrl() {
+ val properties = CoApiProperties(
+ clients = mapOf(
+ "test" to ClientDefinition(
+ baseUrl = "test"
+ )
+ )
+ )
+ assertThat(properties.getBaseUri("test"), equalTo("test"))
+ }
+
  @Test
  fun getBasePackages() {
  val properties = CoApiProperties()

spring/src/main/kotlin/me/ahoo/coapi/spring/CoApiDefinition.kt

@@ -40,10 +40,13 @@ data class CoApiDefinition(
  }
 
  private fun CoApi.resolveBaseUrl(environment: Environment): String {
+ if (baseUrl.isNotBlank()) {
+ return environment.resolvePlaceholders(baseUrl)
+ }
  if (serviceId.isNotBlank()) {
- return LB_SCHEME_PREFIX + serviceId
+ return LB_SCHEME_PREFIX + environment.resolvePlaceholders(serviceId)
  }
- return environment.resolvePlaceholders(baseUrl)
+ return ""
  }
 
  private fun Class<*>.resolveClientName(coApi: CoApi): String {

spring/src/main/kotlin/me/ahoo/coapi/spring/client/ClientProperties.kt

@@ -18,6 +18,7 @@ import org.springframework.web.reactive.function.client.ExchangeFilterFunction
 
 interface ClientProperties {
 
+ fun getBaseUri(coApiName: String): String
  fun getFilter(coApiName: String): FilterDefinition
  fun getInterceptor(coApiName: String): InterceptorDefinition
 

spring/src/main/kotlin/me/ahoo/coapi/spring/client/reactive/AbstractWebClientFactoryBean.kt

@@ -35,9 +35,12 @@ abstract class AbstractWebClientFactoryBean(private val definition: CoApiDefinit
  override fun getObject(): WebClient {
  val clientBuilder = appContext
  .getBean(WebClient.Builder::class.java)
-
- clientBuilder.baseUrl(definition.baseUrl)
  val clientProperties = appContext.getBean(ClientProperties::class.java)
+ val baseUrl = clientProperties.getBaseUri(definition.name).ifBlank {
+ definition.baseUrl
+ }
+ clientBuilder.baseUrl(baseUrl)
+
  val filterDefinition = clientProperties.getFilter(definition.name)
  clientBuilder.filters {
  filterDefinition.initFilters(it)

spring/src/main/kotlin/me/ahoo/coapi/spring/client/sync/AbstractRestClientFactoryBean.kt

@@ -32,8 +32,12 @@ abstract class AbstractRestClientFactoryBean(private val definition: CoApiDefini
  override fun getObject(): RestClient {
  val clientBuilder = appContext
  .getBean(RestClient.Builder::class.java)
- clientBuilder.baseUrl(definition.baseUrl)
  val clientProperties = appContext.getBean(ClientProperties::class.java)
+ val baseUrl = clientProperties.getBaseUri(definition.name).ifBlank {
+ definition.baseUrl
+ }
+ clientBuilder.baseUrl(baseUrl)
+
  val interceptorDefinition = clientProperties.getInterceptor(definition.name)
  clientBuilder.requestInterceptors {
  interceptorDefinition.initInterceptors(it)

spring/src/test/kotlin/me/ahoo/coapi/spring/CoApiContextTest.kt

@@ -119,6 +119,10 @@ data class MockClientProperties(
  val filter: Map<String, ClientProperties.FilterDefinition> = emptyMap(),
  val interceptor: Map<String, ClientProperties.InterceptorDefinition> = emptyMap(),
 ) : ClientProperties {
+ override fun getBaseUri(coApiName: String): String {
+ return ""
+ }
+
  override fun getFilter(coApiName: String): ClientProperties.FilterDefinition {
  return filter[coApiName] ?: ClientProperties.FilterDefinition()
  }