From b9487a8cd91b64d6ad5b1d31a21b1b2684586969 Mon Sep 17 00:00:00 2001 From: Thomas Leing Date: Fri, 17 Mar 2023 17:08:47 -0700 Subject: [PATCH 1/2] Use better fallback for list query -- needs doublechecking for why this was the other method before --- .../com/amplifyframework/api/aws/AppSyncGraphQLRequest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aws-api-appsync/src/main/java/com/amplifyframework/api/aws/AppSyncGraphQLRequest.java b/aws-api-appsync/src/main/java/com/amplifyframework/api/aws/AppSyncGraphQLRequest.java index 0261381957..1743c6e258 100644 --- a/aws-api-appsync/src/main/java/com/amplifyframework/api/aws/AppSyncGraphQLRequest.java +++ b/aws-api-appsync/src/main/java/com/amplifyframework/api/aws/AppSyncGraphQLRequest.java @@ -160,7 +160,7 @@ public String getQuery() { modelName = modelSchema.getListPluralName() != null && !modelSchema.getListPluralName().isEmpty() ? Casing.capitalizeFirst(modelSchema.getListPluralName()) - : modelName + "s"; + : Casing.capitalizeFirst(modelSchema.getPluralName()); } else if (QueryType.SYNC.equals(operation)) { // The sync operation name is pluralized using pluralize.js, which uses more complex pluralization rules // than simply adding an 's' at the end (e.g. baby > babies, person > people, etc). This pluralized name From 05920d832e8e75d654d3af488b7b9319f1f2759f Mon Sep 17 00:00:00 2001 From: Thomas Leing Date: Sat, 25 Mar 2023 05:54:59 -0700 Subject: [PATCH 2/2] Full fallback, fix unit test --- .../api/aws/AppSyncGraphQLRequest.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/aws-api-appsync/src/main/java/com/amplifyframework/api/aws/AppSyncGraphQLRequest.java b/aws-api-appsync/src/main/java/com/amplifyframework/api/aws/AppSyncGraphQLRequest.java index 1743c6e258..a30c6d6e8c 100644 --- a/aws-api-appsync/src/main/java/com/amplifyframework/api/aws/AppSyncGraphQLRequest.java +++ b/aws-api-appsync/src/main/java/com/amplifyframework/api/aws/AppSyncGraphQLRequest.java @@ -156,19 +156,23 @@ public String getQuery() { } String modelName = Casing.capitalizeFirst(modelSchema.getName()); + String pluralName = modelSchema.getPluralName() != null && + !modelSchema.getPluralName().isEmpty() + ? Casing.capitalizeFirst(modelSchema.getPluralName()) + : modelName + "s"; if (QueryType.LIST.equals(operation)) { modelName = modelSchema.getListPluralName() != null && !modelSchema.getListPluralName().isEmpty() ? Casing.capitalizeFirst(modelSchema.getListPluralName()) - : Casing.capitalizeFirst(modelSchema.getPluralName()); + : pluralName; } else if (QueryType.SYNC.equals(operation)) { // The sync operation name is pluralized using pluralize.js, which uses more complex pluralization rules // than simply adding an 's' at the end (e.g. baby > babies, person > people, etc). This pluralized name // is an annotation on the codegen'd model class, so we will just grab it from the ModelSchema. modelName = modelSchema.getSyncPluralName() != null - && !modelSchema.getSyncPluralName().isEmpty() + && !modelSchema.getSyncPluralName().isEmpty() ? Casing.capitalizeFirst(modelSchema.getSyncPluralName()) - : Casing.capitalizeFirst(modelSchema.getPluralName()); + : pluralName; } String operationString =