[RESTEASY-2267] Further fixes to documentation + minor fix to a testcase

resteasy · Jun 17, 2019 · 0f4606d · 0f4606d
1 parent 8c7e985
commit 0f4606d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/docbook/reference/en/en-US/modules/MicroProfile_Rest_Client.xml b/docbook/reference/en/en-US/modules/MicroProfile_Rest_Client.xml
@@ -61,8 +61,7 @@ public interface TestResourceIntf {
    public String test();
 }
 
-TestResourceIntf service = MicroprofileClientBuilderResolver.instance()
-                              .newBuilder()
+TestResourceIntf service = RestClientBuilder.newBuilder()
                               .baseUrl("http://localhost:8081/")
                               .build(TestResourceIntf.class);
 String s = service.test();
@@ -133,8 +132,7 @@ by registering providers:
 </para>
 
 <programlisting id="listing1">
-TestResourceIntf service = MicroprofileClientBuilderResolver.instance()
-                              .newBuilder()
+TestResourceIntf service = RestClientBuilder.newBuilder()
                               .baseUrl("http://localhost:8081/")
                               .register(MyClientResponseFilter.class)
                               .register(MyMessageBodyReader.class)
@@ -616,8 +614,7 @@ public interface TestResourceIntf extends Closeable {
    public String test();
 }
 
-TestResourceIntf service = MicroprofileClientBuilderResolver.instance()
-                              .newBuilder()
+TestResourceIntf service = RestClientBuilder.newBuilder()
                               .baseUrl("http://localhost:8081/")
                               .build(TestResourceIntf.class);
 try (TestResourceIntf tr = service) {
@@ -780,8 +777,7 @@ For example:
 <programlisting>
 KeyStore trustStore = ... ;
 HostnameVerifier verifier ... ;
-TestResourceIntf service = MicroprofileClientBuilderResolver.instance()
-                              .newBuilder()
+TestResourceIntf service = RestClientBuilder.newBuilder()
                               .baseUrl("http://localhost:8081/")
                               .trustStore(trustStore)
                               .hostnameVerifier(verifier)

diff --git a/...ts/src/test/java/org/jboss/resteasy/test/microprofile/restclient/RestClientProxyTest.java b/...ts/src/test/java/org/jboss/resteasy/test/microprofile/restclient/RestClientProxyTest.java
@@ -56,7 +56,7 @@ private String generateURL(String path)
    public void testGetClient() throws Exception
    {
       RestClientBuilder builder = RestClientBuilder.newBuilder();
-      RestClientBuilder resteasyBuilder = BuilderResolver.instance().newBuilder();
+      RestClientBuilder resteasyBuilder = new BuilderResolver().newBuilder();
       assertEquals(resteasyBuilder.getClass(), builder.getClass());
       HelloClient client = builder.baseUrl(new URL(generateURL(""))).build(HelloClient.class);