You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sl...@apache.org on 2024/10/06 19:44:43 UTC
(maven-project-info-reports-plugin) branch deprecated created (now 3ec7dae)
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a change to branch deprecated
in repository https://gitbox.apache.org/repos/asf/maven-project-info-reports-plugin.git
at 3ec7dae Cleanups
This branch includes the following new commits:
new 3ec7dae Cleanups
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
(maven-project-info-reports-plugin) 01/01: Cleanups
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch deprecated
in repository https://gitbox.apache.org/repos/asf/maven-project-info-reports-plugin.git
commit 3ec7daec6383e44d14373164b7ede483713f9256
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Sun Oct 6 21:44:34 2024 +0200
Cleanups
---
.../report/projectinfo/DependenciesReport.java | 54 +++++++-----------
.../projectinfo/DependencyConvergenceReport.java | 3 +-
.../report/projectinfo/IssueManagementReport.java | 2 +-
.../report/projectinfo/MailingListsReport.java | 6 +-
.../report/projectinfo/PluginManagementReport.java | 3 +-
.../maven/report/projectinfo/PluginsReport.java | 3 +-
.../maven/report/projectinfo/SummaryReport.java | 3 +
.../maven/report/projectinfo/TeamReport.java | 4 +-
.../projectinfo/dependencies/Dependencies.java | 3 +-
.../dependencies/DependencyVersionMap.java | 6 +-
.../SinkSerializingDependencyNodeVisitor.java | 2 +-
.../renderer/DependenciesRenderer.java | 24 ++++----
.../renderer/DependencyManagementRenderer.java | 66 ++++++++++------------
.../projectinfo/AbstractProjectInfoTestCase.java | 7 +--
.../report/projectinfo/MailingListsReportTest.java | 2 +-
.../projectinfo/PluginManagementReportTest.java | 9 +--
.../projectinfo/ProjectInfoReportUtilsTest.java | 4 --
17 files changed, 80 insertions(+), 121 deletions(-)
diff --git a/src/main/java/org/apache/maven/report/projectinfo/DependenciesReport.java b/src/main/java/org/apache/maven/report/projectinfo/DependenciesReport.java
index 2d60f2a..57e4de9 100644
--- a/src/main/java/org/apache/maven/report/projectinfo/DependenciesReport.java
+++ b/src/main/java/org/apache/maven/report/projectinfo/DependenciesReport.java
@@ -20,12 +20,13 @@ package org.apache.maven.report.projectinfo;
import java.io.BufferedReader;
import java.io.File;
-import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.LineNumberReader;
import java.io.OutputStream;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
import java.util.Locale;
import org.apache.maven.artifact.Artifact;
@@ -48,7 +49,6 @@ import org.apache.maven.shared.dependency.graph.DependencyGraphBuilderException;
import org.apache.maven.shared.dependency.graph.DependencyNode;
import org.apache.maven.shared.jar.classes.JarClassesAnalysis;
import org.codehaus.plexus.util.IOUtil;
-import org.codehaus.plexus.util.ReaderFactory;
/**
* Generates the Project Dependencies report.
@@ -205,45 +205,33 @@ public class DependenciesReport extends AbstractProjectInfoReport {
* @throws IOException if any
*/
private void copyResources(File outputDirectory) throws IOException {
- InputStream resourceList = null;
- InputStream in = null;
- BufferedReader reader = null;
- OutputStream out = null;
- try {
- resourceList = getClass().getClassLoader().getResourceAsStream(RESOURCES_DIR + "/resources.txt");
-
+ try (InputStream resourceList =
+ getClass().getClassLoader().getResourceAsStream(RESOURCES_DIR + "/resources.txt")) {
if (resourceList != null) {
- reader = new LineNumberReader(new InputStreamReader(resourceList, ReaderFactory.US_ASCII));
+ try (BufferedReader reader =
+ new LineNumberReader(new InputStreamReader(resourceList, StandardCharsets.US_ASCII))) {
- for (String line = reader.readLine(); line != null; line = reader.readLine()) {
- in = getClass().getClassLoader().getResourceAsStream(RESOURCES_DIR + "/" + line);
+ for (String line = reader.readLine(); line != null; line = reader.readLine()) {
+ try (InputStream in =
+ getClass().getClassLoader().getResourceAsStream(RESOURCES_DIR + "/" + line)) {
- if (in == null) {
- throw new IOException("The resource " + line + " doesn't exist.");
- }
+ if (in == null) {
+ throw new IOException("The resource " + line + " doesn't exist.");
+ }
- File outputFile = new File(outputDirectory, line);
+ File outputFile = new File(outputDirectory, line);
- if (!outputFile.getParentFile().exists()) {
- outputFile.getParentFile().mkdirs();
- }
+ if (!outputFile.getParentFile().exists()) {
+ outputFile.getParentFile().mkdirs();
+ }
- out = new FileOutputStream(outputFile);
- IOUtil.copy(in, out);
- out.close();
- out = null;
- in.close();
- in = null;
+ try (OutputStream out = Files.newOutputStream(outputFile.toPath())) {
+ IOUtil.copy(in, out);
+ }
+ }
+ }
}
-
- reader.close();
- reader = null;
}
- } finally {
- IOUtil.close(out);
- IOUtil.close(reader);
- IOUtil.close(in);
- IOUtil.close(resourceList);
}
}
}
diff --git a/src/main/java/org/apache/maven/report/projectinfo/DependencyConvergenceReport.java b/src/main/java/org/apache/maven/report/projectinfo/DependencyConvergenceReport.java
index b143aa7..0293ed2 100644
--- a/src/main/java/org/apache/maven/report/projectinfo/DependencyConvergenceReport.java
+++ b/src/main/java/org/apache/maven/report/projectinfo/DependencyConvergenceReport.java
@@ -20,7 +20,6 @@ package org.apache.maven.report.projectinfo;
import java.util.ArrayList;
import java.util.Arrays;
-import java.util.Collections;
import java.util.Comparator;
import java.util.HashMap;
import java.util.HashSet;
@@ -332,7 +331,7 @@ public class DependencyConvergenceReport extends AbstractProjectInfoReport {
+ depList.get(0).getDependency());
return;
}
- Collections.sort(projectNodes, new DependencyNodeComparator());
+ projectNodes.sort(new DependencyNodeComparator());
for (DependencyNode projectNode : projectNodes) {
if (isReactorBuild()) {
diff --git a/src/main/java/org/apache/maven/report/projectinfo/IssueManagementReport.java b/src/main/java/org/apache/maven/report/projectinfo/IssueManagementReport.java
index 6082348..cb73e15 100644
--- a/src/main/java/org/apache/maven/report/projectinfo/IssueManagementReport.java
+++ b/src/main/java/org/apache/maven/report/projectinfo/IssueManagementReport.java
@@ -119,7 +119,7 @@ public class IssueManagementReport extends AbstractProjectInfoReport {
sink.paragraph();
linkPatternedText(getI18nString("scarab.intro"));
sink.paragraph_();
- } else if (system == null || "".equals(system.trim())) {
+ } else if (system == null || system.trim().isEmpty()) {
paragraph(getI18nString("general.intro"));
} else {
paragraph(getI18nString("custom.intro").replaceFirst("%issueManagementSystem%", system));
diff --git a/src/main/java/org/apache/maven/report/projectinfo/MailingListsReport.java b/src/main/java/org/apache/maven/report/projectinfo/MailingListsReport.java
index 2d4e425..bd6bc68 100644
--- a/src/main/java/org/apache/maven/report/projectinfo/MailingListsReport.java
+++ b/src/main/java/org/apache/maven/report/projectinfo/MailingListsReport.java
@@ -185,7 +185,7 @@ public class MailingListsReport extends AbstractProjectInfoReport {
textRow.add(createLinkPatternedText(
ProjectInfoReportUtils.getArchiveServer(otherArchive), otherArchive));
- tableRow(textRow.toArray(new String[textRow.size()]));
+ tableRow(textRow.toArray(new String[0]));
// Other lines...
while (it.hasNext()) {
@@ -212,14 +212,14 @@ public class MailingListsReport extends AbstractProjectInfoReport {
textRow.add(createLinkPatternedText(
ProjectInfoReportUtils.getArchiveServer(otherArchive), otherArchive));
- tableRow(textRow.toArray(new String[textRow.size()]));
+ tableRow(textRow.toArray(new String[0]));
}
} else {
if (otherArchives) {
textRow.add(null);
}
- tableRow(textRow.toArray(new String[textRow.size()]));
+ tableRow(textRow.toArray(new String[0]));
}
}
diff --git a/src/main/java/org/apache/maven/report/projectinfo/PluginManagementReport.java b/src/main/java/org/apache/maven/report/projectinfo/PluginManagementReport.java
index 2c2c7aa..92af841 100644
--- a/src/main/java/org/apache/maven/report/projectinfo/PluginManagementReport.java
+++ b/src/main/java/org/apache/maven/report/projectinfo/PluginManagementReport.java
@@ -18,7 +18,6 @@
*/
package org.apache.maven.report.projectinfo;
-import java.util.Collections;
import java.util.Comparator;
import java.util.List;
import java.util.Locale;
@@ -199,7 +198,7 @@ public class PluginManagementReport extends AbstractProjectInfoReport {
startSection(getTitle());
// can't use straight artifact comparison because we want optional last
- Collections.sort(pluginManagement, getPluginComparator());
+ pluginManagement.sort(getPluginComparator());
startTable();
tableHeader(tableHeader);
diff --git a/src/main/java/org/apache/maven/report/projectinfo/PluginsReport.java b/src/main/java/org/apache/maven/report/projectinfo/PluginsReport.java
index 83a6f98..d6a7b00 100644
--- a/src/main/java/org/apache/maven/report/projectinfo/PluginsReport.java
+++ b/src/main/java/org/apache/maven/report/projectinfo/PluginsReport.java
@@ -19,7 +19,6 @@
package org.apache.maven.report.projectinfo;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.Comparator;
import java.util.List;
import java.util.Locale;
@@ -186,7 +185,7 @@ public class PluginsReport extends AbstractProjectInfoReport {
return;
}
- Collections.sort(list, getPluginComparator());
+ list.sort(getPluginComparator());
startTable();
tableHeader(tableHeader);
diff --git a/src/main/java/org/apache/maven/report/projectinfo/SummaryReport.java b/src/main/java/org/apache/maven/report/projectinfo/SummaryReport.java
index a2cb397..f102eed 100644
--- a/src/main/java/org/apache/maven/report/projectinfo/SummaryReport.java
+++ b/src/main/java/org/apache/maven/report/projectinfo/SummaryReport.java
@@ -141,6 +141,7 @@ public class SummaryReport extends AbstractProjectInfoReport {
String sourceConfigured = getPluginParameter(pluginId, "source");
String targetConfigured = getPluginParameter(pluginId, "target");
+ /*
String forkFlag = getPluginParameter(pluginId, "fork");
String compilerVersionConfigured = null;
if ("true".equalsIgnoreCase(forkFlag)) {
@@ -148,6 +149,8 @@ public class SummaryReport extends AbstractProjectInfoReport {
}
String minimumJavaVersion = compilerVersionConfigured;
+ */
+ String minimumJavaVersion;
if (targetConfigured != null) {
minimumJavaVersion = targetConfigured;
} else if (sourceConfigured != null) {
diff --git a/src/main/java/org/apache/maven/report/projectinfo/TeamReport.java b/src/main/java/org/apache/maven/report/projectinfo/TeamReport.java
index 10e0823..5440f33 100644
--- a/src/main/java/org/apache/maven/report/projectinfo/TeamReport.java
+++ b/src/main/java/org/apache/maven/report/projectinfo/TeamReport.java
@@ -258,7 +258,7 @@ public class TeamReport extends AbstractProjectInfoReport {
if (member.getRoles() != null) {
// Comma separated roles
List<String> var = member.getRoles();
- tableCell(StringUtils.join(var.toArray(new String[var.size()]), ", "));
+ tableCell(StringUtils.join(var.toArray(new String[0]), ", "));
} else {
tableCell(null);
}
@@ -338,7 +338,7 @@ public class TeamReport extends AbstractProjectInfoReport {
timeZone,
properties);
- return requiredArray.toArray(new String[requiredArray.size()]);
+ return requiredArray.toArray(new String[0]);
}
/**
diff --git a/src/main/java/org/apache/maven/report/projectinfo/dependencies/Dependencies.java b/src/main/java/org/apache/maven/report/projectinfo/dependencies/Dependencies.java
index 150afc1..6311cc8 100644
--- a/src/main/java/org/apache/maven/report/projectinfo/dependencies/Dependencies.java
+++ b/src/main/java/org/apache/maven/report/projectinfo/dependencies/Dependencies.java
@@ -24,7 +24,6 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.jar.JarEntry;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.project.MavenProject;
@@ -218,7 +217,7 @@ public class Dependencies {
File file = getFile(artifact);
if (file.isDirectory()) {
- jarData = new JarData(artifact.getFile(), null, new ArrayList<JarEntry>());
+ jarData = new JarData(artifact.getFile(), null, new ArrayList<>());
jarData.setJarClasses(new JarClasses());
} else {
diff --git a/src/main/java/org/apache/maven/report/projectinfo/dependencies/DependencyVersionMap.java b/src/main/java/org/apache/maven/report/projectinfo/dependencies/DependencyVersionMap.java
index 3cfe705..2862400 100644
--- a/src/main/java/org/apache/maven/report/projectinfo/dependencies/DependencyVersionMap.java
+++ b/src/main/java/org/apache/maven/report/projectinfo/dependencies/DependencyVersionMap.java
@@ -90,11 +90,7 @@ public class DependencyVersionMap implements DependencyNodeVisitor {
private void addDependency(DependencyNode node) {
String key = constructKey(node);
- List<DependencyNode> nodes = idsToNode.get(key);
- if (nodes == null) {
- nodes = new ArrayList<>();
- idsToNode.put(key, nodes);
- }
+ List<DependencyNode> nodes = idsToNode.computeIfAbsent(key, k -> new ArrayList<>());
nodes.add(node);
}
diff --git a/src/main/java/org/apache/maven/report/projectinfo/dependencies/SinkSerializingDependencyNodeVisitor.java b/src/main/java/org/apache/maven/report/projectinfo/dependencies/SinkSerializingDependencyNodeVisitor.java
index 6d6c879..6200702 100644
--- a/src/main/java/org/apache/maven/report/projectinfo/dependencies/SinkSerializingDependencyNodeVisitor.java
+++ b/src/main/java/org/apache/maven/report/projectinfo/dependencies/SinkSerializingDependencyNodeVisitor.java
@@ -36,7 +36,7 @@ public class SinkSerializingDependencyNodeVisitor implements DependencyNodeVisit
/**
* Provides tokens to use when serializing the dependency tree.
*/
- private class TreeTokens {
+ private static class TreeTokens {
private final Sink sink;
TreeTokens(Sink sink) {
diff --git a/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java b/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java
index dd2324f..e7329f9 100644
--- a/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java
+++ b/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java
@@ -357,7 +357,7 @@ public class DependenciesRenderer extends AbstractProjectInfoRenderer {
startSection(getI18nString("file.details.title"));
List<Artifact> alldeps = dependencies.getAllDependencies();
- Collections.sort(alldeps, getArtifactComparator());
+ alldeps.sort(getArtifactComparator());
resolveAtrifacts(alldeps);
@@ -714,7 +714,7 @@ public class DependenciesRenderer extends AbstractProjectInfoRenderer {
String[] tableHeader = getDependencyTableHeader(withClassifier, withOptional);
// can't use straight artifact comparison because we want optional last
- Collections.sort(artifacts, getArtifactComparator());
+ artifacts.sort(getArtifactComparator());
String anchorByScope = isTransitive
? getI18nString("transitive.title") + "_" + scope
@@ -735,16 +735,14 @@ public class DependenciesRenderer extends AbstractProjectInfoRenderer {
}
private Comparator<Artifact> getArtifactComparator() {
- return new Comparator<Artifact>() {
- public int compare(Artifact a1, Artifact a2) {
- // put optional last
- if (a1.isOptional() && !a2.isOptional()) {
- return +1;
- } else if (!a1.isOptional() && a2.isOptional()) {
- return -1;
- } else {
- return a1.compareTo(a2);
- }
+ return (a1, a2) -> {
+ // put optional last
+ if (a1.isOptional() && !a2.isOptional()) {
+ return +1;
+ } else if (!a1.isOptional() && a2.isOptional()) {
+ return -1;
+ } else {
+ return a1.compareTo(a2);
}
};
}
@@ -1261,7 +1259,7 @@ public class DependenciesRenderer extends AbstractProjectInfoRenderer {
return MAP_BY_SCOPE.get(scope);
}
- private String scope;
+ private final String scope;
SummaryTableRowOrder() {
this(null);
diff --git a/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependencyManagementRenderer.java b/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependencyManagementRenderer.java
index eb8a278..28a000c 100644
--- a/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependencyManagementRenderer.java
+++ b/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependencyManagementRenderer.java
@@ -20,7 +20,6 @@ package org.apache.maven.report.projectinfo.dependencies.renderer;
import java.util.Collections;
import java.util.Comparator;
-import java.util.Iterator;
import java.util.List;
import java.util.Locale;
import java.util.Map;
@@ -176,7 +175,7 @@ public class DependencyManagementRenderer extends AbstractProjectInfoRenderer {
private void renderDependenciesForScope(String scope, List<Dependency> artifacts) {
if (artifacts != null) {
// can't use straight artifact comparison because we want optional last
- Collections.sort(artifacts, getDependencyComparator());
+ artifacts.sort(getDependencyComparator());
startSection(scope);
@@ -203,7 +202,6 @@ public class DependencyManagementRenderer extends AbstractProjectInfoRenderer {
}
}
- @SuppressWarnings("unchecked")
private String[] getDependencyRow(Dependency dependency, boolean hasClassifier) {
Artifact artifact = repositorySystem.createArtifact(
dependency.getGroupId(),
@@ -225,11 +223,7 @@ public class DependencyManagementRenderer extends AbstractProjectInfoRenderer {
artifact, buildingRequest.getLocalRepository(), buildingRequest.getRemoteRepositories());
// only use versions from range
- for (Iterator<ArtifactVersion> iter = versions.iterator(); iter.hasNext(); ) {
- if (!range.containsVersion(iter.next())) {
- iter.remove();
- }
- }
+ versions.removeIf(artifactVersion -> !range.containsVersion(artifactVersion));
// select latest, assuming pom information will be the most accurate
if (!versions.isEmpty()) {
@@ -291,42 +285,40 @@ public class DependencyManagementRenderer extends AbstractProjectInfoRenderer {
}
private Comparator<Dependency> getDependencyComparator() {
- return new Comparator<Dependency>() {
- public int compare(Dependency a1, Dependency a2) {
- int result = a1.getGroupId().compareTo(a2.getGroupId());
- if (result != 0) {
- return result;
- }
+ return (a1, a2) -> {
+ int result = a1.getGroupId().compareTo(a2.getGroupId());
+ if (result != 0) {
+ return result;
+ }
- result = a1.getArtifactId().compareTo(a2.getArtifactId());
- if (result != 0) {
- return result;
- }
+ result = a1.getArtifactId().compareTo(a2.getArtifactId());
+ if (result != 0) {
+ return result;
+ }
- result = a1.getType().compareTo(a2.getType());
- if (result != 0) {
- return result;
- }
+ result = a1.getType().compareTo(a2.getType());
+ if (result != 0) {
+ return result;
+ }
- if (a1.getClassifier() == null) {
- if (a2.getClassifier() != null) {
- return 1;
- }
- } else {
- if (a2.getClassifier() != null) {
- result = a1.getClassifier().compareTo(a2.getClassifier());
- } else {
- return -1;
- }
+ if (a1.getClassifier() == null) {
+ if (a2.getClassifier() != null) {
+ return 1;
}
-
- if (result != 0) {
- return result;
+ } else {
+ if (a2.getClassifier() != null) {
+ result = a1.getClassifier().compareTo(a2.getClassifier());
+ } else {
+ return -1;
}
+ }
- // We don't consider the version range in the comparison, just the resolved version
- return a1.getVersion().compareTo(a2.getVersion());
+ if (result != 0) {
+ return result;
}
+
+ // We don't consider the version range in the comparison, just the resolved version
+ return a1.getVersion().compareTo(a2.getVersion());
};
}
}
diff --git a/src/test/java/org/apache/maven/report/projectinfo/AbstractProjectInfoTestCase.java b/src/test/java/org/apache/maven/report/projectinfo/AbstractProjectInfoTestCase.java
index d6e8d20..86bab99 100644
--- a/src/test/java/org/apache/maven/report/projectinfo/AbstractProjectInfoTestCase.java
+++ b/src/test/java/org/apache/maven/report/projectinfo/AbstractProjectInfoTestCase.java
@@ -77,11 +77,6 @@ public abstract class AbstractProjectInfoTestCase extends AbstractMojoTestCase {
artifactStubFactory.getWorkingDir().mkdirs();
}
- @Override
- protected void tearDown() throws Exception {
- super.tearDown();
- }
-
/**
* Gets a trimmed String for the given key from the resource bundle defined by Plexus.
*
@@ -113,7 +108,7 @@ public abstract class AbstractProjectInfoTestCase extends AbstractMojoTestCase {
throw new IllegalArgumentException("The title cannot be empty");
}
- return String.format("%s \u2013 %s", shortTitle, projectTitle);
+ return String.format("%s – %s", shortTitle, projectTitle);
}
/**
diff --git a/src/test/java/org/apache/maven/report/projectinfo/MailingListsReportTest.java b/src/test/java/org/apache/maven/report/projectinfo/MailingListsReportTest.java
index 61a63e5..19d1d16 100644
--- a/src/test/java/org/apache/maven/report/projectinfo/MailingListsReportTest.java
+++ b/src/test/java/org/apache/maven/report/projectinfo/MailingListsReportTest.java
@@ -79,7 +79,7 @@ public class MailingListsReportTest extends AbstractProjectInfoTestCase {
assertEquals("MAILTO:test-subscribe2@maven.apache.org", subscribeLinks[1].getAttribute("href"));
String unsubscribe = getString("report.mailing-lists.column.unsubscribe");
WebLink[] unsubscribeLinks = response.getMatchingLinks(WebLink.MATCH_CONTAINED_TEXT, unsubscribe);
- assertTrue(unsubscribeLinks.length == 1);
+ assertEquals(1, unsubscribeLinks.length);
assertEquals("https://example.com/unsubscribe", unsubscribeLinks[0].getAttribute("href"));
}
diff --git a/src/test/java/org/apache/maven/report/projectinfo/PluginManagementReportTest.java b/src/test/java/org/apache/maven/report/projectinfo/PluginManagementReportTest.java
index eae4984..f9de331 100644
--- a/src/test/java/org/apache/maven/report/projectinfo/PluginManagementReportTest.java
+++ b/src/test/java/org/apache/maven/report/projectinfo/PluginManagementReportTest.java
@@ -32,7 +32,6 @@ import org.apache.maven.plugin.testing.stubs.MavenProjectStub;
import org.apache.maven.project.ProjectBuilder;
import org.apache.maven.project.ProjectBuildingRequest;
import org.apache.maven.project.ProjectBuildingResult;
-import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
import static org.mockito.Mockito.isA;
@@ -56,12 +55,8 @@ public class PluginManagementReportTest extends AbstractProjectInfoTestCase {
ProjectBuilder builder = mock(ProjectBuilder.class);
when(builder.build(isA(Artifact.class), isA(ProjectBuildingRequest.class)))
- .thenAnswer(new Answer<ProjectBuildingResult>() {
- @Override
- public ProjectBuildingResult answer(InvocationOnMock invocation) throws Throwable {
- return createProjectBuildingResult((Artifact) invocation.getArgument(0), "http://m.a.o/");
- }
- });
+ .thenAnswer((Answer<ProjectBuildingResult>)
+ invocation -> createProjectBuildingResult(invocation.getArgument(0), "http://m.a.o/"));
setVariableValueToObject(mojo, "projectBuilder", builder);
diff --git a/src/test/java/org/apache/maven/report/projectinfo/ProjectInfoReportUtilsTest.java b/src/test/java/org/apache/maven/report/projectinfo/ProjectInfoReportUtilsTest.java
index 0ff3b55..a3acec0 100644
--- a/src/test/java/org/apache/maven/report/projectinfo/ProjectInfoReportUtilsTest.java
+++ b/src/test/java/org/apache/maven/report/projectinfo/ProjectInfoReportUtilsTest.java
@@ -101,10 +101,6 @@ public class ProjectInfoReportUtilsTest extends AbstractMojoTestCase {
};
}
- protected void tearDown() throws Exception {
- super.tearDown();
- }
-
public void testGetInputStreamURL() throws Exception {
assertTrue(ProjectInfoReportUtils.isArtifactUrlValid("http://my.intern.domain:8080/test"));