Simplify some boolean expressions.

diff --git a/src/main/java/net/pterodactylus/sone/core/Core.java b/src/main/java/net/pterodactylus/sone/core/Core.java
index 500995d..ce16e6f 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -436,7 +436,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
         *         {@code false} otherwise
         */
        public boolean isModifiedSone(Sone sone) {
-               return (soneInserters.containsKey(sone)) ? soneInserters.get(sone).isModified() : false;
+               return soneInserters.containsKey(sone) && soneInserters.get(sone).isModified();
        }
 
        /**

diff --git a/src/main/java/net/pterodactylus/sone/data/Post.java b/src/main/java/net/pterodactylus/sone/data/Post.java
index 759a8ba..63d4b77 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/data/Post.java
+++ b/src/main/java/net/pterodactylus/sone/data/Post.java
@@ -45,7 +45,7 @@ public interface Post extends Identified {
 
                @Override
                public boolean apply(Post post) {
-                       return (post == null) ? false : post.getTime() <= System.currentTimeMillis();
+                       return (post != null) && (post.getTime() <= System.currentTimeMillis());
                }
 
        };

diff --git a/src/main/java/net/pterodactylus/sone/data/PostReply.java b/src/main/java/net/pterodactylus/sone/data/PostReply.java
index 4a1fbad..d010261 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/data/PostReply.java
+++ b/src/main/java/net/pterodactylus/sone/data/PostReply.java
@@ -36,7 +36,7 @@ public interface PostReply extends Reply<PostReply> {
 
                @Override
                public boolean apply(PostReply postReply) {
-                       return (postReply == null) ? false : postReply.getPost().isPresent();
+                       return (postReply != null) && postReply.getPost().isPresent();
                }
        };
 

diff --git a/src/main/java/net/pterodactylus/sone/data/Reply.java b/src/main/java/net/pterodactylus/sone/data/Reply.java
index c229d04..e9b7a1d 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/data/Reply.java
+++ b/src/main/java/net/pterodactylus/sone/data/Reply.java
@@ -51,7 +51,7 @@ public interface Reply<T extends Reply<T>> extends Identified {
                 */
                @Override
                public boolean apply(Reply<?> reply) {
-                       return (reply == null) ? false : reply.getTime() <= System.currentTimeMillis();
+                       return (reply != null) && (reply.getTime() <= System.currentTimeMillis());
                }
 
        };

diff --git a/src/main/java/net/pterodactylus/sone/data/Sone.java b/src/main/java/net/pterodactylus/sone/data/Sone.java
index d7a7dee..166591f 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/data/Sone.java
+++ b/src/main/java/net/pterodactylus/sone/data/Sone.java
@@ -144,7 +144,7 @@ public interface Sone extends Identified, Fingerprintable, Comparable<Sone> {
 
                @Override
                public boolean apply(Sone sone) {
-                       return (sone == null) ? false : sone.getTime() != 0;
+                       return (sone != null) && (sone.getTime() != 0);
                }
        };
 
@@ -153,7 +153,7 @@ public interface Sone extends Identified, Fingerprintable, Comparable<Sone> {
 
                @Override
                public boolean apply(Sone sone) {
-                       return (sone == null) ? false : sone.getIdentity() instanceof OwnIdentity;
+                       return (sone != null) && (sone.getIdentity() instanceof OwnIdentity);
                }
 
        };
@@ -163,7 +163,7 @@ public interface Sone extends Identified, Fingerprintable, Comparable<Sone> {
 
                @Override
                public boolean apply(Sone sone) {
-                       return (sone == null) ? false : !sone.getRootAlbum().getAlbums().isEmpty();
+                       return (sone != null) && !sone.getRootAlbum().getAlbums().isEmpty();
                }
        };
 

diff --git a/src/main/java/net/pterodactylus/sone/web/SearchPage.java b/src/main/java/net/pterodactylus/sone/web/SearchPage.java
index e9241a1..45773ca 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/web/SearchPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/SearchPage.java
@@ -581,7 +581,7 @@ public class SearchPage extends SoneTemplatePage {
 
                        @Override
                        public boolean apply(Hit<?> hit) {
-                               return (hit == null) ? false : hit.getScore() > 0;
+                               return (hit != null) && (hit.getScore() > 0);
                        }
 
                };

diff --git a/src/main/java/net/pterodactylus/sone/web/page/PageToadlet.java b/src/main/java/net/pterodactylus/sone/web/page/PageToadlet.java
index a40a543..fc58339 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/web/page/PageToadlet.java
+++ b/src/main/java/net/pterodactylus/sone/web/page/PageToadlet.java
@@ -193,7 +193,7 @@ public class PageToadlet extends Toadlet implements LinkEnabledCallback, LinkFil
         */
        @Override
        public boolean isLinkExcepted(URI link) {
-               return (page instanceof FreenetPage) ? ((FreenetPage) page).isLinkExcepted(link) : false;
+               return (page instanceof FreenetPage) && ((FreenetPage) page).isLinkExcepted(link);
        }
 
 }