Skip to content

Commit 8c8ab88

Browse files
meltsufinmeltsufin
committed
PR feedback
1 parent bde778e commit 8c8ab88

6 files changed

Lines changed: 22 additions & 235 deletions

File tree

‎src/main/java/com/google/api/generator/gapic/protoparser/Parser.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -882,10 +882,8 @@ static String parsePageSizeFieldName(
882882
String pagedFieldName = null;
883883

884884
if (inputMessage != null
885-
&& inputMessage.fieldMap() != null
886885
&& inputMessage.fieldMap().containsKey("page_token")
887886
&& outputMessage != null
888-
&& outputMessage.fieldMap() != null
889887
&& outputMessage.fieldMap().containsKey("next_page_token")) {
890888
// List of potential field names representing page size.
891889
// page_size gets priority over max_results if both are present

‎src/main/java/com/google/api/generator/gapic/utils/ResourceReferenceUtils.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2020 Google LLC
1+
// Copyright 2021 Google LLC
22
//
33
// Licensed under the Apache License, Version 2.0 (the "License");
44
// you may not use this file except in compliance with the License.

‎src/test/java/com/google/api/generator/gapic/composer/common/TestProtoLoader.java‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -179,14 +179,6 @@ public GapicContext parseShowcaseMessaging() {
179179

180180
Map<String, Message> messageTypes = Parser.parseMessages(fileDescriptor);
181181
Map<String, ResourceName> resourceNames = Parser.parseResourceNames(fileDescriptor);
182-
183-
FileDescriptor identityFileDescriptor = IdentityOuterClass.getDescriptor();
184-
Map<String, ResourceName> identityResourceNames = Parser
185-
.parseResourceNames(identityFileDescriptor);
186-
187-
resourceNames.put("showcase.googleapis.com/User",
188-
identityResourceNames.get("showcase.googleapis.com/User"));
189-
190182
Set<ResourceName> outputResourceNames = new HashSet<>();
191183
List<Service> services =
192184
Parser.parseService(

‎src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/MessagingClient.golden‎

Lines changed: 18 additions & 216 deletions
Original file line numberDiff line numberDiff line change
@@ -483,26 +483,20 @@ public class MessagingClient implements BackgroundResource {
483483
* <pre>{@code
484484
* try (MessagingClient messagingClient = MessagingClient.create()) {
485485
* ProfileName parent = ProfileName.of("[USER]");
486-
* UserName user = UserName.of("[USER]");
487486
* ByteString image = ByteString.EMPTY;
488-
* Blurb response = messagingClient.createBlurb(parent, user, image);
487+
* Blurb response = messagingClient.createBlurb(parent, image);
489488
* }
490489
* }</pre>
491490
*
492491
* @param parent
493-
* @param user
494492
* @param image
495493
* @throws com.google.api.gax.rpc.ApiException if the remote call fails
496494
*/
497-
public final Blurb createBlurb(ProfileName parent, UserName user, ByteString image) {
495+
public final Blurb createBlurb(ProfileName parent, ByteString image) {
498496
CreateBlurbRequest request =
499497
CreateBlurbRequest.newBuilder()
500498
.setParent(parent == null ? null : parent.toString())
501-
.setBlurb(
502-
Blurb.newBuilder()
503-
.setUser(user == null ? null : user.toString())
504-
.setImage(image)
505-
.build())
499+
.setBlurb(Blurb.newBuilder().setImage(image).build())
506500
.build();
507501
return createBlurb(request);
508502
}
@@ -514,111 +508,20 @@ public class MessagingClient implements BackgroundResource {
514508
* <pre>{@code
515509
* try (MessagingClient messagingClient = MessagingClient.create()) {
516510
* ProfileName parent = ProfileName.of("[USER]");
517-
* UserName user = UserName.of("[USER]");
518511
* String text = "text3556653";
519-
* Blurb response = messagingClient.createBlurb(parent, user, text);
512+
* Blurb response = messagingClient.createBlurb(parent, text);
520513
* }
521514
* }</pre>
522515
*
523516
* @param parent
524-
* @param user
525517
* @param text
526518
* @throws com.google.api.gax.rpc.ApiException if the remote call fails
527519
*/
528-
public final Blurb createBlurb(ProfileName parent, UserName user, String text) {
520+
public final Blurb createBlurb(ProfileName parent, String text) {
529521
CreateBlurbRequest request =
530522
CreateBlurbRequest.newBuilder()
531523
.setParent(parent == null ? null : parent.toString())
532-
.setBlurb(
533-
Blurb.newBuilder()
534-
.setUser(user == null ? null : user.toString())
535-
.setText(text)
536-
.build())
537-
.build();
538-
return createBlurb(request);
539-
}
540-
541-
// AUTO-GENERATED DOCUMENTATION AND METHOD.
542-
/**
543-
* Sample code:
544-
*
545-
* <pre>{@code
546-
* try (MessagingClient messagingClient = MessagingClient.create()) {
547-
* ProfileName parent = ProfileName.of("[USER]");
548-
* String user = UserName.of("[USER]").toString();
549-
* ByteString image = ByteString.EMPTY;
550-
* Blurb response = messagingClient.createBlurb(parent, user, image);
551-
* }
552-
* }</pre>
553-
*
554-
* @param parent
555-
* @param user
556-
* @param image
557-
* @throws com.google.api.gax.rpc.ApiException if the remote call fails
558-
*/
559-
public final Blurb createBlurb(ProfileName parent, String user, ByteString image) {
560-
CreateBlurbRequest request =
561-
CreateBlurbRequest.newBuilder()
562-
.setParent(parent == null ? null : parent.toString())
563-
.setBlurb(Blurb.newBuilder().setUser(user).setImage(image).build())
564-
.build();
565-
return createBlurb(request);
566-
}
567-
568-
// AUTO-GENERATED DOCUMENTATION AND METHOD.
569-
/**
570-
* Sample code:
571-
*
572-
* <pre>{@code
573-
* try (MessagingClient messagingClient = MessagingClient.create()) {
574-
* ProfileName parent = ProfileName.of("[USER]");
575-
* String user = UserName.of("[USER]").toString();
576-
* String text = "text3556653";
577-
* Blurb response = messagingClient.createBlurb(parent, user, text);
578-
* }
579-
* }</pre>
580-
*
581-
* @param parent
582-
* @param user
583-
* @param text
584-
* @throws com.google.api.gax.rpc.ApiException if the remote call fails
585-
*/
586-
public final Blurb createBlurb(ProfileName parent, String user, String text) {
587-
CreateBlurbRequest request =
588-
CreateBlurbRequest.newBuilder()
589-
.setParent(parent == null ? null : parent.toString())
590-
.setBlurb(Blurb.newBuilder().setUser(user).setText(text).build())
591-
.build();
592-
return createBlurb(request);
593-
}
594-
595-
// AUTO-GENERATED DOCUMENTATION AND METHOD.
596-
/**
597-
* Sample code:
598-
*
599-
* <pre>{@code
600-
* try (MessagingClient messagingClient = MessagingClient.create()) {
601-
* RoomName parent = RoomName.of("[ROOM]");
602-
* UserName user = UserName.of("[USER]");
603-
* ByteString image = ByteString.EMPTY;
604-
* Blurb response = messagingClient.createBlurb(parent, user, image);
605-
* }
606-
* }</pre>
607-
*
608-
* @param parent
609-
* @param user
610-
* @param image
611-
* @throws com.google.api.gax.rpc.ApiException if the remote call fails
612-
*/
613-
public final Blurb createBlurb(RoomName parent, UserName user, ByteString image) {
614-
CreateBlurbRequest request =
615-
CreateBlurbRequest.newBuilder()
616-
.setParent(parent == null ? null : parent.toString())
617-
.setBlurb(
618-
Blurb.newBuilder()
619-
.setUser(user == null ? null : user.toString())
620-
.setImage(image)
621-
.build())
524+
.setBlurb(Blurb.newBuilder().setText(text).build())
622525
.build();
623526
return createBlurb(request);
624527
}
@@ -630,53 +533,20 @@ public class MessagingClient implements BackgroundResource {
630533
* <pre>{@code
631534
* try (MessagingClient messagingClient = MessagingClient.create()) {
632535
* RoomName parent = RoomName.of("[ROOM]");
633-
* UserName user = UserName.of("[USER]");
634-
* String text = "text3556653";
635-
* Blurb response = messagingClient.createBlurb(parent, user, text);
636-
* }
637-
* }</pre>
638-
*
639-
* @param parent
640-
* @param user
641-
* @param text
642-
* @throws com.google.api.gax.rpc.ApiException if the remote call fails
643-
*/
644-
public final Blurb createBlurb(RoomName parent, UserName user, String text) {
645-
CreateBlurbRequest request =
646-
CreateBlurbRequest.newBuilder()
647-
.setParent(parent == null ? null : parent.toString())
648-
.setBlurb(
649-
Blurb.newBuilder()
650-
.setUser(user == null ? null : user.toString())
651-
.setText(text)
652-
.build())
653-
.build();
654-
return createBlurb(request);
655-
}
656-
657-
// AUTO-GENERATED DOCUMENTATION AND METHOD.
658-
/**
659-
* Sample code:
660-
*
661-
* <pre>{@code
662-
* try (MessagingClient messagingClient = MessagingClient.create()) {
663-
* RoomName parent = RoomName.of("[ROOM]");
664-
* String user = UserName.of("[USER]").toString();
665536
* ByteString image = ByteString.EMPTY;
666-
* Blurb response = messagingClient.createBlurb(parent, user, image);
537+
* Blurb response = messagingClient.createBlurb(parent, image);
667538
* }
668539
* }</pre>
669540
*
670541
* @param parent
671-
* @param user
672542
* @param image
673543
* @throws com.google.api.gax.rpc.ApiException if the remote call fails
674544
*/
675-
public final Blurb createBlurb(RoomName parent, String user, ByteString image) {
545+
public final Blurb createBlurb(RoomName parent, ByteString image) {
676546
CreateBlurbRequest request =
677547
CreateBlurbRequest.newBuilder()
678548
.setParent(parent == null ? null : parent.toString())
679-
.setBlurb(Blurb.newBuilder().setUser(user).setImage(image).build())
549+
.setBlurb(Blurb.newBuilder().setImage(image).build())
680550
.build();
681551
return createBlurb(request);
682552
}
@@ -688,84 +558,20 @@ public class MessagingClient implements BackgroundResource {
688558
* <pre>{@code
689559
* try (MessagingClient messagingClient = MessagingClient.create()) {
690560
* RoomName parent = RoomName.of("[ROOM]");
691-
* String user = UserName.of("[USER]").toString();
692561
* String text = "text3556653";
693-
* Blurb response = messagingClient.createBlurb(parent, user, text);
562+
* Blurb response = messagingClient.createBlurb(parent, text);
694563
* }
695564
* }</pre>
696565
*
697566
* @param parent
698-
* @param user
699567
* @param text
700568
* @throws com.google.api.gax.rpc.ApiException if the remote call fails
701569
*/
702-
public final Blurb createBlurb(RoomName parent, String user, String text) {
570+
public final Blurb createBlurb(RoomName parent, String text) {
703571
CreateBlurbRequest request =
704572
CreateBlurbRequest.newBuilder()
705573
.setParent(parent == null ? null : parent.toString())
706-
.setBlurb(Blurb.newBuilder().setUser(user).setText(text).build())
707-
.build();
708-
return createBlurb(request);
709-
}
710-
711-
// AUTO-GENERATED DOCUMENTATION AND METHOD.
712-
/**
713-
* Sample code:
714-
*
715-
* <pre>{@code
716-
* try (MessagingClient messagingClient = MessagingClient.create()) {
717-
* String parent = ProfileName.of("[USER]").toString();
718-
* UserName user = UserName.of("[USER]");
719-
* ByteString image = ByteString.EMPTY;
720-
* Blurb response = messagingClient.createBlurb(parent, user, image);
721-
* }
722-
* }</pre>
723-
*
724-
* @param parent
725-
* @param user
726-
* @param image
727-
* @throws com.google.api.gax.rpc.ApiException if the remote call fails
728-
*/
729-
public final Blurb createBlurb(String parent, UserName user, ByteString image) {
730-
CreateBlurbRequest request =
731-
CreateBlurbRequest.newBuilder()
732-
.setParent(parent)
733-
.setBlurb(
734-
Blurb.newBuilder()
735-
.setUser(user == null ? null : user.toString())
736-
.setImage(image)
737-
.build())
738-
.build();
739-
return createBlurb(request);
740-
}
741-
742-
// AUTO-GENERATED DOCUMENTATION AND METHOD.
743-
/**
744-
* Sample code:
745-
*
746-
* <pre>{@code
747-
* try (MessagingClient messagingClient = MessagingClient.create()) {
748-
* String parent = ProfileName.of("[USER]").toString();
749-
* UserName user = UserName.of("[USER]");
750-
* String text = "text3556653";
751-
* Blurb response = messagingClient.createBlurb(parent, user, text);
752-
* }
753-
* }</pre>
754-
*
755-
* @param parent
756-
* @param user
757-
* @param text
758-
* @throws com.google.api.gax.rpc.ApiException if the remote call fails
759-
*/
760-
public final Blurb createBlurb(String parent, UserName user, String text) {
761-
CreateBlurbRequest request =
762-
CreateBlurbRequest.newBuilder()
763-
.setParent(parent)
764-
.setBlurb(
765-
Blurb.newBuilder()
766-
.setUser(user == null ? null : user.toString())
767-
.setText(text)
768-
.build())
574+
.setBlurb(Blurb.newBuilder().setText(text).build())
769575
.build();
770576
return createBlurb(request);
771577
}
@@ -777,22 +583,20 @@ public class MessagingClient implements BackgroundResource {
777583
* <pre>{@code
778584
* try (MessagingClient messagingClient = MessagingClient.create()) {
779585
* String parent = ProfileName.of("[USER]").toString();
780-
* String user = UserName.of("[USER]").toString();
781586
* ByteString image = ByteString.EMPTY;
782-
* Blurb response = messagingClient.createBlurb(parent, user, image);
587+
* Blurb response = messagingClient.createBlurb(parent, image);
783588
* }
784589
* }</pre>
785590
*
786591
* @param parent
787-
* @param user
788592
* @param image
789593
* @throws com.google.api.gax.rpc.ApiException if the remote call fails
790594
*/
791-
public final Blurb createBlurb(String parent, String user, ByteString image) {
595+
public final Blurb createBlurb(String parent, ByteString image) {
792596
CreateBlurbRequest request =
793597
CreateBlurbRequest.newBuilder()
794598
.setParent(parent)
795-
.setBlurb(Blurb.newBuilder().setUser(user).setImage(image).build())
599+
.setBlurb(Blurb.newBuilder().setImage(image).build())
796600
.build();
797601
return createBlurb(request);
798602
}
@@ -804,22 +608,20 @@ public class MessagingClient implements BackgroundResource {
804608
* <pre>{@code
805609
* try (MessagingClient messagingClient = MessagingClient.create()) {
806610
* String parent = ProfileName.of("[USER]").toString();
807-
* String user = UserName.of("[USER]").toString();
808611
* String text = "text3556653";
809-
* Blurb response = messagingClient.createBlurb(parent, user, text);
612+
* Blurb response = messagingClient.createBlurb(parent, text);
810613
* }
811614
* }</pre>
812615
*
813616
* @param parent
814-
* @param user
815617
* @param text
816618
* @throws com.google.api.gax.rpc.ApiException if the remote call fails
817619
*/
818-
public final Blurb createBlurb(String parent, String user, String text) {
620+
public final Blurb createBlurb(String parent, String text) {
819621
CreateBlurbRequest request =
820622
CreateBlurbRequest.newBuilder()
821623
.setParent(parent)
822-
.setBlurb(Blurb.newBuilder().setUser(user).setText(text).build())
624+
.setBlurb(Blurb.newBuilder().setText(text).build())
823625
.build();
824626
return createBlurb(request);
825627
}

‎src/test/java/com/google/api/generator/gapic/testdata/compliance.proto‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ syntax = "proto3";
1616

1717
import "google/api/annotations.proto";
1818
import "google/api/client.proto";
19+
import "google/cloud/extended_operations.proto";
1920

2021
package google.showcase.v1beta1;
2122

0 commit comments

Comments
 (0)