Browse Source

Merge branch '6.2.x'

# Conflicts:
#	spring-aop/src/main/java/org/springframework/aop/framework/CoroutinesUtils.java
#	spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/DefaultPersistenceUnitManager.java
#	spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/MutablePersistenceUnitInfo.java
#	spring-orm/src/test/java/org/springframework/orm/jpa/persistenceunit/PersistenceXmlParsingTests.java
pull/35665/head
Juergen Hoeller 2 months ago
parent
commit
b261b74793
  1. 2
      spring-aop/src/main/java/org/springframework/aop/framework/CoroutinesUtils.java
  2. 1
      spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/PersistenceManagedTypes.java
  3. 2
      spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/SimplePersistenceManagedTypes.java

2
spring-aop/src/main/java/org/springframework/aop/framework/CoroutinesUtils.java

@ -40,7 +40,7 @@ abstract class CoroutinesUtils { @@ -40,7 +40,7 @@ abstract class CoroutinesUtils {
}
}
@SuppressWarnings({"unchecked", "rawtypes"})
@SuppressWarnings({"rawtypes", "unchecked"})
static @Nullable Object awaitSingleOrNull(@Nullable Object value, Object continuation) {
return MonoKt.awaitSingleOrNull(value instanceof Mono mono ? mono : Mono.justOrEmpty(value),
(Continuation<Object>) continuation);

1
spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/PersistenceManagedTypes.java

@ -56,6 +56,7 @@ public interface PersistenceManagedTypes { @@ -56,6 +56,7 @@ public interface PersistenceManagedTypes {
*/
@Nullable URL getPersistenceUnitRootUrl();
/**
* Create an instance using the specified managed class names.
* @param managedClassNames the managed class names

2
spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/SimplePersistenceManagedTypes.java

@ -39,6 +39,7 @@ class SimplePersistenceManagedTypes implements PersistenceManagedTypes { @@ -39,6 +39,7 @@ class SimplePersistenceManagedTypes implements PersistenceManagedTypes {
SimplePersistenceManagedTypes(List<String> managedClassNames, List<String> managedPackages,
@Nullable URL persistenceUnitRootUrl) {
this.managedClassNames = managedClassNames;
this.managedPackages = managedPackages;
this.persistenceUnitRootUrl = persistenceUnitRootUrl;
@ -48,6 +49,7 @@ class SimplePersistenceManagedTypes implements PersistenceManagedTypes { @@ -48,6 +49,7 @@ class SimplePersistenceManagedTypes implements PersistenceManagedTypes {
this(managedClassNames, managedPackages, null);
}
@Override
public List<String> getManagedClassNames() {
return this.managedClassNames;

Loading…
Cancel
Save