Skip to content

Commit e340e45

Browse files
committed
Rename aopAvailable constants in TransactionSynchronizationUtils
Closes gh-33796
1 parent a06bbcc commit e340e45

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

Diff for: spring-core/src/main/java/org/springframework/aot/nativex/feature/PreComputeFieldFeature.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2023 the original author or authors.
2+
* Copyright 2002-2024 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -23,8 +23,8 @@
2323
import org.graalvm.nativeimage.hosted.Feature;
2424

2525
/**
26-
* GraalVM {@link Feature} that substitutes boolean field values that match a certain pattern
27-
* with values pre-computed AOT without causing class build-time initialization.
26+
* GraalVM {@link Feature} that substitutes boolean field values that match certain patterns
27+
* with values pre-computed ahead-of-time without causing class build-time initialization.
2828
*
2929
* <p>It is possible to pass <pre style="code">-Dspring.native.precompute.log=verbose</pre> as a
3030
* <pre style="code">native-image</pre> compiler build argument to display detailed logs

Diff for: spring-tx/src/main/java/org/springframework/transaction/reactive/TransactionSynchronizationUtils.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2023 the original author or authors.
2+
* Copyright 2002-2024 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -42,7 +42,7 @@ abstract class TransactionSynchronizationUtils {
4242

4343
private static final Log logger = LogFactory.getLog(TransactionSynchronizationUtils.class);
4444

45-
private static final boolean aopAvailable = ClassUtils.isPresent(
45+
private static final boolean aopPresent = ClassUtils.isPresent(
4646
"org.springframework.aop.scope.ScopedObject", TransactionSynchronizationUtils.class.getClassLoader());
4747

4848

@@ -58,7 +58,7 @@ static Object unwrapResourceIfNecessary(Object resource) {
5858
if (resourceRef instanceof InfrastructureProxy infrastructureProxy) {
5959
resourceRef = infrastructureProxy.getWrappedObject();
6060
}
61-
if (aopAvailable) {
61+
if (aopPresent) {
6262
// now unwrap scoped proxy
6363
resourceRef = ScopedProxyUnwrapper.unwrapIfNecessary(resourceRef);
6464
}

Diff for: spring-tx/src/main/java/org/springframework/transaction/support/TransactionSynchronizationUtils.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2023 the original author or authors.
2+
* Copyright 2002-2024 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -40,7 +40,7 @@ public abstract class TransactionSynchronizationUtils {
4040

4141
private static final Log logger = LogFactory.getLog(TransactionSynchronizationUtils.class);
4242

43-
private static final boolean aopAvailable = ClassUtils.isPresent(
43+
private static final boolean aopPresent = ClassUtils.isPresent(
4444
"org.springframework.aop.scope.ScopedObject", TransactionSynchronizationUtils.class.getClassLoader());
4545

4646

@@ -67,7 +67,7 @@ public static Object unwrapResourceIfNecessary(Object resource) {
6767
if (resourceRef instanceof InfrastructureProxy infrastructureProxy) {
6868
resourceRef = infrastructureProxy.getWrappedObject();
6969
}
70-
if (aopAvailable) {
70+
if (aopPresent) {
7171
// now unwrap scoped proxy
7272
resourceRef = ScopedProxyUnwrapper.unwrapIfNecessary(resourceRef);
7373
}

0 commit comments

Comments
 (0)