Add method to import images using multiple threads

Author: ppouchin

src/main/java/fr/igred/omero/repository/DatasetWrapper.java

@@ -463,7 +463,28 @@ public void removeImage(Client client, ImageWrapper image)
      */
     public boolean importImages(Client client, String... paths)
     throws ServiceException, OMEROServerError, AccessException, IOException, ExecutionException {
-        boolean success = importImages(client, data, paths);
+        return importImages(client, 1, paths);
+    }
+
+
+    /**
+     * Imports all images candidates in the paths to the dataset in OMERO.
+     *
+     * @param client  The client handling the connection.
+     * @param threads The number of threads (same value used for filesets and uploads).
+     * @param paths   Paths to the image files on the computer.
+     *
+     * @return If the import did not exit because of an error.
+     *
+     * @throws ServiceException   Cannot connect to OMERO.
+     * @throws AccessException    Cannot access data.
+     * @throws OMEROServerError   Server error.
+     * @throws IOException        Cannot read file.
+     * @throws ExecutionException A Facility can't be retrieved or instantiated.
+     */
+    public boolean importImages(Client client, int threads, String... paths)
+    throws ServiceException, OMEROServerError, AccessException, IOException, ExecutionException {
+        boolean success = importImages(client, data, threads, paths);
         refresh(client);
         return success;
     }

src/main/java/fr/igred/omero/repository/GenericRepositoryObjectWrapper.java

@@ -70,17 +70,18 @@ protected GenericRepositoryObjectWrapper(T o) {
     /**
      * Imports all images candidates in the paths to the target in OMERO.
      *
-     * @param client The client handling the connection.
-     * @param target The import target.
-     * @param paths  Paths to the image files on the computer.
+     * @param client  The client handling the connection.
+     * @param target  The import target.
+     * @param threads The number of threads (same value used for filesets and uploads).
+     * @param paths   Paths to the image files on the computer.
      *
      * @return If the import did not exit because of an error.
      *
      * @throws ServiceException Cannot connect to OMERO.
      * @throws OMEROServerError Server error.
      * @throws IOException      Cannot read file.
      */
-    protected static boolean importImages(GatewayWrapper client, DataObject target, String... paths)
+    protected static boolean importImages(GatewayWrapper client, DataObject target, int threads, String... paths)
     throws ServiceException, OMEROServerError, IOException {
         boolean success;
 
@@ -89,6 +90,8 @@ protected static boolean importImages(GatewayWrapper client, DataObject target,
         config.target.set(type + ":" + target.getId());
         config.username.set(client.getUser().getUserName());
         config.email.set(client.getUser().getEmail());
+        config.parallelFileset.set(threads);
+        config.parallelUpload.set(threads);
 
         OMEROMetadataStoreClient store = client.getImportStore();
         try (OMEROWrapper reader = new OMEROWrapper(config)) {

src/main/java/fr/igred/omero/repository/ScreenWrapper.java

@@ -351,7 +351,28 @@ public void refresh(GatewayWrapper client) throws ServiceException, AccessExcept
      */
     public boolean importImages(GatewayWrapper client, String... paths)
     throws ServiceException, OMEROServerError, AccessException, IOException, ExecutionException {
-        boolean success = importImages(client, data, paths);
+        return this.importImages(client, 1, paths);
+    }
+
+
+    /**
+     * Imports all images candidates in the paths to the screen in OMERO.
+     *
+     * @param client  The client handling the connection.
+     * @param threads The number of threads (same value used for filesets and uploads).
+     * @param paths   Paths to the image files on the computer.
+     *
+     * @return If the import did not exit because of an error.
+     *
+     * @throws ServiceException   Cannot connect to OMERO.
+     * @throws AccessException    Cannot access data.
+     * @throws OMEROServerError   Server error.
+     * @throws IOException        Cannot read file.
+     * @throws ExecutionException A Facility can't be retrieved or instantiated.
+     */
+    public boolean importImages(GatewayWrapper client, int threads, String... paths)
+    throws ServiceException, OMEROServerError, AccessException, IOException, ExecutionException {
+        boolean success = importImages(client, data, threads, paths);
         refresh(client);
         return success;
     }

src/test/java/fr/igred/omero/repository/ImageImportTest.java

@@ -49,7 +49,8 @@ void testImportImage() throws Exception {
 
         DatasetWrapper dataset = client.getDataset(DATASET2.id);
 
-        boolean imported = dataset.importImages(client, f1.getAbsolutePath(), f2.getAbsolutePath());
+        boolean imported = dataset.importImages(client, 2, f1.getAbsolutePath(), f2.getAbsolutePath());
+        client.closeImport();
 
         removeFile(f1);
         removeFile(f2);