Skip to content
This repository has been archived by the owner on Jun 28, 2022. It is now read-only.

Commit

Permalink
merge master to Discogapic (#1304)
Browse files Browse the repository at this point in the history
* Fix JSON pretty print in Ruby sample (#1254)

* Ruby: README Overhaul (feat. examples) (#1245)

* go: use new metadata methods (#1262)

Updates googleapis/google-cloud-go#624.

metadata.FromContext and metdata.NewContext
are replaced by metadata.{New,From}{Incoming,Outgoing}Context.

Generated unit tests now verify that x-goog-api-client header
is inserted.

Additionally, clients now save a string slice containing x-goog-api-client
header value instead of the value by itself.
This is a small optimization so that we don't create a new slice every time.

* Change media body from an object to a string (#1256)

Samples fail before sending a request if the media body is an object.

* Fix NONE auth Go sample (#1261)

* Change Node.js unit test require. (#1264)

* Ruby: Allow doc gapic generation to generate tests. (#1266)

* Ruby: Remove aliasing from method samples and tests (#1253)

* Ruby: Fix broken baselines from aliasing fix (#1269)

* Remove unused code (#1270)

* Python: README overhaul. (#1263)

* Ruby: Update gemspec and add useful metadata files (#1258)

* Ruby: Update gemspec and add useful metadata files

* Specify HTTP client when constructing client (#1275)

If a HTTP client is not passed to `build`, the Google API Python client
will create a default one and attempt to authenticate it. This causes
failures in environments where ADC auth is not available (Travis).

In any case, it's not useful to access any auth code in the mock tests.
This commit removes that possibility.

* Fix JSON print in Ruby (#1274)

It turns out that `to_h` is not a method available on every object
returned by the samples at the moment. Also, there's some kind of
decoding bug showing up in certain samples where the JSON module is
unable to unparse the response.

It's troublesome to have so much boilerplate just to pretty print. This
commit removes the pretty calls in favor of the vanilla `to_json` method
implemented by the base model class in the Ruby client. In the future,
once the bugs w.r.t `pretty_generate` have been resolved, we can revert.

* NodeJS: Update version index to support partial veneers (#1267)

* NodeJS: Updates to package.json (#1268)

* Migrate import disambiguation to Python MVVM (#1243)

* Fix Node package.json (#1282)

* go: use time.UnixNano instead of testutil.UIDSpace (#1279)

Since generated code should be testable from api-client-staging repo,
we want to reduce dependency on other cloud.google.com/go packages,
especially internal ones.

Clients will still depend on testutil for ProjID and TokenSource.
This is OK, since they can be easily reimplemented in google-client-staging
repo itself.

* Update Java grpc metadata for new staging structure (#1265)

* PHP: share credentials with operations client (#1283)

* java: move CredentialProvider up to ClientSettings (#1251)

This implements the client side changes to support
googleapis/gax-java#305.

* NodeJS: generate readme. (#1240)

* NodeJS: Small additions to the package.json (#1289)

* NodeJS: Use fileheader for copyright lines. (#1293)

* NodeJS: Use correct casing for partial veneers (#1295)

* NodeJS: Small readme fix from GCN reviews (#1294)

* go: make longrunning methods use generated longrunning client (#1288)

The cloud.google.com/go/longrunning package will need to change
slightly to accomodate this change.

xGoogHeader is now gone from the generated longrunnging types,
as the header will be automatically inserted by LROClient itself.

* NodeJS: Update partial veneer surface to add api documentation. (#1296)

* NodeJS: Metadata updates. (#1298)

* Readme: Update readme templates to add api summaries. (#1299)

* Add PHP Exception tests (#951)

* Add exception tests
* Remove unnecessary checks in exception tests

* Process markdown cloud links for PHP (#1091)

* Process markdown cloud links for PHP
* Restructure comment formatting

* go: return error creating LRO client instead of panicking (#1300)
  • Loading branch information
garrettjonesgoogle authored May 27, 2017
1 parent a5014a4 commit 90aa518
Show file tree
Hide file tree
Showing 156 changed files with 6,595 additions and 3,589 deletions.
2 changes: 1 addition & 1 deletion src/main/java/com/google/api/codegen/CommentPatterns.java
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public final class CommentPatterns {
public static final Pattern BACK_QUOTE_PATTERN = Pattern.compile("(?<!`)``?(?!`)");
public static final Pattern ABSOLUTE_LINK_PATTERN =
Pattern.compile("\\[([^\\]]+)\\]\\((\\p{Alpha}+:[^\\)]+)\\)");
public static final Pattern CLOUD_LINK_PATTERN =
public static final Pattern RELATIVE_LINK_PATTERN =
Pattern.compile("\\[([^\\]]+)\\]\\(((?!\\p{Alpha}+:)[^\\)]+)\\)");
public static final Pattern PROTO_LINK_PATTERN =
Pattern.compile("\\[([^\\]]+)\\]\\[([A-Za-z_][A-Za-z_.0-9]*)?\\]");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,7 @@ private SampleView createSampleView(SampleTransformerContext context) {
discoveryBuildParams.add(String.format("'%s'", config.apiVersion()));
switch (config.authType()) {
case NONE:
discoveryBuildParams.add("http=httplib2.Http(timeout=60)");
break;
case API_KEY:
discoveryBuildParams.add("developerKey=" + credentialsVarName);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -431,7 +431,7 @@ public static List<GapicProvider<? extends Object>> defaultCreate(
providers.add(messageProvider);
}
}
if (generatorConfig.enableTestGenerator() && id.equals(RUBY)) {
if (generatorConfig.enableTestGenerator()) {
GapicCodePathMapper rubyTestPathMapper =
CommonGapicCodePathMapper.newBuilder()
.setPrefix("test")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ public class JavaGrpcPackageMetadataTransformer extends JavaPackageMetadataTrans
private final Map<String, String> snippetsOutput =
ImmutableMap.of(
"LICENSE.snip", "LICENSE",
"metadatagen/java/grpc/package.snip", "build.gradle");
"metadatagen/java/grpc/build.gradle.snip", "build.gradle");

@Override
protected Map<String, String> getSnippetsOutput() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public class JavaProtoPackageMetadataTransformer extends JavaPackageMetadataTran
private final Map<String, String> snippetsOutput =
ImmutableMap.of(
"LICENSE.snip", "LICENSE",
"metadatagen/java/grpc/package.snip", "build.gradle");
"metadatagen/java/grpc/build.gradle.snip", "build.gradle");

@Override
protected Map<String, String> getSnippetsOutput() {
Expand Down
44 changes: 0 additions & 44 deletions src/main/java/com/google/api/codegen/metacode/FieldSetting.java

This file was deleted.

30 changes: 0 additions & 30 deletions src/main/java/com/google/api/codegen/metacode/InitCode.java

This file was deleted.

26 changes: 0 additions & 26 deletions src/main/java/com/google/api/codegen/metacode/InitCodeLine.java

This file was deleted.

This file was deleted.

67 changes: 0 additions & 67 deletions src/main/java/com/google/api/codegen/metacode/MapInitCodeLine.java

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,8 @@ public OptionalArrayMethodView generateMethod(GapicMethodContext context) {
apiMethod.type(ClientMethodType.OptionalArrayMethod);
}
apiMethod.apiClassName(namer.getApiWrapperClassName(context.getInterfaceConfig()));
apiMethod.fullyQualifiedApiClassName(
namer.getFullyQualifiedApiWrapperClassName(context.getInterfaceConfig()));
apiMethod.apiVariableName(namer.getApiWrapperVariableName(context.getInterfaceConfig()));
apiMethod.apiModuleName(namer.getApiWrapperModuleName());
InitCodeOutputType initCodeOutputType =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -273,6 +273,7 @@ private InitCodeLineView generateStructureInitCodeLine(

String typeName = typeTable.getAndSaveNicknameFor(item.getType());
surfaceLine.typeName(typeName);
surfaceLine.fullyQualifiedTypeName(typeTable.getFullNameFor(item.getType()));
surfaceLine.typeConstructor(namer.getTypeConstructor(typeName));

surfaceLine.fieldSettings(getFieldSettings(context, item.getChildren().values()));
Expand Down Expand Up @@ -391,6 +392,8 @@ private InitValueView getInitValue(GapicMethodContext context, InitCodeNode item

initValue.apiWrapperName(
context.getNamer().getApiWrapperClassName(context.getInterfaceConfig()));
initValue.fullyQualifiedApiWrapperName(
context.getNamer().getFullyQualifiedApiWrapperClassName(context.getInterfaceConfig()));
initValue.formatFunctionName(
context
.getNamer()
Expand Down
Loading

0 comments on commit 90aa518

Please sign in to comment.