mirror of
https://github.com/spring-projects/spring-framework
synced 2026-06-08 17:33:33 +00:00
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
This commit is contained in:
@@ -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
@@ -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
@@ -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 {
|
||||
this(managedClassNames, managedPackages, null);
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public List<String> getManagedClassNames() {
|
||||
return this.managedClassNames;
|
||||
|
||||
Reference in New Issue
Block a user