fix unit tests (#18)

Author: DanielLiu1123

src/main/java/com/freemanan/starter/httpexchange/HttpClientBeanRegistrar.java

@@ -111,7 +111,7 @@ public void registerHttpClientBean(BeanDefinitionRegistry registry, String class
                         ScopedProxyUtils.createScopedProxy(new BeanDefinitionHolder(abd, className), registry, false);
                 BeanDefinitionReaderUtils.registerBeanDefinition(scopedProxy, registry);
             } else {
-                registry.registerBeanDefinition(className, abd);
+                BeanDefinitionReaderUtils.registerBeanDefinition(new BeanDefinitionHolder(abd, className), registry);
             }
         } catch (BeanDefinitionOverrideException ignore) {
             // clients are included in base packages

src/test/java/com/freemanan/starter/httpexchange/DynamicRefreshTests.java

@@ -11,7 +11,6 @@
 import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.cloud.endpoint.event.RefreshEvent;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.core.env.ConfigurableEnvironment;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.service.annotation.GetExchange;
@@ -29,17 +28,17 @@ void testDynamicRefresh() {
                 .properties("server.port=" + port)
                 .properties("http-exchange.base-url=http://localhost:" + port)
                 .run();
-        ConfigurableEnvironment env = ctx.getEnvironment();
 
         FooApi api = ctx.getBean(FooApi.class);
         assertThat(api.get()).isEqualTo("OK");
 
-        env.getSystemProperties().put("http-exchange.base-url", "http://localhost:" + port + "/v2");
+        System.setProperty("http-exchange.base-url", "http://localhost:" + port + "/v2");
         ctx.publishEvent(new RefreshEvent(ctx, null, null));
 
         // base-url changed
         assertThat(api.get()).isEqualTo("OK v2");
 
+        System.clearProperty("http-exchange.base-url");
         ctx.close();
     }
 

src/test/java/com/freemanan/starter/httpexchange/ExtendShadedTests.java

@@ -37,7 +37,7 @@ void userApiFirst_whenHaveControllerAndApiBeans() {
                 .properties("server.port=" + port)
                 .run();
         long count = ctx.getBeanProvider(FooApi.class).stream().count();
-        assertThat(count).isEqualTo(2);
+        assertThat(count).isEqualTo(3);
 
         FooApi fooApi = ctx.getBean(FooApi.class);
         assertThat(fooApi).isNotInstanceOf(FooController.class);

src/test/java/com/freemanan/starter/httpexchange/ExtendTests.java

@@ -34,7 +34,7 @@ void userApiFirst_whenHaveControllerAndApiBeans() {
                 .profiles("ControllerApiTests")
                 .properties("server.port=" + port)
                 .run();
-        assertThat(ctx.getBeanProvider(FooApi.class)).hasSize(2);
+        assertThat(ctx.getBeanProvider(FooApi.class)).hasSize(3);
 
         FooApi fooApi = ctx.getBean(FooApi.class);
         assertThat(fooApi).isNotInstanceOf(FooController.class);