feat: add support for rest-only services in generator

spring-cloud-generator/java_gapic_spring.bzl

@@ -78,6 +78,7 @@ def java_gapic_spring_library(
         gapic_yaml = None,
         service_yaml = None,
         transport = None,
+        rest_numeric_enums = False,
         **kwargs):
     library_name = name + "-spring"
     raw_srcjar_name = name + "_raw"
@@ -89,6 +90,7 @@ def java_gapic_spring_library(
         gapic_yaml = gapic_yaml,
         service_yaml = service_yaml,
         transport = transport,
+        rest_numeric_enums = rest_numeric_enums,
         **kwargs
     )
 
@@ -105,6 +107,7 @@ def _java_gapic_spring_srcjar(
         gapic_yaml,
         service_yaml,
         transport,
+        rest_numeric_enums,
         # Can be used to provide a java_library with a customized generator,
         # like the one which dumps descriptor to a file for future debugging.
         java_generator_name = "java_gapic_spring",
@@ -128,6 +131,9 @@ def _java_gapic_spring_srcjar(
     if transport:
         opt_args.append("transport=%s" % transport)
 
+    if rest_numeric_enums:
+        opt_args.append("rest-numeric-enums")
+
     # Produces the GAPIC metadata file if this flag is set. to any value.
     # Protoc invocation: --java_gapic_opt=metadata
     plugin_args = ["metadata"]

spring-cloud-generator/pom.xml

@@ -51,6 +51,12 @@
             <version>4.12</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>com.google.truth</groupId>
+            <artifactId>truth</artifactId>
+            <version>1.1.3</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>

spring-cloud-generator/scripts/generate-library-list.sh

@@ -33,7 +33,6 @@ for d in ./google-cloud-java/*java-*/; do
   api_shortname=$(cat $d/.repo-metadata.json | jq -r .api_shortname)
   distribution_name=$(cat $d/.repo-metadata.json | jq -r .distribution_name)
   library_type=$(cat $d/.repo-metadata.json | jq -r .library_type)
-  transport=$(cat $d/.repo-metadata.json | jq -r .transport)
   release_level=$(cat $d/.repo-metadata.json | jq -r .release_level)
   monorepo_folder=$(basename $d)
 
@@ -44,10 +43,6 @@ for d in ./google-cloud-java/*java-*/; do
     echo "$d: non auto type: $library_type"
     continue
   fi
-  if [[ $transport != *grpc* ]] ; then
-    echo "$d: transport type not in scope: $transport"
-    continue
-  fi
   if [[ $group_id != "com.google.cloud" ]] ; then
     echo "$d: group_id not in scope: $group_id"
     continue

spring-cloud-generator/scripts/setup-build-rule.sh

@@ -33,7 +33,7 @@ GAPIC_RULE_FULL="$(buildozer 'print rule' $googleapis_folder/BUILD.bazel:%java_g
 buildozer "new java_gapic_spring_library $SPRING_RULE_NAME" $googleapis_folder/BUILD.bazel:__pkg__
 
 # Copy attributes from java_gapic_library rule
-attrs_array=("srcs" "grpc_service_config" "gapic_yaml" "service_yaml" "transport")
+attrs_array=("srcs" "grpc_service_config" "gapic_yaml" "service_yaml" "transport" "rest_numeric_enums")
 for attribute in "${attrs_array[@]}"
   do
     echo "$attribute"

spring-cloud-generator/src/main/java/com/google/cloud/generator/spring/composer/SpringAutoConfigClassComposer.java

@@ -113,7 +113,7 @@ public GapicClass generate(GapicContext context, Service service) {
     Expr thisExpr = ValueExpr.withValue(ThisObjectValue.withType(dynamicTypes.get(className)));
     Transport transport = context.transport();
     boolean hasRestOption =
-        (transport.equals(Transport.GRPC_REST) || transport.equals(Transport.REST))
+        transport.equals(Transport.GRPC_REST)
             && service.hasAnyEnabledMethodsForTransport(Transport.REST);
     String serviceSettingsMethodName = JavaStyle.toLowerCamelCase(service.name()) + "Settings";
 

spring-cloud-generator/src/main/java/com/google/cloud/generator/spring/composer/SpringComposer.java

@@ -24,7 +24,6 @@
 import com.google.api.generator.gapic.model.GapicClass;
 import com.google.api.generator.gapic.model.GapicContext;
 import com.google.api.generator.gapic.model.GapicPackageInfo;
-import com.google.api.generator.gapic.model.Transport;
 import com.google.common.collect.ImmutableList;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -66,12 +65,8 @@ protected static List<GapicClass> generatePerServiceClasses(GapicContext context
         .services()
         .forEach(
             s -> {
-              // Transport.REST is out of scope for Spring composers.
-              if (context.transport() == Transport.GRPC
-                  || context.transport() == Transport.GRPC_REST) {
-                clazzes.add(SpringAutoConfigClassComposer.instance().generate(context, s));
-                clazzes.add(SpringPropertiesClassComposer.instance().generate(context, s));
-              }
+              clazzes.add(SpringAutoConfigClassComposer.instance().generate(context, s));
+              clazzes.add(SpringPropertiesClassComposer.instance().generate(context, s));
             });
     return clazzes;
   }

spring-cloud-generator/src/main/java/com/google/cloud/generator/spring/composer/SpringPropertiesClassComposer.java

@@ -79,7 +79,7 @@ public GapicClass generate(GapicContext context, Service service) {
     Map<String, TypeNode> dynamicTypes = createDynamicTypes(service, packageName);
     Transport transport = context.transport();
     boolean hasRestOption =
-        (transport.equals(Transport.GRPC_REST) || transport.equals(Transport.REST))
+        transport.equals(Transport.GRPC_REST)
             && service.hasAnyEnabledMethodsForTransport(Transport.REST);
 
     // TODO: this is the prefix user will use to set properties, may need to change depending on

spring-cloud-generator/src/test/java/com/google/cloud/generator/spring/composer/SpringAutoConfigClassComposerTest.java

@@ -16,55 +16,82 @@
 
 package com.google.cloud.generator.spring.composer;
 
+import static com.google.common.truth.Truth.assertThat;
+
 import com.google.api.generator.gapic.model.GapicClass;
 import com.google.api.generator.gapic.model.GapicContext;
 import com.google.api.generator.gapic.model.Service;
 import com.google.api.generator.gapic.model.Transport;
 import com.google.cloud.generator.spring.utils.Assert;
 import com.google.cloud.generator.spring.utils.GrpcRestTestProtoLoader;
+import com.google.cloud.generator.spring.utils.RestTestProtoLoader;
 import com.google.cloud.generator.spring.utils.TestProtoLoader;
 import org.junit.Before;
 import org.junit.Test;
 
 public class SpringAutoConfigClassComposerTest {
-  private GapicContext context;
+  private GapicContext echoContext;
+  private GapicContext echoGrpcRestContext;
+  private GapicContext echoRestContext;
   private GapicContext wickedContext;
+
+  private GapicContext complianceContext;
   private Service echoProtoService;
+  private Service echoGrpcRestProtoService;
+  private Service echoRestProtoService;
   private Service wickedProtoService;
+  private Service complianceProtoService;
 
   @Before
   public void setUp() {
-    this.context = TestProtoLoader.instance().parseShowcaseEcho();
-    this.echoProtoService = this.context.services().get(0);
+    this.echoContext = TestProtoLoader.instance().parseShowcaseEcho();
+    this.echoProtoService = this.echoContext.services().get(0);
+    this.echoGrpcRestContext = GrpcRestTestProtoLoader.instance().parseShowcaseEcho();
+    this.echoGrpcRestProtoService = this.echoGrpcRestContext.services().get(0);
+    this.echoRestContext = RestTestProtoLoader.instance().parseShowcaseEcho();
+    this.echoRestProtoService = this.echoRestContext.services().get(0);
     this.wickedContext = GrpcRestTestProtoLoader.instance().parseShowcaseWicked();
     this.wickedProtoService = this.wickedContext.services().get(0);
+    this.complianceContext = RestTestProtoLoader.instance().parseCompliance();
+    this.complianceProtoService = this.complianceContext.services().get(0);
   }
 
   @Test
   public void generateAutoConfigClazzGrpcTest() {
+    assertThat(this.echoContext.transport()).isEqualTo(Transport.GRPC);
     GapicClass clazz =
-        SpringAutoConfigClassComposer.instance().generate(this.context, this.echoProtoService);
+        SpringAutoConfigClassComposer.instance().generate(this.echoContext, this.echoProtoService);
     String fileName = clazz.classDefinition().classIdentifier() + "Grpc.golden";
     Assert.assertGoldenClass(this.getClass(), clazz, fileName);
   }
 
   @Test
   public void generateAutoConfigClazzGrpcRestTest() {
-    GapicContext contextGrpcRest =
-        this.context.toBuilder().setTransport(Transport.GRPC_REST).build();
+    assertThat(this.echoGrpcRestContext.transport()).isEqualTo(Transport.GRPC_REST);
     GapicClass clazz =
-        SpringAutoConfigClassComposer.instance().generate(contextGrpcRest, this.echoProtoService);
+        SpringAutoConfigClassComposer.instance()
+            .generate(this.echoGrpcRestContext, this.echoGrpcRestProtoService);
     String fileName = clazz.classDefinition().classIdentifier() + "GrpcRest.golden";
     Assert.assertGoldenClass(this.getClass(), clazz, fileName);
   }
 
   @Test
   public void generateAutoConfigClazzNoRestRpcsTest() {
-    GapicContext contextGrpcRest =
-        this.wickedContext.toBuilder().setTransport(Transport.GRPC_REST).build();
+    assertThat(this.wickedContext.transport()).isEqualTo(Transport.GRPC_REST);
     GapicClass clazz =
-        SpringAutoConfigClassComposer.instance().generate(contextGrpcRest, this.wickedProtoService);
+        SpringAutoConfigClassComposer.instance()
+            .generate(this.wickedContext, this.wickedProtoService);
     String fileName = clazz.classDefinition().classIdentifier() + "NoRestRpcs.golden";
     Assert.assertGoldenClass(this.getClass(), clazz, fileName);
   }
+
+  @Test
+  public void generateAutoConfigClazzRestTest() {
+    assertThat(this.complianceContext.transport()).isEqualTo(Transport.REST);
+    GapicClass clazz =
+        SpringAutoConfigClassComposer.instance()
+            .generate(this.complianceContext, this.complianceProtoService);
+    String fileName = clazz.classDefinition().classIdentifier() + "Rest.golden";
+    Assert.assertGoldenClass(this.getClass(), clazz, fileName);
+  }
 }

spring-cloud-generator/src/test/java/com/google/cloud/generator/spring/composer/SpringPropertiesClassComposerTest.java

@@ -16,55 +16,82 @@
 
 package com.google.cloud.generator.spring.composer;
 
+import static com.google.common.truth.Truth.assertThat;
+
 import com.google.api.generator.gapic.model.GapicClass;
 import com.google.api.generator.gapic.model.GapicContext;
 import com.google.api.generator.gapic.model.Service;
 import com.google.api.generator.gapic.model.Transport;
 import com.google.cloud.generator.spring.utils.Assert;
 import com.google.cloud.generator.spring.utils.GrpcRestTestProtoLoader;
+import com.google.cloud.generator.spring.utils.RestTestProtoLoader;
 import com.google.cloud.generator.spring.utils.TestProtoLoader;
 import org.junit.Before;
 import org.junit.Test;
 
 public class SpringPropertiesClassComposerTest {
-  private GapicContext context;
+  private GapicContext echoContext;
+  private GapicContext echoGrpcRestContext;
+  private GapicContext echoRestContext;
   private GapicContext wickedContext;
+
+  private GapicContext complianceContext;
   private Service echoProtoService;
+  private Service echoGrpcRestProtoService;
+  private Service echoRestProtoService;
   private Service wickedProtoService;
+  private Service complianceProtoService;
 
   @Before
   public void setUp() {
-    this.context = TestProtoLoader.instance().parseShowcaseEcho();
-    this.echoProtoService = this.context.services().get(0);
+    this.echoContext = TestProtoLoader.instance().parseShowcaseEcho();
+    this.echoProtoService = this.echoContext.services().get(0);
+    this.echoGrpcRestContext = GrpcRestTestProtoLoader.instance().parseShowcaseEcho();
+    this.echoGrpcRestProtoService = this.echoGrpcRestContext.services().get(0);
+    this.echoRestContext = RestTestProtoLoader.instance().parseShowcaseEcho();
+    this.echoRestProtoService = this.echoRestContext.services().get(0);
     this.wickedContext = GrpcRestTestProtoLoader.instance().parseShowcaseWicked();
     this.wickedProtoService = this.wickedContext.services().get(0);
+    this.complianceContext = RestTestProtoLoader.instance().parseCompliance();
+    this.complianceProtoService = this.complianceContext.services().get(0);
   }
 
   @Test
   public void generatePropertiesClazzGrpcTest() {
+    assertThat(this.echoContext.transport()).isEqualTo(Transport.GRPC);
     GapicClass clazz =
-        SpringPropertiesClassComposer.instance().generate(this.context, this.echoProtoService);
+        SpringPropertiesClassComposer.instance().generate(this.echoContext, this.echoProtoService);
     String fileName = clazz.classDefinition().classIdentifier() + "Grpc.golden";
     Assert.assertGoldenClass(this.getClass(), clazz, fileName);
   }
 
   @Test
   public void generatePropertiesClazzGrpcRestTest() {
-    GapicContext contextGrpcRest =
-        this.context.toBuilder().setTransport(Transport.GRPC_REST).build();
+    assertThat(this.echoGrpcRestContext.transport()).isEqualTo(Transport.GRPC_REST);
     GapicClass clazz =
-        SpringPropertiesClassComposer.instance().generate(contextGrpcRest, this.echoProtoService);
+        SpringPropertiesClassComposer.instance()
+            .generate(this.echoGrpcRestContext, this.echoGrpcRestProtoService);
     String fileName = clazz.classDefinition().classIdentifier() + "GrpcRest.golden";
     Assert.assertGoldenClass(this.getClass(), clazz, fileName);
   }
 
   @Test
   public void generatePropertiesClazzNoRestRpcsTest() {
-    GapicContext contextGrpcRest =
-        this.wickedContext.toBuilder().setTransport(Transport.GRPC_REST).build();
+    assertThat(this.wickedContext.transport()).isEqualTo(Transport.GRPC_REST);
     GapicClass clazz =
-        SpringPropertiesClassComposer.instance().generate(contextGrpcRest, this.wickedProtoService);
+        SpringPropertiesClassComposer.instance()
+            .generate(this.wickedContext, this.wickedProtoService);
     String fileName = clazz.classDefinition().classIdentifier() + "NoRestRpcs.golden";
     Assert.assertGoldenClass(this.getClass(), clazz, fileName);
   }
+
+  @Test
+  public void generatePropertiesClazzRestTest() {
+    assertThat(this.complianceContext.transport()).isEqualTo(Transport.REST);
+    GapicClass clazz =
+        SpringPropertiesClassComposer.instance()
+            .generate(this.complianceContext, this.complianceProtoService);
+    String fileName = clazz.classDefinition().classIdentifier() + "Rest.golden";
+    Assert.assertGoldenClass(this.getClass(), clazz, fileName);
+  }
 }