spring/spring-framework
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-framework.git synced 2026-09-23 14:40:00 +00:00
Code Issues Projects Releases Wiki Activity
35,264 Commits 18 Branches 368 Tags
91c6851f29f07c74caa2fc0ce7a7ad463c0bda4e
Commit Graph
2474 Commits
Author SHA1 Message Date
Juergen Hoeller 16d9965fe3 Consistently enforce non-null instance in AbstractFactoryBean 
Closes gh-37091
 2026-07-27 19:47:12 +02:00
Sam Brannen bb34bf6dc6 Merge branch '7.0.x' 2026-06-27 18:09:31 +02:00
Sam Brannen 78f05d8f8e Address deprecation warnings 
This commit addresses warnings across the code base related to:

- internal and public deprecations in Spring Framework
- deprecated Locale constructors
- deprecated URL constructors
- deprecated Thread#getId method
 2026-06-27 18:08:53 +02:00
Juergen Hoeller bd405756ab Avoid "NullAway.Init" suppression in favor of explicit field handling 
Closes gh-36961
 2026-06-23 11:55:58 +02:00
Juergen Hoeller 0dc2d03093 Merge branch '7.0.x' 
# Conflicts:
#	spring-context/src/main/java/org/springframework/validation/DataBinder.java
 2026-06-22 21:55:43 +02:00
Juergen Hoeller d0331a049a Refine various javadoc notes 2026-06-22 21:52:57 +02:00
Juergen Hoeller 7de9c8d58a Consistently handle input format mismatch 2026-06-22 21:52:18 +02:00
Sam Brannen 94db4f7f7a Merge branch '7.0.x' 2026-06-17 11:56:51 +02:00
Yanming Zhou 0fc724b348 Make inner classes in tests static where feasible 
Closes gh-36939

Signed-off-by: Yanming Zhou <zhouyanming@gmail.com>
 2026-06-17 11:49:12 +02:00
Yanming Zhou cdc3c52640 Replace isAssignableFrom() with isInstance() where feasible 
Closes gh-36899

Signed-off-by: Yanming Zhou <zhouyanming@gmail.com>
 2026-06-15 15:16:18 +02:00
Juergen Hoeller ecc847c493 Fix applicability note on setAutoGrowCollectionLimit 
Closes gh-36863
 2026-06-02 17:28:33 +02:00
Juergen Hoeller e6ce2a3c36 Expose autoGrowCollectionLimit in ConfigurablePropertyAccessor interface 
See gh-36862
 2026-06-02 17:20:52 +02:00
Juergen Hoeller 00ca23859e Merge branch '7.0.x' 
# Conflicts:
#	framework-platform/framework-platform.gradle
 2026-05-27 16:35:51 +02:00
Juergen Hoeller af2b96192d Force initialization of configuration class in mainline thread 
Closes gh-36844
 2026-05-27 16:32:37 +02:00
Juergen Hoeller a0ec6656b4 Merge branch '7.0.x' 2026-05-13 19:46:39 +02:00
Juergen Hoeller 8fe1de4595 Polishing 2026-05-13 19:46:07 +02:00
Juergen Hoeller 9db16e4c15 Merge branch '7.0.x' 
# Conflicts:
#	framework-platform/framework-platform.gradle
 2026-05-08 16:02:00 +02:00
Juergen Hoeller d3152c11c7 Consistently expose map key quotes 
Closes gh-36765
 2026-05-08 15:59:57 +02:00
Juergen Hoeller 6ff2d187cf Merge branch '7.0.x' 
# Conflicts:
#	spring-context/src/test/java/org/springframework/context/support/GenericApplicationContextTests.java
 2026-04-30 14:21:49 +02:00
Juergen Hoeller 08c5280843 Consistent wrapping of BeanCreationExceptions from instance suppliers 
Includes tests for circular references and bean definition overrides.

Closes gh-36725
See gh-36648
 2026-04-30 14:19:25 +02:00
Sam Brannen 0e1a2b4f87 Merge branch '7.0.x' 2026-04-27 14:01:51 +03:00
Yanming Zhou bfb88cfc1c Remove unnecessary invocations of toString() 
Closes gh-36709

Signed-off-by: Yanming Zhou <zhouyanming@gmail.com>
 2026-04-27 11:27:29 +03:00
Sam Brannen 8566e7bf55 Favor Class#getTypeName over ClassUtils#getQualifiedName where feasible 2026-04-08 13:27:52 +02:00
Sébastien Deleuze 2ee4c3a363 Provide bean conditional registration capabilities in BeanRegistrarDsl 
Closes gh-36601
 2026-04-05 18:49:07 +02:00
Stéphane Nicoll 2086508924 Polish 
See gh-36581
 2026-04-02 14:41:26 +02:00
Sam Brannen 7590c4c92e Fix Javadoc link 
See gh-36581
 2026-04-02 13:32:32 +02:00
Sam Brannen 596c0df826 Merge branch '7.0.x' 2026-04-02 12:45:50 +02:00
Sam Brannen b6fc3a1b6f Enforce use of AssertJ assumptions via Checkstyle 
Closes gh-36582
 2026-04-02 12:43:12 +02:00
Stéphane Nicoll d5b6f4a7ee Polish BeanRegistrar Javadoc and add tests for non-invocation semantics 
Revise the BeanRegistrar Javadoc to document the two distinct usage
modes: @Configuration/@Import and programmatic GenericApplicationContext
setup.

Clarify that implementations are not Spring components (requiring a
no-arg constructor and no dependency injection), and detail the ordering
guarantees for each mode.

Add missing tests

Signed-off-by: Stéphane Nicoll <stephane.nicoll@broadcom.com>
 2026-04-02 11:18:58 +02:00
