diff --git a/showcase/gapic-showcase/pom.xml b/showcase/gapic-showcase/pom.xml index 6d8bbb3e38..52ced35020 100644 --- a/showcase/gapic-showcase/pom.xml +++ b/showcase/gapic-showcase/pom.xml @@ -19,7 +19,7 @@ - 0.29.0 + 0.30.0 diff --git a/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/EchoClient.java b/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/EchoClient.java index b3f069a31b..f2aa7eee98 100644 --- a/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/EchoClient.java +++ b/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/EchoClient.java @@ -74,6 +74,7 @@ * .setSeverity(Severity.forNumber(0)) * .setHeader("header-1221270899") * .setOtherHeader("otherHeader-2026585667") + * .setRequestId("requestId693933066") * .build(); * EchoResponse response = echoClient.echo(request); * } @@ -437,6 +438,7 @@ public final OperationsClient getHttpJsonOperationsClient() { * .setSeverity(Severity.forNumber(0)) * .setHeader("header-1221270899") * .setOtherHeader("otherHeader-2026585667") + * .setRequestId("requestId693933066") * .build(); * EchoResponse response = echoClient.echo(request); * } @@ -467,6 +469,7 @@ public final EchoResponse echo(EchoRequest request) { * .setSeverity(Severity.forNumber(0)) * .setHeader("header-1221270899") * .setOtherHeader("otherHeader-2026585667") + * .setRequestId("requestId693933066") * .build(); * ApiFuture future = echoClient.echoCallable().futureCall(request); * // Do something. @@ -615,6 +618,7 @@ public final ServerStreamingCallable expandCallable * .setSeverity(Severity.forNumber(0)) * .setHeader("header-1221270899") * .setOtherHeader("otherHeader-2026585667") + * .setRequestId("requestId693933066") * .build(); * requestObserver.onNext(request); * } @@ -644,6 +648,7 @@ public final ClientStreamingCallable collectCallable( * .setSeverity(Severity.forNumber(0)) * .setHeader("header-1221270899") * .setOtherHeader("otherHeader-2026585667") + * .setRequestId("requestId693933066") * .build(); * bidiStream.send(request); * for (EchoResponse response : bidiStream) { diff --git a/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/TestingClient.java b/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/TestingClient.java index 8d531e99e6..cebb83e0b7 100644 --- a/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/TestingClient.java +++ b/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/TestingClient.java @@ -46,6 +46,8 @@ // AUTO-GENERATED DOCUMENTATION AND CLASS. /** * Service Description: A service to facilitate running discrete sets of tests against Showcase. + * Adding this comment with special characters for comment formatting tests: 1. + * (abra->kadabra->alakazam) 2) [Nonsense][]: `pokemon/*/psychic/*` * *

This class provides the ability to make remote calls to the backing service through method * calls that map to API methods. Sample code to get started: @@ -73,7 +75,7 @@ * Method Variants * * CreateSession - *

Creates a new testing session. + *

Creates a new testing session. Adding this comment with special characters for comment formatting tests: 1. (abra->kadabra->alakazam) 2) [Nonsense][]: `pokemon/*/psychic/*` * *

Request object method variants only take one parameter, a request object, which must be constructed before the call.

