From: David ‘Bombe’ Roden <bombe@pterodactylus.net>
Date: Fri, 6 Jan 2017 19:26:28 +0000 (+0100)
Subject: Simplify ternary operator expressions
X-Git-Tag: 0.9.7^2~366
X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=commitdiff_plain;h=782094688a0ad5d9de242fc79bd6cc255f611ead

Simplify ternary operator expressions
---

diff --git a/src/main/java/net/pterodactylus/sone/freenet/wot/IdentityChangeDetector.java b/src/main/java/net/pterodactylus/sone/freenet/wot/IdentityChangeDetector.java
index cfce632..f014de5 100644
--- a/src/main/java/net/pterodactylus/sone/freenet/wot/IdentityChangeDetector.java
+++ b/src/main/java/net/pterodactylus/sone/freenet/wot/IdentityChangeDetector.java
@@ -105,7 +105,7 @@ public class IdentityChangeDetector {
 		return new Predicate<Identity>() {
 			@Override
 			public boolean apply(Identity identity) {
-				return (identity == null) ? false : identityHasChanged(oldIdentities.get(identity.getId()), identity);
+				return (identity != null) && identityHasChanged(oldIdentities.get(identity.getId()), identity);
 			}
 		};
 	}
@@ -151,7 +151,7 @@ public class IdentityChangeDetector {
 		return new Predicate<String>() {
 			@Override
 			public boolean apply(String context) {
-				return (identity == null) ? false : !identity.getContexts().contains(context);
+				return (identity != null) && !identity.getContexts().contains(context);
 			}
 		};
 	}
@@ -160,7 +160,7 @@ public class IdentityChangeDetector {
 		return new Predicate<Identity>() {
 			@Override
 			public boolean apply(Identity identity) {
-				return (identity == null) ? false : !newIdentities.contains(identity);
+				return (identity != null) && !newIdentities.contains(identity);
 			}
 		};
 	}
@@ -169,7 +169,7 @@ public class IdentityChangeDetector {
 		return new Predicate<Entry<String, String>>() {
 			@Override
 			public boolean apply(Entry<String, String> property) {
-				return (property == null) ? false : !identity.getProperties().containsKey(property.getKey());
+				return (property != null) && !identity.getProperties().containsKey(property.getKey());
 			}
 		};
 	}
@@ -178,7 +178,7 @@ public class IdentityChangeDetector {
 		return new Predicate<Entry<String, String>>() {
 			@Override
 			public boolean apply(Entry<String, String> property) {
-				return (property == null) ? false : !newIdentity.getProperty(property.getKey()).equals(property.getValue());
+				return (property != null) && !newIdentity.getProperty(property.getKey()).equals(property.getValue());
 			}
 		};
 	}