Skip to content

Commit a536f85

Browse files
mp911demp911de
committed
Upgrade to JPA 3.2.
Closes: #3673 Original Pull Request: #3695
1 parent d72bb39 commit a536f85

File tree

2 files changed

+126
-5
lines changed

2 files changed

+126
-5
lines changed

‎pom.xml

+117-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<hibernate-70-snapshots>7.0.0-SNAPSHOT</hibernate-70-snapshots>
3838
<hsqldb>2.7.4</hsqldb>
3939
<h2>2.3.232</h2>
40-
<jakarta-persistence-api>3.1.0</jakarta-persistence-api>
40+
<jakarta-persistence-api>3.2.0</jakarta-persistence-api>
4141
<jsqlparser>5.0</jsqlparser>
4242
<mysql-connector-java>9.1.0</mysql-connector-java>
4343
<postgresql>42.7.4</postgresql>
@@ -111,6 +111,44 @@
111111
</repository>
112112
</repositories>
113113
</profile>
114+
<profile>
115+
<id>all-dbs</id>
116+
<build>
117+
<plugins>
118+
<plugin>
119+
<groupId>org.apache.maven.plugins</groupId>
120+
<artifactId>maven-surefire-plugin</artifactId>
121+
<executions>
122+
<execution>
123+
<id>mysql-test</id>
124+
<phase>test</phase>
125+
<goals>
126+
<goal>test</goal>
127+
</goals>
128+
<configuration>
129+
<includes>
130+
<include>**/MySql*IntegrationTests.java</include>
131+
</includes>
132+
</configuration>
133+
</execution>
134+
<execution>
135+
<id>postgres-test</id>
136+
<phase>test</phase>
137+
<goals>
138+
<goal>test</goal>
139+
</goals>
140+
<configuration>
141+
<includes>
142+
<include>**/Postgres*IntegrationTests.java
143+
</include>
144+
</includes>
145+
</configuration>
146+
</execution>
147+
</executions>
148+
</plugin>
149+
</plugins>
150+
</build>
151+
</profile>
114152
<profile>
115153
<id>eclipselink-next</id>
116154
<properties>
@@ -151,6 +189,84 @@
151189
</dependencies>
152190

153191
<build>
192+
<plugins>
193+
194+
<plugin>
195+
<groupId>org.apache.maven.plugins</groupId>
196+
<artifactId>maven-surefire-plugin</artifactId>
197+
<dependencies>
198+
<dependency>
199+
<groupId>org.springframework</groupId>
200+
<artifactId>spring-instrument</artifactId>
201+
<version>${spring}</version>
202+
<scope>runtime</scope>
203+
</dependency>
204+
</dependencies>
205+
<executions>
206+
<execution>
207+
<!-- override the default-test execution and exclude everything -->
208+
<id>default-test</id>
209+
<configuration>
210+
<excludes>
211+
<exclude>**/*</exclude>
212+
</excludes>
213+
</configuration>
214+
</execution>
215+
<execution>
216+
<id>unit-test</id>
217+
<goals>
218+
<goal>test</goal>
219+
</goals>
220+
<phase>test</phase>
221+
<configuration>
222+
<includes>
223+
<include>**/*UnitTests.java</include>
224+
</includes>
225+
</configuration>
226+
</execution>
227+
<execution>
228+
<id>integration-test</id>
229+
<goals>
230+
<goal>test</goal>
231+
</goals>
232+
<phase>test</phase>
233+
<configuration>
234+
<includes>
235+
<include>**/*IntegrationTests.java</include>
236+
<include>**/*Tests.java</include>
237+
</includes>
238+
<excludes>
239+
<exclude>**/*UnitTests.java</exclude>
240+
<exclude>**/EclipseLink*</exclude>
241+
<exclude>**/MySql*</exclude>
242+
<exclude>**/Postgres*</exclude>
243+
</excludes>
244+
<argLine>
245+
-javaagent:${settings.localRepository}/org/springframework/spring-instrument/${spring}/spring-instrument-${spring}.jar
246+
</argLine>
247+
</configuration>
248+
</execution>
249+
<execution>
250+
<id>eclipselink-test</id>
251+
<goals>
252+
<goal>test</goal>
253+
</goals>
254+
<phase>test</phase>
255+
<configuration>
256+
<includes>
257+
<include>**/EclipseLink*Tests.java</include>
258+
</includes>
259+
<argLine>
260+
-javaagent:${settings.localRepository}/org/eclipse/persistence/org.eclipse.persistence.jpa/${eclipselink}/org.eclipse.persistence.jpa-${eclipselink}.jar
261+
-javaagent:${settings.localRepository}/org/springframework/spring-instrument/${spring}/spring-instrument-${spring}.jar
262+
</argLine>
263+
</configuration>
264+
</execution>
265+
</executions>
266+
</plugin>
267+
268+
</plugins>
269+
154270
<pluginManagement>
155271
<plugins>
156272
<plugin>

‎spring-data-jpa/src/test/java/org/springframework/data/jpa/util/TestMetaModel.java

+9-4
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,13 @@ public class TestMetaModel implements Metamodel {
4343
private final Set<Class<?>> managedTypes;
4444
private final Lazy<EntityManagerFactory> entityManagerFactory = Lazy.of(this::init);
4545
private final Lazy<Metamodel> metamodel = Lazy.of(() -> entityManagerFactory.get().getMetamodel());
46-
private Lazy<EntityManager> enityManager = Lazy.of(() -> entityManagerFactory.get().createEntityManager());
46+
private final Lazy<EntityManager> entityManager = Lazy.of(() -> entityManagerFactory.get().createEntityManager());
4747

48-
TestMetaModel(Set<Class<?>> managedTypes) {
48+
private TestMetaModel(Set<Class<?>> managedTypes) {
4949
this("dynamic-tests", managedTypes);
5050
}
5151

52-
TestMetaModel(String persistenceUnit, Set<Class<?>> managedTypes) {
52+
private TestMetaModel(String persistenceUnit, Set<Class<?>> managedTypes) {
5353
this.persistenceUnit = persistenceUnit;
5454
this.managedTypes = managedTypes;
5555
}
@@ -66,6 +66,11 @@ public <X> EntityType<X> entity(Class<X> cls) {
6666
return metamodel.get().entity(cls);
6767
}
6868

69+
@Override
70+
public EntityType<?> entity(String s) {
71+
return metamodel.get().entity(s);
72+
}
73+
6974
public <X> ManagedType<X> managedType(Class<X> cls) {
7075
return metamodel.get().managedType(cls);
7176
}
@@ -87,7 +92,7 @@ public Set<EmbeddableType<?>> getEmbeddables() {
8792
}
8893

8994
public EntityManager entityManager() {
90-
return enityManager.get();
95+
return entityManager.get();
9196
}
9297

9398
EntityManagerFactory init() {

0 commit comments

Comments
 (0)