aws-amplify
diff --git a/‎CHANGELOG.md
+11 b/‎CHANGELOG.md
+11
diff --git a/‎README.md
+6-6 b/‎README.md
+6-6
diff --git a/‎aws-api/src/androidTest/java/com/amplifyframework/api/aws/SubscriptionEndpointTest.java
+48-1 b/‎aws-api/src/androidTest/java/com/amplifyframework/api/aws/SubscriptionEndpointTest.java
+48-1
diff --git a/‎aws-api/src/main/java/com/amplifyframework/api/aws/AWSApiPlugin.java
+32-9 b/‎aws-api/src/main/java/com/amplifyframework/api/aws/AWSApiPlugin.java
+32-9
diff --git a/‎aws-api/src/main/java/com/amplifyframework/api/aws/SubscriptionEndpoint.java
+14-7 b/‎aws-api/src/main/java/com/amplifyframework/api/aws/SubscriptionEndpoint.java
+14-7
diff --git a/‎aws-api/src/main/java/com/amplifyframework/api/aws/auth/IamRequestDecorator.java
+7-4 b/‎aws-api/src/main/java/com/amplifyframework/api/aws/auth/IamRequestDecorator.java
+7-4
diff --git a/‎aws-auth-cognito/src/main/java/com/amplifyframework/auth/cognito/AWSCognitoAuthService.kt
+4-3 b/‎aws-auth-cognito/src/main/java/com/amplifyframework/auth/cognito/AWSCognitoAuthService.kt
+4-3
diff --git a/‎aws-auth-cognito/src/main/java/com/amplifyframework/auth/cognito/AWSEndpointResolver.kt
-27 b/‎aws-auth-cognito/src/main/java/com/amplifyframework/auth/cognito/AWSEndpointResolver.kt
-27
diff --git a/‎aws-datastore/src/main/java/com/amplifyframework/datastore/AWSDataStorePlugin.java
+1-2 b/‎aws-datastore/src/main/java/com/amplifyframework/datastore/AWSDataStorePlugin.java
+1-2
diff --git a/‎aws-datastore/src/main/java/com/amplifyframework/datastore/syncengine/ReachabilityMonitor.kt
+2-2 b/‎aws-datastore/src/main/java/com/amplifyframework/datastore/syncengine/ReachabilityMonitor.kt
+2-2
@@ -1,3 +1,14 @@
+## [Release 2.3.0](https://github.com/aws-amplify/amplify-android/releases/tag/release_v2.3.0)
+
+### Features
+- **storage:** Add support for S3 acceleration mode ([#2304](https://github.com/aws-amplify/amplify-android/issues/2304))
+- **aws-datastore:** Make the reachability component configurable ([#2307](https://github.com/aws-amplify/amplify-android/issues/2307))
+
+### Bug Fixes
+- **datastore:** Fix aliasing of column names ([#2312](https://github.com/aws-amplify/amplify-android/issues/2312))
+
+[See all changes between 2.2.2 and 2.3.0](https://github.com/aws-amplify/amplify-android/compare/release_v2.2.2...release_v2.3.0)
+
 ## [Release 2.2.2](https://github.com/aws-amplify/amplify-android/releases/tag/release_v2.2.2)
 
 ### Bug Fixes
 
@@ -69,12 +69,12 @@ dependencies section:
 ```groovy
 dependencies {
     // Only specify modules that provide functionality your app will use
-    implementation 'com.amplifyframework:aws-analytics-pinpoint:2.2.2'
-    implementation 'com.amplifyframework:aws-api:2.2.2'
-    implementation 'com.amplifyframework:aws-auth-cognito:2.2.2'
-    implementation 'com.amplifyframework:aws-datastore:2.2.2'
-    implementation 'com.amplifyframework:aws-predictions:2.2.2'
-    implementation 'com.amplifyframework:aws-storage-s3:2.2.2'
+    implementation 'com.amplifyframework:aws-analytics-pinpoint:2.3.0'
+    implementation 'com.amplifyframework:aws-api:2.3.0'
+    implementation 'com.amplifyframework:aws-auth-cognito:2.3.0'
+    implementation 'com.amplifyframework:aws-datastore:2.3.0'
+    implementation 'com.amplifyframework:aws-predictions:2.3.0'
+    implementation 'com.amplifyframework:aws-storage-s3:2.3.0'
 }
 ```
 
 
@@ -37,8 +37,10 @@
 import java.util.Set;
 import java.util.concurrent.Executor;
 import java.util.concurrent.Executors;
+import java.util.concurrent.atomic.AtomicInteger;
 
 import static androidx.test.core.app.ApplicationProvider.getApplicationContext;
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertNotNull;
 
@@ -71,7 +73,7 @@ public void setup() throws ApiException, JSONException {
 
         final GraphQLResponse.Factory responseFactory = new GsonGraphQLResponseFactory();
         final SubscriptionAuthorizer authorizer = new SubscriptionAuthorizer(apiConfiguration);
-        this.subscriptionEndpoint = new SubscriptionEndpoint(apiConfiguration, responseFactory, authorizer);
+        this.subscriptionEndpoint = new SubscriptionEndpoint(apiConfiguration, null, responseFactory, authorizer);
 
         this.eventId = RandomString.string();
         this.subscriptionIdsForRelease = new HashSet<>();
@@ -119,6 +121,51 @@ public void twoSubscriptionsToTheSameThing() throws ApiException {
         assertNotEquals(firstSubscriptionId, secondSubscriptionId);
     }
 
+    /**
+     * It uses a configurator if present.
+     *
+     * This test verifies that a configurator can add an interceptor and that it will be run when establishing
+     * subscriptions.
+     * @throws ApiException On failure to load API configuration from config file
+     * @throws JSONException On failure to manipulate configuration JSON during test arrangement
+     */
+    @Test
+    public void usesConfiguratorIfPresent() throws ApiException, JSONException {
+        String endpointConfigKey = "eventsApi"; // The endpoint config in amplifyconfiguration.json with this name
+        JSONObject configJson = Resources.readAsJson(getApplicationContext(), R.raw.amplifyconfiguration)
+                .getJSONObject("api")
+                .getJSONObject("plugins")
+                .getJSONObject("awsAPIPlugin");
+        AWSApiPluginConfiguration pluginConfiguration = AWSApiPluginConfigurationReader.readFrom(configJson);
+        ApiConfiguration apiConfiguration = pluginConfiguration.getApi(endpointConfigKey);
+        assertNotNull(apiConfiguration);
+
+        final GraphQLResponse.Factory responseFactory = new GsonGraphQLResponseFactory();
+        final SubscriptionAuthorizer authorizer = new SubscriptionAuthorizer(apiConfiguration);
+
+        final AtomicInteger counter = new AtomicInteger();
+
+        final OkHttpConfigurator configurator = okHttpBuilder -> {
+            counter.incrementAndGet();
+
+            okHttpBuilder.addInterceptor(chain -> {
+                counter.incrementAndGet();
+
+                return chain.proceed(chain.request());
+            });
+        };
+
+        this.subscriptionEndpoint = new SubscriptionEndpoint(apiConfiguration, configurator, responseFactory,
+                authorizer);
+
+        String firstSubscriptionId = subscribeToEventComments(eventId);
+        assertNotNull(firstSubscriptionId);
+
+        subscriptionIdsForRelease.add(firstSubscriptionId);
+
+        assertEquals(2, counter.get());
+    }
+
     /**
      * Subscribe to comments on an event.
      * @param eventId ID of event for which comments are being made
 
@@ -72,7 +72,8 @@
 @SuppressWarnings("TypeParameterHidesVisibleType") // <R> shadows >com.amplifyframework.api.aws.R
 public final class AWSApiPlugin extends ApiPlugin<Map<String, OkHttpClient>> {
     private final Map<String, ClientDetails> apiDetails;
-    private final Map<String, OkHttpConfigurator> apiConfigurators;
+    private final Map<String, OkHttpConfigurator> apiHttpClientConfigurators;
+    private final Map<String, OkHttpConfigurator> apiWebsocketUpgradeClientConfigurators;
     private final GraphQLResponse.Factory gqlResponseFactory;
     private final ApiAuthProviders authProvider;
     private final ExecutorService executorService;
@@ -106,7 +107,8 @@ private AWSApiPlugin(@NonNull Builder builder) {
         this.gqlApis = new HashSet<>();
         this.executorService = Executors.newCachedThreadPool();
         this.requestDecorator = new AuthRuleRequestDecorator(authProvider);
-        this.apiConfigurators = Immutable.of(builder.apiConfigurators);
+        this.apiHttpClientConfigurators = Immutable.of(builder.apiHttpClientConfigurators);
+        this.apiWebsocketUpgradeClientConfigurators = Immutable.of(builder.apiWebsocketUpgradeClientConfigurators);
     }
 
     /**
@@ -140,7 +142,7 @@ public void configure(
             okHttpClientBuilder.addNetworkInterceptor(UserAgentInterceptor.using(UserAgent::string));
             okHttpClientBuilder.eventListener(new ApiConnectionEventListener());
 
-            OkHttpConfigurator configurator = apiConfigurators.get(apiName);
+            OkHttpConfigurator configurator = apiHttpClientConfigurators.get(apiName);
             if (configurator != null) {
                 configurator.applyConfiguration(okHttpClientBuilder);
             }
@@ -174,8 +176,11 @@ public void configure(
             } else if (EndpointType.GRAPHQL.equals(endpointType)) {
                 final SubscriptionAuthorizer subscriptionAuthorizer =
                     new SubscriptionAuthorizer(apiConfiguration, authProvider);
+                final OkHttpConfigurator websocketUpgradeConfigurator =
+                        apiWebsocketUpgradeClientConfigurators.get(apiName);
                 final SubscriptionEndpoint subscriptionEndpoint =
-                    new SubscriptionEndpoint(apiConfiguration, gqlResponseFactory, subscriptionAuthorizer);
+                    new SubscriptionEndpoint(apiConfiguration, websocketUpgradeConfigurator, gqlResponseFactory,
+                            subscriptionAuthorizer);
                 clientDetails = new ClientDetails(apiConfiguration,
                                                   okHttpClientBuilder.build(),
                                                   subscriptionEndpoint,
@@ -869,11 +874,13 @@ private void transitionTo(ApiEndpointStatus newStatus) {
      */
     public static final class Builder {
         private ApiAuthProviders apiAuthProviders;
-        private final Map<String, OkHttpConfigurator> apiConfigurators;
+        private final Map<String, OkHttpConfigurator> apiHttpClientConfigurators;
+        private final Map<String, OkHttpConfigurator> apiWebsocketUpgradeClientConfigurators;
 
         private Builder() {
             this.apiAuthProviders = ApiAuthProviders.noProviderOverrides();
-            this.apiConfigurators = new HashMap<>();
+            this.apiHttpClientConfigurators = new HashMap<>();
+            this.apiWebsocketUpgradeClientConfigurators = new HashMap<>();
         }
 
         /**
@@ -890,17 +897,33 @@ public Builder apiAuthProviders(@NonNull ApiAuthProviders apiAuthProviders) {
 
         /**
          * Apply customizations to an underlying OkHttpClient that will be used
-         * for a particular API.
+         * for a particular API's Http operations.
          * @param forApiName The name of the API for which these customizations should apply.
                              This can be found in your `amplifyconfiguration.json` file.
          * @param byConfigurator A lambda that hands the user an OkHttpClient.Builder,
-         *                       and enables the user to set come configurations on it.
+         *                       and enables the user to set some configurations on it.
          * @return A builder instance, to continue chaining configurations
          */
         @NonNull
         public Builder configureClient(
                 @NonNull String forApiName, @NonNull OkHttpConfigurator byConfigurator) {
-            this.apiConfigurators.put(forApiName, byConfigurator);
+            this.apiHttpClientConfigurators.put(forApiName, byConfigurator);
+            return this;
+        }
+
+        /**
+         * Apply customizations to an underlying OkHttpClient that will be used
+         * for the WebSocket protocol upgrade of a particular API.
+         * @param forApiName The name of the API for which these customizations should apply.
+        This can be found in your `amplifyconfiguration.json` file.
+         * @param byConfigurator A lambda that hands the user an OkHttpClient.Builder,
+         *                       and enables the user to set some configurations on it.
+         * @return A builder instance, to continue chaining configurations
+         */
+        @NonNull
+        public Builder configureWebSocketUpgradeClient(
+                @NonNull String forApiName, @NonNull OkHttpConfigurator byConfigurator) {
+            this.apiWebsocketUpgradeClientConfigurators.put(forApiName, byConfigurator);
             return this;
         }
 
 
@@ -18,6 +18,7 @@
 import android.net.Uri;
 import android.util.Base64;
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.core.util.ObjectsCompat;
 
 import com.amplifyframework.AmplifyException;
@@ -76,19 +77,25 @@ final class SubscriptionEndpoint {
 
     SubscriptionEndpoint(
             @NonNull ApiConfiguration apiConfiguration,
+            @Nullable OkHttpConfigurator configurator,
             @NonNull GraphQLResponse.Factory responseFactory,
             @NonNull SubscriptionAuthorizer authorizer
-    ) throws ApiException {
+    ) {
         this.apiConfiguration = Objects.requireNonNull(apiConfiguration);
         this.subscriptions = new ConcurrentHashMap<>();
         this.responseFactory = Objects.requireNonNull(responseFactory);
         this.authorizer = Objects.requireNonNull(authorizer);
         this.timeoutWatchdog = new TimeoutWatchdog();
         this.pendingSubscriptionIds = Collections.synchronizedSet(new HashSet<>());
-        this.okHttpClient = new OkHttpClient.Builder()
-            .addNetworkInterceptor(UserAgentInterceptor.using(UserAgent::string))
-            .retryOnConnectionFailure(true)
-            .build();
+
+        OkHttpClient.Builder okHttpClientBuilder = new OkHttpClient.Builder()
+                .retryOnConnectionFailure(true);
+
+        if (configurator != null) {
+            configurator.applyConfiguration(okHttpClientBuilder);
+        }
+
+        this.okHttpClient = okHttpClientBuilder.build();
     }
 
     synchronized <T> void requestSubscription(
@@ -126,6 +133,7 @@ synchronized <T> void requestSubscription(
                 webSocket = okHttpClient.newWebSocket(new Request.Builder()
                     .url(buildConnectionRequestUrl(authType))
                     .addHeader("Sec-WebSocket-Protocol", "graphql-ws")
+                    .header("User-Agent", UserAgent.string())
                     .build(), webSocketListener);
             } catch (ApiException apiException) {
                 onSubscriptionError.accept(apiException);
@@ -332,7 +340,7 @@ private String buildConnectionRequestUrl(AuthorizationType authType) throws ApiE
         return new Uri.Builder()
             .scheme("wss")
             .authority(authority)
-            .appendPath(path)
+            .path(path)
             .appendQueryParameter("header", Base64.encodeToString(rawHeader, Base64.DEFAULT))
             .appendQueryParameter("payload", "e30=")
             .build()
@@ -490,7 +498,6 @@ public int hashCode() {
     final class AmplifyWebSocketListener extends WebSocketListener {
         private final CountDownLatch connectionResponse;
         private final AtomicReference<EndpointStatus> endpointStatus;
-        private OkHttpClient okHttpClient;
 
         AmplifyWebSocketListener() {
             this(new CountDownLatch(1));
 
@@ -18,17 +18,20 @@
 import com.amplifyframework.api.ApiException.ApiAuthException;
 import com.amplifyframework.api.aws.sigv4.AWS4Signer;
 
+import aws.smithy.kotlin.runtime.net.Url;
+
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.util.List;
 import java.util.Map;
 
 import aws.smithy.kotlin.runtime.auth.awscredentials.CredentialsProvider;
+import aws.smithy.kotlin.runtime.http.DeferredHeaders;
 import aws.smithy.kotlin.runtime.http.Headers;
 import aws.smithy.kotlin.runtime.http.HttpMethod;
-import aws.smithy.kotlin.runtime.http.Url;
 import aws.smithy.kotlin.runtime.http.content.ByteArrayContent;
 import aws.smithy.kotlin.runtime.http.request.HttpRequest;
+import aws.smithy.kotlin.runtime.http.request.HttpRequestKt;
 import okhttp3.MediaType;
 import okhttp3.RequestBody;
 import okio.Buffer;
@@ -79,7 +82,7 @@ public final okhttp3.Request decorate(okhttp3.Request req) throws ApiAuthExcepti
             return null;
         });
 
-        HttpRequest req2 = new HttpRequest(method, url, headers, body2);
+        HttpRequest req2 = HttpRequestKt.HttpRequest(method, url, headers, body2, DeferredHeaders.Companion.getEmpty());
 
         HttpRequest request = v4Signer.signBlocking(req2, credentialsProvider, serviceName).getOutput();
 
@@ -124,8 +127,8 @@ private byte[] getBytes(RequestBody body) throws ApiAuthException {
             return output.toByteArray();
         } catch (IOException exception) {
             throw new ApiAuthException("Unable to calculate SigV4 signature for the request",
-                    exception,
-                    "Check your application logs for details.");
+                exception,
+                "Check your application logs for details.");
         }
     }
 }
@@ -17,7 +17,8 @@ package com.amplifyframework.auth.cognito
 
 import aws.sdk.kotlin.services.cognitoidentity.CognitoIdentityClient
 import aws.sdk.kotlin.services.cognitoidentityprovider.CognitoIdentityProviderClient
-import aws.smithy.kotlin.runtime.http.endpoints.Endpoint
+import aws.smithy.kotlin.runtime.client.endpoints.Endpoint
+import aws.smithy.kotlin.runtime.client.endpoints.EndpointProvider
 import com.amplifyframework.statemachine.codegen.data.AuthConfiguration
 
 interface AWSCognitoAuthService {
@@ -30,8 +31,8 @@ interface AWSCognitoAuthService {
 
                 CognitoIdentityProviderClient {
                     this.region = it.region
-                    this.endpointResolver = it.endpoint?.let { endpoint ->
-                        AWSEndpointResolver(Endpoint(endpoint))
+                    this.endpointProvider = it.endpoint?.let { endpoint ->
+                        EndpointProvider { Endpoint(endpoint) }
                     }
                 }
             }
 
@@ -755,8 +755,7 @@ Builder storageAdapter(LocalStorageAdapter storageAdapter) {
          * @param reachabilityMonitor An instance that implements LocalStorageAdapter.
          * @return Current builder instance, for fluent construction of plugin.
          */
-        @VisibleForTesting
-        Builder reachabilityMonitor(ReachabilityMonitor reachabilityMonitor) {
+        public Builder reachabilityMonitor(ReachabilityMonitor reachabilityMonitor) {
             this.reachabilityMonitor = reachabilityMonitor;
             return this;
         }
 
@@ -36,7 +36,7 @@ import java.util.concurrent.TimeUnit
  * The network changes are debounced with a 250 ms delay to allow some time for one network to connect after another
  * network has disconnected (for example, wifi is lost, then cellular connects) to reduce thrashing.
  */
-internal interface ReachabilityMonitor {
+public interface ReachabilityMonitor {
     fun configure(context: Context)
     @VisibleForTesting
     fun configure(context: Context, connectivityProvider: ConnectivityProvider)
@@ -99,7 +99,7 @@ private class ReachabilityMonitorImpl constructor(val schedulerProvider: Schedul
  * is a concrete class created within context.getSystemService() it can't be overridden with a test
  * implementation, so this interface works around that issue.
  */
-internal interface ConnectivityProvider {
+public interface ConnectivityProvider {
     val hasActiveNetwork: Boolean
     fun registerDefaultNetworkCallback(context: Context, callback: NetworkCallback)
 }
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,8 @@ package com.amplifyframework.auth.cognito`
`17`	`17`
`18`	`18`	`import aws.sdk.kotlin.services.cognitoidentity.CognitoIdentityClient`
`19`	`19`	`import aws.sdk.kotlin.services.cognitoidentityprovider.CognitoIdentityProviderClient`
`20`		`-import aws.smithy.kotlin.runtime.http.endpoints.Endpoint`
	`20`	`+import aws.smithy.kotlin.runtime.client.endpoints.Endpoint`
	`21`	`+import aws.smithy.kotlin.runtime.client.endpoints.EndpointProvider`
`21`	`22`	`import com.amplifyframework.statemachine.codegen.data.AuthConfiguration`
`22`	`23`
`23`	`24`	`interface AWSCognitoAuthService {`
`@@ -30,8 +31,8 @@ interface AWSCognitoAuthService {`
`30`	`31`
`31`	`32`	`CognitoIdentityProviderClient {`
`32`	`33`	`this.region = it.region`
`33`		`- this.endpointResolver = it.endpoint?.let { endpoint ->`
`34`		`- AWSEndpointResolver(Endpoint(endpoint))`
	`34`	`+ this.endpointProvider = it.endpoint?.let { endpoint ->`
	`35`	`+ EndpointProvider { Endpoint(endpoint) }`
`35`	`36`	`}`
`36`	`37`	`}`
`37`	`38`	`}`