Skip to content

Commit d5004cb

Browse files
committed
refactor: update usages for generic AuthorizationProxyFactory.proxy signature
Signed-off-by: dae won <[email protected]>
1 parent b76b23c commit d5004cb

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

config/src/main/java/org/springframework/security/config/annotation/method/configuration/AuthorizationProxyWebConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public Object visit(AuthorizationAdvisorProxyFactory proxyFactory, Object target
5151
if (target instanceof ModelAndView mav) {
5252
View view = mav.getView();
5353
String viewName = mav.getViewName();
54-
Map<String, Object> model = (Map<String, Object>) proxyFactory.proxy(mav.getModel());
54+
Map<String, Object> model = proxyFactory.proxy(mav.getModel());
5555
ModelAndView proxied = (view != null) ? new ModelAndView(view, model)
5656
: new ModelAndView(viewName, model);
5757
proxied.setStatus(mav.getStatus());

core/src/main/java/org/springframework/security/aot/hint/AuthorizeReturnObjectHintsRegistrar.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ public void registerHints(RuntimeHints hints, ConfigurableListableBeanFactory be
109109
}
110110

111111
private void registerProxy(RuntimeHints hints, Class<?> clazz) {
112-
Class<?> proxied = (Class<?>) this.proxyFactory.proxy(clazz);
112+
Class<?> proxied = this.proxyFactory.proxy(clazz);
113113
if (proxied == null) {
114114
return;
115115
}

core/src/main/java/org/springframework/security/authorization/method/AuthorizationAdvisorProxyFactory.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -172,16 +172,16 @@ public void afterSingletonsInstantiated() {
172172
* @return the proxied instance
173173
*/
174174
@Override
175-
public Object proxy(Object target) {
175+
public <T> T proxy(T target) {
176176
if (target == null) {
177177
return null;
178178
}
179179
if (target instanceof AuthorizationProxy proxied) {
180-
return proxied;
180+
return (T) proxied;
181181
}
182182
Object proxied = this.visitor.visit(this, target);
183183
if (proxied != null) {
184-
return proxied;
184+
return (T) proxied;
185185
}
186186
ProxyFactory factory = new ProxyFactory(target);
187187
factory.addAdvisors(this.authorizationProxy);
@@ -191,7 +191,7 @@ public Object proxy(Object target) {
191191
factory.addInterface(AuthorizationProxy.class);
192192
factory.setOpaque(true);
193193
factory.setProxyTargetClass(!Modifier.isFinal(target.getClass().getModifiers()));
194-
return factory.getProxy();
194+
return (T) factory.getProxy();
195195
}
196196

197197
/**
@@ -442,7 +442,7 @@ public Object visit(AuthorizationAdvisorProxyFactory proxyFactory, Object target
442442

443443
@SuppressWarnings("unchecked")
444444
private <T> T proxyCast(AuthorizationProxyFactory proxyFactory, T target) {
445-
return (T) proxyFactory.proxy(target);
445+
return proxyFactory.proxy(target);
446446
}
447447

448448
private <T> Iterable<T> proxyIterable(AuthorizationProxyFactory proxyFactory, Iterable<T> iterable) {

0 commit comments

Comments
 (0)