Skip to content

Add the ability to specify additional import directories #47

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
merged 1 commit into from
Jun 8, 2018
Merged

Add the ability to specify additional import directories #47

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
40 changes: 31 additions & 9 deletions protoc-bundled-plugin/src/main/java/com/comoyo/maven/plugins/protoc/ProtocBundledMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
import java.io.BufferedReader;
import java.io.File;
import java.io.InputStreamReader;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
Expand Down Expand Up @@ -146,6 +147,14 @@ public class ProtocBundledMojo extends AbstractMojo
*/
private File[] inputDirectories;

/**
* Directories containing *.proto files available to import.
*
* @parameter
* property="importDirectories"
*/
private File[] importDirectories;

/**
* Output directory for generated Java class files.
*
Expand All @@ -163,6 +172,14 @@ public class ProtocBundledMojo extends AbstractMojo
*/
private File[] testInputDirectories;

/**
* Directories containing *.proto files available to import for test.
*
* @parameter
* property="testImportDirectories"
*/
private File[] testImportDirectories;

/**
* Output directory for generated Java class files.
*
Expand Down Expand Up @@ -353,15 +370,20 @@ private void ensureProtocBinaryPresent()
* @param dir base dir for input file, used to resolve includes
* @param input input file to compile
*/
private void compileFile(File inputDir, File input, File outputDir)
private void compileFile(File inputDir, File input, File outputDir, File[] importDirs)
throws MojoExecutionException
{
try {
List<String> command = new ArrayList<String>();
command.add(protocExec.toString());
command.add("--proto_path=" + inputDir.getAbsolutePath());
for (File importDir : importDirs) {
command.add("--proto_path=" + importDir.getAbsolutePath());
}
command.add("--java_out=" + outputDir);
command.add(input.getAbsolutePath());
final Process proc
= new ProcessBuilder(protocExec.toString(),
"--proto_path=" + inputDir.getAbsolutePath(),
"--java_out=" + outputDir,
input.getAbsolutePath())
= new ProcessBuilder(command.toArray(new String[command.size()]))
.redirectErrorStream(true)
.start();
final BufferedReader procOut
Expand Down Expand Up @@ -389,7 +411,7 @@ private void compileFile(File inputDir, File input, File outputDir)
* Compile all *.proto files found under inputDirectories.
*
*/
private boolean compileAllFiles(String tag, File[] inputDirs, File outputDir)
private boolean compileAllFiles(String tag, File[] inputDirs, File[] importDirs, File outputDir)
throws MojoExecutionException
{
final IOFileFilter filter = new SuffixFileFilter(".proto");
Expand All @@ -407,7 +429,7 @@ private boolean compileAllFiles(String tag, File[] inputDirs, File outputDir)
= FileUtils.iterateFiles(inputDir, filter, TrueFileFilter.INSTANCE);
while (files.hasNext()) {
final File input = files.next();
compileFile(inputDir, input, outputDir);
compileFile(inputDir, input, outputDir, importDirs);
seen = true;
}
}
Expand All @@ -427,14 +449,14 @@ public void execute()
if (inputDirectories.length == 0) {
inputDirectories = new File[]{new File(project.getBasedir(), "src/main/protobuf")};
}
if (compileAllFiles("main", inputDirectories, outputDirectory)) {
if (compileAllFiles("main", inputDirectories, importDirectories, outputDirectory)) {
project.addCompileSourceRoot(outputDirectory.getAbsolutePath());
}

if (testInputDirectories.length == 0) {
testInputDirectories = new File[]{new File(project.getBasedir(), "src/test/protobuf")};
}
if (compileAllFiles("test", testInputDirectories, testOutputDirectory)) {
if (compileAllFiles("test", testInputDirectories, testImportDirectories, testOutputDirectory)) {
project.addTestCompileSourceRoot(testOutputDirectory.getAbsolutePath());
}
}
Expand Down