From dcabde9f13cd2f4609709b2ba60756a11c6c046b Mon Sep 17 00:00:00 2001 From: John Blum Date: Thu, 27 Jan 2022 17:54:06 -0800 Subject: [PATCH] Add [test] implementation dependency on 'jakarta.persistence:jakarta.persistence-api'. Correct test source import and use Jakarta EE types (e.g. @jakarta.persistence.Id) rather than Java EE types. --- .../spring-geode-samples-caching-inline-async.gradle | 1 + .../app/caching/inline/async/client/model/Golfer.java | 6 +++--- .../multi-store/spring-geode-smoke-tests-multi-store.gradle | 1 + .../src/main/java/example/app/model/Contact.java | 4 ++-- spring-geode/spring-geode.gradle | 1 + .../src/test/java/example/app/crm/model/Customer.java | 2 +- 6 files changed, 9 insertions(+), 6 deletions(-) diff --git a/spring-geode-samples/caching/inline-async/spring-geode-samples-caching-inline-async.gradle b/spring-geode-samples/caching/inline-async/spring-geode-samples-caching-inline-async.gradle index e52fc7fc..2a89674b 100644 --- a/spring-geode-samples/caching/inline-async/spring-geode-samples-caching-inline-async.gradle +++ b/spring-geode-samples/caching/inline-async/spring-geode-samples-caching-inline-async.gradle @@ -13,6 +13,7 @@ dependencies { compileOnly "com.google.code.findbugs:jsr305:$findbugsVersion" implementation "org.projectlombok:lombok" + implementation "jakarta.persistence:jakarta.persistence-api" implementation "org.springframework.boot:spring-boot-starter-data-jpa" implementation "org.springframework.boot:spring-boot-starter-web" diff --git a/spring-geode-samples/caching/inline-async/src/main/java/example/app/caching/inline/async/client/model/Golfer.java b/spring-geode-samples/caching/inline-async/src/main/java/example/app/caching/inline/async/client/model/Golfer.java index 03465d09..e439fab0 100644 --- a/spring-geode-samples/caching/inline-async/src/main/java/example/app/caching/inline/async/client/model/Golfer.java +++ b/spring-geode-samples/caching/inline-async/src/main/java/example/app/caching/inline/async/client/model/Golfer.java @@ -37,8 +37,8 @@ import lombok.ToString; * and {@link Integer score} of the {@link Golfer} when s/he competes/plays in a golf tournament. * * @author John Blum - * @see javax.persistence.Entity - * @see javax.persistence.Table + * @see jakarta.persistence.Entity + * @see jakarta.persistence.Table * @see org.springframework.data.annotation.Id * @since 1.4.0 */ @@ -52,7 +52,7 @@ import lombok.ToString; @SuppressWarnings("unused") public class Golfer implements Comparable { - @javax.persistence.Id @Id @NonNull + @jakarta.persistence.Id @Id @NonNull private String name; @Setter diff --git a/spring-geode-tests/smoke-tests/multi-store/spring-geode-smoke-tests-multi-store.gradle b/spring-geode-tests/smoke-tests/multi-store/spring-geode-smoke-tests-multi-store.gradle index 95eae4b0..81bf7a2b 100644 --- a/spring-geode-tests/smoke-tests/multi-store/spring-geode-smoke-tests-multi-store.gradle +++ b/spring-geode-tests/smoke-tests/multi-store/spring-geode-smoke-tests-multi-store.gradle @@ -12,6 +12,7 @@ dependencies { implementation "org.assertj:assertj-core" implementation "org.projectlombok:lombok" + implementation "jakarta.persistence:jakarta.persistence-api" implementation "org.springframework.boot:spring-boot-starter-data-jpa" implementation "org.springframework.boot:spring-boot-starter-data-mongodb" diff --git a/spring-geode-tests/smoke-tests/multi-store/src/main/java/example/app/model/Contact.java b/spring-geode-tests/smoke-tests/multi-store/src/main/java/example/app/model/Contact.java index 82ebef6a..2cc06949 100644 --- a/spring-geode-tests/smoke-tests/multi-store/src/main/java/example/app/model/Contact.java +++ b/spring-geode-tests/smoke-tests/multi-store/src/main/java/example/app/model/Contact.java @@ -33,7 +33,7 @@ import lombok.ToString; * Abstract Data Type (ADT) modeling contact information for a person. * * @author John Blum - * @see javax.persistence.Entity + * @see jakarta.persistence.Entity * @see org.springframework.data.annotation.Id * @since 1.2.0 */ @@ -49,7 +49,7 @@ import lombok.ToString; @SuppressWarnings("unused") public class Contact { - @javax.persistence.Id @Id @NonNull + @jakarta.persistence.Id @Id @NonNull private String name; @Column(name = "email_address") diff --git a/spring-geode/spring-geode.gradle b/spring-geode/spring-geode.gradle index 2ad87f94..6e146fe6 100644 --- a/spring-geode/spring-geode.gradle +++ b/spring-geode/spring-geode.gradle @@ -32,6 +32,7 @@ dependencies { exclude group: "org.skyscreamer", module: "jsonassert" } + testImplementation "jakarta.persistence:jakarta.persistence-api" testImplementation "org.springframework.boot:spring-boot-starter-data-jpa" testImplementation "org.springframework.boot:spring-boot-starter-data-cassandra" testImplementation "org.springframework.data:spring-data-geode-test" diff --git a/spring-geode/src/test/java/example/app/crm/model/Customer.java b/spring-geode/src/test/java/example/app/crm/model/Customer.java index 0cc92961..b0b7bb09 100644 --- a/spring-geode/src/test/java/example/app/crm/model/Customer.java +++ b/spring-geode/src/test/java/example/app/crm/model/Customer.java @@ -47,7 +47,7 @@ import lombok.NoArgsConstructor; public class Customer { @Id - @javax.persistence.Id + @jakarta.persistence.Id @PrimaryKey private Long id;