Merge remote-tracking branch 'origin/fence-integration-release/0004' …

…into ALS-5000 # Conflicts: # pic-sure-auth-services/src/main/java/edu/harvard/hms/dbmi/avillach/auth/data/repository/UserRepository.java # pic-sure-auth-services/src/main/java/edu/harvard/hms/dbmi/avillach/auth/rest/AuthService.java
hms-dbmi · Oct 31, 2023 · 7462de2 · 7462de2
2 parents 9b3ee2b + d8853b6
commit 7462de2
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 13 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) {

diff --git a/...sure-auth-services/src/main/java/edu/harvard/hms/dbmi/avillach/auth/rest/AuthService.java b/...sure-auth-services/src/main/java/edu/harvard/hms/dbmi/avillach/auth/rest/AuthService.java
@@ -31,7 +31,7 @@
 @Produces("application/json")
 public class AuthService {
 
-    private Logger logger = LoggerFactory.getLogger(this.getClass());
+    private final Logger logger = LoggerFactory.getLogger(this.getClass());
 
     @Inject
     AuthenticationService authenticationService;