Skip to content

38300 update to spring boot 3 #448

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
brandonandre merged 5 commits into from
May 7, 2026
Merged

38300 update to spring boot 3 #448

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5e9e1d8
38300 Update to SpringBoot 3
cgendreau May 5, 2026
a88dcc3
Changes ManyToOne to LAZY
cgendreau May 5, 2026
6f2c40c
Updated dina-base
cgendreau May 6, 2026
2cb7a27
Support #38300 - Update to SpringBoot 3
brandonandre May 7, 2026
a951204
Support #38300 - Update to SpringBoot 3
brandonandre May 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>

Expand Down Expand Up @@ -223,7 +222,6 @@
</executions>
<configuration>
<includeSystemScope>true</includeSystemScope>
<fork>${spring-boot-maven-plugin.fork}</fork>
</configuration>
</plugin>
<plugin>
Expand Down
2 changes: 0 additions & 2 deletions src/main/java/ca/gc/aafc/objectstore/api/DefaultValueConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -20,7 +19,6 @@ public Map<String, Object> getProperties() {
return Map.copyOf(Map.of("values", values));
}

@ConstructorBinding
@RequiredArgsConstructor
@Getter
public static class DefaultValue {
Expand Down
2 changes: 0 additions & 2 deletions src/main/java/ca/gc/aafc/objectstore/api/OrphanRemovalConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -19,7 +18,6 @@ public class OrphanRemovalConfiguration {

private OrphanRemovalExpirationSetting expiration;

@ConstructorBinding
@RequiredArgsConstructor
@Getter
public static class OrphanRemovalExpirationSetting {
Expand Down
2 changes: 0 additions & 2 deletions src/main/java/ca/gc/aafc/objectstore/api/config/FileUploadConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/ca/gc/aafc/objectstore/api/config/ObjectExportQueueProperties.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/ca/gc/aafc/objectstore/api/config/SearchQueueProperties.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
21 changes: 11 additions & 10 deletions src/main/java/ca/gc/aafc/objectstore/api/entities/AbstractObjectStoreMetadata.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
package ca.gc.aafc.objectstore.api.entities;

import ca.gc.aafc.dina.entity.DinaEntity;

import io.hypersistence.utils.hibernate.type.basic.PostgreSQLEnumType;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
Expand All @@ -10,14 +12,14 @@
import org.hibernate.annotations.NaturalIdCache;
import org.hibernate.annotations.Type;

import javax.persistence.Column;
import javax.persistence.EnumType;
import javax.persistence.Enumerated;
import javax.persistence.MappedSuperclass;
import javax.persistence.Transient;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Size;
import jakarta.persistence.Column;
import jakarta.persistence.EnumType;
import jakarta.persistence.Enumerated;
import jakarta.persistence.MappedSuperclass;
import jakarta.persistence.Transient;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import jakarta.validation.constraints.Size;
import java.time.OffsetDateTime;
import java.util.Optional;
import java.util.UUID;
Expand Down Expand Up @@ -82,7 +84,7 @@ public String getFilename() {
}

@NotNull
@Type(type = "pgsql_enum")
@Type(PostgreSQLEnumType.class)
@Enumerated(EnumType.STRING)
@Column(name = "dc_type")
public DcType getDcType() {
Expand Down Expand Up @@ -140,7 +142,6 @@ public String getNotPubliclyReleasableReason() {
return notPubliclyReleasableReason;
}

@Type(type = "string-array")
@Column(name = "ac_tags", columnDefinition = "text[]")
public String[] getAcTags() {
return acTags;
Expand Down
30 changes: 16 additions & 14 deletions src/main/java/ca/gc/aafc/objectstore/api/entities/Derivative.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,22 @@
package ca.gc.aafc.objectstore.api.entities;

import io.hypersistence.utils.hibernate.type.basic.PostgreSQLEnumType;
import jakarta.persistence.FetchType;
import lombok.AllArgsConstructor;
import lombok.NoArgsConstructor;
import org.hibernate.annotations.Type;

import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.EnumType;
import javax.persistence.Enumerated;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
import javax.persistence.Table;
import javax.persistence.Transient;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.EnumType;
import jakarta.persistence.Enumerated;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.GenerationType;
import jakarta.persistence.Id;
import jakarta.persistence.JoinColumn;
import jakarta.persistence.ManyToOne;
import jakarta.persistence.Table;
import jakarta.persistence.Transient;
import lombok.experimental.SuperBuilder;

@Entity
Expand Down Expand Up @@ -58,7 +60,7 @@ public void setId(Integer id) {
this.id = id;
}

@ManyToOne
@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "ac_derived_from", referencedColumnName = "id")
public ObjectStoreMetadata getAcDerivedFrom() {
return acDerivedFrom;
Expand All @@ -68,7 +70,7 @@ public void setAcDerivedFrom(ObjectStoreMetadata acDerivedFrom) {
this.acDerivedFrom = acDerivedFrom;
}

@Type(type = "pgsql_enum")
@Type(PostgreSQLEnumType.class)
@Enumerated(EnumType.STRING)
@Column(name = "derivative_type")
public DerivativeType getDerivativeType() {
Expand All @@ -79,7 +81,7 @@ public void setDerivativeType(DerivativeType derivativeType) {
this.derivativeType = derivativeType;
}

@ManyToOne
@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "generated_from_derivative", referencedColumnName = "id")
public Derivative getGeneratedFromDerivative() {
return generatedFromDerivative;
Expand Down
12 changes: 6 additions & 6 deletions src/main/java/ca/gc/aafc/objectstore/api/entities/MigrationHint.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package ca.gc.aafc.objectstore.api.entities;

import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Id;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.Table;
import jakarta.persistence.Id;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.GenerationType;
import jakarta.persistence.Column;
import java.time.OffsetDateTime;
import lombok.Data;

Expand Down
31 changes: 16 additions & 15 deletions src/main/java/ca/gc/aafc/objectstore/api/entities/ObjectStoreManagedAttribute.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,21 @@
package ca.gc.aafc.objectstore.api.entities;

import io.hypersistence.utils.hibernate.type.basic.PostgreSQLEnumType;
import io.hypersistence.utils.hibernate.type.json.JsonType;
import java.time.OffsetDateTime;
import java.util.UUID;

import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.EnumType;
import javax.persistence.Enumerated;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Transient;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Size;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.EnumType;
import jakarta.persistence.Enumerated;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.GenerationType;
import jakarta.persistence.Id;
import jakarta.persistence.Transient;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import jakarta.validation.constraints.Size;

import ca.gc.aafc.dina.i18n.MultilingualTitle;
import lombok.Getter;
Expand Down Expand Up @@ -55,8 +57,8 @@ public class ObjectStoreManagedAttribute implements ca.gc.aafc.dina.entity.Manag
private String key;

@NotNull
@Type(type = "jsonb")
@Column(name = "multilingual_description")
@Type(JsonType.class)
@Column(name = "multilingual_description", columnDefinition = "jsonb")
public MultilingualDescription getMultilingualDescription() {
return multilingualDescription;
}
Expand Down Expand Up @@ -96,7 +98,7 @@ public void setName(String name) {
}

@NotNull
@Type(type = "pgsql_enum")
@Type(PostgreSQLEnumType.class)
@Enumerated(EnumType.STRING)
@Column(name = "type")
public VocabularyElementType getVocabularyElementType() {
Expand All @@ -107,7 +109,6 @@ public void setVocabularyElementType(VocabularyElementType type) {
this.vocabularyElementType = type;
}

@Type(type = "string-array")
@Column(columnDefinition = "text[]")
public String[] getAcceptedValues() {
return acceptedValues;
Expand Down
41 changes: 22 additions & 19 deletions src/main/java/ca/gc/aafc/objectstore/api/entities/ObjectStoreMetadata.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package ca.gc.aafc.objectstore.api.entities;

import io.hypersistence.utils.hibernate.type.json.JsonType;
import java.util.ArrayList;
import java.util.HashMap;
import lombok.Builder;
Expand All @@ -9,21 +10,21 @@
import org.hibernate.annotations.UpdateTimestamp;
import org.hibernate.validator.constraints.URL;

import javax.persistence.CascadeType;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
import javax.persistence.OneToMany;
import javax.persistence.Table;
import javax.persistence.Transient;
import javax.validation.constraints.Max;
import javax.validation.constraints.Min;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Size;
import jakarta.persistence.CascadeType;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.GenerationType;
import jakarta.persistence.Id;
import jakarta.persistence.JoinColumn;
import jakarta.persistence.ManyToOne;
import jakarta.persistence.OneToMany;
import jakarta.persistence.Table;
import jakarta.persistence.Transient;
import jakarta.validation.constraints.Max;
import jakarta.validation.constraints.Min;
import jakarta.validation.constraints.NotNull;
import jakarta.validation.constraints.Size;

import java.time.OffsetDateTime;
import java.util.List;
Expand All @@ -32,6 +33,8 @@
import lombok.Setter;
import lombok.experimental.SuperBuilder;

import ca.gc.aafc.dina.entity.ValueHolder;

/**
* The Class ObjectStoreMetadata.
*/
Expand Down Expand Up @@ -73,7 +76,7 @@ public class ObjectStoreMetadata extends AbstractObjectStoreMetadata {
// used to move the value from the dto to the entity through the mapper
@Setter
@Builder.Default
private StringHolder acSubtypeStr = StringHolder.undefined();
private ValueHolder<String> acSubtypeStr = ValueHolder.undefined();

/**
* Read-only field to get the ac_sub_type_id to allow filtering by null values.
Expand Down Expand Up @@ -265,7 +268,7 @@ public String getGroup() {
}

@Transient
public StringHolder getAcSubtypeStr() {
public ValueHolder<String> getAcSubtypeStr() {
return acSubtypeStr;
}

Expand All @@ -276,9 +279,9 @@ public StringHolder getAcSubtypeStr() {
public void setGroup(String group) {
}

@Type(type = "jsonb")
@Type(JsonType.class)
@NotNull
@Column(name = "managed_attribute_values")
@Column(name = "managed_attribute_values", columnDefinition = "jsonb")
public Map<String, String> getManagedAttributes() {
return managedAttributes;
}
Expand Down
Loading
Loading