Test in Open Access

hms-dbmi · Oct 12, 2023 · ce6b238 · ce6b238
1 parent b70f52d
commit ce6b238
Showing 1 changed file with 13 additions and 22 deletions.
diff --git a/...ices/src/main/java/edu/harvard/hms/dbmi/avillach/auth/data/repository/UserRepository.java b/...ices/src/main/java/edu/harvard/hms/dbmi/avillach/auth/data/repository/UserRepository.java
@@ -32,18 +32,14 @@ protected UserRepository() {
     }
 
     public User findBySubject(String subject) {
-        try {
-            CriteriaQuery<User> query = em.getCriteriaBuilder().createQuery(User.class);
-            Root<User> queryRoot = query.from(User.class);
-            query.select(queryRoot);
-            CriteriaBuilder cb = cb();
-            return em.createQuery(query
-                            .where(
-                                    eq(cb, queryRoot, "subject", subject)))
-                    .getSingleResult();
-        } catch (NoResultException e) {
-            return null;
-        }
+        CriteriaQuery<User> query = em.getCriteriaBuilder().createQuery(User.class);
+        Root<User> queryRoot = query.from(User.class);
+        query.select(queryRoot);
+        CriteriaBuilder cb = cb();
+        return em.createQuery(query
+                        .where(
+                                eq(cb, queryRoot, "subject", subject)))
+                .getSingleResult();
     }
 
     public User findBySubjectAndConnection(String subject, String connectionId) {
@@ -81,21 +77,16 @@ public List<User> listUnmatchedByConnectionId(Connection connection) {
      * @return
      */
     public User findOrCreate(User inputUser) {
-        User user = null;
+        User user;
         String subject = inputUser.getSubject();
         try {
             user = findBySubject(subject);
-            if (user != null) {
-                logger.info("findOrCreate(), trying to find user: {subject: " + subject +
-                        "}, and found a user with uuid: " + user.getUuid()
-                        + ", subject: " + user.getSubject());
-            } else {
-                logger.info("findOrCreate(), trying to find user: {subject: " + subject +
-                        "}, but could not find a user with this subject, going to create a new user.");
-                user = createUser(inputUser);
-            }
+            logger.info("findOrCreate(), trying to find user: {subject: " + subject +
+                    "}, and found a user with uuid: " + user.getUuid()
+                    + ", subject: " + user.getSubject());
         } catch (NonUniqueResultException e) {
             logger.error("findOrCreate() " + e.getClass().getSimpleName() + ": " + e.getMessage());
+            user = createUser(inputUser);
         }
         return user;
     }