Skip to content

Commit 9a9551b

Browse files
committed
Make JUnit Jupiter support classes package private
Issue: SPR-13575
1 parent 045c678 commit 9a9551b

File tree

4 files changed

+8
-16
lines changed

4 files changed

+8
-16
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.test.context.junit.jupiter.support;
17+
package org.springframework.test.context.junit.jupiter;
1818

1919
import java.lang.reflect.Constructor;
2020
import java.lang.reflect.Executable;
Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.test.context.junit.jupiter.support;
17+
package org.springframework.test.context.junit.jupiter;
1818

1919
import java.lang.annotation.Annotation;
2020
import java.lang.reflect.AnnotatedElement;
@@ -32,8 +32,6 @@
3232
import org.springframework.core.MethodParameter;
3333
import org.springframework.core.annotation.AnnotatedElementUtils;
3434

35-
import static org.springframework.core.annotation.AnnotatedElementUtils.hasAnnotation;
36-
3735
/**
3836
* Collection of utilities related to autowiring of individual method parameters.
3937
*
@@ -43,7 +41,7 @@
4341
* @see #isAutowirable(Parameter)
4442
* @see #resolveDependency(Parameter, Class, ApplicationContext)
4543
*/
46-
public abstract class ParameterAutowireUtils {
44+
abstract class ParameterAutowireUtils {
4745

4846
private ParameterAutowireUtils() {
4947
/* no-op */
@@ -58,11 +56,11 @@ private ParameterAutowireUtils() {
5856
* {@link Qualifier @Qualifier}, or {@link Value @Value}.
5957
* @see #resolveDependency(Parameter, Class, ApplicationContext)
6058
*/
61-
public static boolean isAutowirable(Parameter parameter) {
59+
static boolean isAutowirable(Parameter parameter) {
6260
return ApplicationContext.class.isAssignableFrom(parameter.getType())
63-
|| hasAnnotation(parameter, Autowired.class)
64-
|| hasAnnotation(parameter, Qualifier.class)
65-
|| hasAnnotation(parameter, Value.class);
61+
|| AnnotatedElementUtils.hasAnnotation(parameter, Autowired.class)
62+
|| AnnotatedElementUtils.hasAnnotation(parameter, Qualifier.class)
63+
|| AnnotatedElementUtils.hasAnnotation(parameter, Value.class);
6664
}
6765

6866
/**
@@ -91,7 +89,7 @@ public static boolean isAutowirable(Parameter parameter) {
9189
* @see MethodParameterFactory#createSynthesizingMethodParameter(Parameter)
9290
* @see AutowireCapableBeanFactory#resolveDependency(DependencyDescriptor, String)
9391
*/
94-
public static Object resolveDependency(Parameter parameter, Class<?> containingClass,
92+
static Object resolveDependency(Parameter parameter, Class<?> containingClass,
9593
ApplicationContext applicationContext) {
9694

9795
boolean required = findMergedAnnotation(parameter, Autowired.class).map(Autowired::required).orElse(true);

spring-test/src/main/java/org/springframework/test/context/junit/jupiter/SpringExtension.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838
import org.springframework.context.ApplicationContext;
3939
import org.springframework.core.annotation.AnnotatedElementUtils;
4040
import org.springframework.test.context.TestContextManager;
41-
import org.springframework.test.context.junit.jupiter.support.ParameterAutowireUtils;
4241
import org.springframework.util.Assert;
4342

4443
/**

spring-test/src/main/java/org/springframework/test/context/junit/jupiter/support/package-info.java

Lines changed: 0 additions & 5 deletions
This file was deleted.

0 commit comments

Comments
 (0)