Skip to content

Use default target Path, add target path to project sources, make apiPath required #5

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 3 commits into from
Feb 4, 2024
Merged

Use default target Path, add target path to project sources, make apiPath required #5

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8d4f42e
Use default target Path, add target path to project sources, make api…
maddingo Jan 28, 2024
268702c
use File.separator, add targetDir to compiler sources only if id!=json
maddingo Feb 2, 2024
6222bb2
allow to disable automatic compile source root
hauner Feb 4, 2024
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
28 changes: 17 additions & 11 deletions src/main/java/io/openapiprocessor/maven/ProcessMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import org.apache.maven.plugins.annotations.LifecyclePhase;
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.project.MavenProject;

import java.io.File;
import java.nio.file.Path;
Expand All @@ -28,21 +29,21 @@ public class ProcessMojo extends AbstractMojo {
@Parameter(required = true)
private String id;

@Parameter(required = false)
private String processorName;

@Parameter(required = false)
@Parameter(required = true)
private File apiPath;

@Parameter(required = false)
private Options options;

@Parameter(readonly = true, required = true, defaultValue = "${project.basedir}")
private File baseDir;
@Parameter(required = false, defaultValue = "true")
private boolean addSourceRoot;

@Parameter(readonly = true, required = true, defaultValue = "${project}")
private MavenProject project;

@Override
public void execute () throws MojoExecutionException {
String processor = String.format ("openapi-processor-%s", processorName == null ? id : processorName);
String processor = String.format ("openapi-processor-%s", id);

try {
getLog().info(String.format ("%10s - %s", "processor", processor));
Expand All @@ -51,11 +52,16 @@ public void execute () throws MojoExecutionException {

File source = apiPath.getParentFile ();
String relativeSource = stripBaseDir (source.getAbsolutePath ());
getLog().info(String.format ("%10s - ${project.basedir}/%s", "apiPath", relativeSource));
getLog().info(String.format ("%10s - ${project.basedir}%s%s", "apiPath", File.pathSeparator, relativeSource));

String targetDir = (String) properties.computeIfAbsent (TARGET_DIR, k -> project.getBuild().getDirectory() + File.pathSeparator + "generated-sources" + File.pathSeparator + id);

if (addSourceRoot) {
project.addCompileSourceRoot(targetDir);
}

String targetDir = (String) properties.get (TARGET_DIR);
String relativeTargetDir = stripBaseDir (targetDir);
getLog().info(String.format ("%10s - ${project.basedir}/%s", "targetDir", relativeTargetDir));
getLog().info(String.format ("%10s - ${project.basedir}%s%s", "targetDir", File.pathSeparator, relativeTargetDir));

File targetRoot = new File(targetDir);
UpToDateCheck upToDateCheck = new UpToDateCheck ();
Expand All @@ -79,7 +85,7 @@ public void execute () throws MojoExecutionException {
}

private String stripBaseDir (String source) {
Path base = Paths.get (baseDir.getAbsolutePath ());
Path base = Paths.get (project.getBasedir().getAbsolutePath ());
Path src = Paths.get (source);
return base.relativize (src).toString ();
}
Expand Down