Skip to content

Commit 118d3ed

Browse files
brandonandrebrandonandre
authored
Merge pull request #448 from AAFC-BICoE/38300_Update_to_SpringBoot_3
38300 update to spring boot 3
2 parents d4fb9a8 + a951204 commit 118d3ed

82 files changed

Lines changed: 244 additions & 313 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎pom.xml‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<parent>
1515
<groupId>org.springframework.boot</groupId>
1616
<artifactId>spring-boot-starter-parent</artifactId>
17-
<version>2.7.18</version>
17+
<version>3.0.13</version>
1818
</parent>
1919

2020
<properties>
@@ -47,14 +47,13 @@
4747

4848
<asciidoctor-maven-plugin.version>2.1.0</asciidoctor-maven-plugin.version>
4949
<asciidoctorj.diagram.version>2.0.2</asciidoctorj.diagram.version>
50-
<dina-base-api.version>0.162</dina-base-api.version>
50+
<dina-base-api.version>0.167</dina-base-api.version>
5151

5252
<postgresql.version>42.4.4</postgresql.version>
5353

5454
<!-- Override to avoid NoClassDefFoundError: org/apache/maven/doxia/siterenderer/DocumentContent -->
5555
<maven-site-plugin.version>3.7.1</maven-site-plugin.version>
5656

57-
<spring-boot-maven-plugin.fork>false</spring-boot-maven-plugin.fork>
5857
</properties>
5958
<dependencies>
6059

@@ -223,7 +222,6 @@
223222
</executions>
224223
<configuration>
225224
<includeSystemScope>true</includeSystemScope>
226-
<fork>${spring-boot-maven-plugin.fork}</fork>
227225
</configuration>
228226
</plugin>
229227
<plugin>

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import lombok.RequiredArgsConstructor;
55
import lombok.Setter;
66
import org.springframework.boot.context.properties.ConfigurationProperties;
7-
import org.springframework.boot.context.properties.ConstructorBinding;
87

98
import java.util.List;
109
import java.util.Map;
@@ -20,7 +19,6 @@ public Map<String, Object> getProperties() {
2019
return Map.copyOf(Map.of("values", values));
2120
}
2221

