-
Notifications
You must be signed in to change notification settings - Fork 53
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[ggj][parsing] feat: add Service.yaml parsing (#415)
* fix: refactor requestBuilder into separate method in ServiceClientClassComposer * feat: add varargs to AnonClass and ref setter methods * feat: add HTTP annotation parsing/validation * feat: Generate RequestParamsExtractor in GrpcServiceStub * feat: add GrpcPublisherStub test to exercise HTTP subfields * fix: add ByteString to DefaultValueComposer * fix: Use repeated field name for paged RPC unit tests * fix: refactor exception field, use paged repeated field name, add pubsub client test * fix: ensure all testgen methods throw Exceptions * fix: Fix resname helper method names for of* and format* * fix: use only generated resnames in codegen * fix: propagate of*Name changes to resname codegen * fix: fix method arg resname mappings, add logging test * fix: ensure paged tests use the right repeated resp. type * feat: add PackageInfoDefinition AST node * feat: add package-info.java codegen * feat: add Service.yaml parsing * Update BUILD.bazel
- Loading branch information
Showing
13 changed files
with
359 additions
and
5 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
59 changes: 59 additions & 0 deletions
59
src/main/java/com/google/api/generator/gapic/protoparser/ServiceYamlParser.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,59 @@ | ||
| // Copyright 2020 Google LLC | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| package com.google.api.generator.gapic.protoparser; | ||
|
|
||
| import com.google.common.base.Strings; | ||
| import com.google.gson.Gson; | ||
| import com.google.gson.GsonBuilder; | ||
| import com.google.protobuf.InvalidProtocolBufferException; | ||
| import com.google.protobuf.util.JsonFormat; | ||
| import java.io.File; | ||
| import java.io.IOException; | ||
| import java.nio.file.Files; | ||
| import java.nio.file.Paths; | ||
| import java.util.LinkedHashMap; | ||
| import java.util.Map; | ||
| import java.util.Optional; | ||
| import org.yaml.snakeyaml.Yaml; | ||
| import org.yaml.snakeyaml.constructor.SafeConstructor; | ||
|
|
||
| public class ServiceYamlParser { | ||
| public static Optional<com.google.api.Service> parse(String serviceYamlFilePath) { | ||
| if (Strings.isNullOrEmpty(serviceYamlFilePath) || !(new File(serviceYamlFilePath)).exists()) { | ||
| return Optional.empty(); | ||
| } | ||
|
|
||
| String fileContents = null; | ||
| try { | ||
| fileContents = new String(Files.readAllBytes(Paths.get(serviceYamlFilePath))); | ||
| } catch (IOException e) { | ||
| return Optional.empty(); | ||
| } | ||
|
|
||
| Yaml yaml = new Yaml(new SafeConstructor()); | ||
| Map<String, Object> yamlMap = yaml.load(fileContents); | ||
| Gson gson = new GsonBuilder().setPrettyPrinting().setLenient().create(); | ||
| String jsonString = gson.toJson(yamlMap, LinkedHashMap.class); | ||
| // Use the full name instead of an import, to avoid reader confusion with this and | ||
| // model.Service. | ||
| com.google.api.Service.Builder serviceBuilder = com.google.api.Service.newBuilder(); | ||
| try { | ||
| JsonFormat.parser().ignoringUnknownFields().merge(jsonString, serviceBuilder); | ||
| } catch (InvalidProtocolBufferException e) { | ||
| return Optional.empty(); | ||
| } | ||
| return Optional.of(serviceBuilder.build()); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
40 changes: 40 additions & 0 deletions
40
src/test/java/com/google/api/generator/gapic/protoparser/ServiceYamlParserTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| // Copyright 2020 Google LLC | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| package com.google.api.generator.gapic.protoparser; | ||
|
|
||
| import static junit.framework.Assert.assertEquals; | ||
| import static junit.framework.Assert.assertTrue; | ||
|
|
||
| import java.nio.file.Path; | ||
| import java.nio.file.Paths; | ||
| import java.util.Optional; | ||
| import org.junit.Test; | ||
|
|
||
| public class ServiceYamlParserTest { | ||
| private static final String YAML_DIRECTORY = | ||
| "src/test/java/com/google/api/generator/gapic/testdata/"; | ||
|
|
||
| @Test | ||
| public void parseServiceYaml_basic() { | ||
| String yamlFilename = "logging.yaml"; | ||
| Path yamlPath = Paths.get(YAML_DIRECTORY, yamlFilename); | ||
| Optional<com.google.api.Service> serviceYamlProtoOpt = | ||
| ServiceYamlParser.parse(yamlPath.toString()); | ||
| assertTrue(serviceYamlProtoOpt.isPresent()); | ||
|
|
||
| com.google.api.Service serviceYamlProto = serviceYamlProtoOpt.get(); | ||
| assertEquals("logging.googleapis.com", serviceYamlProto.getName()); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.