>> groupArtifactsPerVers
.filter(this::isIncludedSpec)
.map(this::createNewDefaultArtifact)
.distinct()
- .map(this::resolveArtifactFromRepositories)
+ .map(defaultArtifact -> new ArtifactRepositoryResolver(artifactResolver,repositorySession,remoteRepositories).resolveArtifactFromRepositories(defaultArtifact))
.collect(Collectors
.groupingBy(artifactResult -> artifactResult.getArtifact().getGroupId(), TreeMap::new,
Collectors.toSet()));
diff --git a/boat-maven-plugin/src/main/java/com/backbase/oss/boat/GenerateDocMojo.java b/boat-maven-plugin/src/main/java/com/backbase/oss/boat/GenerateDocMojo.java
index 0f26649c6..1b16ae73b 100644
--- a/boat-maven-plugin/src/main/java/com/backbase/oss/boat/GenerateDocMojo.java
+++ b/boat-maven-plugin/src/main/java/com/backbase/oss/boat/GenerateDocMojo.java
@@ -2,6 +2,7 @@
import lombok.extern.slf4j.Slf4j;
import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugin.MojoFailureException;
import org.apache.maven.plugins.annotations.Mojo;
@Mojo(name = "doc", threadSafe = true)
@@ -9,7 +10,7 @@
public class GenerateDocMojo extends GenerateFromDirectoryDocMojo {
@Override
- public void execute() throws MojoExecutionException {
+ public void execute() throws MojoExecutionException, MojoFailureException {
getLog().info("Generating Boat Docs");
generatorName = "boat-docs";
super.execute();
diff --git a/boat-maven-plugin/src/main/java/com/backbase/oss/boat/GenerateFromDirectoryDocMojo.java b/boat-maven-plugin/src/main/java/com/backbase/oss/boat/GenerateFromDirectoryDocMojo.java
index e2f2aa957..dbb31e553 100644
--- a/boat-maven-plugin/src/main/java/com/backbase/oss/boat/GenerateFromDirectoryDocMojo.java
+++ b/boat-maven-plugin/src/main/java/com/backbase/oss/boat/GenerateFromDirectoryDocMojo.java
@@ -2,6 +2,7 @@
import lombok.extern.slf4j.Slf4j;
import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugin.MojoFailureException;
import java.io.File;
@@ -12,12 +13,21 @@
@Slf4j
public class GenerateFromDirectoryDocMojo extends GenerateMojo {
+
@Override
- public void execute() throws MojoExecutionException {
+ public void execute() throws MojoExecutionException, MojoFailureException {
+ if (inputSpec != null) {
+ File inputSpecFile = new File(inputSpec);
+ fileInputExecute(inputSpecFile);
+ } else {
+ log.info("Input read as Artifact");
+ super.execute();
+ }
+ }
- File inputSpecFile = new File(inputSpec);
+ private void fileInputExecute(File inputSpecFile) throws MojoExecutionException, MojoFailureException {
- if (inputSpecFile.isDirectory()){
+ if (inputSpecFile.isDirectory()) {
log.info("inputSpec is being read as a directory");
File[] inputSpecs;
@@ -29,11 +39,11 @@ public void execute() throws MojoExecutionException {
throw new MojoExecutionException("No OpenAPI specs found in: " + inputSpec);
}
- for(File f : inputSpecs){
+ for (File f : inputSpecs) {
inputSpec = f.getPath();
- output = new File(outPutDirectory.getPath(),f.getName().substring(0,f.getName().lastIndexOf(".")).concat("-docs"));
+ output = new File(outPutDirectory.getPath(), f.getName().substring(0, f.getName().lastIndexOf(".")).concat("-docs"));
- if(!output.exists()){
+ if (!output.exists()) {
output.mkdir();
}
@@ -41,7 +51,7 @@ public void execute() throws MojoExecutionException {
super.execute();
}
- }else {
+ } else {
log.info("inputSpec being read as a single file");
super.execute();
diff --git a/boat-maven-plugin/src/main/java/com/backbase/oss/boat/GenerateMojo.java b/boat-maven-plugin/src/main/java/com/backbase/oss/boat/GenerateMojo.java
index bb7191f1d..cecab8539 100644
--- a/boat-maven-plugin/src/main/java/com/backbase/oss/boat/GenerateMojo.java
+++ b/boat-maven-plugin/src/main/java/com/backbase/oss/boat/GenerateMojo.java
@@ -33,13 +33,12 @@
import java.util.Set;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
-import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugin.MojoFailureException;
import org.apache.maven.plugins.annotations.Component;
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 org.openapitools.codegen.CliOption;
import org.openapitools.codegen.ClientOptInput;
import org.openapitools.codegen.CodegenConfig;
@@ -77,7 +76,7 @@
@SuppressWarnings({"DefaultAnnotationParam", "java:S3776", "java:S5411"})
@Mojo(name = "generate", defaultPhase = LifecyclePhase.GENERATE_SOURCES, threadSafe = true)
@Slf4j
-public class GenerateMojo extends AbstractMojo {
+public class GenerateMojo extends InputMavenArtifactMojo {
private static String trimCSV(String text) {
if (isNotEmpty(text)) {
@@ -136,21 +135,6 @@ private static String trimCSV(String text) {
protected File copyTo;
- /**
- * Location of the OpenAPI spec, as URL or local file glob pattern.
- *
- * If the input is a local file, the value of this property is considered a glob pattern that must
- * resolve to a unique file.
- *
- *
- * The glob pattern allows to express the input specification in a version neutral way. For
- * instance, if the actual file is {@code my-service-api-v3.1.4.yaml} the expression could be
- * {@code my-service-api-v*.yaml}.
- *
- */
- @Parameter(name = "inputSpec", property = "openapi.generator.maven.plugin.inputSpec", required = true)
- protected String inputSpec;
-
/**
* Git host, e.g. gitlab.com.
*/
@@ -486,11 +470,7 @@ private static String trimCSV(String text) {
@Parameter(name = "writeDebugFiles")
protected boolean writeDebugFiles = false;
- /**
- * The project being built.
- */
- @Parameter(readonly = true, required = true, defaultValue = "${project}")
- protected MavenProject project;
+
public void setBuildContext(BuildContext buildContext) {
this.buildContext = buildContext;
@@ -498,13 +478,15 @@ public void setBuildContext(BuildContext buildContext) {
@Override
@SuppressWarnings({"java:S3776", "java:S1874"})
- public void execute() throws MojoExecutionException {
+ public void execute() throws MojoExecutionException, MojoFailureException {
+
if (skip) {
getLog().info("Code generation is skipped.");
return;
}
+ super.execute();
File inputSpecFile = new File(inputSpec);
File inputParent = inputSpecFile.getParentFile();
diff --git a/boat-maven-plugin/src/main/java/com/backbase/oss/boat/GenerateRestTemplateEmbeddedMojo.java b/boat-maven-plugin/src/main/java/com/backbase/oss/boat/GenerateRestTemplateEmbeddedMojo.java
index f21a705a4..53eb60342 100644
--- a/boat-maven-plugin/src/main/java/com/backbase/oss/boat/GenerateRestTemplateEmbeddedMojo.java
+++ b/boat-maven-plugin/src/main/java/com/backbase/oss/boat/GenerateRestTemplateEmbeddedMojo.java
@@ -1,6 +1,7 @@
package com.backbase.oss.boat;
import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugin.MojoFailureException;
import org.apache.maven.plugins.annotations.Mojo;
/**
@@ -10,7 +11,7 @@
public class GenerateRestTemplateEmbeddedMojo extends AbstractGenerateMojo {
@Override
- public void execute() throws MojoExecutionException {
+ public void execute() throws MojoExecutionException, MojoFailureException {
getLog().info("Generating Client using Spring Rest Template");
execute("java", "resttemplate", true, false, true);
}
diff --git a/boat-maven-plugin/src/main/java/com/backbase/oss/boat/GenerateSpringBootEmbeddedMojo.java b/boat-maven-plugin/src/main/java/com/backbase/oss/boat/GenerateSpringBootEmbeddedMojo.java
index 15f17d5d2..f4bd2a569 100644
--- a/boat-maven-plugin/src/main/java/com/backbase/oss/boat/GenerateSpringBootEmbeddedMojo.java
+++ b/boat-maven-plugin/src/main/java/com/backbase/oss/boat/GenerateSpringBootEmbeddedMojo.java
@@ -1,6 +1,7 @@
package com.backbase.oss.boat;
import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugin.MojoFailureException;
import org.apache.maven.plugins.annotations.Mojo;
/**
@@ -10,7 +11,7 @@
public class GenerateSpringBootEmbeddedMojo extends AbstractGenerateMojo {
@Override
- public void execute() throws MojoExecutionException {
+ public void execute() throws MojoExecutionException, MojoFailureException {
getLog().info("Generating Server Stubs using Spring Boot");
execute("spring", "spring-boot", true, false, false);
}
diff --git a/boat-maven-plugin/src/main/java/com/backbase/oss/boat/GenerateWebClientEmbeddedMojo.java b/boat-maven-plugin/src/main/java/com/backbase/oss/boat/GenerateWebClientEmbeddedMojo.java
index 76bdc7c50..bf8ad91fc 100644
--- a/boat-maven-plugin/src/main/java/com/backbase/oss/boat/GenerateWebClientEmbeddedMojo.java
+++ b/boat-maven-plugin/src/main/java/com/backbase/oss/boat/GenerateWebClientEmbeddedMojo.java
@@ -1,6 +1,7 @@
package com.backbase.oss.boat;
import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugin.MojoFailureException;
import org.apache.maven.plugins.annotations.Mojo;
/**
@@ -10,7 +11,7 @@
public class GenerateWebClientEmbeddedMojo extends AbstractGenerateMojo {
@Override
- public void execute() throws MojoExecutionException {
+ public void execute() throws MojoExecutionException, MojoFailureException {
getLog().info("Generating Server Stubs using Web Client Boot");
execute("java", "webclient", true, true, true);
}
diff --git a/boat-maven-plugin/src/main/java/com/backbase/oss/boat/InputArtifact.java b/boat-maven-plugin/src/main/java/com/backbase/oss/boat/InputArtifact.java
new file mode 100644
index 000000000..da7e17a27
--- /dev/null
+++ b/boat-maven-plugin/src/main/java/com/backbase/oss/boat/InputArtifact.java
@@ -0,0 +1,42 @@
+package com.backbase.oss.boat;
+
+import lombok.Getter;
+import lombok.Setter;
+import lombok.extern.slf4j.Slf4j;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+
+
+@Getter
+@Setter
+@Slf4j
+public class InputArtifact {
+ private String groupId;
+ private String artifactId;
+ private String version;
+ private String type;
+ private String classifier;
+ private String fileName;
+ private boolean overWrite;
+ private boolean overWriteIfNewer;
+ private boolean needsProcessing;
+
+ public boolean isNeedsProcessing(File destFile, File originFile){
+ needsProcessing = overWrite || !destFile.exists() || (overWriteIfNewer && isNewer(destFile,originFile));
+ return needsProcessing;
+ }
+
+ private boolean isNewer( File destFile, File originFile ) {
+ try {
+ long destMod = Files.getLastModifiedTime( destFile.toPath() ).toMillis();
+ long originMod = Files.getLastModifiedTime( originFile.toPath() ).toMillis();
+ return originMod > destMod;
+ } catch (IOException e) {
+ log.debug("Assuming artifact was not modified since artifact was last downloaded, cannot last read modified time");
+ return false;
+ }
+
+ }
+}
diff --git a/boat-maven-plugin/src/main/java/com/backbase/oss/boat/InputMavenArtifactMojo.java b/boat-maven-plugin/src/main/java/com/backbase/oss/boat/InputMavenArtifactMojo.java
new file mode 100644
index 000000000..579c1d310
--- /dev/null
+++ b/boat-maven-plugin/src/main/java/com/backbase/oss/boat/InputMavenArtifactMojo.java
@@ -0,0 +1,181 @@
+package com.backbase.oss.boat;
+
+
+import lombok.extern.slf4j.Slf4j;
+import org.apache.maven.plugin.AbstractMojo;
+import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugin.MojoFailureException;
+import org.apache.maven.plugins.annotations.Component;
+import org.apache.maven.plugins.annotations.Parameter;
+import org.apache.maven.project.MavenProject;
+import org.codehaus.plexus.util.Expand;
+import org.eclipse.aether.RepositorySystemSession;
+import org.eclipse.aether.artifact.DefaultArtifact;
+import org.eclipse.aether.impl.ArtifactResolver;
+import org.eclipse.aether.repository.RemoteRepository;
+import org.eclipse.aether.resolution.ArtifactResult;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.List;
+import java.util.concurrent.locks.ReentrantLock;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+@Slf4j
+public class InputMavenArtifactMojo extends AbstractMojo {
+
+ /**
+ * A maven artifact containing a spec, or multiple to be processed
+ */
+ @Parameter(name = "inputMavenArtifact", property = "inputMavenArtifact", required = false)
+ protected InputArtifact inputMavenArtifact;
+
+ /**
+ * File input used for Linting and Validating
+ * Can be directory or file
+ */
+ @Parameter(name = "input", required = false)
+ protected File input;
+
+ /**
+ * Location of the OpenAPI spec, as URL or local file glob pattern.
+ *
+ * If the input is a local file, the value of this property is considered a glob pattern that must
+ * resolve to a unique file.
+ *
+ *
+ * The glob pattern allows to express the input specification in a version neutral way. For
+ * instance, if the actual file is {@code my-service-api-v3.1.4.yaml} the expression could be
+ * {@code my-service-api-v*.yaml}.
+ *
+ */
+ @Parameter(name = "inputSpec", property = "openapi.generator.maven.plugin.inputSpec", required = false)
+ protected String inputSpec;
+
+ /**
+ * The project being built.
+ */
+ @Parameter(readonly = true, required = true, defaultValue = "${project}")
+ protected MavenProject project;
+
+ /**
+ * Used to set up artifact request
+ */
+ @Parameter(defaultValue = "${repositorySystemSession}", readonly = true)
+ protected RepositorySystemSession repositorySession;
+
+ /**
+ * Used to look up Artifacts in the remote repository.
+ */
+ @Component
+ protected ArtifactResolver artifactResolver;
+
+ /**
+ * List of Remote Repositories used by the resolver.
+ */
+ @Parameter(defaultValue = "${project.remoteProjectRepositories}", readonly = true)
+ protected List remoteRepositories;
+
+ private final ReentrantLock reLock = new ReentrantLock(true);
+
+ @Override
+ public void execute() throws MojoExecutionException, MojoFailureException {
+
+ if (inputMavenArtifact != null && inputMavenArtifact.getArtifactId() != null) {
+ getArtifact();
+ }
+
+ if (input == null && inputSpec == null && inputMavenArtifact == null) {
+ throw new MojoExecutionException("Missing input from plugin, input options are: inputMavenArtifact, input, inputSpec");
+ }
+
+ if (input == null) {
+ input = new File(inputSpec);
+ }
+
+ }
+
+
+ private void getArtifact() throws MojoExecutionException {
+ ArtifactResult result;
+
+ File specUnzipDirectory = new File(project.getBuild().getDirectory()
+ + File.separator + "input-artifact" + File.separator
+ + inputMavenArtifact.getArtifactId(), inputMavenArtifact.getVersion());
+
+
+
+
+
+ // The artifact will be downloaded to the local repository if necessary. An artifact that is already resolved will
+ // be skipped and is not re-resolved.
+ result = new ArtifactRepositoryResolver(artifactResolver, repositorySession, remoteRepositories).resolveArtifactFromRepositories(new DefaultArtifact(inputMavenArtifact.getGroupId()
+ , inputMavenArtifact.getArtifactId()
+ , inputMavenArtifact.getClassifier()
+ , inputMavenArtifact.getType()
+ , inputMavenArtifact.getVersion()));
+
+ if (inputMavenArtifact.isNeedsProcessing(specUnzipDirectory,result.getArtifact().getFile())) {
+
+ unzipSpec(result.getArtifact().getFile(), specUnzipDirectory);
+
+ }
+
+ try (Stream walk = Files.walk(specUnzipDirectory.toPath())) {
+
+ List paths = walk
+ .filter(Files::isRegularFile)
+ .filter(path -> path.endsWith(inputMavenArtifact.getFileName()))
+ .map(Path::toString)
+ .collect(Collectors.toList());
+
+ if (paths.size() > 1) {
+ log.info("found multiple files of matching {} in zip, using {}", inputMavenArtifact.getFileName(), paths.get(0));
+ } else if (paths.isEmpty()) {
+ throw new MojoExecutionException("no file matching " + inputMavenArtifact.getFileName() + " was found in artifact zip");
+ }
+
+ inputSpec = paths.get(0);
+ input = new File(paths.get(0));
+
+ } catch (IOException e) {
+ log.debug(e.getMessage());
+ throw new MojoExecutionException("Could not search unzipped artifact directory");
+ }
+
+ }
+
+
+ private void unzipSpec(File inputFile, File specUnzipDirectory) throws MojoExecutionException {
+ reLock.lock();
+ try {
+ specUnzipDirectory.mkdirs();
+ unzip(inputFile, specUnzipDirectory);
+ } catch (Exception e) {
+ reLock.unlock();
+ throw new MojoExecutionException("Error extracting spec: " + inputFile, e);
+ }finally {
+ reLock.unlock();
+ }
+ }
+
+ private void unzip(File source, File out) throws Exception {
+ Expand expand = new Expand();
+ expand.setSrc(source);
+ expand.setDest(out);
+ expand.setOverwrite(true);
+ expand.execute();
+ }
+
+ public void setInput(File input) {
+ this.input = input;
+ }
+
+}
+
+
+
+
diff --git a/boat-maven-plugin/src/test/java/com/backbase/oss/boat/ArtifactMojoTests.java b/boat-maven-plugin/src/test/java/com/backbase/oss/boat/ArtifactMojoTests.java
new file mode 100644
index 000000000..f3272fbb2
--- /dev/null
+++ b/boat-maven-plugin/src/test/java/com/backbase/oss/boat/ArtifactMojoTests.java
@@ -0,0 +1,266 @@
+package com.backbase.oss.boat;
+
+import org.apache.maven.model.Build;
+import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugin.MojoFailureException;
+import org.apache.maven.project.MavenProject;
+import org.codehaus.plexus.logging.console.ConsoleLogger;
+import org.eclipse.aether.RepositorySystemSession;
+import org.eclipse.aether.impl.ArtifactResolver;
+import org.eclipse.aether.resolution.ArtifactResolutionException;
+import org.eclipse.aether.resolution.ArtifactResult;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.sonatype.plexus.build.incremental.DefaultBuildContext;
+
+import java.io.File;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+@ExtendWith(MockitoExtension.class)
+class ArtifactMojoTests {
+
+ ArtifactResolver artifactResolver;
+ ArtifactResult artifactResult;
+
+ @Test
+ void testArtifactResolver(){
+
+ GenerateDocMojo mojo = new GenerateDocMojo();
+ File output = new File("target/boat-docs");
+ if (!output.exists()) {
+ output.mkdirs();
+ }
+
+ DefaultBuildContext defaultBuildContext = new DefaultBuildContext();
+ defaultBuildContext.enableLogging(new ConsoleLogger());
+
+ mojo.getLog();
+ mojo.buildContext = defaultBuildContext;
+ mojo.project = new MavenProject();
+ mojo.output = output;
+ mojo.skip = false;
+ mojo.skipIfSpecIsUnchanged = false;
+ mojo.bundleSpecs = true;
+ mojo.dereferenceComponents = true;
+
+ assertThrows(MojoExecutionException.class, mojo::execute);
+
+ }
+
+ @Test
+ void testArtifactInputMojo() throws ArtifactResolutionException, MojoFailureException, MojoExecutionException {
+ File file = getFile("/oas-examples/openapi-zips-1.0.0-SNAPSHOT-api.zip");
+ artifactResolver = mock(ArtifactResolver.class);
+ artifactResult = mock( ArtifactResult.class);
+ org.eclipse.aether.artifact.Artifact artifact = mock(org.eclipse.aether.artifact.Artifact.class);
+
+ when(artifactResolver.resolveArtifact(any(),any())).thenReturn(artifactResult);
+ when(artifactResult.getArtifact()).thenReturn(artifact);
+ when(artifact.getFile()).thenReturn(file);
+
+ GenerateDocMojo mojo = new GenerateDocMojo();
+ File output = new File("target/boat-docs");
+ if (!output.exists()) {
+ output.mkdirs();
+ }
+
+ DefaultBuildContext defaultBuildContext = new DefaultBuildContext();
+ defaultBuildContext.enableLogging(new ConsoleLogger());
+ InputArtifact inputArtifact = new InputArtifact();
+ inputArtifact.setVersion("1.0.0-SNAPSHOT");
+ inputArtifact.setGroupId("test.groupId");
+ inputArtifact.setArtifactId("openapi-zips");
+ inputArtifact.setClassifier("api");
+ inputArtifact.setType("zip");
+ inputArtifact.setFileName("presentation-integration-api/openapi.yaml");
+
+ mojo.inputMavenArtifact=inputArtifact;
+ mojo.getLog();
+ mojo.buildContext = defaultBuildContext;
+ mojo.artifactResolver = artifactResolver;
+ Build build = new Build();
+ build.setDirectory("target");
+
+
+ MavenProject project = new MavenProject();
+
+ project.setBuild(build);
+ mojo.project = project;
+ mojo.repositorySession = mock(RepositorySystemSession.class);
+ mojo.output = output;
+ mojo.skip = false;
+ mojo.skipIfSpecIsUnchanged = false;
+ mojo.bundleSpecs = true;
+ mojo.dereferenceComponents = true;
+ mojo.execute();
+
+ assertThat(output.list()).containsExactlyInAnyOrder("index.html", ".openapi-generator-ignore", ".openapi-generator");
+
+ }
+ @Test
+ void testArtifactInputMojoOverwrite() throws ArtifactResolutionException, MojoFailureException, MojoExecutionException {
+ File file = getFile("/oas-examples/openapi-zips-1.0.0-SNAPSHOT-api.zip");
+ artifactResolver = mock(ArtifactResolver.class);
+ artifactResult = mock( ArtifactResult.class);
+ org.eclipse.aether.artifact.Artifact artifact = mock(org.eclipse.aether.artifact.Artifact.class);
+
+ when(artifactResolver.resolveArtifact(any(),any())).thenReturn(artifactResult);
+ when(artifactResult.getArtifact()).thenReturn(artifact);
+ when(artifact.getFile()).thenReturn(file);
+
+ GenerateDocMojo mojo = new GenerateDocMojo();
+ File output = new File("target/boat-docs");
+ if (!output.exists()) {
+ output.mkdirs();
+ }
+
+ DefaultBuildContext defaultBuildContext = new DefaultBuildContext();
+ defaultBuildContext.enableLogging(new ConsoleLogger());
+ InputArtifact inputArtifact = new InputArtifact();
+ inputArtifact.setVersion("1.0.0-SNAPSHOT");
+ inputArtifact.setGroupId("test.groupId");
+ inputArtifact.setArtifactId("openapi-zips");
+ inputArtifact.setClassifier("api");
+ inputArtifact.setType("zip");
+ inputArtifact.setOverWriteIfNewer(true);
+ inputArtifact.setFileName("presentation-integration-api/openapi.yaml");
+
+ mojo.inputMavenArtifact=inputArtifact;
+ mojo.getLog();
+ mojo.buildContext = defaultBuildContext;
+ mojo.artifactResolver = artifactResolver;
+ Build build = new Build();
+ build.setDirectory("target");
+
+
+ MavenProject project = new MavenProject();
+
+ project.setBuild(build);
+ mojo.project = project;
+ mojo.repositorySession = mock(RepositorySystemSession.class);
+ mojo.output = output;
+ mojo.skip = false;
+ mojo.skipIfSpecIsUnchanged = false;
+ mojo.bundleSpecs = true;
+ mojo.dereferenceComponents = true;
+ mojo.execute();
+
+ assertThat(output.list()).containsExactlyInAnyOrder("index.html", ".openapi-generator-ignore", ".openapi-generator");
+
+ }
+ @Test
+ void testArtifactInputMojoDuplicateFile() throws ArtifactResolutionException, MojoFailureException, MojoExecutionException {
+ File file = getFile("/oas-examples/openapi-zips-1.0.0-SNAPSHOT-api.zip");
+ artifactResolver = mock(ArtifactResolver.class);
+ artifactResult = mock( ArtifactResult.class);
+ org.eclipse.aether.artifact.Artifact artifact = mock(org.eclipse.aether.artifact.Artifact.class);
+
+ when(artifactResolver.resolveArtifact(any(),any())).thenReturn(artifactResult);
+ when(artifactResult.getArtifact()).thenReturn(artifact);
+ when(artifact.getFile()).thenReturn(file);
+
+ GenerateDocMojo mojo = new GenerateDocMojo();
+ File output = new File("target/boat-docs");
+ if (!output.exists()) {
+ output.mkdirs();
+ }
+
+ DefaultBuildContext defaultBuildContext = new DefaultBuildContext();
+ defaultBuildContext.enableLogging(new ConsoleLogger());
+ InputArtifact inputArtifact = new InputArtifact();
+ inputArtifact.setVersion("1.0.0-SNAPSHOT");
+ inputArtifact.setGroupId("test.groupId");
+ inputArtifact.setArtifactId("openapi-zips");
+ inputArtifact.setClassifier("api");
+ inputArtifact.setType("zip");
+ inputArtifact.setFileName("openapi.yaml");
+
+ mojo.inputMavenArtifact=inputArtifact;
+ mojo.getLog();
+ mojo.buildContext = defaultBuildContext;
+ mojo.artifactResolver = artifactResolver;
+ Build build = new Build();
+ build.setDirectory("target");
+
+
+ MavenProject project = new MavenProject();
+
+ project.setBuild(build);
+ mojo.project = project;
+ mojo.repositorySession = mock(RepositorySystemSession.class);
+ mojo.output = output;
+ mojo.skip = false;
+ mojo.skipIfSpecIsUnchanged = false;
+ mojo.bundleSpecs = true;
+ mojo.dereferenceComponents = true;
+ mojo.execute();
+
+ assertThat(output.list()).containsExactlyInAnyOrder("index.html", ".openapi-generator-ignore", ".openapi-generator");
+
+ }
+
+ @Test
+ void testArtifactInputMojoFail() throws ArtifactResolutionException, MojoFailureException, MojoExecutionException {
+ File file = getFile("/oas-examples/openapi-zips-1.0.0-SNAPSHOT-api.zip");
+ artifactResolver = mock(ArtifactResolver.class);
+ artifactResult = mock( ArtifactResult.class);
+ org.eclipse.aether.artifact.Artifact artifact = mock(org.eclipse.aether.artifact.Artifact.class);
+
+ when(artifactResolver.resolveArtifact(any(),any())).thenReturn(artifactResult);
+ when(artifactResult.getArtifact()).thenReturn(artifact);
+ when(artifact.getFile()).thenReturn(file);
+
+ GenerateDocMojo mojo = new GenerateDocMojo();
+ File output = new File("target/boat-docs");
+ if (!output.exists()) {
+ output.mkdirs();
+ }
+
+ DefaultBuildContext defaultBuildContext = new DefaultBuildContext();
+ defaultBuildContext.enableLogging(new ConsoleLogger());
+ InputArtifact inputArtifact = new InputArtifact();
+ inputArtifact.setVersion("1.0.0-SNAPSHOT");
+ inputArtifact.setGroupId("test.groupId");
+ inputArtifact.setArtifactId("openapi-zips");
+ inputArtifact.setClassifier("api");
+ inputArtifact.setType("zip");
+ inputArtifact.setFileName("file-not-present.yaml");
+
+ mojo.inputMavenArtifact=inputArtifact;
+ mojo.getLog();
+ mojo.buildContext = defaultBuildContext;
+ mojo.artifactResolver = artifactResolver;
+ Build build = new Build();
+ build.setDirectory("target");
+
+
+ MavenProject project = new MavenProject();
+
+ project.setBuild(build);
+ mojo.project = project;
+ mojo.repositorySession = mock(RepositorySystemSession.class);
+ mojo.output = output;
+ mojo.skip = false;
+ mojo.skipIfSpecIsUnchanged = false;
+ mojo.bundleSpecs = true;
+ mojo.dereferenceComponents = true;
+
+ assertThrows(MojoExecutionException.class, mojo::execute);
+
+ }
+
+
+
+ private File getFile(String fileName) {
+ return new File(getClass().getResource(fileName).getFile());
+ }
+
+
+
+}
diff --git a/boat-maven-plugin/src/test/java/com/backbase/oss/boat/ExportBomMojoTests.java b/boat-maven-plugin/src/test/java/com/backbase/oss/boat/ExportBomMojoTests.java
new file mode 100644
index 000000000..9b800a078
--- /dev/null
+++ b/boat-maven-plugin/src/test/java/com/backbase/oss/boat/ExportBomMojoTests.java
@@ -0,0 +1,155 @@
+package com.backbase.oss.boat;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import java.io.File;
+import java.util.Collections;
+import java.util.List;
+import org.apache.maven.model.Build;
+import org.apache.maven.model.Dependency;
+import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugin.MojoFailureException;
+import org.apache.maven.project.MavenProject;
+import org.codehaus.plexus.logging.console.ConsoleLogger;
+import org.eclipse.aether.RepositorySystemSession;
+import org.eclipse.aether.artifact.DefaultArtifact;
+import org.eclipse.aether.impl.ArtifactResolver;
+import org.eclipse.aether.impl.MetadataResolver;
+import org.eclipse.aether.metadata.Metadata;
+import org.eclipse.aether.resolution.ArtifactResolutionException;
+import org.eclipse.aether.resolution.ArtifactResult;
+import org.eclipse.aether.resolution.MetadataResult;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Captor;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.sonatype.plexus.build.incremental.DefaultBuildContext;
+
+@ExtendWith(MockitoExtension.class)
+class ExportBomMojoTests {
+ @Mock
+ ArtifactResolver artifactResolver;
+ @Mock
+ ArtifactResult artifactResult;
+ @Mock
+ MetadataResolver metadataResolver;
+
+ @Mock
+ MetadataResult metadataResult;
+ @Mock
+ Metadata metadatamock;
+
+ @Captor
+ ArgumentCaptor argCaptor;
+
+
+ @Test
+ void testExportBomEmptyMeta() throws MojoFailureException, MojoExecutionException, ArtifactResolutionException {
+ artifactResolver = mock(ArtifactResolver.class);
+ artifactResult = mock( ArtifactResult.class);
+ metadataResolver = mock(MetadataResolver.class);
+ org.eclipse.aether.artifact.Artifact artifact = mock(org.eclipse.aether.artifact.Artifact.class);
+
+ when(metadataResolver.resolveMetadata(any(),any())).thenReturn(Collections.singletonList(metadataResult));
+
+ ExportBomMojo mojo = new ExportBomMojo();
+ File output = new File("target/boat-bom-export");
+ if (!output.exists()) {
+ output.mkdirs();
+ }
+
+ DefaultBuildContext defaultBuildContext = new DefaultBuildContext();
+ defaultBuildContext.enableLogging(new ConsoleLogger());
+
+ mojo.getLog();
+ mojo.artifactResolver = artifactResolver;
+ mojo.metadataResolver = metadataResolver;
+ mojo.setSpecBom(new Dependency());
+
+
+ Build build = new Build();
+ build.setDirectory("target");
+
+ MavenProject project = new MavenProject();
+ mojo.remoteRepositories = Collections.EMPTY_LIST;
+ project.setBuild(build);
+ mojo.project = project;
+ mojo.repositorySession = mock(RepositorySystemSession.class);
+ mojo.execute();
+
+ assertThat(output.list()).isEmpty();
+ }
+
+ @Test
+ void testExportBomUseOfArtifactResolver() throws MojoFailureException, MojoExecutionException, ArtifactResolutionException {
+ File versionFile = getFile("/export-bom/maven-metadata-test-example.xml");
+ String groupId="test.groupId";
+ String artifactId = "raml-bom";
+ String type = "pom";
+ String version= "[1.0.0,)";
+
+ File pomFile = getFile("/export-bom/raml-spec-bom/pom.xml");
+ artifactResolver = mock(ArtifactResolver.class);
+ artifactResult = mock( ArtifactResult.class);
+ org.eclipse.aether.artifact.Artifact artifact; //= mock(org.eclipse.aether.artifact.Artifact.class);
+ artifact = new DefaultArtifact(groupId, artifactId, "", type, version,Collections.EMPTY_MAP, pomFile);
+
+
+ when(artifactResolver.resolveArtifact(any(),any())).thenReturn(artifactResult);
+ when(artifactResult.getArtifact()).thenReturn(artifact);
+ //when(artifact.getFile()).thenReturn(pomFile);
+
+
+ when(metadataResolver.resolveMetadata(any(),any())).thenReturn(Collections.singletonList(metadataResult));
+
+ ExportBomMojo mojo = new ExportBomMojo();
+ File output = new File("target/boat-bom-export");
+ if (!output.exists()) {
+ output.mkdirs();
+ }
+ when(metadataResult.isResolved()).thenReturn(true);
+
+
+ doReturn(metadatamock).when(metadataResult).getMetadata();
+ doReturn(versionFile).when(metadatamock).getFile();
+
+ DefaultBuildContext defaultBuildContext = new DefaultBuildContext();
+ defaultBuildContext.enableLogging(new ConsoleLogger());
+
+ mojo.getLog();
+ mojo.artifactResolver = artifactResolver;
+ mojo.metadataResolver = metadataResolver;
+ Dependency dependency = new Dependency();
+
+ dependency.setType(type);
+ dependency.setGroupId(groupId);
+ dependency.setArtifactId(artifactId);
+ dependency.setVersion(version);
+ mojo.setSpecBom(dependency);
+
+
+ Build build = new Build();
+ build.setDirectory("target");
+
+ MavenProject project = new MavenProject();
+ mojo.remoteRepositories = Collections.EMPTY_LIST;
+
+ project.setBuild(build);
+ mojo.project = project;
+ mojo.repositorySession = mock(RepositorySystemSession.class);
+ mojo.execute();
+
+ assertThat(output.list()).isEmpty();
+
+ }
+ private File getFile(String fileName) {
+ return new File(getClass().getResource(fileName).getFile());
+ }
+
+}
diff --git a/boat-maven-plugin/src/test/java/com/backbase/oss/boat/ExportMojoTests.java b/boat-maven-plugin/src/test/java/com/backbase/oss/boat/ExportMojoTests.java
index b01164bc1..4a467063b 100644
--- a/boat-maven-plugin/src/test/java/com/backbase/oss/boat/ExportMojoTests.java
+++ b/boat-maven-plugin/src/test/java/com/backbase/oss/boat/ExportMojoTests.java
@@ -11,7 +11,6 @@
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.logging.console.ConsoleLogger;
-import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.sonatype.plexus.build.incremental.DefaultBuildContext;
diff --git a/boat-maven-plugin/src/test/java/com/backbase/oss/boat/GenerateMojoTests.java b/boat-maven-plugin/src/test/java/com/backbase/oss/boat/GenerateMojoTests.java
index 955725894..31457400a 100644
--- a/boat-maven-plugin/src/test/java/com/backbase/oss/boat/GenerateMojoTests.java
+++ b/boat-maven-plugin/src/test/java/com/backbase/oss/boat/GenerateMojoTests.java
@@ -4,6 +4,7 @@
import com.backbase.oss.codegen.java.BoatSpringCodeGen;
import java.io.File;
import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugin.MojoFailureException;
import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.logging.console.ConsoleLogger;
import org.junit.jupiter.api.BeforeEach;
@@ -27,7 +28,7 @@ void setUp() {
}
@Test
- void addTestCompileSourceRoot() throws MojoExecutionException {
+ void addTestCompileSourceRoot() throws MojoExecutionException, MojoFailureException {
GenerateMojo mojo = configure(new GenerateMojo(), DefaultCodegen.class.getName());
mojo.addCompileSourceRoot = false;
@@ -46,7 +47,7 @@ void addTestCompileSourceRoot() throws MojoExecutionException {
}
@Test
- void useJavaBoat() throws MojoExecutionException {
+ void useJavaBoat() throws MojoExecutionException, MojoFailureException {
GenerateMojo mojo = configure(new GenerateMojo(), "java");
mojo.execute();
@@ -55,7 +56,7 @@ void useJavaBoat() throws MojoExecutionException {
}
@Test
- void useSpringBoat() throws MojoExecutionException {
+ void useSpringBoat() throws MojoExecutionException, MojoFailureException {
GenerateMojo mojo = configure(new GenerateMojo(), "spring");
mojo.execute();
@@ -64,7 +65,7 @@ void useSpringBoat() throws MojoExecutionException {
}
@Test
- void useJavaBoatForRestTemplateEmbedded() throws MojoExecutionException {
+ void useJavaBoatForRestTemplateEmbedded() throws MojoExecutionException, MojoFailureException {
GenerateMojo mojo = configure(new GenerateRestTemplateEmbeddedMojo(), null);
mojo.execute();
@@ -73,7 +74,7 @@ void useJavaBoatForRestTemplateEmbedded() throws MojoExecutionException {
}
@Test
- void useSpringBoatForSpringBootEmbedded() throws MojoExecutionException {
+ void useSpringBoatForSpringBootEmbedded() throws MojoExecutionException, MojoFailureException {
GenerateMojo mojo = configure(new GenerateSpringBootEmbeddedMojo(), null);
mojo.execute();
@@ -82,7 +83,7 @@ void useSpringBoatForSpringBootEmbedded() throws MojoExecutionException {
}
@Test
- void useJavaBoatForWebClientEmbedded() throws MojoExecutionException {
+ void useJavaBoatForWebClientEmbedded() throws MojoExecutionException, MojoFailureException {
GenerateMojo mojo = configure(new GenerateWebClientEmbeddedMojo(), null);
mojo.execute();
diff --git a/boat-maven-plugin/src/test/java/com/backbase/oss/boat/GeneratorTests.java b/boat-maven-plugin/src/test/java/com/backbase/oss/boat/GeneratorTests.java
index 4aa024d51..ed8cbd38f 100644
--- a/boat-maven-plugin/src/test/java/com/backbase/oss/boat/GeneratorTests.java
+++ b/boat-maven-plugin/src/test/java/com/backbase/oss/boat/GeneratorTests.java
@@ -28,7 +28,7 @@ static void setupLocale() {
}
@Test
- void testHtml2() throws MojoExecutionException {
+ void testHtml2() throws MojoExecutionException, MojoFailureException {
String spec = System.getProperty("spec", getClass().getResource("/oas-examples/petstore.yaml").getFile());
GenerateMojo mojo = new GenerateMojo();
@@ -55,7 +55,7 @@ void testHtml2() throws MojoExecutionException {
}
@Test
- void testBoatDocs() throws MojoExecutionException {
+ void testBoatDocs() throws MojoExecutionException, MojoFailureException {
String spec = System.getProperty("spec", getClass().getResource("/oas-examples/petstore.yaml").getFile());
@@ -86,7 +86,7 @@ void testBoatDocs() throws MojoExecutionException {
}
@Test
- void testBoatDocsWithDirectory() throws MojoExecutionException {
+ void testBoatDocsWithDirectory() throws MojoExecutionException, MojoFailureException {
String spec = System.getProperty("spec", getClass().getResource("/boat-doc-oas-examples").getFile());
@@ -235,7 +235,7 @@ void testAngularExamplesInComponents() {
}
@Test
- void testBeanValidation() throws MojoExecutionException {
+ void testBeanValidation() throws MojoExecutionException, MojoFailureException {
GenerateMojo mojo = new GenerateMojo();
String inputFile = getClass().getResource("/oas-examples/petstore.yaml").getFile();
diff --git a/boat-maven-plugin/src/test/resources/export-bom/maven-metadata-test-example.xml b/boat-maven-plugin/src/test/resources/export-bom/maven-metadata-test-example.xml
new file mode 100644
index 000000000..971aae3d4
--- /dev/null
+++ b/boat-maven-plugin/src/test/resources/export-bom/maven-metadata-test-example.xml
@@ -0,0 +1,15 @@
+
+ test.groupId
+ openapi-zips
+ [1.0.0,)
+
+ 1.0.0
+ 1.0.0
+
+ 1.0.0
+
+ 20150509185437
+
+
diff --git a/boat-maven-plugin/src/test/resources/export-bom/raml-spec-bom/pom.xml b/boat-maven-plugin/src/test/resources/export-bom/raml-spec-bom/pom.xml
new file mode 100644
index 000000000..51b78d2fd
--- /dev/null
+++ b/boat-maven-plugin/src/test/resources/export-bom/raml-spec-bom/pom.xml
@@ -0,0 +1,32 @@
+
+
+ 4.0.0
+
+ com.backbase.oss.boat.example
+ raml-spec-bom
+ 1.0.0-SNAPSHOT
+
+
+ 1.0.0-SNAPSHOT
+
+
+ pom
+
+ BOAT :: RAML Bill-Of-Materials
+
+
+
+
+ com.backbase.oss.boat.example
+ raml-spec
+ ${raml-spec.version}
+
+
+
+
+
+
+
+
diff --git a/boat-maven-plugin/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker b/boat-maven-plugin/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
new file mode 100644
index 000000000..ca6ee9cea
--- /dev/null
+++ b/boat-maven-plugin/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
@@ -0,0 +1 @@
+mock-maker-inline
\ No newline at end of file
diff --git a/boat-maven-plugin/src/test/resources/oas-examples/openapi-zips-1.0.0-SNAPSHOT-api.zip b/boat-maven-plugin/src/test/resources/oas-examples/openapi-zips-1.0.0-SNAPSHOT-api.zip
new file mode 100644
index 000000000..c12e5d4f7
Binary files /dev/null and b/boat-maven-plugin/src/test/resources/oas-examples/openapi-zips-1.0.0-SNAPSHOT-api.zip differ