Juergen Hoeller 0abf97ff90 Polishing 2026-03-28 20:38:03 +01:00
Juergen Hoeller 7502b92392 Introduce DeferredBeanRegistrar and BeanRegistry#containsBean methods 
Closes gh-21497
 2026-03-28 20:27:23 +01:00
Sam Brannen 3d70074089 Introduce support for custom parameter names in ParameterResolutionDelegate 
The resolveDependency() utility method in ParameterResolutionDelegate
resolves a dependency using the name of the parameter as a fallback
qualifier. That suffices for most use cases; however, there are times
when a custom parameter name should be used instead.

For example, for our Bean Override support in the Spring TestContext
Framework, an annotation such as @⁠MockitoBean("myBean") specifies an
explicit name that should be used instead of name of the annotated
parameter.

Furthermore, introducing support for custom parameter names will
greatly simplify the logic in SpringExtension that will be required to
implement #36096.

To address those issues, this commit introduces an overloaded variant
of resolveDependency() which accepts a custom parameter name.
Internally, a custom DependencyDescriptor has been implemented to
transparently support this use case.

See gh-36096
Closes gh-36534
 2026-03-25 13:15:15 +01:00
Sam Brannen bcc9e27dd0 Polishing 2026-03-25 12:41:05 +01:00
Yanming Zhou 0eba6f0da3 Add typesafe method to get generic bean by name with type reference 
Fix GH-34687

Signed-off-by: Yanming Zhou <zhouyanming@gmail.com>
 2026-03-24 08:02:58 +01:00
Sam Brannen 5d45036c09 Merge branch '7.0.x' 2026-03-20 11:13:01 +01:00
Sam Brannen 8ca0262e2f Avoid the use of assertThat(Arrays.equals(...)) 
See gh-36504
 2026-03-20 10:54:57 +01:00
Sam Brannen 29ea530525 Convert assertThat(Boolean.FALSE).isEqualTo(x) to assertThat(x).isEqualTo(Boolean.FALSE) 
See gh-36504
 2026-03-20 10:54:54 +01:00
Sam Brannen ac10d079df Convert assertThat(Boolean.TRUE).isEqualTo(x) to assertThat(x).isEqualTo(Boolean.TRUE) 
See gh-36504
 2026-03-20 10:54:46 +01:00
Sam Brannen 87c4acd7ac Convert assertThat(x.equals(y)).isTrue() to assertThat(x).isEqualTo(y) 
Search:

  assertThat\((?!\s*Arrays\.)((?:[^()]+|\([^()]*\))+)\.equals\(\s*((?:[^()]+|\([^()]*\))+)\s*\)\)(.*)\.isTrue\(\)

Replace:

  assertThat($1)$3.isEqualTo($2)

See gh-36504
 2026-03-20 10:54:42 +01:00
Sam Brannen 2ce21f7654 Convert assertThat(x.equals(y)).isFalse() to assertThat(x).isNotEqualTo(y) 
Search:

  assertThat\((?!\s*Arrays\.)(.+?)\.equals\((.+?)\)\)(.*?)\.isFalse\(\)

Replace:

  assertThat($1)$3.isNotEqualTo($2)

See gh-36504
 2026-03-20 10:54:37 +01:00
Sam Brannen 9e6504b05a Remove unnecessary parentheses in assertThat() arguments 
Search:  assertThat\(\(\s*((?:[^()]+|\([^()]*\))+)\s*\)\)(\s*\..+)

Replace: assertThat($1)$2

See gh-36504
 2026-03-20 10:54:31 +01:00
Sam Brannen a40ec44cb7 Convert assertThat(x instanceof X).isTrue() to assertThat(x).isInstanceOf() 
Search:  assertThat\((.+?) instanceof (.+?)\)(.*?)\.isTrue\(\)

Replace: assertThat($1)$3.isInstanceOf($2.class)

See gh-36504
 2026-03-20 10:54:23 +01:00
Sam Brannen 4357bbd31b Convert assertThat(!x).isTrue() to assertThat(x).isFalse() 
Search:  assertThat\(\!(.+?)\)(.*?)\.isTrue\(\)

Replace: assertThat($1)$2.isFalse()

See gh-36504
 2026-03-20 10:54:13 +01:00
Sam Brannen 4548f1ec66 Inline conditions in assertThat() statements 
Search: assertThat\(conditions?[0-9]?\)

See gh-36504
 2026-03-20 10:53:54 +01:00
Sam Brannen 6ec2455e24 Merge branch '7.0.x' 2026-03-18 18:39:17 +01:00
Sam Brannen 1256307c83 Enable SpringJUnit5 Checkstyle rule 
See gh-36496
Closes gh-36496
 2026-03-18 18:38:43 +01:00
Sam Brannen 003d8b2f80 Merge branch '7.0.x' 2026-03-18 18:19:31 +01:00
Sam Brannen 4c14abf0cd Remove obsolete "test" prefix from test method names 
Although this commit also changes the visibility of some test methods
to package-private, the remainder of that task will be addressed in
conjunction with gh-36496.

Closes gh-36495
 2026-03-18 18:16:15 +01:00
Juergen Hoeller 1345760087 Support "classpath*:" prefix for ResourceLoader#getResource 
Introduces a general-purpose consumeContent method on Resource and EncodedResource with special behavior for multi-content resources. Regular getInputStream/getReader calls will expose the merged content of all same-named resources in the classpath.

Closes gh-36415
 2026-03-16 12:23:16 +01:00
Sam Brannen 5eb0e99d58 Fix common typos and grammatical mistakes 
Closes gh-36471
 2026-03-15 17:05:29 +01:00