Merge branch 'main' into mattcreaser/api-regex-china

aws-amplify · Nov 15, 2024 · 18f1b1a · 18f1b1a
2 parents a1a2798 + 59bde4e
commit 18f1b1a
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 5 deletions.
diff --git a/apollo/apollo-appsync/src/main/java/com/amplifyframework/apollo/appsync/AppSyncEndpoint.kt b/apollo/apollo-appsync/src/main/java/com/amplifyframework/apollo/appsync/AppSyncEndpoint.kt
@@ -21,7 +21,7 @@ import java.net.URL
 import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 
 private val standardEndpointRegex =
-    "^https://\\w{26}\\.appsync-api\\.\\w{2}(?:-\\w{2,})+-\\d\\.amazonaws.com/graphql$".toRegex()
+    "^https://\\w{26}\\.appsync-api\\.\\w{2}(?:-\\w{2,})+-\\d\\.amazonaws.com(?:\\.cn)?/graphql$".toRegex()
 
 /**
  * Class representing the AppSync endpoint. There are multiple URLs associated with each AppSync endpoint: the

diff --git a/...o/apollo-appsync/src/test/java/com/amplifyframework/apollo/appsync/AppSyncEndpointTest.kt b/...o/apollo-appsync/src/test/java/com/amplifyframework/apollo/appsync/AppSyncEndpointTest.kt
@@ -26,6 +26,8 @@ import org.junit.Test
 
 class AppSyncEndpointTest {
     private val standardAppSyncUrl = "https://example1234567890123456789.appsync-api.us-east-1.amazonaws.com/graphql"
+    private val standardAppSyncUrlChina =
+        "https://example1234567890123456789.appsync-api.us-east-1.amazonaws.com.cn/graphql"
     private val customAppSyncUrl = "https://api.example.com/graphql"
 
     @Test
@@ -48,6 +50,13 @@ class AppSyncEndpointTest {
             "https://example1234567890123456789.appsync-realtime-api.us-east-1.amazonaws.com/graphql/connect"
     }
 
+    @Test
+    fun `uses expected realtime URL for standard endpoint in China`() {
+        val endpoint = AppSyncEndpoint(standardAppSyncUrlChina)
+        endpoint.websocketConnection.toString() shouldBe
+            "https://example1234567890123456789.appsync-realtime-api.us-east-1.amazonaws.com.cn/graphql/connect"
+    }
+
     @Test
     fun `uses expected realtime URL for custom endpoint`() {
         val endpoint = AppSyncEndpoint(customAppSyncUrl)

diff --git a/core-kotlin/src/main/java/com/amplifyframework/kotlin/core/Amplify.kt b/core-kotlin/src/main/java/com/amplifyframework/kotlin/core/Amplify.kt
@@ -41,11 +41,11 @@ import com.amplifyframework.logging.LoggingCategory
 @Suppress("unused")
 class Amplify {
     companion object {
-        val Analytics = AnalyticsCategory()
+        val Analytics: AnalyticsCategory = delegate.Analytics
         val API = KotlinApiFacade()
         val Auth = KotlinAuthFacade()
         val Geo = KotlinGeoFacade()
-        val Logging = LoggingCategory()
+        val Logging: LoggingCategory = delegate.Logging
         val Storage = KotlinStorageFacade()
         val Hub = KotlinHubFacade()
         val DataStore = KotlinDataStoreFacade()

diff --git a/rxbindings/src/main/java/com/amplifyframework/rx/RxAmplify.java b/rxbindings/src/main/java/com/amplifyframework/rx/RxAmplify.java
@@ -34,10 +34,10 @@ public final class RxAmplify {
     private RxAmplify() {}
 
     // Breaking the rules, here. Don't look.
-    @SuppressWarnings({"checkstyle:all"}) public static final AnalyticsCategory Analytics = new AnalyticsCategory();
+    @SuppressWarnings({"checkstyle:all"}) public static final AnalyticsCategory Analytics = Amplify.Analytics;
     @SuppressWarnings({"checkstyle:all"}) public static final RxApiCategoryBehavior API = new RxApiBinding();
     @SuppressWarnings({"checkstyle:all"}) public static final RxAuthCategoryBehavior Auth = new RxAuthBinding();
-    @SuppressWarnings({"checkstyle:all"}) public static final LoggingCategory Logging = new LoggingCategory();
+    @SuppressWarnings({"checkstyle:all"}) public static final LoggingCategory Logging = Amplify.Logging;
     @SuppressWarnings({"checkstyle:all"}) public static final RxStorageCategoryBehavior Storage = new RxStorageBinding();
     @SuppressWarnings({"checkstyle:all"}) public static final RxHubCategoryBehavior Hub = new RxHubBinding();
     @SuppressWarnings({"checkstyle:all"}) public static final RxDataStoreCategoryBehavior DataStore = new RxDataStoreBinding();