*
    @@ -366,7 +368,9 @@ public TestingStub getStub() { // AUTO-GENERATED DOCUMENTATION AND METHOD. /** - * Creates a new testing session. + * Creates a new testing session. Adding this comment with special characters for comment + * formatting tests: 1. (abra->kadabra->alakazam) 2) [Nonsense][]: + * `pokemon/*/psychic/*` * *

    Sample code: * @@ -392,7 +396,9 @@ public final Session createSession(CreateSessionRequest request) { // AUTO-GENERATED DOCUMENTATION AND METHOD. /** - * Creates a new testing session. + * Creates a new testing session. Adding this comment with special characters for comment + * formatting tests: 1. (abra->kadabra->alakazam) 2) [Nonsense][]: + * `pokemon/*/psychic/*` * *

    Sample code: * diff --git a/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/package-info.java b/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/package-info.java index 3e4b18d27e..8b10221563 100644 --- a/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/package-info.java +++ b/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/package-info.java @@ -75,6 +75,7 @@ * .setSeverity(Severity.forNumber(0)) * .setHeader("header-1221270899") * .setOtherHeader("otherHeader-2026585667") + * .setRequestId("requestId693933066") * .build(); * EchoResponse response = echoClient.echo(request); * } @@ -140,6 +141,8 @@ *

    ======================= TestingClient ======================= * *

    Service Description: A service to facilitate running discrete sets of tests against Showcase. + * Adding this comment with special characters for comment formatting tests: 1. + * (abra->kadabra->alakazam) 2) [Nonsense][]: `pokemon/*/psychic/*` * *

    Sample for TestingClient: * diff --git a/showcase/gapic-showcase/src/main/resources/META-INF/native-image/com.google.showcase.v1beta1/reflect-config.json b/showcase/gapic-showcase/src/main/resources/META-INF/native-image/com.google.showcase.v1beta1/reflect-config.json index 417da67b50..27722fa934 100644 --- a/showcase/gapic-showcase/src/main/resources/META-INF/native-image/com.google.showcase.v1beta1/reflect-config.json +++ b/showcase/gapic-showcase/src/main/resources/META-INF/native-image/com.google.showcase.v1beta1/reflect-config.json @@ -116,6 +116,33 @@ "allDeclaredClasses": true, "allPublicClasses": true }, + { + "name": "com.google.api.FieldInfo", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.api.FieldInfo$Builder", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.api.FieldInfo$Format", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, { "name": "com.google.api.GoSettings", "queryAllDeclaredConstructors": true, diff --git a/showcase/grpc-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/TestingGrpc.java b/showcase/grpc-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/TestingGrpc.java index 890e11e6ec..61c3d974e4 100644 --- a/showcase/grpc-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/TestingGrpc.java +++ b/showcase/grpc-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/TestingGrpc.java @@ -6,6 +6,9 @@ *

      * A service to facilitate running discrete sets of tests
      * against Showcase.
    + * Adding this comment with special characters for comment formatting tests:
    + * 1. (abra->kadabra->alakazam)
    + * 2) [Nonsense][]: `pokemon/*/psychic/*`
      * 
    */ @javax.annotation.Generated( @@ -315,6 +318,9 @@ public TestingFutureStub newStub(io.grpc.Channel channel, io.grpc.CallOptions ca *
        * A service to facilitate running discrete sets of tests
        * against Showcase.
    +   * Adding this comment with special characters for comment formatting tests:
    +   * 1. (abra->kadabra->alakazam)
    +   * 2) [Nonsense][]: `pokemon/*/psychic/*`
        * 
    */ public interface AsyncService { @@ -322,6 +328,9 @@ public interface AsyncService { /** *
          * Creates a new testing session.
    +     * Adding this comment with special characters for comment formatting tests:
    +     * 1. (abra->kadabra->alakazam)
    +     * 2) [Nonsense][]: `pokemon/*/psychic/*`
          * 
    */ default void createSession(com.google.showcase.v1beta1.CreateSessionRequest request, @@ -412,6 +421,9 @@ default void verifyTest(com.google.showcase.v1beta1.VerifyTestRequest request, *
        * A service to facilitate running discrete sets of tests
        * against Showcase.
    +   * Adding this comment with special characters for comment formatting tests:
    +   * 1. (abra->kadabra->alakazam)
    +   * 2) [Nonsense][]: `pokemon/*/psychic/*`
        * 
    */ public static abstract class TestingImplBase @@ -427,6 +439,9 @@ public static abstract class TestingImplBase *
        * A service to facilitate running discrete sets of tests
        * against Showcase.
    +   * Adding this comment with special characters for comment formatting tests:
    +   * 1. (abra->kadabra->alakazam)
    +   * 2) [Nonsense][]: `pokemon/*/psychic/*`
        * 
    */ public static final class TestingStub @@ -445,6 +460,9 @@ protected TestingStub build( /** *
          * Creates a new testing session.
    +     * Adding this comment with special characters for comment formatting tests:
    +     * 1. (abra->kadabra->alakazam)
    +     * 2) [Nonsense][]: `pokemon/*/psychic/*`
          * 
    */ public void createSession(com.google.showcase.v1beta1.CreateSessionRequest request, @@ -543,6 +561,9 @@ public void verifyTest(com.google.showcase.v1beta1.VerifyTestRequest request, *
        * A service to facilitate running discrete sets of tests
        * against Showcase.
    +   * Adding this comment with special characters for comment formatting tests:
    +   * 1. (abra->kadabra->alakazam)
    +   * 2) [Nonsense][]: `pokemon/*/psychic/*`
        * 
    */ public static final class TestingBlockingStub @@ -561,6 +582,9 @@ protected TestingBlockingStub build( /** *
          * Creates a new testing session.
    +     * Adding this comment with special characters for comment formatting tests:
    +     * 1. (abra->kadabra->alakazam)
    +     * 2) [Nonsense][]: `pokemon/*/psychic/*`
          * 
    */ public com.google.showcase.v1beta1.Session createSession(com.google.showcase.v1beta1.CreateSessionRequest request) { @@ -651,6 +675,9 @@ public com.google.showcase.v1beta1.VerifyTestResponse verifyTest(com.google.show *
        * A service to facilitate running discrete sets of tests
        * against Showcase.
    +   * Adding this comment with special characters for comment formatting tests:
    +   * 1. (abra->kadabra->alakazam)
    +   * 2) [Nonsense][]: `pokemon/*/psychic/*`
        * 
    */ public static final class TestingFutureStub @@ -669,6 +696,9 @@ protected TestingFutureStub build( /** *
          * Creates a new testing session.
    +     * Adding this comment with special characters for comment formatting tests:
    +     * 1. (abra->kadabra->alakazam)
    +     * 2) [Nonsense][]: `pokemon/*/psychic/*`
          * 
    */ public com.google.common.util.concurrent.ListenableFuture createSession( diff --git a/showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/EchoOuterClass.java b/showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/EchoOuterClass.java index ee364911c9..68f346d533 100644 --- a/showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/EchoOuterClass.java +++ b/showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/EchoOuterClass.java @@ -127,111 +127,113 @@ public static void registerAllExtensions( "\n)schema/google/showcase/v1beta1/echo.pr" + "oto\022\027google.showcase.v1beta1\032\034google/api" + "/annotations.proto\032\027google/api/client.pr" + - "oto\032\037google/api/field_behavior.proto\032\030go" + - "ogle/api/routing.proto\032#google/longrunni" + - "ng/operations.proto\032\031google/protobuf/any" + - ".proto\032\036google/protobuf/duration.proto\032\037" + - "google/protobuf/timestamp.proto\032\027google/" + - "rpc/status.proto\"\254\001\n\013EchoRequest\022\021\n\007cont" + - "ent\030\001 \001(\tH\000\022#\n\005error\030\002 \001(\0132\022.google.rpc." + - "StatusH\000\0223\n\010severity\030\003 \001(\0162!.google.show" + - "case.v1beta1.Severity\022\016\n\006header\030\004 \001(\t\022\024\n" + - "\014other_header\030\005 \001(\tB\n\n\010response\"T\n\014EchoR" + - "esponse\022\017\n\007content\030\001 \001(\t\0223\n\010severity\030\002 \001" + - "(\0162!.google.showcase.v1beta1.Severity\"P\n" + - "\027EchoErrorDetailsRequest\022\032\n\022single_detai" + - "l_text\030\001 \001(\t\022\031\n\021multi_detail_text\030\002 \003(\t\"" + - "\362\002\n\030EchoErrorDetailsResponse\022U\n\rsingle_d" + - "etail\030\001 \001(\0132>.google.showcase.v1beta1.Ec" + - "hoErrorDetailsResponse.SingleDetail\022[\n\020m" + - "ultiple_details\030\002 \001(\0132A.google.showcase." + - "v1beta1.EchoErrorDetailsResponse.Multipl" + - "eDetails\032M\n\014SingleDetail\022=\n\005error\030\001 \001(\0132" + - "..google.showcase.v1beta1.ErrorWithSingl" + - "eDetail\032S\n\017MultipleDetails\022@\n\005error\030\001 \001(" + - "\01321.google.showcase.v1beta1.ErrorWithMul" + - "tipleDetails\">\n\025ErrorWithSingleDetail\022%\n" + - "\007details\030\001 \001(\0132\024.google.protobuf.Any\"A\n\030" + - "ErrorWithMultipleDetails\022%\n\007details\030\001 \003(" + - "\0132\024.google.protobuf.Any\"x\n\rExpandRequest" + - "\022\017\n\007content\030\001 \001(\t\022!\n\005error\030\002 \001(\0132\022.googl" + - "e.rpc.Status\0223\n\020stream_wait_time\030\003 \001(\0132\031" + - ".google.protobuf.Duration\"R\n\022PagedExpand" + - "Request\022\025\n\007content\030\001 \001(\tB\004\342A\001\002\022\021\n\tpage_s" + - "ize\030\002 \001(\005\022\022\n\npage_token\030\003 \001(\t\"Z\n\030PagedEx" + - "pandLegacyRequest\022\025\n\007content\030\001 \001(\tB\004\342A\001\002" + - "\022\023\n\013max_results\030\002 \001(\005\022\022\n\npage_token\030\003 \001(" + - "\t\"h\n\023PagedExpandResponse\0228\n\tresponses\030\001 " + - "\003(\0132%.google.showcase.v1beta1.EchoRespon" + - "se\022\027\n\017next_page_token\030\002 \001(\t\"(\n\027PagedExpa" + - "ndResponseList\022\r\n\005words\030\001 \003(\t\"\203\002\n\037PagedE" + - "xpandLegacyMappedResponse\022`\n\014alphabetize" + - "d\030\001 \003(\0132J.google.showcase.v1beta1.PagedE" + - "xpandLegacyMappedResponse.AlphabetizedEn" + - "try\022\027\n\017next_page_token\030\002 \001(\t\032e\n\021Alphabet" + - "izedEntry\022\013\n\003key\030\001 \001(\t\022?\n\005value\030\002 \001(\01320." + - "google.showcase.v1beta1.PagedExpandRespo" + - "nseList:\0028\001\"\331\001\n\013WaitRequest\022.\n\010end_time\030" + - "\001 \001(\0132\032.google.protobuf.TimestampH\000\022(\n\003t" + - "tl\030\004 \001(\0132\031.google.protobuf.DurationH\000\022#\n" + - "\005error\030\002 \001(\0132\022.google.rpc.StatusH\001\0228\n\007su" + - "ccess\030\003 \001(\0132%.google.showcase.v1beta1.Wa" + - "itResponseH\001B\005\n\003endB\n\n\010response\"\037\n\014WaitR" + - "esponse\022\017\n\007content\030\001 \001(\t\"<\n\014WaitMetadata" + - "\022,\n\010end_time\030\001 \001(\0132\032.google.protobuf.Tim" + - "estamp\"\255\001\n\014BlockRequest\0221\n\016response_dela" + - "y\030\001 \001(\0132\031.google.protobuf.Duration\022#\n\005er" + - "ror\030\002 \001(\0132\022.google.rpc.StatusH\000\0229\n\007succe" + - "ss\030\003 \001(\0132&.google.showcase.v1beta1.Block" + - "ResponseH\000B\n\n\010response\" \n\rBlockResponse\022" + - "\017\n\007content\030\001 \001(\t*D\n\010Severity\022\017\n\013UNNECESS" + - "ARY\020\000\022\r\n\tNECESSARY\020\001\022\n\n\006URGENT\020\002\022\014\n\010CRIT" + - "ICAL\020\0032\241\r\n\004Echo\022\224\003\n\004Echo\022$.google.showca" + - "se.v1beta1.EchoRequest\032%.google.showcase" + - ".v1beta1.EchoResponse\"\276\002\202\323\344\223\002\027\"\022/v1beta1" + - "/echo:echo:\001*\212\323\344\223\002\232\002\022\010\n\006header\022\031\n\006header" + - "\022\017{routing_id=**}\022+\n\006header\022!{table_name" + - "=regions/*/zones/*/**}\022\"\n\006header\022\030{super" + - "_id=projects/*}/**\0220\n\006header\022&{table_nam" + - "e=projects/*/instances/*/**}\0221\n\006header\022\'" + - "projects/*/{instance_id=instances/*}/**\022" + - "\030\n\014other_header\022\010{baz=**}\022#\n\014other_heade" + - "r\022\023{qux=projects/*}/**\022\237\001\n\020EchoErrorDeta" + - "ils\0220.google.showcase.v1beta1.EchoErrorD" + - "etailsRequest\0321.google.showcase.v1beta1." + - "EchoErrorDetailsResponse\"&\202\323\344\223\002 \"\033/v1bet" + - "a1/echo:error-details:\001*\022\212\001\n\006Expand\022&.go" + - "ogle.showcase.v1beta1.ExpandRequest\032%.go" + - "ogle.showcase.v1beta1.EchoResponse\"/\332A\rc" + - "ontent,error\202\323\344\223\002\031\"\024/v1beta1/echo:expand" + - ":\001*0\001\022z\n\007Collect\022$.google.showcase.v1bet" + - "a1.EchoRequest\032%.google.showcase.v1beta1" + - ".EchoResponse\" \202\323\344\223\002\032\"\025/v1beta1/echo:col" + - "lect:\001*(\001\022W\n\004Chat\022$.google.showcase.v1be" + - "ta1.EchoRequest\032%.google.showcase.v1beta" + - "1.EchoResponse(\0010\001\022\216\001\n\013PagedExpand\022+.goo" + - "gle.showcase.v1beta1.PagedExpandRequest\032" + - ",.google.showcase.v1beta1.PagedExpandRes" + - "ponse\"$\202\323\344\223\002\036\"\031/v1beta1/echo:pagedExpand" + - ":\001*\022\240\001\n\021PagedExpandLegacy\0221.google.showc" + - "ase.v1beta1.PagedExpandLegacyRequest\032,.g" + - "oogle.showcase.v1beta1.PagedExpandRespon" + - "se\"*\202\323\344\223\002$\"\037/v1beta1/echo:pagedExpandLeg" + - "acy:\001*\022\262\001\n\027PagedExpandLegacyMapped\022+.goo" + - "gle.showcase.v1beta1.PagedExpandRequest\032" + - "8.google.showcase.v1beta1.PagedExpandLeg" + - "acyMappedResponse\"0\202\323\344\223\002*\"%/v1beta1/echo" + - ":pagedExpandLegacyMapped:\001*\022\211\001\n\004Wait\022$.g" + - "oogle.showcase.v1beta1.WaitRequest\032\035.goo" + - "gle.longrunning.Operation\"<\312A\034\n\014WaitResp" + - "onse\022\014WaitMetadata\202\323\344\223\002\027\"\022/v1beta1/echo:" + - "wait:\001*\022v\n\005Block\022%.google.showcase.v1bet" + - "a1.BlockRequest\032&.google.showcase.v1beta" + - "1.BlockResponse\"\036\202\323\344\223\002\030\"\023/v1beta1/echo:b" + - "lock:\001*\032\021\312A\016localhost:7469Bq\n\033com.google" + - ".showcase.v1beta1P\001Z4github.com/googleap" + - "is/gapic-showcase/server/genproto\352\002\031Goog" + - "le::Showcase::V1beta1b\006proto3" + "oto\032\037google/api/field_behavior.proto\032\033go" + + "ogle/api/field_info.proto\032\030google/api/ro" + + "uting.proto\032#google/longrunning/operatio" + + "ns.proto\032\031google/protobuf/any.proto\032\036goo" + + "gle/protobuf/duration.proto\032\037google/prot" + + "obuf/timestamp.proto\032\027google/rpc/status." + + "proto\"\312\001\n\013EchoRequest\022\021\n\007content\030\001 \001(\tH\000" + + "\022#\n\005error\030\002 \001(\0132\022.google.rpc.StatusH\000\0223\n" + + "\010severity\030\003 \001(\0162!.google.showcase.v1beta" + + "1.Severity\022\016\n\006header\030\004 \001(\t\022\024\n\014other_head" + + "er\030\005 \001(\t\022\034\n\nrequest_id\030\007 \001(\tB\010\342\214\317\327\010\002\010\001B\n" + + "\n\010response\"T\n\014EchoResponse\022\017\n\007content\030\001 " + + "\001(\t\0223\n\010severity\030\002 \001(\0162!.google.showcase." + + "v1beta1.Severity\"P\n\027EchoErrorDetailsRequ" + + "est\022\032\n\022single_detail_text\030\001 \001(\t\022\031\n\021multi" + + "_detail_text\030\002 \003(\t\"\362\002\n\030EchoErrorDetailsR" + + "esponse\022U\n\rsingle_detail\030\001 \001(\0132>.google." + + "showcase.v1beta1.EchoErrorDetailsRespons" + + "e.SingleDetail\022[\n\020multiple_details\030\002 \001(\013" + + "2A.google.showcase.v1beta1.EchoErrorDeta" + + "ilsResponse.MultipleDetails\032M\n\014SingleDet" + + "ail\022=\n\005error\030\001 \001(\0132..google.showcase.v1b" + + "eta1.ErrorWithSingleDetail\032S\n\017MultipleDe" + + "tails\022@\n\005error\030\001 \001(\01321.google.showcase.v" + + "1beta1.ErrorWithMultipleDetails\">\n\025Error" + + "WithSingleDetail\022%\n\007details\030\001 \001(\0132\024.goog" + + "le.protobuf.Any\"A\n\030ErrorWithMultipleDeta" + + "ils\022%\n\007details\030\001 \003(\0132\024.google.protobuf.A" + + "ny\"x\n\rExpandRequest\022\017\n\007content\030\001 \001(\t\022!\n\005" + + "error\030\002 \001(\0132\022.google.rpc.Status\0223\n\020strea" + + "m_wait_time\030\003 \001(\0132\031.google.protobuf.Dura" + + "tion\"R\n\022PagedExpandRequest\022\025\n\007content\030\001 " + + "\001(\tB\004\342A\001\002\022\021\n\tpage_size\030\002 \001(\005\022\022\n\npage_tok" + + "en\030\003 \001(\t\"Z\n\030PagedExpandLegacyRequest\022\025\n\007" + + "content\030\001 \001(\tB\004\342A\001\002\022\023\n\013max_results\030\002 \001(\005" + + "\022\022\n\npage_token\030\003 \001(\t\"h\n\023PagedExpandRespo" + + "nse\0228\n\tresponses\030\001 \003(\0132%.google.showcase" + + ".v1beta1.EchoResponse\022\027\n\017next_page_token" + + "\030\002 \001(\t\"(\n\027PagedExpandResponseList\022\r\n\005wor" + + "ds\030\001 \003(\t\"\203\002\n\037PagedExpandLegacyMappedResp" + + "onse\022`\n\014alphabetized\030\001 \003(\0132J.google.show" + + "case.v1beta1.PagedExpandLegacyMappedResp" + + "onse.AlphabetizedEntry\022\027\n\017next_page_toke" + + "n\030\002 \001(\t\032e\n\021AlphabetizedEntry\022\013\n\003key\030\001 \001(" + + "\t\022?\n\005value\030\002 \001(\01320.google.showcase.v1bet" + + "a1.PagedExpandResponseList:\0028\001\"\331\001\n\013WaitR" + + "equest\022.\n\010end_time\030\001 \001(\0132\032.google.protob" + + "uf.TimestampH\000\022(\n\003ttl\030\004 \001(\0132\031.google.pro" + + "tobuf.DurationH\000\022#\n\005error\030\002 \001(\0132\022.google" + + ".rpc.StatusH\001\0228\n\007success\030\003 \001(\0132%.google." + + "showcase.v1beta1.WaitResponseH\001B\005\n\003endB\n" + + "\n\010response\"\037\n\014WaitResponse\022\017\n\007content\030\001 " + + "\001(\t\"<\n\014WaitMetadata\022,\n\010end_time\030\001 \001(\0132\032." + + "google.protobuf.Timestamp\"\255\001\n\014BlockReque" + + "st\0221\n\016response_delay\030\001 \001(\0132\031.google.prot" + + "obuf.Duration\022#\n\005error\030\002 \001(\0132\022.google.rp" + + "c.StatusH\000\0229\n\007success\030\003 \001(\0132&.google.sho" + + "wcase.v1beta1.BlockResponseH\000B\n\n\010respons" + + "e\" \n\rBlockResponse\022\017\n\007content\030\001 \001(\t*D\n\010S" + + "everity\022\017\n\013UNNECESSARY\020\000\022\r\n\tNECESSARY\020\001\022" + + "\n\n\006URGENT\020\002\022\014\n\010CRITICAL\020\0032\241\r\n\004Echo\022\224\003\n\004E" + + "cho\022$.google.showcase.v1beta1.EchoReques" + + "t\032%.google.showcase.v1beta1.EchoResponse" + + "\"\276\002\202\323\344\223\002\027\"\022/v1beta1/echo:echo:\001*\212\323\344\223\002\232\002\022" + + "\010\n\006header\022\031\n\006header\022\017{routing_id=**}\022+\n\006" + + "header\022!{table_name=regions/*/zones/*/**" + + "}\022\"\n\006header\022\030{super_id=projects/*}/**\0220\n" + + "\006header\022&{table_name=projects/*/instance" + + "s/*/**}\0221\n\006header\022\'projects/*/{instance_" + + "id=instances/*}/**\022\030\n\014other_header\022\010{baz" + + "=**}\022#\n\014other_header\022\023{qux=projects/*}/*" + + "*\022\237\001\n\020EchoErrorDetails\0220.google.showcase" + + ".v1beta1.EchoErrorDetailsRequest\0321.googl" + + "e.showcase.v1beta1.EchoErrorDetailsRespo" + + "nse\"&\202\323\344\223\002 \"\033/v1beta1/echo:error-details" + + ":\001*\022\212\001\n\006Expand\022&.google.showcase.v1beta1" + + ".ExpandRequest\032%.google.showcase.v1beta1" + + ".EchoResponse\"/\332A\rcontent,error\202\323\344\223\002\031\"\024/" + + "v1beta1/echo:expand:\001*0\001\022z\n\007Collect\022$.go" + + "ogle.showcase.v1beta1.EchoRequest\032%.goog" + + "le.showcase.v1beta1.EchoResponse\" \202\323\344\223\002\032" + + "\"\025/v1beta1/echo:collect:\001*(\001\022W\n\004Chat\022$.g" + + "oogle.showcase.v1beta1.EchoRequest\032%.goo" + + "gle.showcase.v1beta1.EchoResponse(\0010\001\022\216\001" + + "\n\013PagedExpand\022+.google.showcase.v1beta1." + + "PagedExpandRequest\032,.google.showcase.v1b" + + "eta1.PagedExpandResponse\"$\202\323\344\223\002\036\"\031/v1bet" + + "a1/echo:pagedExpand:\001*\022\240\001\n\021PagedExpandLe" + + "gacy\0221.google.showcase.v1beta1.PagedExpa" + + "ndLegacyRequest\032,.google.showcase.v1beta" + + "1.PagedExpandResponse\"*\202\323\344\223\002$\"\037/v1beta1/" + + "echo:pagedExpandLegacy:\001*\022\262\001\n\027PagedExpan" + + "dLegacyMapped\022+.google.showcase.v1beta1." + + "PagedExpandRequest\0328.google.showcase.v1b" + + "eta1.PagedExpandLegacyMappedResponse\"0\202\323" + + "\344\223\002*\"%/v1beta1/echo:pagedExpandLegacyMap" + + "ped:\001*\022\211\001\n\004Wait\022$.google.showcase.v1beta" + + "1.WaitRequest\032\035.google.longrunning.Opera" + + "tion\"<\312A\034\n\014WaitResponse\022\014WaitMetadata\202\323\344" + + "\223\002\027\"\022/v1beta1/echo:wait:\001*\022v\n\005Block\022%.go" + + "ogle.showcase.v1beta1.BlockRequest\032&.goo" + + "gle.showcase.v1beta1.BlockResponse\"\036\202\323\344\223" + + "\002\030\"\023/v1beta1/echo:block:\001*\032\021\312A\016localhost" + + ":7469Bq\n\033com.google.showcase.v1beta1P\001Z4" + + "github.com/googleapis/gapic-showcase/ser" + + "ver/genproto\352\002\031Google::Showcase::V1beta1" + + "b\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor .internalBuildGeneratedFileFrom(descriptorData, @@ -239,6 +241,7 @@ public static void registerAllExtensions( com.google.api.AnnotationsProto.getDescriptor(), com.google.api.ClientProto.getDescriptor(), com.google.api.FieldBehaviorProto.getDescriptor(), + com.google.api.FieldInfoProto.getDescriptor(), com.google.api.RoutingProto.getDescriptor(), com.google.longrunning.OperationsProto.getDescriptor(), com.google.protobuf.AnyProto.getDescriptor(), @@ -251,7 +254,7 @@ public static void registerAllExtensions( internal_static_google_showcase_v1beta1_EchoRequest_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_google_showcase_v1beta1_EchoRequest_descriptor, - new java.lang.String[] { "Content", "Error", "Severity", "Header", "OtherHeader", "Response", }); + new java.lang.String[] { "Content", "Error", "Severity", "Header", "OtherHeader", "RequestId", "Response", }); internal_static_google_showcase_v1beta1_EchoResponse_descriptor = getDescriptor().getMessageTypes().get(1); internal_static_google_showcase_v1beta1_EchoResponse_fieldAccessorTable = new @@ -370,6 +373,7 @@ public static void registerAllExtensions( com.google.protobuf.ExtensionRegistry.newInstance(); registry.add(com.google.api.ClientProto.defaultHost); registry.add(com.google.api.FieldBehaviorProto.fieldBehavior); + registry.add(com.google.api.FieldInfoProto.fieldInfo); registry.add(com.google.api.AnnotationsProto.http); registry.add(com.google.api.ClientProto.methodSignature); registry.add(com.google.api.RoutingProto.routing); @@ -379,6 +383,7 @@ public static void registerAllExtensions( com.google.api.AnnotationsProto.getDescriptor(); com.google.api.ClientProto.getDescriptor(); com.google.api.FieldBehaviorProto.getDescriptor(); + com.google.api.FieldInfoProto.getDescriptor(); com.google.api.RoutingProto.getDescriptor(); com.google.longrunning.OperationsProto.getDescriptor(); com.google.protobuf.AnyProto.getDescriptor(); diff --git a/showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/EchoRequest.java b/showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/EchoRequest.java index bb3fd63095..75318a46a1 100644 --- a/showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/EchoRequest.java +++ b/showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/EchoRequest.java @@ -27,6 +27,7 @@ private EchoRequest() { severity_ = 0; header_ = ""; otherHeader_ = ""; + requestId_ = ""; } @java.lang.Override @@ -318,6 +319,53 @@ public java.lang.String getOtherHeader() { } } + public static final int REQUEST_ID_FIELD_NUMBER = 7; + @SuppressWarnings("serial") + private volatile java.lang.Object requestId_ = ""; + /** + *
    +   * Based on go/client-populate-request-id-design; subject to change
    +   * 
    + * + * string request_id = 7 [(.google.api.field_info) = { ... } + * @return The requestId. + */ + @java.lang.Override + public java.lang.String getRequestId() { + java.lang.Object ref = requestId_; + if (ref instanceof java.lang.String) { + return (java.lang.String) ref; + } else { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + requestId_ = s; + return s; + } + } + /** + *
    +   * Based on go/client-populate-request-id-design; subject to change
    +   * 
    + * + * string request_id = 7 [(.google.api.field_info) = { ... } + * @return The bytes for requestId. + */ + @java.lang.Override + public com.google.protobuf.ByteString + getRequestIdBytes() { + java.lang.Object ref = requestId_; + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + requestId_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + private byte memoizedIsInitialized = -1; @java.lang.Override public final boolean isInitialized() { @@ -347,6 +395,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(otherHeader_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 5, otherHeader_); } + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(requestId_)) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 7, requestId_); + } getUnknownFields().writeTo(output); } @@ -373,6 +424,9 @@ public int getSerializedSize() { if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(otherHeader_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(5, otherHeader_); } + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(requestId_)) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(7, requestId_); + } size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; @@ -393,6 +447,8 @@ public boolean equals(final java.lang.Object obj) { .equals(other.getHeader())) return false; if (!getOtherHeader() .equals(other.getOtherHeader())) return false; + if (!getRequestId() + .equals(other.getRequestId())) return false; if (!getResponseCase().equals(other.getResponseCase())) return false; switch (responseCase_) { case 1: @@ -423,6 +479,8 @@ public int hashCode() { hash = (53 * hash) + getHeader().hashCode(); hash = (37 * hash) + OTHER_HEADER_FIELD_NUMBER; hash = (53 * hash) + getOtherHeader().hashCode(); + hash = (37 * hash) + REQUEST_ID_FIELD_NUMBER; + hash = (53 * hash) + getRequestId().hashCode(); switch (responseCase_) { case 1: hash = (37 * hash) + CONTENT_FIELD_NUMBER; @@ -579,6 +637,7 @@ public Builder clear() { severity_ = 0; header_ = ""; otherHeader_ = ""; + requestId_ = ""; responseCase_ = 0; response_ = null; return this; @@ -624,6 +683,9 @@ private void buildPartial0(com.google.showcase.v1beta1.EchoRequest result) { if (((from_bitField0_ & 0x00000010) != 0)) { result.otherHeader_ = otherHeader_; } + if (((from_bitField0_ & 0x00000020) != 0)) { + result.requestId_ = requestId_; + } } private void buildPartialOneofs(com.google.showcase.v1beta1.EchoRequest result) { @@ -692,6 +754,11 @@ public Builder mergeFrom(com.google.showcase.v1beta1.EchoRequest other) { bitField0_ |= 0x00000010; onChanged(); } + if (!other.getRequestId().isEmpty()) { + requestId_ = other.requestId_; + bitField0_ |= 0x00000020; + onChanged(); + } switch (other.getResponseCase()) { case CONTENT: { responseCase_ = 1; @@ -761,6 +828,11 @@ public Builder mergeFrom( bitField0_ |= 0x00000010; break; } // case 42 + case 58: { + requestId_ = input.readStringRequireUtf8(); + bitField0_ |= 0x00000020; + break; + } // case 58 default: { if (!super.parseUnknownField(input, extensionRegistry, tag)) { done = true; // was an endgroup tag @@ -1344,6 +1416,98 @@ public Builder setOtherHeaderBytes( onChanged(); return this; } + + private java.lang.Object requestId_ = ""; + /** + *
    +     * Based on go/client-populate-request-id-design; subject to change
    +     * 
    + * + * string request_id = 7 [(.google.api.field_info) = { ... } + * @return The requestId. + */ + public java.lang.String getRequestId() { + java.lang.Object ref = requestId_; + if (!(ref instanceof java.lang.String)) { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + requestId_ = s; + return s; + } else { + return (java.lang.String) ref; + } + } + /** + *
    +     * Based on go/client-populate-request-id-design; subject to change
    +     * 
    + * + * string request_id = 7 [(.google.api.field_info) = { ... } + * @return The bytes for requestId. + */ + public com.google.protobuf.ByteString + getRequestIdBytes() { + java.lang.Object ref = requestId_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + requestId_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + /** + *
    +     * Based on go/client-populate-request-id-design; subject to change
    +     * 
    + * + * string request_id = 7 [(.google.api.field_info) = { ... } + * @param value The requestId to set. + * @return This builder for chaining. + */ + public Builder setRequestId( + java.lang.String value) { + if (value == null) { throw new NullPointerException(); } + requestId_ = value; + bitField0_ |= 0x00000020; + onChanged(); + return this; + } + /** + *
    +     * Based on go/client-populate-request-id-design; subject to change
    +     * 
    + * + * string request_id = 7 [(.google.api.field_info) = { ... } + * @return This builder for chaining. + */ + public Builder clearRequestId() { + requestId_ = getDefaultInstance().getRequestId(); + bitField0_ = (bitField0_ & ~0x00000020); + onChanged(); + return this; + } + /** + *
    +     * Based on go/client-populate-request-id-design; subject to change
    +     * 
    + * + * string request_id = 7 [(.google.api.field_info) = { ... } + * @param value The bytes for requestId to set. + * @return This builder for chaining. + */ + public Builder setRequestIdBytes( + com.google.protobuf.ByteString value) { + if (value == null) { throw new NullPointerException(); } + checkByteStringIsUtf8(value); + requestId_ = value; + bitField0_ |= 0x00000020; + onChanged(); + return this; + } @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { diff --git a/showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/EchoRequestOrBuilder.java b/showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/EchoRequestOrBuilder.java index d804458923..6a4b297a58 100644 --- a/showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/EchoRequestOrBuilder.java +++ b/showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/EchoRequestOrBuilder.java @@ -123,5 +123,25 @@ public interface EchoRequestOrBuilder extends com.google.protobuf.ByteString getOtherHeaderBytes(); + /** + *
    +   * Based on go/client-populate-request-id-design; subject to change
    +   * 
    + * + * string request_id = 7 [(.google.api.field_info) = { ... } + * @return The requestId. + */ + java.lang.String getRequestId(); + /** + *
    +   * Based on go/client-populate-request-id-design; subject to change
    +   * 
    + * + * string request_id = 7 [(.google.api.field_info) = { ... } + * @return The bytes for requestId. + */ + com.google.protobuf.ByteString + getRequestIdBytes(); + com.google.showcase.v1beta1.EchoRequest.ResponseCase getResponseCase(); } diff --git a/showcase/proto-gapic-showcase-v1beta1/src/main/proto/schema/google/showcase/v1beta1/echo.proto b/showcase/proto-gapic-showcase-v1beta1/src/main/proto/schema/google/showcase/v1beta1/echo.proto index 101b37c25f..3e797adfc3 100644 --- a/showcase/proto-gapic-showcase-v1beta1/src/main/proto/schema/google/showcase/v1beta1/echo.proto +++ b/showcase/proto-gapic-showcase-v1beta1/src/main/proto/schema/google/showcase/v1beta1/echo.proto @@ -17,6 +17,7 @@ syntax = "proto3"; import "google/api/annotations.proto"; import "google/api/client.proto"; import "google/api/field_behavior.proto"; +import "google/api/field_info.proto"; import "google/api/routing.proto"; import "google/longrunning/operations.proto"; import "google/protobuf/any.proto"; @@ -209,6 +210,11 @@ message EchoRequest { // Optional. This field can be set to test the routing annotation on the Echo method. string other_header = 5; + + // Based on go/client-populate-request-id-design; subject to change + string request_id = 7 [ + (google.api.field_info).format = UUID4 + ]; } // The response message for the Echo methods. diff --git a/showcase/proto-gapic-showcase-v1beta1/src/main/proto/schema/google/showcase/v1beta1/testing.proto b/showcase/proto-gapic-showcase-v1beta1/src/main/proto/schema/google/showcase/v1beta1/testing.proto index 56e85e97e5..be66091074 100644 --- a/showcase/proto-gapic-showcase-v1beta1/src/main/proto/schema/google/showcase/v1beta1/testing.proto +++ b/showcase/proto-gapic-showcase-v1beta1/src/main/proto/schema/google/showcase/v1beta1/testing.proto @@ -28,12 +28,18 @@ option ruby_package = "Google::Showcase::V1beta1"; // A service to facilitate running discrete sets of tests // against Showcase. +// Adding this comment with special characters for comment formatting tests: +// 1. (abra->kadabra->alakazam) +// 2) [Nonsense][]: `pokemon/*/psychic/*` service Testing { // This service is meant to only run locally on the port 7469 (keypad digits // for "show"). option (google.api.default_host) = "localhost:7469"; // Creates a new testing session. + // Adding this comment with special characters for comment formatting tests: + // 1. (abra->kadabra->alakazam) + // 2) [Nonsense][]: `pokemon/*/psychic/*` rpc CreateSession(CreateSessionRequest) returns (Session) { option (google.api.http) = { post: "/v1beta1/sessions"