fix: Use a deterministic ordering for rest placeholders (#3333)

Deterministic outputs are required for automated testing of the micro-generator when comparing outputs between generators Co-authored-by: Brent Shaffer <[email protected]>
googleapis · Jan 21, 2021 · 267e4dd · 267e4dd
1 parent 1d7141f
commit 267e4dd
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 17 deletions.
diff --git a/src/main/java/com/google/api/codegen/transformer/php/PhpGapicSurfaceTransformer.java b/src/main/java/com/google/api/codegen/transformer/php/PhpGapicSurfaceTransformer.java
@@ -407,7 +407,9 @@ private List<RestPlaceholderConfigView> generateRestPlaceholderConfigViews(
       SurfaceNamer namer, Set<String> templateVars) {
     List<RestPlaceholderConfigView> placeholderViews = new ArrayList<>(templateVars.size());
 
-    for (String var : templateVars) {
+    List<String> templateVarsList = new ArrayList<>(templateVars);
+    Collections.sort(templateVarsList);
+    for (String var : templateVarsList) {
       placeholderViews.add(generateRestPlaceholderConfigView(namer, var));
     }
 

diff --git a/src/test/java/com/google/api/codegen/gapic/testdata/php/php_library.baseline b/src/test/java/com/google/api/codegen/gapic/testdata/php/php_library.baseline
@@ -5579,14 +5579,14 @@ return [
                     ],
                 ],
                 'placeholders' => [
-                    'name' => [
+                    'alt_book_name' => [
                         'getters' => [
-                            'getName',
+                            'getAltBookName',
                         ],
                     ],
-                    'alt_book_name' => [
+                    'name' => [
                         'getters' => [
-                            'getAltBookName',
+                            'getName',
                         ],
                     ],
                 ]

diff --git a/src/test/java/com/google/api/codegen/protoannotations/testdata/php_library.baseline b/src/test/java/com/google/api/codegen/protoannotations/testdata/php_library.baseline
@@ -6639,14 +6639,14 @@ return [
                     ],
                 ],
                 'placeholders' => [
-                    'name' => [
+                    'alt_book_name' => [
                         'getters' => [
-                            'getName',
+                            'getAltBookName',
                         ],
                     ],
-                    'alt_book_name' => [
+                    'name' => [
                         'getters' => [
-                            'getAltBookName',
+                            'getName',
                         ],
                     ],
                 ]

diff --git a/src/test/java/com/google/api/codegen/protoannotations/testdata/php_library_rest.baseline b/src/test/java/com/google/api/codegen/protoannotations/testdata/php_library_rest.baseline
@@ -3843,14 +3843,14 @@ return [
                     ],
                 ],
                 'placeholders' => [
-                    'name' => [
+                    'alt_book_name' => [
                         'getters' => [
-                            'getName',
+                            'getAltBookName',
                         ],
                     ],
-                    'alt_book_name' => [
+                    'name' => [
                         'getters' => [
-                            'getAltBookName',
+                            'getName',
                         ],
                     ],
                 ]

diff --git a/...oogle/api/codegen/protoannotations/testdata/php_library_with_grpc_service_config.baseline b/...oogle/api/codegen/protoannotations/testdata/php_library_with_grpc_service_config.baseline
@@ -6658,14 +6658,14 @@ return [
                     ],
                 ],
                 'placeholders' => [
-                    'name' => [
+                    'alt_book_name' => [
                         'getters' => [
-                            'getName',
+                            'getAltBookName',
                         ],
                     ],
-                    'alt_book_name' => [
+                    'name' => [
                         'getters' => [
-                            'getAltBookName',
+                            'getName',
                         ],
                     ],
                 ]