Merge branch 'dev'

Author: cgendreau

.github/workflows/build_deploy_documentation.yml

@@ -5,9 +5,10 @@ on: [push]
 jobs:
   build:
     runs-on: ubuntu-latest
+    if: ${{ github.ref == 'refs/heads/main' }}
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v6
       - name: Install asciidoctor
         run: |
            sudo apt-get install -y asciidoctor        
@@ -19,7 +20,6 @@ jobs:
       #     cp -r asciidoc/user-guide/images/. generated-docs/images
 
       - name: Deploy GitHub Pages (only on master branch)
-        # if: ${{ github.ref == 'refs/heads/main' }}
         uses: peaceiris/actions-gh-pages@v3
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/ci.yml

@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - name: Set up JDK 21
         uses: actions/setup-java@v4
         with:

imagemagick/Dockerfile

@@ -1,11 +1,11 @@
-FROM aafcbicoe/object-store-api:1.32
+FROM aafcbicoe/object-store-api:1.33
 
 USER root
 RUN apt-get update && apt-get install -y --no-install-recommends git ca-certificates build-essential curl
 RUN git clone --depth=1 https://github.com/SoftCreatR/imei.git /tmp/imei
 
-RUN bash /tmp/imei/imei.sh -i -y
+RUN bash /tmp/imei/imei.sh
 
-RUN /usr/local/bin/magick -version
+RUN magick -version
 
 RUN ldconfig

pom.xml

@@ -5,7 +5,7 @@
 
   <groupId>ca.gc.aafc</groupId>
   <artifactId>object-store.api</artifactId>
-  <version>1.33</version>
+  <version>1.34</version>
   <packaging>jar</packaging>
 
   <name>Object-Store API</name>
@@ -14,7 +14,7 @@
   <parent>
     <groupId>org.springframework.boot</groupId>
     <artifactId>spring-boot-starter-parent</artifactId>
-    <version>2.7.18</version>
+    <version>3.0.13</version>
   </parent>
 
   <properties>
@@ -47,14 +47,13 @@
 
     <asciidoctor-maven-plugin.version>2.1.0</asciidoctor-maven-plugin.version>
     <asciidoctorj.diagram.version>2.0.2</asciidoctorj.diagram.version>
-    <dina-base-api.version>0.162</dina-base-api.version>
+    <dina-base-api.version>0.167</dina-base-api.version>
 
     <postgresql.version>42.4.4</postgresql.version>
 
     <!-- Override to avoid NoClassDefFoundError: org/apache/maven/doxia/siterenderer/DocumentContent -->
     <maven-site-plugin.version>3.7.1</maven-site-plugin.version>
 
-    <spring-boot-maven-plugin.fork>false</spring-boot-maven-plugin.fork>
   </properties>
   <dependencies>
 
@@ -223,7 +222,6 @@
         </executions>
         <configuration>
           <includeSystemScope>true</includeSystemScope>
-          <fork>${spring-boot-maven-plugin.fork}</fork>
         </configuration>
       </plugin>
       <plugin>

src/main/java/ca/gc/aafc/objectstore/api/DefaultValueConfiguration.java

@@ -4,7 +4,6 @@
 import lombok.RequiredArgsConstructor;
 import lombok.Setter;
 import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.boot.context.properties.ConstructorBinding;
 
 import java.util.List;
 import java.util.Map;
@@ -20,7 +19,6 @@ public Map<String, Object> getProperties() {
     return Map.copyOf(Map.of("values", values));
   }
 
-  @ConstructorBinding
   @RequiredArgsConstructor
   @Getter
   public static class DefaultValue {

src/main/java/ca/gc/aafc/objectstore/api/OrphanRemovalConfiguration.java

@@ -4,7 +4,6 @@
 import lombok.RequiredArgsConstructor;
 import lombok.Setter;
 import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.boot.context.properties.ConstructorBinding;
 import org.springframework.boot.convert.DurationUnit;
 import org.springframework.context.annotation.Configuration;
 
@@ -19,7 +18,6 @@ public class OrphanRemovalConfiguration {
 
   private OrphanRemovalExpirationSetting expiration;
 
-  @ConstructorBinding
   @RequiredArgsConstructor
   @Getter
   public static class OrphanRemovalExpirationSetting {

src/main/java/ca/gc/aafc/objectstore/api/config/ApiInfoConfiguration.java

@@ -0,0 +1,45 @@
+package ca.gc.aafc.objectstore.api.config;
+
+import java.util.Map;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.info.BuildProperties;
+import org.springframework.context.annotation.Configuration;
+
+import ca.gc.aafc.dina.dto.ApiInfoDto;
+import ca.gc.aafc.objectstore.api.image.ImageConverter;
+
+@Configuration
+public class ApiInfoConfiguration {
+
+  @Value("${dina.fileStorage.implementation:}")
+  private String storageImplementation;
+
+  @Value("${dina.messaging.isProducer:false}")
+  private Boolean isProducer;
+
+  @Value("${dina.messaging.isConsumer:false}")
+  private Boolean isConsumer;
+
+  private final String apiVersion;
+  private final boolean magickCommandAvailable;
+
+  public ApiInfoConfiguration(BuildProperties buildProperties) {
+    this.apiVersion = buildProperties.getVersion();
+    this.magickCommandAvailable = ImageConverter.isToolAvailable();
+  }
+
+  public ApiInfoDto buildApiInfoDto() {
+    ApiInfoDto infoDto = new ApiInfoDto();
+    infoDto.setModuleVersion(apiVersion);
+    infoDto.setMessageProducer(isProducer);
+    infoDto.setMessageConsumer(isConsumer);
+
+    Map<String, Object> moduleInfo = Map.of(
+      "storageImplementation", storageImplementation,
+      "magickCommandAvailable", magickCommandAvailable);
+
+    infoDto.setModuleInfo(moduleInfo);
+    return infoDto;
+  }
+}

src/main/java/ca/gc/aafc/objectstore/api/config/FileUploadConfiguration.java

@@ -3,12 +3,10 @@
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.boot.context.properties.ConstructorBinding;
 
 import java.util.Map;
 
 @ConfigurationProperties(prefix = "spring.servlet")
-@ConstructorBinding
 @RequiredArgsConstructor
 @Getter
 public class FileUploadConfiguration {

src/main/java/ca/gc/aafc/objectstore/api/config/ObjectExportQueueProperties.java

@@ -1,6 +1,6 @@
 package ca.gc.aafc.objectstore.api.config;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.stereotype.Component;

src/main/java/ca/gc/aafc/objectstore/api/config/SearchQueueProperties.java

@@ -1,6 +1,6 @@
 package ca.gc.aafc.objectstore.api.config;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.stereotype.Component;