From 61a28570ca25ae789cca09736ddc427e172ac213 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Wed, 29 Aug 2018 15:10:51 +0300
Subject: getUserByName is non nullable

---
 juick-server/src/main/java/com/juick/server/api/Messages.java     | 2 +-
 juick-server/src/main/java/com/juick/server/api/Users.java        | 4 ++--
 juick-server/src/main/java/com/juick/service/UserServiceImpl.java | 3 ++-
 3 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'juick-server')

diff --git a/juick-server/src/main/java/com/juick/server/api/Messages.java b/juick-server/src/main/java/com/juick/server/api/Messages.java
index db6463dd..80c718b7 100644
--- a/juick-server/src/main/java/com/juick/server/api/Messages.java
+++ b/juick-server/src/main/java/com/juick/server/api/Messages.java
@@ -100,7 +100,7 @@ public class Messages {
         List<Integer> mids;
         if (!StringUtils.isEmpty(uname)) {
             User user = userService.getUserByName(uname);
-            if (user != null) {
+            if (!user.isAnonymous()) {
                 if (!StringUtils.isEmpty(media)) {
                     mids = messagesService.getUserPhotos(user.getUid(), 0, before);
                 } else if (!StringUtils.isEmpty(tag)) {
diff --git a/juick-server/src/main/java/com/juick/server/api/Users.java b/juick-server/src/main/java/com/juick/server/api/Users.java
index c91581a0..237b7ed6 100644
--- a/juick-server/src/main/java/com/juick/server/api/Users.java
+++ b/juick-server/src/main/java/com/juick/server/api/Users.java
@@ -106,7 +106,7 @@ public class Users {
         } else {
             if (WebUtils.isUserName(uname)) {
                 com.juick.User u = userService.getUserByName(uname);
-                if (u != null && u.getUid() > 0) {
+                if (!u.isAnonymous()) {
                     uid = u.getUid();
                 }
             }
@@ -131,7 +131,7 @@ public class Users {
         } else {
             if (WebUtils.isUserName(uname)) {
                 com.juick.User u = userService.getUserByName(uname);
-                if (u != null && u.getUid() > 0) {
+                if (!u.isAnonymous()) {
                     uid = u.getUid();
                 }
             }
diff --git a/juick-server/src/main/java/com/juick/service/UserServiceImpl.java b/juick-server/src/main/java/com/juick/service/UserServiceImpl.java
index 077fb01d..bcdb7a13 100644
--- a/juick-server/src/main/java/com/juick/service/UserServiceImpl.java
+++ b/juick-server/src/main/java/com/juick/service/UserServiceImpl.java
@@ -33,6 +33,7 @@ import org.springframework.jdbc.support.KeyHolder;
 import org.springframework.stereotype.Repository;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.annotation.Nonnull;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -126,6 +127,7 @@ public class UserServiceImpl extends BaseJdbcService implements UserService {
     }
 
     @Transactional(readOnly = true)
+    @Nonnull
     @Override
     public User getUserByName(final String username) {
         if (StringUtils.isNotBlank(username)) {
@@ -135,7 +137,6 @@ public class UserServiceImpl extends BaseJdbcService implements UserService {
             if (!list.isEmpty())
                 return list.get(0);
         }
-        // TODO: @NonNullable ?
         return AnonymousUser.INSTANCE;
     }
 
-- 
cgit v1.2.3