Fix integration tests

Author: adwsingh

.github/workflows/ci.yml

@@ -28,6 +28,9 @@ jobs:
       - name: Clean, build and javadoc
         run: ./gradlew clean build javadoc -Plog-tests --stacktrace
 
+      - name: Integration tests
+        run: ./gradlew integ -Plog-tests --stacktrace
+
       - name: Allow long file names in git for windows
         if: matrix.os == 'windows-latest'
         run: git config --system core.longpaths true

codegen/plugins/client-codegen/src/main/java/software/amazon/smithy/java/codegen/client/generators/ClientInterfaceGenerator.java

@@ -132,11 +132,11 @@ final class Builder extends ${client:T}.Builder<${interface:T}, Builder>${?setti
                                             ${/hasTransportSettings}${?defaultSchemes}
                                             ${defaultAuth:C|}${/defaultSchemes}
 
-                                            private Builder() {${?defaultSchemes}
-                                                configBuilder()
-                                                    .putSupportedAuthSchemes(${#defaultSchemes}${value:L}.createAuthScheme(${key:L})${^key.last}, ${/key.last}${/defaultSchemes})
+                                            private Builder() {
+                                                configBuilder()${?defaultSchemes}
+                                                    .putSupportedAuthSchemes(${#defaultSchemes}${value:L}.createAuthScheme(${key:L})${^key.last}, ${/key.last}${/defaultSchemes})${/defaultSchemes}
                                                     .service(${serviceApi:T}.instance());
-                                            ${/defaultSchemes}}
+                                            }
 
                                             @Override
                                             public ${interface:T} build() {

examples/restjson-client/src/it/java/software/amazon/smithy/java/example/ClientConfigTest.java

@@ -30,6 +30,7 @@
 import software.amazon.smithy.java.example.restjson.model.GetPersonImage;
 import software.amazon.smithy.java.example.restjson.model.GetPersonImageInput;
 import software.amazon.smithy.java.example.restjson.model.GetPersonImageOutput;
+import software.amazon.smithy.java.example.restjson.model.PersonDirectoryApiService;
 import software.amazon.smithy.java.example.restjson.model.PutPerson;
 import software.amazon.smithy.java.example.restjson.model.PutPersonImage;
 import software.amazon.smithy.java.example.restjson.model.PutPersonImageInput;
@@ -154,6 +155,7 @@ static final class Builder extends
 
             private Builder() {
                 ClientConfig.Builder configBuilder = configBuilder();
+                configBuilder.service(PersonDirectoryApiService.instance());
                 configBuilder.protocol(new RestJsonClientProtocol(PreludeSchemas.DOCUMENT.id()));
                 configBuilder.transport(new JavaHttpClientTransport(HttpClient.newHttpClient()));