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

Java: don't use List<ResourceName> in flattened methods #2131

Merged
merged 11 commits into from
Jul 3, 2018
Merged

Java: don't use List<ResourceName> in flattened methods #2131

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
e0fe3a9
don't generate flattened methods with List<ResourceName> as a paramet…
andreamlin Jul 3, 2018
e244e39
also just use List<STring> instead of List<ResourceName> in generated…
andreamlin Jul 3, 2018
9718cdb
move DefaultFeatureConfig change into JavaFeatuerConfig
andreamlin Jul 3, 2018
4a4e88a
update flattening config
andreamlin Jul 3, 2018
f9724dd
check if resourcename is repeated
andreamlin Jul 3, 2018
6c6079a
googleJavaFormat
andreamlin Jul 3, 2018
f8c9e97
update baseline
andreamlin Jul 3, 2018
19bc2bc
don't use java feature config
andreamlin Jul 3, 2018
a563cae
move flatteningconfig check to fLatteningconfig
andreamlin Jul 3, 2018
f3f699c
add issue # for singular params to use ResourceNameTypes
andreamlin Jul 3, 2018
6f55af1
Merge branch 'master' into no_paging_resourcenames
andreamlin Jul 3, 2018
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
16 changes: 16 additions & 0 deletions src/main/java/com/google/api/codegen/config/FlatteningConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,4 +129,20 @@ public FlatteningConfig withResourceNamesInSamplesOnly() {
Map.Entry::getKey, e -> e.getValue().withResourceNameInSampleOnly()));
return new AutoValue_FlatteningConfig(newFlattenedFieldConfigs, getFlatteningName());
}

public static boolean hasAnyRepeatedResourceNameParameter(FlatteningConfig flatteningGroup) {
// Used in Java to prevent generating a flattened method with List<ResourceName> as a parameter
// because that has the same type erasure as the version of the flattened method with
// List<String> as a parameter.

// TODO(gapic-generator issue #2137) Only use raw String type for repeated params
// not for singular params in the same flattened method.
return flatteningGroup
.getFlattenedFieldConfigs()
.values()
.stream()
.anyMatch(
(FieldConfig fieldConfig) ->
fieldConfig.getField().isRepeated() && fieldConfig.useResourceNameType());
}
}
3 changes: 3 additions & 0 deletions ...oogle/api/codegen/discogapic/transformer/java/JavaDiscoGapicRequestToViewTransformer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,9 @@ private RequestObjectParamView getRequestObjectParams(
for (FlatteningConfig flatteningGroup : methodConfig.getFlatteningConfigs()) {
MethodContext flattenedMethodContext =
context.asFlattenedMethodContext(method, flatteningGroup);
if (FlatteningConfig.hasAnyRepeatedResourceNameParameter(flatteningGroup)) {
flattenedMethodContext = flattenedMethodContext.withResourceNamesInSamplesOnly();
}
Iterable<FieldConfig> fieldConfigs =
flattenedMethodContext.getFlatteningConfig().getFlattenedFieldConfigs().values();
for (FieldConfig fieldConfig : fieldConfigs) {
Expand Down
12 changes: 10 additions & 2 deletions src/main/java/com/google/api/codegen/transformer/java/JavaMethodViewGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,10 @@ public List<StaticLangApiMethodView> generateApiMethods(InterfaceContext context
for (FlatteningConfig flatteningGroup : methodConfig.getFlatteningConfigs()) {
MethodContext flattenedMethodContext =
context.asFlattenedMethodContext(method, flatteningGroup);
apiMethods.add(
clientMethodTransformer.generatePagedFlattenedMethod(flattenedMethodContext));
if (!FlatteningConfig.hasAnyRepeatedResourceNameParameter(flatteningGroup)) {
apiMethods.add(
clientMethodTransformer.generatePagedFlattenedMethod(flattenedMethodContext));
}
if (hasAnyResourceNameParameter(flatteningGroup)) {
apiMethods.add(
clientMethodTransformer.generatePagedFlattenedMethod(
Expand Down Expand Up @@ -105,6 +107,9 @@ public List<StaticLangApiMethodView> generateApiMethods(InterfaceContext context
for (FlatteningConfig flatteningGroup : methodConfig.getFlatteningConfigs()) {
MethodContext flattenedMethodContext =
context.asFlattenedMethodContext(method, flatteningGroup);
if (FlatteningConfig.hasAnyRepeatedResourceNameParameter(flatteningGroup)) {
flattenedMethodContext = flattenedMethodContext.withResourceNamesInSamplesOnly();
}
apiMethods.add(
clientMethodTransformer.generateAsyncOperationFlattenedMethod(
flattenedMethodContext));
Expand All @@ -126,6 +131,9 @@ public List<StaticLangApiMethodView> generateApiMethods(InterfaceContext context
for (FlatteningConfig flatteningGroup : methodConfig.getFlatteningConfigs()) {
MethodContext flattenedMethodContext =
context.asFlattenedMethodContext(method, flatteningGroup);
if (FlatteningConfig.hasAnyRepeatedResourceNameParameter(flatteningGroup)) {
flattenedMethodContext = flattenedMethodContext.withResourceNamesInSamplesOnly();
}
apiMethods.add(clientMethodTransformer.generateFlattenedMethod(flattenedMethodContext));

if (hasAnyResourceNameParameter(flatteningGroup)) {
Expand Down
7 changes: 7 additions & 0 deletions src/main/java/com/google/api/codegen/transformer/java/JavaSurfaceTestTransformer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,9 @@ SmokeTestClassView.Builder createSmokeTestClassViewBuilder(InterfaceContext cont
testCaseTransformer.getSmokeTestFlatteningGroup(
context.getMethodConfig(method), context.getInterfaceConfig().getSmokeTestConfig());
MethodContext methodContext = context.asFlattenedMethodContext(method, flatteningGroup);
if (FlatteningConfig.hasAnyRepeatedResourceNameParameter(flatteningGroup)) {
methodContext = methodContext.withResourceNamesInSamplesOnly();
}

SmokeTestClassView.Builder testClass = SmokeTestClassView.newBuilder();
StaticLangApiMethodView apiMethodView = createSmokeTestCaseApiMethodView(methodContext);
Expand Down Expand Up @@ -304,6 +307,10 @@ private List<TestCaseView> createTestCaseViews(InterfaceContext context) {
}
for (FlatteningConfig flatteningGroup : methodConfig.getFlatteningConfigs()) {
MethodContext methodContext = context.asFlattenedMethodContext(method, flatteningGroup);
if (FlatteningConfig.hasAnyRepeatedResourceNameParameter(flatteningGroup)) {
methodContext = methodContext.withResourceNamesInSamplesOnly();
flatteningGroup = methodContext.getFlatteningConfig();
}
InitCodeContext initCodeContext =
initCodeTransformer.createRequestInitCodeContext(
methodContext,
Expand Down
Loading