From 88a104f800629cd7895fb94b8d31142e018ec8a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Besson?= <sbesson@glencoesoftware.com>
Date: Thu, 16 May 2024 13:00:24 +0100
Subject: [PATCH] Consume omero-zarr-pixel-buffer 0.4.0 and omero-ms-core 0.9.0

Replace com.glencoesoftware.omero.ms.core.PixelsService imports
Add blitz/*PixelBuffer.xml to the classpath for pixel buffer discoverability
---
 build.gradle                                                | 6 +++---
 .../java/com/glencoesoftware/omero/ms/pixelbuffer/Main.java | 1 +
 .../ms/pixelbuffer/PixelBufferMicroserviceVerticle.java     | 1 +
 .../omero/ms/pixelbuffer/PixelBufferVerticle.java           | 6 +++---
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/build.gradle b/build.gradle
index 911baa7..cc10b66 100755
--- a/build.gradle
+++ b/build.gradle
@@ -56,12 +56,12 @@ dependencies {
     implementation 'io.zipkin.reporter2:zipkin-sender-okhttp3:2.10.0'
     implementation 'ch.qos.logback:logback-classic:1.3.14'
     implementation 'org.slf4j:log4j-over-slf4j:1.7.32'
-    implementation 'com.glencoesoftware.omero:omero-zarr-pixel-buffer:0.3.0'
-    implementation 'com.glencoesoftware.omero:omero-ms-core:0.8.0'
+    implementation 'com.glencoesoftware.omero:omero-zarr-pixel-buffer:0.4.0'
+    implementation 'com.glencoesoftware.omero:omero-ms-core:0.9.0'
     implementation 'io.vertx:vertx-web:3.8.1'
     implementation 'io.vertx:vertx-config:3.8.1'
     implementation 'io.vertx:vertx-config-yaml:3.8.1'
-    implementation 'org.openmicroscopy:omero-blitz:5.7.2'
+    implementation 'org.openmicroscopy:omero-blitz:5.7.3'
     implementation 'io.prometheus.jmx:collector:0.12.0'
     implementation 'io.prometheus:simpleclient_hotspot:0.8.0'
     implementation 'com.zeroc:icegrid:3.6.4'
diff --git a/src/main/java/com/glencoesoftware/omero/ms/pixelbuffer/Main.java b/src/main/java/com/glencoesoftware/omero/ms/pixelbuffer/Main.java
index 2239d51..267db26 100755
--- a/src/main/java/com/glencoesoftware/omero/ms/pixelbuffer/Main.java
+++ b/src/main/java/com/glencoesoftware/omero/ms/pixelbuffer/Main.java
@@ -14,6 +14,7 @@ public static void main(String[] args) {
         ApplicationContext context = new ClassPathXmlApplicationContext(
                 "classpath:ome/config.xml",
                 "classpath:ome/services/datalayer.xml",
+                "classpath*:blitz/*PixelBuffer.xml",
                 "classpath*:beanRefContext.xml");
         PixelsService bean = (PixelsService) context.getBean("/OMERO/Pixels");
         System.err.println("Bean: " + bean);
diff --git a/src/main/java/com/glencoesoftware/omero/ms/pixelbuffer/PixelBufferMicroserviceVerticle.java b/src/main/java/com/glencoesoftware/omero/ms/pixelbuffer/PixelBufferMicroserviceVerticle.java
index df1041e..90c86bb 100755
--- a/src/main/java/com/glencoesoftware/omero/ms/pixelbuffer/PixelBufferMicroserviceVerticle.java
+++ b/src/main/java/com/glencoesoftware/omero/ms/pixelbuffer/PixelBufferMicroserviceVerticle.java
@@ -157,6 +157,7 @@ public void deploy(JsonObject config, Promise<Void> prom) {
         context = new ClassPathXmlApplicationContext(
                 "classpath:ome/config.xml",
                 "classpath:ome/services/datalayer.xml",
+                "classpath*:blitz/*PixelBuffer.xml",
                 "classpath*:beanRefContext.xml");
 
         JsonObject httpTracingConfig =
diff --git a/src/main/java/com/glencoesoftware/omero/ms/pixelbuffer/PixelBufferVerticle.java b/src/main/java/com/glencoesoftware/omero/ms/pixelbuffer/PixelBufferVerticle.java
index d2af33f..da8caff 100755
--- a/src/main/java/com/glencoesoftware/omero/ms/pixelbuffer/PixelBufferVerticle.java
+++ b/src/main/java/com/glencoesoftware/omero/ms/pixelbuffer/PixelBufferVerticle.java
@@ -26,7 +26,7 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.glencoesoftware.omero.ms.core.OmeroMsAbstractVerticle;
 import com.glencoesoftware.omero.ms.core.OmeroRequest;
-import com.glencoesoftware.omero.ms.core.PixelsService;
+import com.glencoesoftware.omero.zarr.ZarrPixelsService;
 
 import Glacier2.CannotCreateSessionException;
 import Glacier2.PermissionDeniedException;
@@ -53,7 +53,7 @@ public class PixelBufferVerticle extends OmeroMsAbstractVerticle {
             "omero.pixel_buffer.get_tile";
 
     /** OMERO server pixels service. */
-    private final PixelsService pixelsService;
+    private final ZarrPixelsService pixelsService;
 
     /** OMERO server host */
     private String host;
@@ -66,7 +66,7 @@ public class PixelBufferVerticle extends OmeroMsAbstractVerticle {
      * @param host OMERO server host.
      * @param port OMERO server port.
      */
-    public PixelBufferVerticle(PixelsService pixelsService) {
+    public PixelBufferVerticle(ZarrPixelsService pixelsService) {
         this.pixelsService = pixelsService;
     }