Skip to content

Commit d150747

Browse files
committed
revert NoServicesFoundException
1 parent 00c1eb1 commit d150747

File tree

6 files changed

+9
-27
lines changed

6 files changed

+9
-27
lines changed

gapic-generator-java/src/main/java/com/google/api/generator/Main.java

+2-8
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
package com.google.api.generator;
1616

1717
import com.google.api.generator.gapic.Generator;
18-
import com.google.api.generator.gapic.protoparser.NoServicesFoundException;
1918
import com.google.protobuf.ExtensionRegistry;
2019
import com.google.protobuf.compiler.PluginProtos.CodeGeneratorRequest;
2120
import 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
}

gapic-generator-java/src/main/java/com/google/api/generator/gapic/Generator.java

+1-4
Original file line numberDiff line numberDiff line change
@@ -14,22 +14,19 @@
1414

1515
package com.google.api.generator.gapic;
1616

17-
import com.google.api.gax.rpc.StatusCode.Code;
1817
import com.google.api.generator.gapic.composer.Composer;
1918
import com.google.api.generator.gapic.model.GapicClass;
2019
import com.google.api.generator.gapic.model.GapicContext;
2120
import com.google.api.generator.gapic.model.GapicPackageInfo;
2221
import com.google.api.generator.gapic.model.ReflectConfig;
23-
import com.google.api.generator.gapic.protoparser.NoServicesFoundException;
2422
import com.google.api.generator.gapic.protoparser.Parser;
2523
import com.google.api.generator.gapic.protowriter.Writer;
2624
import com.google.protobuf.compiler.PluginProtos.CodeGeneratorRequest;
2725
import com.google.protobuf.compiler.PluginProtos.CodeGeneratorResponse;
2826
import java.util.List;
2927

3028
public 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);

gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/ClientLibraryPackageInfoComposer.java

+3-4
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
import com.google.api.generator.gapic.model.GapicPackageInfo;
3030
import com.google.api.generator.gapic.model.Sample;
3131
import com.google.api.generator.gapic.model.Service;
32-
import com.google.api.generator.gapic.protoparser.NoServicesFoundException;
32+
import com.google.common.base.Preconditions;
3333
import com.google.common.base.Strings;
3434
import 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

gapic-generator-java/src/main/java/com/google/api/generator/gapic/protoparser/NoServicesFoundException.java

-9
This file was deleted.

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

+2-2
Original file line numberDiff line numberDiff 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

gapic-generator-java/src/test/java/com/google/api/generator/gapic/protoparser/ParserTest.java

+1
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
import com.google.protobuf.Descriptors.FileDescriptor;
4343
import com.google.protobuf.Descriptors.MethodDescriptor;
4444
import com.google.protobuf.Descriptors.ServiceDescriptor;
45+
import com.google.protobuf.compiler.PluginProtos.CodeGeneratorRequest;
4546
import com.google.showcase.v1beta1.EchoOuterClass;
4647
import com.google.showcase.v1beta1.TestingOuterClass;
4748
import com.google.testgapic.v1beta1.LockerProto;

0 commit comments

Comments
 (0)