Fix bug when connecting to multiple servers

.gitignore

@@ -10,7 +10,11 @@
 
 # generated files
 /build
+/gradle
 /src/generated/*
+gradlew
+*.bat
+*.log
 
 # Local configuration file (sdk path, etc)
 local.properties

.mailmap

@@ -0,0 +1,18 @@
+Aleksandra Tarkowska <[email protected]> <[email protected]>
+Andrew Patterson <[email protected]> Andrew J Patterson <[email protected]>
+Chris Allan <[email protected]> <[email protected]>
+Colin Blackburn <[email protected]> <[email protected]>
+Colin Blackburn <[email protected]> <[email protected]>
+Dominik Lindner <[email protected]> <[email protected]>
+Jean-Marie Burel <[email protected]> jburel <[email protected]>
+Jean-Marie Burel <[email protected]> jean-marie burel <[email protected]>
+Josh Moore <[email protected]> <[email protected]>
+Josh Moore <[email protected]> <[email protected]>
+Josh Moore <[email protected]> <[email protected]>
+Josh Moore <[email protected]> <jmoore@05709c45-44f0-0310-885b-81a1db45b4a6>
+Mark Carroll <[email protected]> <[email protected]>
+Melissa Linkert <[email protected]> <[email protected]>
+Rémy Dornier <[email protected]> Rdornier <[email protected]>
+Roger Leigh <[email protected]> <[email protected]>
+Sébastien Besson <[email protected]> <[email protected]>
+Will Moore <[email protected]> <[email protected]>

CHANGELOG.md

@@ -1,3 +1,30 @@
+5.9.0 (December 2023)
+---------------------
+
+- Simply return empty string if middlename is null ([#84](https://github.com/ome/omero-gateway-java/pull/84))
+- Add method to load multiple objects at once ([#82](https://github.com/ome/omero-gateway-java/pull/82))
+- Download into Fileset_xyz directory ([#85](https://github.com/ome/omero-gateway-java/pull/85))
+- Add method to load original metadata ([#72](https://github.com/ome/omero-gateway-java/pull/72))
+- Bump omero-blitz version to 5.7.2
+
+5.8.2 (September 2023)
+----------------------
+
+- Bump omero-blitz version to 5.7.1
+- Add top-level Git mailmap
+
+5.8.1 (July 2023)
+-----------------
+
+- Fix bug on download images based on omero-insight#264 ([#78](https://github.com/ome/omero-gateway-java/pull/78)) Thanks to Rémy Dornier
+- BugFix: Set StringColumn to the correct size ([#76](https://github.com/ome/omero-gateway-java/pull/76))
+- Bump omero-blitz version to 5.6.3
+
+5.8.0 (March 2023)
+------------------
+
+- Add Facility for shallow loading of objects ([#68](https://github.com/ome/omero-gateway-java/pull/68))
+
 5.7.2 (March 2023)
 ------------------
 

build.gradle

@@ -5,15 +5,15 @@ plugins {
 }
 
 group = "org.openmicroscopy"
-version = "5.7.3-SNAPSHOT"
+version = "5.9.1-SNAPSHOT"
 
 repositories {
     mavenLocal()
     mavenCentral()
 }
 
 dependencies {
-    api("org.openmicroscopy:omero-blitz:5.6.2")
+    api("org.openmicroscopy:omero-blitz:5.7.2")
 
     implementation("commons-beanutils:commons-beanutils:1.9.3")
     implementation("com.zeroc:icegrid:3.6.5")

src/main/java/omero/gateway/Gateway.java

@@ -187,6 +187,8 @@ public class Gateway implements AutoCloseable {
     /** Flag to indicate that executor threads should be shutdown on disconnect */
     private boolean executorShutdownOnDisconnect = false;
 
+    private String serverHost;
+
     /**
      * Creates a new Gateway instance
      * @param log A {@link Logger}
@@ -408,6 +410,20 @@ public String getServerVersion() throws DSOutOfServiceException {
         return serverVersion;
     }
 
+    /**
+     * Get the hostname of the server the Gateway is connected to
+     *
+     * @return See above
+     * @throws DSOutOfServiceException
+     *             If the connection is broken, or not logged in
+     */
+    public String getServerHost() throws DSOutOfServiceException{
+        if (serverHost == null) {
+            throw new DSOutOfServiceException("Not logged in.");
+        }
+        return serverHost;
+    }
+
     /**
      * Get a {@link Facility} to perform further operations with the server
      * 
@@ -1221,6 +1237,7 @@ private ExperimenterData login(SessionWrapper session, LoginCredentials cred)
             }
             // Connector now controls the secureClient for closing.
             String host = session.client.getProperty("omero.host");
+            this.serverHost = host;
             cred.getServer().setHostname(host);
             String port = session.client.getProperty("omero.port");
             cred.getServer().setPort(Integer.parseInt(port));

src/main/java/omero/gateway/facility/Facility.java

@@ -115,8 +115,14 @@ public static <T extends Facility> T getFacility(final Class<T> type,
                         + type.getSimpleName(), e);
             }
         }
-
-        return (T) cache.get(type.getSimpleName(), new Callable<Facility>() {
+        String serverHost;
+        try{
+            serverHost = gateway.getServerHost();
+        }catch (DSOutOfServiceException e){
+            throw new ExecutionException("Not logged in; Can't instantiate "
+                    + type.getSimpleName(), e);
+        }
+        return (T) cache.get(type.getSimpleName() + ":" +serverHost, new Callable<Facility>() {
 
             @Override
             public Facility call() throws Exception {