Improve methods that retrieve groups/users by id

GReD-Clermont · Sep 22, 2023 · 6570453 · 6570453
1 parent f35364a
commit 6570453
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 27 deletions.
diff --git a/src/main/java/fr/igred/omero/Client.java b/src/main/java/fr/igred/omero/Client.java
@@ -29,6 +29,7 @@
 import fr.igred.omero.repository.FolderWrapper;
 import fr.igred.omero.repository.ImageWrapper;
 import fr.igred.omero.repository.ProjectWrapper;
+import omero.ApiUsageException;
 import omero.gateway.Gateway;
 import omero.gateway.SecurityContext;
 import omero.gateway.model.ExperimenterData;
@@ -308,22 +309,18 @@ public ExperimenterWrapper getUser(String username)
      * @return The user matching the user ID, or null if it does not exist.
      *
      * @throws ServiceException       Cannot connect to OMERO.
-     * @throws AccessException        Cannot access data.
-     * @throws ExecutionException     A Facility can't be retrieved or instantiated.
      * @throws OMEROServerError       Server error.
      * @throws NoSuchElementException The requested user cannot be found.
      */
     public ExperimenterWrapper getUser(long userId)
-    throws ServiceException, AccessException, ExecutionException, OMEROServerError {
+    throws ServiceException, OMEROServerError {
         Experimenter user = ExceptionHandler.of(getGateway(), g -> g.getAdminService(getCtx()).getExperimenter(userId))
+                                            .rethrow(ApiUsageException.class,
+                                                     (m, e) -> new NoSuchElementException(m),
+                                                     "User not found: " + userId)
                                             .handleServiceOrServer("Cannot retrieve user: " + userId)
                                             .get();
-
-        if (user != null && user.getOmeName() != null) {
-            return getUser(user.getOmeName().getValue());
-        } else {
-            throw new NoSuchElementException(String.format("User cannot be found: %d", userId));
-        }
+        return new ExperimenterWrapper(new ExperimenterData(user));
     }
 
 
@@ -360,22 +357,18 @@ public GroupWrapper getGroup(String groupName)
      * @return The group with the appropriate group ID, if it exists.
      *
      * @throws ServiceException       Cannot connect to OMERO.
-     * @throws AccessException        Cannot access data.
-     * @throws ExecutionException     A Facility can't be retrieved or instantiated.
      * @throws OMEROServerError       Server error.
      * @throws NoSuchElementException The requested group cannot be found.
      */
     public GroupWrapper getGroup(long groupId)
-    throws ServiceException, AccessException, ExecutionException, OMEROServerError {
+    throws ServiceException, OMEROServerError {
         ExperimenterGroup group = ExceptionHandler.of(getGateway(), g -> g.getAdminService(getCtx()).getGroup(groupId))
+                                                  .rethrow(ApiUsageException.class,
+                                                           (m, e) -> new NoSuchElementException(m),
+                                                           "User not found: " + groupId)
                                                   .handleServiceOrServer("Cannot retrieve group: " + groupId)
                                                   .get();
-
-        if (group != null && group.getName() != null) {
-            return getGroup(group.getName().getValue());
-        } else {
-            throw new NoSuchElementException(String.format("Group cannot be found: %d", groupId));
-        }
+        return new GroupWrapper(new GroupData(group));
     }
 
 

diff --git a/src/main/java/fr/igred/omero/meta/ExperimenterWrapper.java b/src/main/java/fr/igred/omero/meta/ExperimenterWrapper.java
@@ -22,13 +22,8 @@
 import fr.igred.omero.GenericObjectWrapper;
 import fr.igred.omero.exception.AccessException;
 import fr.igred.omero.exception.ExceptionHandler;
-import fr.igred.omero.exception.OMEROServerError;
 import fr.igred.omero.exception.ServiceException;
-import omero.gateway.exception.DSAccessException;
-import omero.gateway.exception.DSOutOfServiceException;
 import omero.gateway.model.ExperimenterData;
-import omero.model.ExperimenterGroup;
-import omero.model.GroupExperimenterMap;
 
 import java.util.List;
 import java.util.NoSuchElementException;

diff --git a/src/test/java/fr/igred/omero/meta/ExperimenterTest.java b/src/test/java/fr/igred/omero/meta/ExperimenterTest.java
@@ -19,7 +19,6 @@
 
 
 import fr.igred.omero.RootTest;
-import fr.igred.omero.exception.OMEROServerError;
 import org.junit.jupiter.api.Test;
 
 import java.util.List;
@@ -42,7 +41,7 @@ void testGetWrongUser() {
 
     @Test
     void testGetWrongUserId() {
-        assertThrows(OMEROServerError.class, () -> client.getUser(859L));
+        assertThrows(NoSuchElementException.class, () -> client.getUser(859L));
     }
 
 

diff --git a/src/test/java/fr/igred/omero/meta/GroupTest.java b/src/test/java/fr/igred/omero/meta/GroupTest.java
@@ -19,7 +19,6 @@
 
 
 import fr.igred.omero.RootTest;
-import fr.igred.omero.exception.OMEROServerError;
 import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
@@ -40,7 +39,7 @@ void testGetWrongGroup() {
 
     @Test
     void testGetWrongGroupId() {
-        assertThrows(OMEROServerError.class, () -> client.getGroup(859L));
+        assertThrows(NoSuchElementException.class, () -> client.getGroup(859L));
     }