use same pagination customization for both sync and async classes

Author: varunnvs92

codegen/src/main/java/software/amazon/awssdk/codegen/emitters/tasks/PaginatorsGeneratorTasks.java

@@ -25,7 +25,6 @@
 import software.amazon.awssdk.codegen.emitters.GeneratorTask;
 import software.amazon.awssdk.codegen.emitters.GeneratorTaskParams;
 import software.amazon.awssdk.codegen.emitters.PoetGeneratorTask;
-import software.amazon.awssdk.codegen.model.config.customization.PaginationSubstitution;
 import software.amazon.awssdk.codegen.model.service.PaginatorDefinition;
 import software.amazon.awssdk.codegen.poet.ClassSpec;
 import software.amazon.awssdk.codegen.poet.paginators.AsyncResponseClassSpec;
@@ -35,8 +34,10 @@
 
 public class PaginatorsGeneratorTasks extends BaseGeneratorTasks {
 
+    private static final String SAME_TOKEN_CUSTOMIZATION = "LastPageHasPreviousToken";
+
     private final String paginatorsClassDir;
-    private final Map<String, PaginationSubstitution> customization;
+    private final Map<String, String> customization;
 
     public PaginatorsGeneratorTasks(GeneratorTaskParams dependencies) {
         super(dependencies);
@@ -68,8 +69,7 @@ private GeneratorTask createSyncTask(Map.Entry<String, PaginatorDefinition> entr
         ClassSpec classSpec = new SyncResponseClassSpec(model, entry.getKey(), entry.getValue());
 
         if (customization != null && customization.containsKey(entry.getKey())) {
-            String sync = customization.get(entry.getKey()).getSync();
-            if (sync != null && sync.equals("SameTokenSyncResponseClassSpec")) {
+            if (SAME_TOKEN_CUSTOMIZATION.equals(customization.get(entry.getKey()))) {
                 classSpec = new SameTokenSyncResponseClassSpec(model, entry.getKey(), entry.getValue());
             }
         }
@@ -81,8 +81,7 @@ private GeneratorTask createAsyncTask(Map.Entry<String, PaginatorDefinition> ent
         ClassSpec classSpec = new AsyncResponseClassSpec(model, entry.getKey(), entry.getValue());
 
         if (customization != null && customization.containsKey(entry.getKey())) {
-            String async = customization.get(entry.getKey()).getAsync();
-            if (async != null && async.equals("SameTokenAsyncResponseClassSpec")) {
+            if (SAME_TOKEN_CUSTOMIZATION.equals(customization.get(entry.getKey()))) {
                 classSpec = new SameTokenAsyncResponseClassSpec(model, entry.getKey(), entry.getValue());
             }
         }

codegen/src/main/java/software/amazon/awssdk/codegen/model/config/customization/CustomizationConfig.java

@@ -150,10 +150,9 @@ public class CustomizationConfig {
     /**
      * Map of paginated operations that use custom class generation.
      * Key - c2j operation name
-     * Value - {@link PaginationSubstitution} object with details about the customizations for
-     *          sync and async response classes
+     * Value - indicates the type of pagination strategy to use
      */
-    private Map<String, PaginationSubstitution> paginationCustomization;
+    private Map<String, String> paginationCustomization;
 
     private CustomizationConfig() {
     }
@@ -387,11 +386,11 @@ public void setCustomProtocolFactoryFqcn(String customProtocolFactoryFqcn) {
         this.customProtocolFactoryFqcn = customProtocolFactoryFqcn;
     }
 
-    public Map<String, PaginationSubstitution> getPaginationCustomization() {
+    public Map<String, String> getPaginationCustomization() {
         return paginationCustomization;
     }
 
-    public void setPaginationCustomization(Map<String, PaginationSubstitution> paginationCustomization) {
+    public void setPaginationCustomization(Map<String, String> paginationCustomization) {
         this.paginationCustomization = paginationCustomization;
     }
 }

codegen/src/main/java/software/amazon/awssdk/codegen/model/config/customization/PaginationSubstitution.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.

codegen/src/main/java/software/amazon/awssdk/codegen/poet/paginators/customizations/SameTokenAsyncResponseClassSpec.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.

codegen/src/main/java/software/amazon/awssdk/codegen/poet/paginators/customizations/SameTokenSyncResponseClassSpec.java

@@ -26,7 +26,6 @@
 import software.amazon.awssdk.codegen.C2jModels;
 import software.amazon.awssdk.codegen.IntermediateModelBuilder;
 import software.amazon.awssdk.codegen.model.config.customization.CustomizationConfig;
-import software.amazon.awssdk.codegen.model.config.customization.PaginationSubstitution;
 import software.amazon.awssdk.codegen.model.intermediate.IntermediateModel;
 import software.amazon.awssdk.codegen.model.service.PaginatorDefinition;
 import software.amazon.awssdk.codegen.model.service.Paginators;
@@ -38,9 +37,10 @@
 
 public class PaginatedResponseClassSpecTest {
 
+    private static final String SAME_TOKEN_CUSTOMIZATION = "LastPageHasPreviousToken";
     private static IntermediateModel intermediateModel;
     private static Paginators paginators;
-    private static Map<String, PaginationSubstitution> customization;
+    private static Map<String, String> paginationCustomization;
 
     @BeforeClass
     public static void setUp() throws IOException {
@@ -60,7 +60,7 @@ public static void setUp() throws IOException {
                      .build())
             .build();
 
-        customization = intermediateModel.getCustomizationConfig().getPaginationCustomization();
+        paginationCustomization = intermediateModel.getCustomizationConfig().getPaginationCustomization();
     }
 
     private static Paginators getPaginatorsModel(File file) {
@@ -96,17 +96,17 @@ private ClassSpec getSyncResponseSpec(Map.Entry<String, PaginatorDefinition> ent
                                                         entry.getKey(),
                                                         entry.getValue());
 
-        if (customization != null && customization.containsKey(entry.getKey())) {
-            String sync = customization.get(entry.getKey()).getSync();
-            switch (sync) {
-                case "SameTokenSyncResponseClassSpec":
+        if (paginationCustomization != null && paginationCustomization.containsKey(entry.getKey())) {
+            String customvalue = paginationCustomization.get(entry.getKey());
+            switch (customvalue) {
+                case SAME_TOKEN_CUSTOMIZATION:
                     classSpec = new SameTokenSyncResponseClassSpec(intermediateModel,
                                                                    entry.getKey(),
                                                                    entry.getValue());
                     break;
 
                 default:
-                    throw new IllegalArgumentException("Unknown customization value: " + sync);
+                    throw new IllegalArgumentException("Unknown paginationCustomization value: " + customvalue);
             }
         }
 
@@ -118,17 +118,17 @@ private ClassSpec getAsyncResponseSpec(Map.Entry<String, PaginatorDefinition> en
                                                          entry.getKey(),
                                                          entry.getValue());
 
-        if (customization != null && customization.containsKey(entry.getKey())) {
-            String async = customization.get(entry.getKey()).getAsync();
-            switch (async) {
-                case "SameTokenAsyncResponseClassSpec":
+        if (paginationCustomization != null && paginationCustomization.containsKey(entry.getKey())) {
+            String customvalue = paginationCustomization.get(entry.getKey());
+            switch (customvalue) {
+                case SAME_TOKEN_CUSTOMIZATION:
                     classSpec = new SameTokenAsyncResponseClassSpec(intermediateModel,
                                                                     entry.getKey(),
                                                                     entry.getValue());
                     break;
 
                 default:
-                    throw new IllegalArgumentException("Unknown customization value: " + async);
+                    throw new IllegalArgumentException("Unknown paginationCustomization value: " + customvalue);
             }
         }
 

codegen/src/test/java/software/amazon/awssdk/codegen/poet/paginators/PaginatedResponseClassSpecTest.java

@@ -6,9 +6,6 @@
     ],
     "verifiedSimpleMethods" : ["paginatedOperationWithResultKey"],
     "paginationCustomization": {
-        "SameTokenPaginationApi" : {
-            "sync" : "SameTokenSyncResponseClassSpec",
-            "async": "SameTokenAsyncResponseClassSpec"
-        }
+        "SameTokenPaginationApi" : "LastPageHasPreviousToken"
     }
 }

codegen/src/test/resources/software/amazon/awssdk/codegen/poet/paginators/customization.config

@@ -12,9 +12,6 @@
       "describeResourcePolicies"
   ],
   "paginationCustomization": {
-    "GetLogEvents" : {
-        "sync" : "SameTokenSyncResponseClassSpec",
-        "async": "SameTokenAsyncResponseClassSpec"
-    }
+    "GetLogEvents" : "LastPageHasPreviousToken"
   }
 }