Skip to content

[ggj][engx] fix: remove one-use wrapper in SettingsSampleCodeComposer #604

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
miraleung merged 18 commits into from
Dec 17, 2020
Merged

[ggj][engx] fix: remove one-use wrapper in SettingsSampleCodeComposer #604

Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
8bc63f4
fix: fix dep ordering in Bazel dedupe rules
miraleung Dec 2, 2020
43307c0
Merge branch 'master' of github.com:googleapis/gapic-generator-java
miraleung Dec 2, 2020
6a139fa
Merge branch 'master' of github.com:googleapis/gapic-generator-java
miraleung Dec 3, 2020
5db4adb
Merge branch 'master' of github.com:googleapis/gapic-generator-java
miraleung Dec 4, 2020
82d628d
Merge branch 'master' of github.com:googleapis/gapic-generator-java
miraleung Dec 7, 2020
1669fd6
Merge branch 'master' of github.com:googleapis/gapic-generator-java
miraleung Dec 9, 2020
06c7f46
Merge branch 'master' of github.com:googleapis/gapic-generator-java
miraleung Dec 10, 2020
ecfe117
Merge branch 'master' of github.com:googleapis/gapic-generator-java
miraleung Dec 15, 2020
2a1f0d0
chore: centralize all Gapic class name getters
miraleung Dec 15, 2020
ce3a525
fix: use gapic-remapped names in package-info.java
miraleung Dec 15, 2020
1ea125a
fix: revert unrelated changes
miraleung Dec 15, 2020
6dd38ca
Merge branch 'dev/a0' of github.com:googleapis/gapic-generator-java i…
miraleung Dec 15, 2020
3540eb9
fix: handle back-compat casing for IAMCredentials API
miraleung Dec 15, 2020
e9a0c17
fix: remove unused package option from integration test rules
miraleung Dec 15, 2020
69a3b6a
fix: rename StubCommentComposer file to match class name
miraleung Dec 15, 2020
f949888
fix: refactor SettingsSampleCodeComposer to be more modular
miraleung Dec 16, 2020
ce575c0
fix: remove one-use wrapper in SettingsSampleCodeComposer
miraleung Dec 16, 2020
22fc28e
Merge branch 'master' into dev/a6
miraleung Dec 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions ...n/java/com/google/api/generator/gapic/composer/samplecode/SettingsSampleCodeComposer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ public static Optional<String> composeSampleCode(Optional<Method> methodOpt, Typ
VariableExpr.withVariable(
Variable.builder()
.setType(classType)
.setName(getServiceSettingsName(className))
.setName(JavaStyle.toLowerCamelCase(className).replace("Stub", ""))
.build());
AssignmentExpr settingBuildAssignmentExpr =
AssignmentExpr.builder()
Expand All @@ -147,10 +147,6 @@ public static Optional<String> composeSampleCode(Optional<Method> methodOpt, Typ
return Optional.of(SampleCodeJavaFormatter.format(writeStatements(statements)));
}

private static String getServiceSettingsName(String className) {
return JavaStyle.toLowerCamelCase(className).replace(STUB, EMPTY_STRING);
}

private static String getClassSettingsBuilderName(String className) {
return JavaStyle.toLowerCamelCase(
String.format(BUILDER_NAME_PATTERN, JavaStyle.toLowerCamelCase(className)))
Expand Down