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

Separating code gen / package gen for Java #2166

Merged
merged 2 commits into from
Jul 26, 2018
Merged

Separating code gen / package gen for Java #2166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e8db1b8
Separating code gen / package gen for Java
garrettjonesgoogle Jul 2, 2018
d88ad4c
Merge branch 'master' into master
garrettjonesgoogle Jul 26, 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
110 changes: 49 additions & 61 deletions src/main/java/com/google/api/codegen/gapic/GapicGeneratorFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,77 +186,65 @@ public static List<CodeGenerator<?>> create(
}

} else if (language.equals(JAVA)) {
Function<ModelToViewTransformer<ProtoApiModel>, CodeGenerator> newJavaGenerator =
transformer ->
GapicGenerator.newBuilder()
.setModel(model)
.setProductConfig(productConfig)
.setSnippetSetRunner(new CommonSnippetSetRunner(new JavaRenderingUtil()))
.setModelToViewTransformer(transformer)
.build();

if (artifactFlags.surfaceGeneratorEnabled()) {
GapicCodePathMapper javaPathMapper =
CommonGapicCodePathMapper.newBuilder()
.setPrefix("src/main/java")
.setShouldAppendPackage(true)
.build();
CodeGenerator mainGenerator =
GapicGenerator.newBuilder()
.setModel(model)
.setProductConfig(productConfig)
.setSnippetSetRunner(new CommonSnippetSetRunner(new JavaRenderingUtil()))
.setModelToViewTransformer(
new JavaGapicSurfaceTransformer(javaPathMapper, packageConfig))
.build();

generators.add(mainGenerator);

CodeGenerator metadataGenerator =
GapicGenerator.newBuilder()
.setModel(model)
.setProductConfig(productConfig)
.setSnippetSetRunner(new CommonSnippetSetRunner(new JavaRenderingUtil()))
.setModelToViewTransformer(
new JavaGapicPackageTransformer<ProtoApiModel>(packageConfig))
.build();
generators.add(metadataGenerator);

CodeGenerator staticResourcesGenerator =
new StaticResourcesGenerator(
ImmutableMap.<String, String>builder()
.put("java/static/build.gradle", "../build.gradle")
.put("java/static/settings.gradle", "../settings.gradle")
.put("java/static/gradlew", "../gradlew")
.put("java/static/gradlew.bat", "../gradlew.bat")
.put(
"java/static/gradle/wrapper/gradle-wrapper.jar",
"../gradle/wrapper/gradle-wrapper.jar")
.put(
"java/static/gradle/wrapper/gradle-wrapper.properties",
"../gradle/wrapper/gradle-wrapper.properties")
.build(),
ImmutableSet.of("../gradlew"));
generators.add(staticResourcesGenerator);
if (artifactFlags.codeFilesEnabled()) {
generators.add(
newJavaGenerator.apply(
new JavaGapicSurfaceTransformer(javaPathMapper, packageConfig)));
generators.add(newJavaGenerator.apply(new JavaGapicSamplesTransformer(javaPathMapper)));
}

CodeGenerator sampleGenerator =
GapicGenerator.newBuilder()
.setModel(model)
.setProductConfig(productConfig)
.setSnippetSetRunner(new CommonSnippetSetRunner(new JavaRenderingUtil()))
.setModelToViewTransformer(new JavaGapicSamplesTransformer(javaPathMapper))
.build();
generators.add(sampleGenerator);
if (artifactFlags.packagingFilesEnabled()) {
generators.add(newJavaGenerator.apply(new JavaGapicPackageTransformer<>(packageConfig)));

CodeGenerator staticResourcesGenerator =
new StaticResourcesGenerator(
ImmutableMap.<String, String>builder()
.put("java/static/build.gradle", "../build.gradle")
.put("java/static/settings.gradle", "../settings.gradle")
.put("java/static/gradlew", "../gradlew")
.put("java/static/gradlew.bat", "../gradlew.bat")
.put(
"java/static/gradle/wrapper/gradle-wrapper.jar",
"../gradle/wrapper/gradle-wrapper.jar")
.put(
"java/static/gradle/wrapper/gradle-wrapper.properties",
"../gradle/wrapper/gradle-wrapper.properties")
.build(),
ImmutableSet.of("../gradlew"));
generators.add(staticResourcesGenerator);
}
}

if (artifactFlags.testGeneratorEnabled()) {
GapicCodePathMapper javaTestPathMapper =
CommonGapicCodePathMapper.newBuilder()
.setPrefix("src/test/java")
.setShouldAppendPackage(true)
.build();
CodeGenerator testGenerator =
GapicGenerator.newBuilder()
.setModel(model)
.setProductConfig(productConfig)
.setSnippetSetRunner(new CommonSnippetSetRunner(new CommonRenderingUtil()))
.setModelToViewTransformer(
new JavaSurfaceTestTransformer<ProtoApiModel>(
javaTestPathMapper,
new JavaGapicSurfaceTransformer(javaTestPathMapper, packageConfig),
"java/grpc_test.snip"))
.build();
generators.add(testGenerator);
if (artifactFlags.codeFilesEnabled()) {
GapicCodePathMapper javaTestPathMapper =
CommonGapicCodePathMapper.newBuilder()
.setPrefix("src/test/java")
.setShouldAppendPackage(true)
.build();
generators.add(
newJavaGenerator.apply(
new JavaSurfaceTestTransformer<>(
javaTestPathMapper,
new JavaGapicSurfaceTransformer(javaTestPathMapper, packageConfig),
"java/grpc_test.snip")));
}
}
return generators;

Expand Down
8 changes: 7 additions & 1 deletion src/main/java/com/google/api/codegen/packagegen/PackagingArtifactType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,13 @@ public enum PackagingArtifactType {

public static PackagingArtifactType of(String generationLayerString) {
if (generationLayerString != null) {
return PackagingArtifactType.valueOf(generationLayerString.toUpperCase());
String generationLayerStringUpper = generationLayerString.toUpperCase();
if (generationLayerStringUpper.equals("GAPIC_CODE")) {
return GAPIC;
} else if (generationLayerStringUpper.equals("GAPIC_CONFIG")) {
return GAPIC;
}
return PackagingArtifactType.valueOf(generationLayerStringUpper);
} else {
return UNKNOWN;
}
Expand Down