ObjectProvider over custom getBeanOrNull method

[ngocnhan-tran1996]

Closes #15805

[jzheaux]

Thanks for the PR, @ngocnhan-tran1996! I've left some feedback inline.

Also, will you please ensure that there are unit tests that confirm the pre-existing behavior? I'm concerned that some of the changes you made, though they change the behavior, did not cause any tests to fail.

[ngocnhan-tran1996]

Thanks for the PR, @ngocnhan-tran1996! I've left some feedback inline.

Also, will you please ensure that there are unit tests that confirm the pre-existing behavior? I'm concerned that some of the changes you made, though they change the behavior, did not cause any tests to fail.

@jzheaux

I found the reason, if change to use getBeanProvider in ServerHttpSecurity, we should fix test in CorsSpecTests. Should I change or preserve this and create a new PR?

[jzheaux]

Good point. I'm not sure that I'm a fan of mocking ApplicationContext as it can make tests like these a bit brittle. Would you consider updating that test to initialize the context in the following way, instead of using @Mock:

@Test 
public void testXXX() {
    GenericApplicationContext context = new GenericApplicationContext();
    context.registerBean(CorsConfigurationSource.class, () -> this.source) // etc. as needed
    context.refresh();
    // ... remove context mocking
}

In this way, when you change to context.getObjectProvider, the tests will not be affected.

If you agree, would you please make that change as a separate commit preceding the commit for updating to ObjectProvider? And then, when you believe the reactive updates are ready, please squash the other commits together so that you have two: One for the updates to CorsSpecTests and one for the ObjectProvider changes.

[ngocnhan-tran1996]

@jzheaux

I updated unit test and changed commit. Please review

[jzheaux]

Thanks for another update, @ngocnhan-tran1996. This is really coming together. I've left just a bit more feedback, which I missed last time.

Additionally, would you please make sure that your commits have a format that includes the associated tickets, like so:

Favor ObjectProvider

Closes gh-15805

Polish CorsSpecTests

Use concrete ApplicationContext to simplify future maintenance.

Issue gh-4832

[ngocnhan-tran1996]

@jzheaux

I updated unit test and changed commit. Please review

[jzheaux]

Thanks, @ngocnhan-tran1996! This has now been merged into main