Consume omero-zarr-pixel-buffer 0.3.0

glencoesoftware · Apr 2, 2024 · 1c03cb1 · 1c03cb1
1 parent 68fe94d
commit 1c03cb1
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 7 deletions.
diff --git a/build.gradle b/build.gradle
@@ -4,12 +4,12 @@ plugins {
 }
 
 group = 'com.glencoesoftware.omero'
-version = '0.6.5-SNAPSHOT'
+version = '0.7.0-SNAPSHOT'
 
 mainClassName = 'io.vertx.core.Launcher'
 
-sourceCompatibility = 1.8
-targetCompatibility = 1.8
+sourceCompatibility = 1.11
+targetCompatibility = 1.11
 
 repositories {
     mavenCentral()
@@ -56,7 +56,8 @@ 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-ms-core:0.7.0'
+    implementation 'com.glencoesoftware.omero:omero-zarr-pixel-buffer:0.3.0'
+    implementation 'com.glencoesoftware.omero:omero-ms-core:0.8.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'

diff --git a/src/main/java/com/glencoesoftware/omero/ms/pixelbuffer/PixelBufferMicroserviceVerticle.java b/src/main/java/com/glencoesoftware/omero/ms/pixelbuffer/PixelBufferMicroserviceVerticle.java
@@ -157,8 +157,7 @@ public void deploy(JsonObject config, Promise<Void> prom) {
         context = new ClassPathXmlApplicationContext(
                 "classpath:ome/config.xml",
                 "classpath:ome/services/datalayer.xml",
-                "classpath*:beanRefContext.xml",
-                "classpath*:service-ms.core.PixelsService.xml");
+                "classpath*:beanRefContext.xml");
 
         JsonObject httpTracingConfig =
                 config.getJsonObject("http-tracing", new JsonObject());

diff --git a/src/main/resources/beanRefContext.xml b/src/main/resources/beanRefContext.xml
@@ -8,6 +8,7 @@
 
   <bean name="filesystem"  abstract="true">
     <constructor-arg index="0" value="${omero.data.dir}"/>
+    <constructor-arg index="1" type="boolean" value="true"/>
   </bean>
 
   <bean id="omeroFilePathResolver" class="ome.services.OmeroFilePathResolver">
@@ -43,8 +44,23 @@
     <property name="graphiteAddress" value="${omero.metrics.graphite}"/>
   </bean>
 
-  <bean id="nullMetrics" class="ome.system.metrics.NullMetrics"/>
+  <bean id="metrics" class="ome.system.metrics.NullMetrics"/>
 
+  <bean name="/OMERO/Pixels" class="com.glencoesoftware.omero.ms.image.region.PixelsService"
+        parent="filesystem">
+    <!-- index=0 "path" comes from parent -->
+    <constructor-arg index="2" value="${omero.pixeldata.memoizer.dir}"/>
+    <constructor-arg index="3" ref="MemoizerWait"/>
+    <constructor-arg index="4" ref="omeroFilePathResolver"/>
+    <constructor-arg index="5" ref="backOff"/>
+    <constructor-arg index="6" ref="tileSizes"/>
+    <constructor-arg index="7" ><null /></constructor-arg>
+    <constructor-arg index="8" value="${omero.pixeldata.zarr_cache_size:500}" />
+    <constructor-arg index="9" value="${omero.pixeldata.max_plane_width:3192}" />
+    <constructor-arg index="10" value="${omero.pixeldata.max_plane_height:3192}" />
+    <property name="metrics" ref="metrics"/>
+  </bean>
+
   <bean id="omero-ms-pixel-buffer-verticle"
         class="com.glencoesoftware.omero.ms.pixelbuffer.PixelBufferVerticle"
         scope="prototype">