23-
@ConstructorBinding
2422
@RequiredArgsConstructor
2523
@Getter
2624
public static class DefaultValue {

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import lombok.RequiredArgsConstructor;
55
import lombok.Setter;
66
import org.springframework.boot.context.properties.ConfigurationProperties;
7-
import org.springframework.boot.context.properties.ConstructorBinding;
87
import org.springframework.boot.convert.DurationUnit;
98
import org.springframework.context.annotation.Configuration;
109

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

2019
private OrphanRemovalExpirationSetting expiration;
2120

22-
@ConstructorBinding
2321
@RequiredArgsConstructor
2422
@Getter
2523
public static class OrphanRemovalExpirationSetting {

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,10 @@
33
import lombok.Getter;
44
import lombok.RequiredArgsConstructor;
55
import org.springframework.boot.context.properties.ConfigurationProperties;
6-
import org.springframework.boot.context.properties.ConstructorBinding;
76

87
import java.util.Map;
98

109
@ConfigurationProperties(prefix = "spring.servlet")
11-
@ConstructorBinding
1210
@RequiredArgsConstructor
1311
@Getter
1412
public class FileUploadConfiguration {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package ca.gc.aafc.objectstore.api.config;
22

3-
import javax.inject.Named;
3+
import jakarta.inject.Named;
44

55
import org.springframework.boot.context.properties.ConfigurationProperties;
66
import org.springframework.stereotype.Component;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package ca.gc.aafc.objectstore.api.config;
22

3-
import javax.inject.Named;
3+
import jakarta.inject.Named;
44

55
import org.springframework.boot.context.properties.ConfigurationProperties;
66
import org.springframework.stereotype.Component;

‎src/main/java/ca/gc/aafc/objectstore/api/entities/AbstractObjectStoreMetadata.java‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
package ca.gc.aafc.objectstore.api.entities;
22

33
import ca.gc.aafc.dina.entity.DinaEntity;
4+
5+
import io.hypersistence.utils.hibernate.type.basic.PostgreSQLEnumType;
46
import lombok.AllArgsConstructor;
57
import lombok.Getter;
68
import lombok.RequiredArgsConstructor;
@@ -10,14 +12,14 @@
1012
import org.hibernate.annotations.NaturalIdCache;
1113
import org.hibernate.annotations.Type;
1214

13-
import javax.persistence.Column;
14-
import javax.persistence.EnumType;
15-
import javax.persistence.Enumerated;
16-
import javax.persistence.MappedSuperclass;
17-
import javax.persistence.Transient;
18-
import javax.validation.constraints.NotBlank;
19-
import javax.validation.constraints.NotNull;
20-
import javax.validation.constraints.Size;
15+
import jakarta.persistence.Column;
16+
import jakarta.persistence.EnumType;
17+
import jakarta.persistence.Enumerated;
18+
import jakarta.persistence.MappedSuperclass;
19+
import jakarta.persistence.Transient;
20+
import jakarta.validation.constraints.NotBlank;
21+
import jakarta.validation.constraints.NotNull;
22+
import jakarta.validation.constraints.Size;
2123
import java.time.OffsetDateTime;
2224
import java.util.Optional;
2325
import java.util.UUID;
@@ -82,7 +84,7 @@ public String getFilename() {
8284
}
8385

8486
@NotNull
85-
@Type(type = "pgsql_enum")
87+
@Type(PostgreSQLEnumType.class)
8688
@Enumerated(EnumType.STRING)
8789
@Column(name = "dc_type")
8890
public DcType getDcType() {
@@ -140,7 +142,6 @@ public String getNotPubliclyReleasableReason() {
140142
return notPubliclyReleasableReason;
141143
}
142144

143-
@Type(type = "string-array")
144145
@Column(name = "ac_tags", columnDefinition = "text[]")
145146
public String[] getAcTags() {
146147
return acTags;

‎src/main/java/ca/gc/aafc/objectstore/api/entities/Derivative.java‎

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,22 @@
11
package ca.gc.aafc.objectstore.api.entities;
22

3+
import io.hypersistence.utils.hibernate.type.basic.PostgreSQLEnumType;
4+
import jakarta.persistence.FetchType;
35
import lombok.AllArgsConstructor;
46
import lombok.NoArgsConstructor;
57
import org.hibernate.annotations.Type;
68

7-
import javax.persistence.Column;
8-
import javax.persistence.Entity;
9-
import javax.persistence.EnumType;
10-
import javax.persistence.Enumerated;
11-
import javax.persistence.GeneratedValue;
12-
import javax.persistence.GenerationType;
13-
import javax.persistence.Id;
14-
import javax.persistence.JoinColumn;
15-
import javax.persistence.ManyToOne;
16-
import javax.persistence.Table;
17-
import javax.persistence.Transient;
9+
import jakarta.persistence.Column;
10+
import jakarta.persistence.Entity;
11+
import jakarta.persistence.EnumType;
12+
import jakarta.persistence.Enumerated;
13+
import jakarta.persistence.GeneratedValue;
14+
import jakarta.persistence.GenerationType;
15+
import jakarta.persistence.Id;
16+
import jakarta.persistence.JoinColumn;
17+
import jakarta.persistence.ManyToOne;
18+
import jakarta.persistence.Table;
19+
import jakarta.persistence.Transient;
1820
import lombok.experimental.SuperBuilder;
1921

2022
@Entity
@@ -58,7 +60,7 @@ public void setId(Integer id) {
5860
this.id = id;
5961
}
6062

61-
@ManyToOne
63+
@ManyToOne(fetch = FetchType.LAZY)
6264
@JoinColumn(name = "ac_derived_from", referencedColumnName = "id")
6365
public ObjectStoreMetadata getAcDerivedFrom() {
6466
return acDerivedFrom;
@@ -68,7 +70,7 @@ public void setAcDerivedFrom(ObjectStoreMetadata acDerivedFrom) {
6870
this.acDerivedFrom = acDerivedFrom;
6971
}
7072

71-
@Type(type = "pgsql_enum")
73+
@Type(PostgreSQLEnumType.class)
7274
@Enumerated(EnumType.STRING)
7375
@Column(name = "derivative_type")
7476
public DerivativeType getDerivativeType() {
@@ -79,7 +81,7 @@ public void setDerivativeType(DerivativeType derivativeType) {
7981
this.derivativeType = derivativeType;
8082
}
8183

82-
@ManyToOne
84+
@ManyToOne(fetch = FetchType.LAZY)
8385
@JoinColumn(name = "generated_from_derivative", referencedColumnName = "id")
8486
public Derivative getGeneratedFromDerivative() {
8587
return generatedFromDerivative;

‎src/main/java/ca/gc/aafc/objectstore/api/entities/MigrationHint.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package ca.gc.aafc.objectstore.api.entities;
22

3-
import javax.persistence.Entity;
4-
import javax.persistence.Table;
5-
import javax.persistence.Id;
6-
import javax.persistence.GeneratedValue;
7-
import javax.persistence.GenerationType;
8-
import javax.persistence.Column;
3+
import jakarta.persistence.Entity;
4+
import jakarta.persistence.Table;
5+
import jakarta.persistence.Id;
6+
import jakarta.persistence.GeneratedValue;
7+
import jakarta.persistence.GenerationType;
8+
import jakarta.persistence.Column;
99
import java.time.OffsetDateTime;
1010
import lombok.Data;
1111

‎src/main/java/ca/gc/aafc/objectstore/api/entities/ObjectStoreManagedAttribute.java‎

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,21 @@
11
package ca.gc.aafc.objectstore.api.entities;
22

3+
import io.hypersistence.utils.hibernate.type.basic.PostgreSQLEnumType;
4+
import io.hypersistence.utils.hibernate.type.json.JsonType;
35
import java.time.OffsetDateTime;
46
import java.util.UUID;
57

6-
import javax.persistence.Column;
7-
import javax.persistence.Entity;
8-
import javax.persistence.EnumType;
9-
import javax.persistence.Enumerated;
10-
import javax.persistence.GeneratedValue;
11-
import javax.persistence.GenerationType;
12-
import javax.persistence.Id;
13-
import javax.persistence.Transient;
14-
import javax.validation.constraints.NotBlank;
15-
import javax.validation.constraints.NotNull;
16-
import javax.validation.constraints.Size;
8+
import jakarta.persistence.Column;
9+
import jakarta.persistence.Entity;
10+
import jakarta.persistence.EnumType;
11+
import jakarta.persistence.Enumerated;
12+
import jakarta.persistence.GeneratedValue;
13+
import jakarta.persistence.GenerationType;
14+
import jakarta.persistence.Id;
15+
import jakarta.persistence.Transient;
16+
import jakarta.validation.constraints.NotBlank;
17+
import jakarta.validation.constraints.NotNull;
18+
import jakarta.validation.constraints.Size;
1719

1820
import ca.gc.aafc.dina.i18n.MultilingualTitle;
1921
import lombok.Getter;
@@ -55,8 +57,8 @@ public class ObjectStoreManagedAttribute implements ca.gc.aafc.dina.entity.Manag
5557
private String key;
5658

5759
@NotNull
58-
@Type(type = "jsonb")
59-
@Column(name = "multilingual_description")
60+
@Type(JsonType.class)
61+
@Column(name = "multilingual_description", columnDefinition = "jsonb")
6062
public MultilingualDescription getMultilingualDescription() {
6163
return multilingualDescription;
6264
}
@@ -96,7 +98,7 @@ public void setName(String name) {
9698
}
9799

98100
@NotNull
99-
@Type(type = "pgsql_enum")
101+
@Type(PostgreSQLEnumType.class)
100102
@Enumerated(EnumType.STRING)
101103
@Column(name = "type")
102104
public VocabularyElementType getVocabularyElementType() {
@@ -107,7 +109,6 @@ public void setVocabularyElementType(VocabularyElementType type) {
107109
this.vocabularyElementType = type;
108110
}
109111

110-
@Type(type = "string-array")
111112
@Column(columnDefinition = "text[]")
112113
public String[] getAcceptedValues() {
113114
return acceptedValues;

0 commit comments

Comments
 (0)