From aff6b1f7c827720d663eb7e715036cfc2749f580 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Thu, 25 Jan 2024 15:37:15 +0000 Subject: [PATCH 1/2] deps: update dependency org.springframework.data:spring-data-bom to v2023.1.2 --- samples/spring-data-jdbc/pom.xml | 2 +- samples/spring-data-mybatis/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/samples/spring-data-jdbc/pom.xml b/samples/spring-data-jdbc/pom.xml index a386b74f..65d9df89 100644 --- a/samples/spring-data-jdbc/pom.xml +++ b/samples/spring-data-jdbc/pom.xml @@ -23,7 +23,7 @@ org.springframework.data spring-data-bom - 2023.0.5 + 2023.1.2 import pom diff --git a/samples/spring-data-mybatis/pom.xml b/samples/spring-data-mybatis/pom.xml index 6c7fb7e4..942471b3 100644 --- a/samples/spring-data-mybatis/pom.xml +++ b/samples/spring-data-mybatis/pom.xml @@ -28,7 +28,7 @@ org.springframework.data spring-data-bom - 2023.0.5 + 2023.1.2 import pom From c2cf6f32c859ffd7e5ea28a900bcf60db30d360f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Knut=20Olav=20L=C3=B8ite?= Date: Thu, 25 Jan 2024 17:44:25 +0100 Subject: [PATCH 2/2] fix: add default constructors to all entities --- samples/pom.xml | 1 + .../google/cloud/spanner/sample/entities/AbstractEntity.java | 4 ++++ .../java/com/google/cloud/spanner/sample/entities/Album.java | 2 ++ .../com/google/cloud/spanner/sample/entities/Concert.java | 4 ++++ .../java/com/google/cloud/spanner/sample/entities/Singer.java | 2 ++ .../java/com/google/cloud/spanner/sample/entities/Track.java | 4 ++++ .../java/com/google/cloud/spanner/sample/entities/Venue.java | 4 ++++ 7 files changed, 21 insertions(+) diff --git a/samples/pom.xml b/samples/pom.xml index b31e3d0b..1e8df92b 100644 --- a/samples/pom.xml +++ b/samples/pom.xml @@ -19,6 +19,7 @@ com.google.cloud.samples shared-configuration 1.2.0 + diff --git a/samples/spring-data-jdbc/src/main/java/com/google/cloud/spanner/sample/entities/AbstractEntity.java b/samples/spring-data-jdbc/src/main/java/com/google/cloud/spanner/sample/entities/AbstractEntity.java index 890816c9..5992f262 100644 --- a/samples/spring-data-jdbc/src/main/java/com/google/cloud/spanner/sample/entities/AbstractEntity.java +++ b/samples/spring-data-jdbc/src/main/java/com/google/cloud/spanner/sample/entities/AbstractEntity.java @@ -20,6 +20,7 @@ import org.springframework.data.annotation.CreatedDate; import org.springframework.data.annotation.Id; import org.springframework.data.annotation.LastModifiedDate; +import org.springframework.data.annotation.PersistenceCreator; public abstract class AbstractEntity { @@ -30,6 +31,9 @@ public abstract class AbstractEntity { @LastModifiedDate private OffsetDateTime updatedAt; + @PersistenceCreator + public AbstractEntity() {} + @Override public boolean equals(Object o) { if (!(o instanceof AbstractEntity)) { diff --git a/samples/spring-data-jdbc/src/main/java/com/google/cloud/spanner/sample/entities/Album.java b/samples/spring-data-jdbc/src/main/java/com/google/cloud/spanner/sample/entities/Album.java index dfde31af..b6b7ac8b 100644 --- a/samples/spring-data-jdbc/src/main/java/com/google/cloud/spanner/sample/entities/Album.java +++ b/samples/spring-data-jdbc/src/main/java/com/google/cloud/spanner/sample/entities/Album.java @@ -18,6 +18,7 @@ import java.math.BigDecimal; import java.time.LocalDate; +import org.springframework.data.annotation.PersistenceCreator; import org.springframework.data.relational.core.mapping.Table; @Table("albums") @@ -33,6 +34,7 @@ public class Album extends AbstractEntity { private Long singerId; + @PersistenceCreator public Album() {} public Album(String title) { diff --git a/samples/spring-data-jdbc/src/main/java/com/google/cloud/spanner/sample/entities/Concert.java b/samples/spring-data-jdbc/src/main/java/com/google/cloud/spanner/sample/entities/Concert.java index 29f2b6d9..1075eed3 100644 --- a/samples/spring-data-jdbc/src/main/java/com/google/cloud/spanner/sample/entities/Concert.java +++ b/samples/spring-data-jdbc/src/main/java/com/google/cloud/spanner/sample/entities/Concert.java @@ -17,6 +17,7 @@ package com.google.cloud.spanner.sample.entities; import java.time.OffsetDateTime; +import org.springframework.data.annotation.PersistenceCreator; import org.springframework.data.relational.core.mapping.Table; @Table("concerts") @@ -32,6 +33,9 @@ public class Concert extends AbstractEntity { private OffsetDateTime endTime; + @PersistenceCreator + public Concert() {} + public Concert(Venue venue, Singer singer, String name) { this.venueId = venue.getId(); this.singerId = singer.getId(); diff --git a/samples/spring-data-jdbc/src/main/java/com/google/cloud/spanner/sample/entities/Singer.java b/samples/spring-data-jdbc/src/main/java/com/google/cloud/spanner/sample/entities/Singer.java index 255459a8..4b68f139 100644 --- a/samples/spring-data-jdbc/src/main/java/com/google/cloud/spanner/sample/entities/Singer.java +++ b/samples/spring-data-jdbc/src/main/java/com/google/cloud/spanner/sample/entities/Singer.java @@ -16,6 +16,7 @@ package com.google.cloud.spanner.sample.entities; +import org.springframework.data.annotation.PersistenceCreator; import org.springframework.data.annotation.ReadOnlyProperty; import org.springframework.data.relational.core.mapping.Table; @@ -31,6 +32,7 @@ public class Singer extends AbstractEntity { private Boolean active; + @PersistenceCreator public Singer() {} public Singer(String firstName, String lastName) { diff --git a/samples/spring-data-jdbc/src/main/java/com/google/cloud/spanner/sample/entities/Track.java b/samples/spring-data-jdbc/src/main/java/com/google/cloud/spanner/sample/entities/Track.java index 268b6e2b..c255a08b 100644 --- a/samples/spring-data-jdbc/src/main/java/com/google/cloud/spanner/sample/entities/Track.java +++ b/samples/spring-data-jdbc/src/main/java/com/google/cloud/spanner/sample/entities/Track.java @@ -16,6 +16,7 @@ package com.google.cloud.spanner.sample.entities; +import org.springframework.data.annotation.PersistenceCreator; import org.springframework.data.relational.core.mapping.Column; import org.springframework.data.relational.core.mapping.Table; @@ -44,6 +45,9 @@ public class Track extends AbstractEntity { private Double sampleRate; + @PersistenceCreator + public Track() {} + public Track(Album album, int trackNumber, String title) { setAlbumId(album.getId()); this.trackNumber = trackNumber; diff --git a/samples/spring-data-jdbc/src/main/java/com/google/cloud/spanner/sample/entities/Venue.java b/samples/spring-data-jdbc/src/main/java/com/google/cloud/spanner/sample/entities/Venue.java index e7855cd0..82dc5973 100644 --- a/samples/spring-data-jdbc/src/main/java/com/google/cloud/spanner/sample/entities/Venue.java +++ b/samples/spring-data-jdbc/src/main/java/com/google/cloud/spanner/sample/entities/Venue.java @@ -16,6 +16,7 @@ package com.google.cloud.spanner.sample.entities; +import org.springframework.data.annotation.PersistenceCreator; import org.springframework.data.relational.core.mapping.Table; @Table("venues") @@ -24,6 +25,9 @@ public class Venue extends AbstractEntity { private String description; + @PersistenceCreator + public Venue() {} + public Venue(String name) { this.name = name; }