From 98b891ffcc6d5eb935f600b2aef3636cb78b1943 Mon Sep 17 00:00:00 2001
From: Chanseok Oh <chanseok@google.com>
Date: Mon, 20 Sep 2021 12:27:49 -0400
Subject: [PATCH] Fix preserving sorted order of a collection (#845)

---
 .../generator/gapic/protoparser/Parser.java   | 20 +++++++++----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/google/api/generator/gapic/protoparser/Parser.java b/src/main/java/com/google/api/generator/gapic/protoparser/Parser.java
index 42e2abaa2f..8fd376b7e0 100644
--- a/src/main/java/com/google/api/generator/gapic/protoparser/Parser.java
+++ b/src/main/java/com/google/api/generator/gapic/protoparser/Parser.java
@@ -115,8 +115,8 @@ public static GapicContext parse(CodeGeneratorRequest request) {
     boolean willGenerateMetadata = PluginArgumentParser.hasMetadataFlag(request);
 
     Optional<String> serviceConfigPathOpt = PluginArgumentParser.parseJsonConfigPath(request);
-    String serviceConfigPath = serviceConfigPathOpt.isPresent() ? serviceConfigPathOpt.get() : null;
-    Optional<GapicServiceConfig> serviceConfigOpt = ServiceConfigParser.parse(serviceConfigPath);
+    Optional<GapicServiceConfig> serviceConfigOpt =
+        ServiceConfigParser.parse(serviceConfigPathOpt.orElse(null));
     if (serviceConfigOpt.isPresent()) {
       GapicServiceConfig serviceConfig = serviceConfigOpt.get();
       serviceConfig.setLroRetrySettings(lroRetrySettingsOpt);
@@ -128,9 +128,7 @@ public static GapicContext parse(CodeGeneratorRequest request) {
     Optional<String> serviceYamlConfigPathOpt =
         PluginArgumentParser.parseServiceYamlConfigPath(request);
     Optional<com.google.api.Service> serviceYamlProtoOpt =
-        serviceYamlConfigPathOpt.isPresent()
-            ? ServiceYamlParser.parse(serviceYamlConfigPathOpt.get())
-            : Optional.empty();
+        serviceYamlConfigPathOpt.flatMap(ServiceYamlParser::parse);
 
     // Collect the resource references seen in messages.
     Set<ResourceReference> outputResourceReferencesSeen = new HashSet<>();
@@ -171,7 +169,7 @@ public static GapicContext parse(CodeGeneratorRequest request) {
       Function<ResourceName, String> typeNameFn =
           r -> r.resourceTypeString().substring(r.resourceTypeString().indexOf("/") + 1);
       Function<Set<ResourceName>, Set<String>> typeStringSetFn =
-          sr -> sr.stream().map(r -> typeNameFn.apply(r)).collect(Collectors.toSet());
+          sr -> sr.stream().map(typeNameFn).collect(Collectors.toSet());
 
       // Include all resource names present in message types for backwards-compatibility with the
       // monolith. In the future, this should be removed on a client library major semver update.
@@ -202,9 +200,9 @@ public static GapicContext parse(CodeGeneratorRequest request) {
         .setMessages(messages)
         .setResourceNames(resourceNames)
         .setHelperResourceNames(outputArgResourceNames)
-        .setServiceConfig(serviceConfigOpt.isPresent() ? serviceConfigOpt.get() : null)
+        .setServiceConfig(serviceConfigOpt.orElse(null))
         .setGapicMetadataEnabled(willGenerateMetadata)
-        .setServiceYamlProto(serviceYamlProtoOpt.isPresent() ? serviceYamlProtoOpt.get() : null)
+        .setServiceYamlProto(serviceYamlProtoOpt.orElse(null))
         .setTransport(transport)
         .build();
   }
@@ -378,7 +376,7 @@ public static List<Service> parseServices(
     outputMixinServices.addAll(
         outputMixinServiceSet.stream()
             .sorted((s1, s2) -> s2.name().compareTo(s1.name()))
-            .collect(Collectors.toSet()));
+            .collect(Collectors.toList()));
     return services;
   }
 
@@ -533,7 +531,7 @@ public static Map<String, Message> parseMessages(
 
   private static Map<String, Message> parseMessages(
       Descriptor messageDescriptor, Set<ResourceReference> outputResourceReferencesSeen) {
-    return parseMessages(messageDescriptor, outputResourceReferencesSeen, new ArrayList<String>());
+    return parseMessages(messageDescriptor, outputResourceReferencesSeen, new ArrayList<>());
   }
 
   private static Map<String, Message> parseMessages(
@@ -829,7 +827,7 @@ static String parsePageSizeFieldName(
 
   @VisibleForTesting
   static String sanitizeDefaultHost(String rawDefaultHost) {
-    if (rawDefaultHost.indexOf(COLON) >= 0) {
+    if (rawDefaultHost.contains(COLON)) {
       // A port is already present, just return the existing string.
       return rawDefaultHost;
     }