Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Removed negative logic #212

Merged
merged 1 commit into from
Mar 21, 2024
Merged

Removed negative logic #212

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
48 changes: 11 additions & 37 deletions src/main/java/org/apache/maven/plugins/invoker/SelectorUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,17 +73,10 @@ static boolean isOsFamily(String osSpec) {
}

static boolean isOsFamily(List<String> families, boolean defaultMatch) {
if (families != null && !families.isEmpty()) {
for (String family : families) {
if (Os.isFamily(family)) {
return true;
}
}

return false;
} else {
if (families == null || families.isEmpty()) {
return defaultMatch;
}
return families.stream().anyMatch(Os::isFamily);
}

/**
Expand Down Expand Up @@ -139,10 +132,6 @@ static String getMavenVersion(File mavenHome) throws IOException {
return null;
}

static boolean isMavenVersion(String mavenSpec) {
return isMavenVersion(mavenSpec, getMavenVersion());
}

static boolean isMavenVersion(String mavenSpec, String actualVersion) {
List<String> includes = new ArrayList<>();
List<String> excludes = new ArrayList<>();
Expand All @@ -157,15 +146,6 @@ static String getJreVersion() {
return System.getProperty("java.version", "");
}

static String getJreVersion(File javaHome) {
// @todo detect actual version
return null;
}

static boolean isJreVersion(String jreSpec) {
return isJreVersion(jreSpec, getJreVersion());
}

static boolean isJreVersion(String jreSpec, String actualJreVersion) {
List<String> includes = new ArrayList<>();
List<String> excludes = new ArrayList<>();
Expand All @@ -176,33 +156,27 @@ static boolean isJreVersion(String jreSpec, String actualJreVersion) {
return isJreVersion(jreVersion, includes, true) && !isJreVersion(jreVersion, excludes, false);
}

static boolean isJreVersion(List<Integer> jreVersion, List<String> versionPatterns, boolean defaultMatch) {
if (versionPatterns != null && !versionPatterns.isEmpty()) {
for (String versionPattern : versionPatterns) {
if (isJreVersion(jreVersion, versionPattern)) {
return true;
}
}

return false;
} else {
static boolean isJreVersion(List<Integer> jreVersions, List<String> versionPatterns, boolean defaultMatch) {
if (versionPatterns == null || versionPatterns.isEmpty()) {
return defaultMatch;
}

return versionPatterns.stream().anyMatch(versionPattern -> isJreVersion(jreVersions, versionPattern));
}

static boolean isJreVersion(List<Integer> jreVersion, String versionPattern) {
static boolean isJreVersion(List<Integer> jreVersions, String versionPattern) {
List<Integer> checkVersion = parseVersion(versionPattern);

if (versionPattern.endsWith("+")) {
// 1.5+ <=> [1.5,)
return compareVersions(jreVersion, checkVersion) >= 0;
return compareVersions(jreVersions, checkVersion) >= 0;
} else if (versionPattern.endsWith("-")) {
// 1.5- <=> (,1.5)
return compareVersions(jreVersion, checkVersion) < 0;
return compareVersions(jreVersions, checkVersion) < 0;
} else {
// 1.5 <=> [1.5,1.6)
return checkVersion.size() <= jreVersion.size()
&& checkVersion.equals(jreVersion.subList(0, checkVersion.size()));
return checkVersion.size() <= jreVersions.size()
&& checkVersion.equals(jreVersions.subList(0, checkVersion.size()));
}
}

Expand Down