File tree Expand file tree Collapse file tree 6 files changed +9
-27
lines changed
main/java/com/google/api/generator
test/java/com/google/api/generator/gapic/protoparser Expand file tree Collapse file tree 6 files changed +9
-27
lines changed Original file line number Diff line number Diff line change 1515package com .google .api .generator ;
1616
1717import com .google .api .generator .gapic .Generator ;
18- import com .google .api .generator .gapic .protoparser .NoServicesFoundException ;
1918import com .google .protobuf .ExtensionRegistry ;
2019import com .google .protobuf .compiler .PluginProtos .CodeGeneratorRequest ;
2120import com .google .protobuf .compiler .PluginProtos .CodeGeneratorResponse ;
@@ -26,12 +25,7 @@ public static void main(String[] args) throws IOException {
2625 ExtensionRegistry registry = ExtensionRegistry .newInstance ();
2726 ProtoRegistry .registerAllExtensions (registry );
2827 CodeGeneratorRequest request = CodeGeneratorRequest .parseFrom (System .in , registry );
29- try {
30- CodeGeneratorResponse response = Generator .generateGapic (request );
31- response .writeTo (System .out );
32- } catch (NoServicesFoundException ex ) {
33- // If no services are found in the protos we will no-op
34- System .err .println ("No services found to generate" );
35- }
28+ CodeGeneratorResponse response = Generator .generateGapic (request );
29+ response .writeTo (System .out );
3630 }
3731}
Original file line number Diff line number Diff line change 1414
1515package com .google .api .generator .gapic ;
1616
17- import com .google .api .gax .rpc .StatusCode .Code ;
1817import com .google .api .generator .gapic .composer .Composer ;
1918import com .google .api .generator .gapic .model .GapicClass ;
2019import com .google .api .generator .gapic .model .GapicContext ;
2120import com .google .api .generator .gapic .model .GapicPackageInfo ;
2221import com .google .api .generator .gapic .model .ReflectConfig ;
23- import com .google .api .generator .gapic .protoparser .NoServicesFoundException ;
2422import com .google .api .generator .gapic .protoparser .Parser ;
2523import com .google .api .generator .gapic .protowriter .Writer ;
2624import com .google .protobuf .compiler .PluginProtos .CodeGeneratorRequest ;
2725import com .google .protobuf .compiler .PluginProtos .CodeGeneratorResponse ;
2826import java .util .List ;
2927
3028public class Generator {
31- public static CodeGeneratorResponse generateGapic (CodeGeneratorRequest request )
32- throws NoServicesFoundException {
29+ public static CodeGeneratorResponse generateGapic (CodeGeneratorRequest request ) {
3330 GapicContext context = Parser .parse (request );
3431 List <GapicClass > clazzes = Composer .composeServiceClasses (context );
3532 GapicPackageInfo packageInfo = Composer .composePackageInfo (context );
Original file line number Diff line number Diff line change 2929import com .google .api .generator .gapic .model .GapicPackageInfo ;
3030import com .google .api .generator .gapic .model .Sample ;
3131import com .google .api .generator .gapic .model .Service ;
32- import com .google .api . generator . gapic . protoparser . NoServicesFoundException ;
32+ import com .google .common . base . Preconditions ;
3333import com .google .common .base .Strings ;
3434import javax .annotation .Generated ;
3535
@@ -44,9 +44,8 @@ public class ClientLibraryPackageInfoComposer {
4444 private static final String SERVICE_DESCRIPTION_HEADER_PATTERN = "Service Description: %s" ;
4545
4646 public static GapicPackageInfo generatePackageInfo (GapicContext context ) {
47- if (context .services ().isEmpty ()) {
48- throw new NoServicesFoundException ("No services found to generate" );
49- }
47+ Preconditions .checkState (!context .services ().isEmpty (), "No services found to generate" );
48+
5049 // Pick some service's package, as we assume they are all the same.
5150 String libraryPakkage = context .services ().get (0 ).pakkage ();
5251
Load Diff This file was deleted.
Original file line number Diff line number Diff line change @@ -115,7 +115,7 @@ public GapicParserException(String errorMessage) {
115115 }
116116 }
117117
118- public static GapicContext parse (CodeGeneratorRequest request ) throws NoServicesFoundException {
118+ public static GapicContext parse (CodeGeneratorRequest request ) {
119119 Optional <String > gapicYamlConfigPathOpt =
120120 PluginArgumentParser .parseGapicYamlConfigPath (request );
121121 Optional <List <GapicBatchingSettings >> batchingSettingsOpt =
@@ -176,7 +176,7 @@ public static GapicContext parse(CodeGeneratorRequest request) throws NoServices
176176 transport );
177177
178178 if (services .isEmpty ()) {
179- throw new NoServicesFoundException ();
179+ // throw new NoServicesFoundException();
180180 }
181181
182182 // TODO(vam-google): Figure out whether we should keep this allowlist or bring
Original file line number Diff line number Diff line change 4242import com .google .protobuf .Descriptors .FileDescriptor ;
4343import com .google .protobuf .Descriptors .MethodDescriptor ;
4444import com .google .protobuf .Descriptors .ServiceDescriptor ;
45+ import com .google .protobuf .compiler .PluginProtos .CodeGeneratorRequest ;
4546import com .google .showcase .v1beta1 .EchoOuterClass ;
4647import com .google .showcase .v1beta1 .TestingOuterClass ;
4748import com .google .testgapic .v1beta1 .LockerProto ;
You can’t perform that action at this time.
0 commit comments