This is an automated email from the ASF dual-hosted git repository. slachiewicz pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-enforcer.git
commit 9fa1e8bbe87768640c193b6975924397d4a0351f Author: Sylwester Lachiewicz <[email protected]> AuthorDate: Tue Nov 17 06:01:28 2026 +0000 Simplify redundant code --- .../rules/AbstractStandardEnforcerRule.java | 6 +++--- .../rules/BanDependencyManagementScope.java | 2 +- .../rules/BanDuplicatePomDependencyVersions.java | 6 ++++-- .../maven/enforcer/rules/BannedRepositories.java | 6 +++--- .../maven/enforcer/rules/RequireActiveProfile.java | 7 +++++-- .../rules/RequireExplicitDependencyScope.java | 10 +++++++--- .../maven/enforcer/rules/RequireJavaVendor.java | 6 +++--- .../enforcer/rules/RequireNoRepositories.java | 18 ++++++++++++----- .../org/apache/maven/enforcer/rules/RequireOS.java | 2 +- .../maven/enforcer/rules/RequirePrerequisite.java | 6 ++++-- .../maven/enforcer/rules/RequireSameVersions.java | 6 ++++-- .../checksum/NormalizeLineSeparatorReader.java | 2 +- .../rules/dependency/DependencyConvergence.java | 2 +- .../rules/dependency/EnforceBytecodeVersion.java | 2 +- .../rules/dependency/RequireUpperBoundDeps.java | 4 ++-- .../enforcer/rules/files/AbstractRequireFiles.java | 7 ++++--- .../enforcer/rules/files/RequireFilesSize.java | 6 +++--- .../enforcer/rules/utils/ArtifactMatcher.java | 23 ++++++++++------------ .../maven/enforcer/rules/utils/PluginWrapper.java | 2 +- .../rules/version/AbstractVersionEnforcer.java | 2 +- .../rules/files/TestRequireFilesExist.java | 8 ++++---- .../internal/DefaultEnforcementRuleHelper.java | 2 +- 22 files changed, 77 insertions(+), 58 deletions(-) diff --git a/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/AbstractStandardEnforcerRule.java b/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/AbstractStandardEnforcerRule.java index 4fa58870..5b9c8944 100644 --- a/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/AbstractStandardEnforcerRule.java +++ b/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/AbstractStandardEnforcerRule.java @@ -49,17 +49,17 @@ public abstract class AbstractStandardEnforcerRule extends AbstractEnforcerRule StringBuilder buffer = new StringBuilder(128); buffer.append( - (project.getGroupId() != null && project.getGroupId().length() > 0) + project.getGroupId() != null && project.getGroupId().length() > 0 ? project.getGroupId() : "[unknown-group-id]"); buffer.append(':'); buffer.append( - (project.getArtifactId() != null && project.getArtifactId().length() > 0) + project.getArtifactId() != null && project.getArtifactId().length() > 0 ? project.getArtifactId() : "[unknown-artifact-id]"); buffer.append(':'); buffer.append( - (project.getVersion() != null && project.getVersion().length() > 0) + project.getVersion() != null && project.getVersion().length() > 0 ? project.getVersion() : "[unknown-version]"); diff --git a/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/BanDependencyManagementScope.java b/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/BanDependencyManagementScope.java index da8f453b..d4b2553f 100644 --- a/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/BanDependencyManagementScope.java +++ b/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/BanDependencyManagementScope.java @@ -76,7 +76,7 @@ public final class BanDependencyManagementScope extends AbstractStandardEnforcer if (message == null) { message = "Scope other than 'import' is not allowed in 'dependencyManagement'"; } - buf.append(message + System.lineSeparator()); + buf.append(message).append(System.lineSeparator()); for (Dependency violatingDependency : violatingDependencies) { buf.append(getErrorMessage(project, violatingDependency)); } diff --git a/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/BanDuplicatePomDependencyVersions.java b/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/BanDuplicatePomDependencyVersions.java index a47723ed..5f42d8c3 100644 --- a/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/BanDuplicatePomDependencyVersions.java +++ b/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/BanDuplicatePomDependencyVersions.java @@ -125,7 +125,8 @@ public final class BanDuplicatePomDependencyVersions extends AbstractStandardEnf } message.append("Found ").append(duplicates).append(" duplicate dependency "); message.append(duplicateDependencies.size() == 1 ? "declaration" : "declarations") - .append(" in this project:" + System.lineSeparator()); + .append(" in this project:") + .append(System.lineSeparator()); message.append(summary); throw new EnforcerRuleException(message.toString()); } @@ -140,7 +141,8 @@ public final class BanDuplicatePomDependencyVersions extends AbstractStandardEnf .append(entry.getKey()) .append("] (") .append(entry.getValue()) - .append(" times)" + System.lineSeparator()); + .append(" times)") + .append(System.lineSeparator()); } } } diff --git a/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/BannedRepositories.java b/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/BannedRepositories.java index 1a263439..52ac44b2 100644 --- a/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/BannedRepositories.java +++ b/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/BannedRepositories.java @@ -138,12 +138,12 @@ public final class BannedRepositories extends AbstractStandardEnforcerRule { for (RemoteRepository repo : repositories) { String url = repo.getUrl().trim(); - if (includes.size() > 0 && !match(url, includes)) { + if (!includes.isEmpty() && !match(url, includes)) { bannedRepos.add(repo); continue; } - if (excludes.size() > 0 && match(url, excludes)) { + if (!excludes.isEmpty() && match(url, excludes)) { bannedRepos.add(repo); } } @@ -178,7 +178,7 @@ public final class BannedRepositories extends AbstractStandardEnforcerRule { private String getRepositoryUrlString(List<RemoteRepository> resultBannedRepos) { StringBuilder urls = new StringBuilder(); for (RemoteRepository repo : resultBannedRepos) { - urls.append(repo.getId() + " - " + repo.getUrl() + System.lineSeparator()); + urls.append(repo.getId() + " - ").append(repo.getUrl()).append(System.lineSeparator()); } return urls.toString(); } diff --git a/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/RequireActiveProfile.java b/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/RequireActiveProfile.java index 7df8486a..ed73bd5a 100644 --- a/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/RequireActiveProfile.java +++ b/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/RequireActiveProfile.java @@ -90,11 +90,14 @@ public final class RequireActiveProfile extends AbstractStandardEnforcerRule { String message = getMessage(); StringBuilder buf = new StringBuilder(); if (message != null) { - buf.append(message + System.lineSeparator()); + buf.append(message).append(System.lineSeparator()); } for (String profile : missingProfiles) { - buf.append("Profile \"" + profile + "\" is not activated." + System.lineSeparator()); + buf.append("Profile \"") + .append(profile) + .append("\" is not activated.") + .append(System.lineSeparator()); } throw new EnforcerRuleException(buf.toString()); diff --git a/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/RequireExplicitDependencyScope.java b/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/RequireExplicitDependencyScope.java index 34c689e2..feebabb3 100644 --- a/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/RequireExplicitDependencyScope.java +++ b/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/RequireExplicitDependencyScope.java @@ -71,9 +71,13 @@ public final class RequireExplicitDependencyScope extends AbstractStandardEnforc if (getMessage() != null) { buf.append(getMessage()).append("\n"); } - buf.append("Found " + numMissingDependencyScopes + " missing dependency " - + scopesFormat.format(numMissingDependencyScopes) - + ". Look at the " + logCategory + " emitted above for the details."); + buf.append("Found ") + .append(numMissingDependencyScopes) + .append(" missing dependency ") + .append(scopesFormat.format(numMissingDependencyScopes)) + .append(". Look at the ") + .append(logCategory) + .append(" emitted above for the details."); throw new EnforcerRuleException(buf.toString()); } } diff --git a/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/RequireJavaVendor.java b/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/RequireJavaVendor.java index e5ebf061..d14c5b9c 100644 --- a/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/RequireJavaVendor.java +++ b/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/RequireJavaVendor.java @@ -56,15 +56,15 @@ public final class RequireJavaVendor extends AbstractStandardEnforcerRule { String result = ""; if (includes != null) { - result += "" + includes.hashCode(); + result += String.valueOf(includes.hashCode()); } if (excludes != null) { - result += "" + excludes.hashCode(); + result += String.valueOf(excludes.hashCode()); } if (getMessage() != null) { - result += "" + getMessage().hashCode(); + result += String.valueOf(getMessage().hashCode()); } return result; diff --git a/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/RequireNoRepositories.java b/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/RequireNoRepositories.java index c47c1cc9..f02efbd1 100644 --- a/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/RequireNoRepositories.java +++ b/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/RequireNoRepositories.java @@ -162,7 +162,7 @@ public final class RequireNoRepositories extends AbstractStandardEnforcerRule { List<Model> badModels = new ArrayList<>(); StringBuilder newMsg = new StringBuilder(); - newMsg.append("Some poms have repositories defined:" + System.lineSeparator()); + newMsg.append("Some poms have repositories defined:").append(System.lineSeparator()); for (Model model : models) { if (banRepositories) { @@ -172,8 +172,12 @@ public final class RequireNoRepositories extends AbstractStandardEnforcerRule { findBannedRepositories(repos, allowedRepositories, allowSnapshotRepositories); if (!bannedRepos.isEmpty()) { badModels.add(model); - newMsg.append(model.getGroupId() + ":" + model.getArtifactId() + VERSION + model.getVersion() - + " has repositories " + bannedRepos); + newMsg.append(model.getGroupId() + ":") + .append(model.getArtifactId()) + .append(VERSION) + .append(model.getVersion()) + .append(" has repositories ") + .append(bannedRepos); } } } @@ -184,8 +188,12 @@ public final class RequireNoRepositories extends AbstractStandardEnforcerRule { findBannedRepositories(repos, allowedPluginRepositories, allowSnapshotPluginRepositories); if (!bannedRepos.isEmpty()) { badModels.add(model); - newMsg.append(model.getGroupId() + ":" + model.getArtifactId() + VERSION + model.getVersion() - + " has plugin repositories " + bannedRepos); + newMsg.append(model.getGroupId() + ":") + .append(model.getArtifactId()) + .append(VERSION) + .append(model.getVersion()) + .append(" has plugin repositories ") + .append(bannedRepos); } } } diff --git a/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/RequireOS.java b/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/RequireOS.java index d1438766..8b36aed1 100644 --- a/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/RequireOS.java +++ b/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/RequireOS.java @@ -161,7 +161,7 @@ public final class RequireOS extends AbstractStandardEnforcerRule { */ public boolean isAllowed() { // empty lambda as problems collector - return activator.isActive(createProfile(), profileActivationContext, (req -> {})); + return activator.isActive(createProfile(), profileActivationContext, req -> {}); } /** diff --git a/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/RequirePrerequisite.java b/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/RequirePrerequisite.java index 1059371a..f2c0c4cd 100644 --- a/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/RequirePrerequisite.java +++ b/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/RequirePrerequisite.java @@ -116,8 +116,10 @@ public final class RequirePrerequisite extends AbstractStandardEnforcerRule { if (getMessage() != null) { buf.append(getMessage()).append("\n"); } - buf.append("The specified Maven prerequisite( " + specifiedVersion - + " ) doesn't match the required version: " + mavenVersion); + buf.append("The specified Maven prerequisite( ") + .append(specifiedVersion) + .append(" ) doesn't match the required version: ") + .append(mavenVersion); throw new EnforcerRuleException(buf.toString()); } } diff --git a/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/RequireSameVersions.java b/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/RequireSameVersions.java index 5ff9662d..a8cadbd8 100644 --- a/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/RequireSameVersions.java +++ b/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/RequireSameVersions.java @@ -122,8 +122,10 @@ public final class RequireSameVersions extends AbstractStandardEnforcerRule { if (getMessage() != null) { builder.append(getMessage()).append("\n"); } - builder.append("Top level project has version " + topLevelProject.getVersion() - + " but current module has different version " + project.getVersion()); + builder.append("Top level project has version ") + .append(topLevelProject.getVersion()) + .append(" but current module has different version ") + .append(project.getVersion()); throw new EnforcerRuleException(builder.toString()); } } diff --git a/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/checksum/NormalizeLineSeparatorReader.java b/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/checksum/NormalizeLineSeparatorReader.java index 5ef8f438..b5a81831 100644 --- a/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/checksum/NormalizeLineSeparatorReader.java +++ b/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/checksum/NormalizeLineSeparatorReader.java @@ -48,7 +48,7 @@ class NormalizeLineSeparatorReader extends FilterReader { enum MatchResult { NO_MATCH, POTENTIAL_MATCH, - MATCH; + MATCH } /** diff --git a/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/dependency/DependencyConvergence.java b/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/dependency/DependencyConvergence.java index 8b76c4d5..aac00ea4 100644 --- a/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/dependency/DependencyConvergence.java +++ b/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/dependency/DependencyConvergence.java @@ -112,7 +112,7 @@ public final class DependencyConvergence extends AbstractStandardEnforcerRule { .append(nodeList.get(0).getArtifact().toString()) .append(". Paths to dependency are:") .append(System.lineSeparator()); - if (nodeList.size() > 0) { + if (!nodeList.isEmpty()) { builder.append(buildTreeString(nodeList.get(0))); } for (DependencyNode node : nodeList.subList(1, nodeList.size())) { diff --git a/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/dependency/EnforceBytecodeVersion.java b/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/dependency/EnforceBytecodeVersion.java index fdae9e55..bbfefe20 100644 --- a/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/dependency/EnforceBytecodeVersion.java +++ b/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/dependency/EnforceBytecodeVersion.java @@ -343,7 +343,7 @@ public class EnforceBytecodeVersion extends AbstractStandardEnforcerRule { * may be different. Hence, we create a "key" out of config and dependency path, and if already inspected, we * skip on doing same job over and over again. */ - private static class ChecksOptions { + private static final class ChecksOptions { private final String id; private final File file; private final List<String> ignorableClasses; diff --git a/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/dependency/RequireUpperBoundDeps.java b/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/dependency/RequireUpperBoundDeps.java index 971cbb77..12d9f517 100644 --- a/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/dependency/RequireUpperBoundDeps.java +++ b/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/dependency/RequireUpperBoundDeps.java @@ -148,7 +148,7 @@ public final class RequireUpperBoundDeps extends AbstractStandardEnforcerRule { .append(". Paths to dependency are:") .append(System.lineSeparator()); - if (conflict.size() > 0) { + if (!conflict.isEmpty()) { errorMessage.append(buildTreeString(conflict.get(0))); } for (DependencyNode node : conflict.subList(1, conflict.size())) { @@ -360,7 +360,7 @@ public final class RequireUpperBoundDeps extends AbstractStandardEnforcerRule { } } - private static class DependencyNodeHopCountPair implements Comparable<DependencyNodeHopCountPair> { + private static final class DependencyNodeHopCountPair implements Comparable<DependencyNodeHopCountPair> { private final DependencyNode node; private int hopCount; private final ParentNodeProvider parentNodeProvider; diff --git a/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/files/AbstractRequireFiles.java b/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/files/AbstractRequireFiles.java index 8682aa6b..2aaa728b 100644 --- a/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/files/AbstractRequireFiles.java +++ b/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/files/AbstractRequireFiles.java @@ -157,15 +157,16 @@ abstract class AbstractRequireFiles extends AbstractStandardEnforcerRule { StringBuilder buf = new StringBuilder(); if (message != null) { - buf.append(message + System.lineSeparator()); + buf.append(message).append(System.lineSeparator()); } buf.append(getErrorMsg()); for (File file : failures) { if (file != null) { - buf.append(file.getAbsolutePath() + System.lineSeparator()); + buf.append(file.getAbsolutePath()).append(System.lineSeparator()); } else { - buf.append("(an empty filename was given and allowNulls is false)" + System.lineSeparator()); + buf.append("(an empty filename was given and allowNulls is false)") + .append(System.lineSeparator()); } } diff --git a/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/files/RequireFilesSize.java b/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/files/RequireFilesSize.java index c792783a..da5f9278 100644 --- a/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/files/RequireFilesSize.java +++ b/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/files/RequireFilesSize.java @@ -87,10 +87,10 @@ public final class RequireFilesSize extends AbstractRequireFiles { if (fileExists(file)) { long length = computeLength(file); if (length < minsize) { - this.errorMsg = (file + " size (" + length + ") too small. Min. is " + minsize); + this.errorMsg = file + " size (" + length + ") too small. Min. is " + minsize; return false; } else if (length > maxsize) { - this.errorMsg = (file + " size (" + length + ") too large. Max. is " + maxsize); + this.errorMsg = file + " size (" + length + ") too large. Max. is " + maxsize; return false; } else { @@ -106,7 +106,7 @@ public final class RequireFilesSize extends AbstractRequireFiles { return true; } } else { - this.errorMsg = (file + " does not exist!"); + this.errorMsg = file + " does not exist!"; return false; } } diff --git a/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/utils/ArtifactMatcher.java b/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/utils/ArtifactMatcher.java index ade30ce2..804ae8af 100644 --- a/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/utils/ArtifactMatcher.java +++ b/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/utils/ArtifactMatcher.java @@ -255,19 +255,16 @@ public final class ArtifactMatcher { String artifactString; public MatchingArtifact(Artifact artifact) { - artifactString = new StringBuilder() - .append(artifact.getGroupId()) - .append(":") - .append(artifact.getArtifactId()) - .append(":") - .append(artifact.getVersion()) - .append(":") - .append(artifact.getType()) - .append(":") - .append(artifact.getScope()) - .append(":") - .append(artifact.getClassifier()) - .toString(); + artifactString = artifact.getGroupId() + ":" + + artifact.getArtifactId() + + ":" + + artifact.getVersion() + + ":" + + artifact.getType() + + ":" + + artifact.getScope() + + ":" + + artifact.getClassifier(); } @Override diff --git a/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/utils/PluginWrapper.java b/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/utils/PluginWrapper.java index ca02879d..691b6c25 100644 --- a/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/utils/PluginWrapper.java +++ b/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/utils/PluginWrapper.java @@ -32,7 +32,7 @@ import org.apache.maven.model.ReportPlugin; * @author Brian Fox * */ -public class PluginWrapper { +public final class PluginWrapper { private final String groupId; private final String artifactId; diff --git a/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/version/AbstractVersionEnforcer.java b/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/version/AbstractVersionEnforcer.java index 14ef4d60..609684af 100644 --- a/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/version/AbstractVersionEnforcer.java +++ b/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/version/AbstractVersionEnforcer.java @@ -106,7 +106,7 @@ abstract class AbstractVersionEnforcer extends AbstractStandardEnforcerRule { public String getCacheId() { if (version != null && !version.isEmpty()) { // return the hash codes of the parameter that matters - return "" + version.hashCode(); + return String.valueOf(version.hashCode()); } else { return "0"; } diff --git a/enforcer-rules/src/test/java/org/apache/maven/enforcer/rules/files/TestRequireFilesExist.java b/enforcer-rules/src/test/java/org/apache/maven/enforcer/rules/files/TestRequireFilesExist.java index e634a085..3dae1ad8 100644 --- a/enforcer-rules/src/test/java/org/apache/maven/enforcer/rules/files/TestRequireFilesExist.java +++ b/enforcer-rules/src/test/java/org/apache/maven/enforcer/rules/files/TestRequireFilesExist.java @@ -58,7 +58,7 @@ class TestRequireFilesExist { void testFileOsIndependentExists() { rule.setFilesList(Collections.singletonList(new File("POM.xml"))); - EnforcerRuleException e = assertThrows(EnforcerRuleException.class, () -> rule.execute()); + EnforcerRuleException e = assertThrows(EnforcerRuleException.class, rule::execute); assertNotNull(e.getMessage()); } @@ -95,7 +95,7 @@ class TestRequireFilesExist { void testEmptyFile() { rule.setFilesList(Collections.singletonList(null)); - EnforcerRuleException e = assertThrows(EnforcerRuleException.class, () -> rule.execute()); + EnforcerRuleException e = assertThrows(EnforcerRuleException.class, rule::execute); assertNotNull(e.getMessage()); } @@ -112,7 +112,7 @@ class TestRequireFilesExist { rule.setFilesList(Collections.emptyList()); assertTrue(rule.getFiles().isEmpty()); - EnforcerRuleException e = assertThrows(EnforcerRuleException.class, () -> rule.execute()); + EnforcerRuleException e = assertThrows(EnforcerRuleException.class, rule::execute); assertNotNull(e.getMessage()); } @@ -133,7 +133,7 @@ class TestRequireFilesExist { assertFalse(f.exists()); rule.setFilesList(Collections.singletonList(f)); - EnforcerRuleException e = assertThrows(EnforcerRuleException.class, () -> rule.execute()); + EnforcerRuleException e = assertThrows(EnforcerRuleException.class, rule::execute); assertNotNull(e.getMessage()); } diff --git a/maven-enforcer-plugin/src/main/java/org/apache/maven/plugins/enforcer/internal/DefaultEnforcementRuleHelper.java b/maven-enforcer-plugin/src/main/java/org/apache/maven/plugins/enforcer/internal/DefaultEnforcementRuleHelper.java index 617475bc..81f3fb41 100644 --- a/maven-enforcer-plugin/src/main/java/org/apache/maven/plugins/enforcer/internal/DefaultEnforcementRuleHelper.java +++ b/maven-enforcer-plugin/src/main/java/org/apache/maven/plugins/enforcer/internal/DefaultEnforcementRuleHelper.java @@ -125,6 +125,6 @@ public class DefaultEnforcementRuleHelper implements EnforcerRuleHelper { @Override public Object getCache(String key, Supplier<?> producer) { - return cache.computeIfAbsent(key, (x) -> producer.get()); + return cache.computeIfAbsent(key, x -> producer.get()); } }
