You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2022/03/05 22:45:07 UTC
[maven] 02/02: [MNG-7299] Simplify conditional expressions
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven.git
commit 48fc4c9937ff873d61063258af805f6d0a1c1c20
Author: Arturo Bernal <ar...@gmail.com>
AuthorDate: Tue Oct 12 07:06:28 2021 +0200
[MNG-7299] Simplify conditional expressions
This closes #583
---
.../maven/model/profile/activation/FileProfileActivator.java | 2 +-
.../model/profile/activation/OperatingSystemProfileActivator.java | 8 ++++----
.../maven/model/profile/activation/PropertyProfileActivator.java | 8 ++------
3 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/FileProfileActivator.java b/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/FileProfileActivator.java
index 060ae6d..e45b883 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/FileProfileActivator.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/FileProfileActivator.java
@@ -126,7 +126,7 @@ public class FileProfileActivator
boolean fileExists = f.exists();
- return missing ? !fileExists : fileExists;
+ return missing != fileExists;
}
@Override
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/OperatingSystemProfileActivator.java b/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/OperatingSystemProfileActivator.java
index 29e96bc..b3b21fa 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/OperatingSystemProfileActivator.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/OperatingSystemProfileActivator.java
@@ -113,7 +113,7 @@ public class OperatingSystemProfileActivator
boolean result = Os.isVersion( test );
- return reverse ? !result : result;
+ return reverse != result;
}
private boolean determineArchMatch( String arch )
@@ -129,7 +129,7 @@ public class OperatingSystemProfileActivator
boolean result = Os.isArch( test );
- return reverse ? !result : result;
+ return reverse != result;
}
private boolean determineNameMatch( String name )
@@ -145,7 +145,7 @@ public class OperatingSystemProfileActivator
boolean result = Os.isName( test );
- return reverse ? !result : result;
+ return reverse != result;
}
private boolean determineFamilyMatch( String family )
@@ -161,7 +161,7 @@ public class OperatingSystemProfileActivator
boolean result = Os.isFamily( test );
- return reverse ? !result : result;
+ return reverse != result;
}
}
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/PropertyProfileActivator.java b/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/PropertyProfileActivator.java
index 47e00d7..1668443 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/PropertyProfileActivator.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/PropertyProfileActivator.java
@@ -95,15 +95,11 @@ public class PropertyProfileActivator
}
// we have a value, so it has to match the system value...
- boolean result = propValue.equals( sysValue );
-
- return reverseValue ? !result : result;
+ return reverseValue != propValue.equals( sysValue );
}
else
{
- boolean result = StringUtils.isNotEmpty( sysValue );
-
- return reverseName ? !result : result;
+ return reverseName != StringUtils.isNotEmpty( sysValue );
}
}