From 7265a70f0af5ffb9dfba050aa8d43580d0d6be06 Mon Sep 17 00:00:00 2001 From: Luke Taylor Date: Sat, 6 Dec 2008 17:33:19 +0000 Subject: [PATCH] SEC-1012: Java5 - use of vararg methods. --- .../security/context/SecurityContextHolder.java | 4 ++-- .../springframework/security/providers/ProviderManager.java | 2 +- .../security/ui/AuthenticationDetailsSourceImpl.java | 2 +- .../security/ui/WebAuthenticationDetailsSource.java | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/core/src/main/java/org/springframework/security/context/SecurityContextHolder.java b/core/src/main/java/org/springframework/security/context/SecurityContextHolder.java index 0248749a89..7aa741e8ad 100644 --- a/core/src/main/java/org/springframework/security/context/SecurityContextHolder.java +++ b/core/src/main/java/org/springframework/security/context/SecurityContextHolder.java @@ -105,8 +105,8 @@ public class SecurityContextHolder { // Try to load a custom strategy try { Class clazz = Class.forName(strategyName); - Constructor customStrategy = clazz.getConstructor(new Class[] {}); - strategy = (SecurityContextHolderStrategy) customStrategy.newInstance(new Object[] {}); + Constructor customStrategy = clazz.getConstructor(); + strategy = (SecurityContextHolderStrategy) customStrategy.newInstance(); } catch (Exception ex) { ReflectionUtils.handleReflectionException(ex); } diff --git a/core/src/main/java/org/springframework/security/providers/ProviderManager.java b/core/src/main/java/org/springframework/security/providers/ProviderManager.java index 662109c5c4..0a12cc5310 100644 --- a/core/src/main/java/org/springframework/security/providers/ProviderManager.java +++ b/core/src/main/java/org/springframework/security/providers/ProviderManager.java @@ -221,7 +221,7 @@ public class ProviderManager extends AbstractAuthenticationManager implements In Constructor constructor = clazz.getConstructor(new Class[] { Authentication.class, AuthenticationException.class }); - Object obj = constructor.newInstance(new Object[] {authentication, exception}); + Object obj = constructor.newInstance(authentication, exception); Assert.isInstanceOf(AbstractAuthenticationEvent.class, obj, "Must be an AbstractAuthenticationEvent"); event = (AbstractAuthenticationEvent) obj; } catch (ClassNotFoundException ignored) {} diff --git a/core/src/main/java/org/springframework/security/ui/AuthenticationDetailsSourceImpl.java b/core/src/main/java/org/springframework/security/ui/AuthenticationDetailsSourceImpl.java index 8578e4cb04..807719a578 100755 --- a/core/src/main/java/org/springframework/security/ui/AuthenticationDetailsSourceImpl.java +++ b/core/src/main/java/org/springframework/security/ui/AuthenticationDetailsSourceImpl.java @@ -28,7 +28,7 @@ public class AuthenticationDetailsSourceImpl implements AuthenticationDetailsSou Object result = null; try { Constructor constructor = getFirstMatchingConstructor(context); - result = constructor.newInstance(new Object[] { context }); + result = constructor.newInstance(context); } catch (Exception ex) { ReflectionUtils.handleReflectionException(ex); } diff --git a/core/src/main/java/org/springframework/security/ui/WebAuthenticationDetailsSource.java b/core/src/main/java/org/springframework/security/ui/WebAuthenticationDetailsSource.java index 56068f62bf..cb357853ec 100644 --- a/core/src/main/java/org/springframework/security/ui/WebAuthenticationDetailsSource.java +++ b/core/src/main/java/org/springframework/security/ui/WebAuthenticationDetailsSource.java @@ -47,9 +47,9 @@ public class WebAuthenticationDetailsSource implements AuthenticationDetailsSour public Object buildDetails(Object context) { Assert.isInstanceOf(HttpServletRequest.class, context); try { - Constructor constructor = clazz.getConstructor(new Class[] {HttpServletRequest.class}); + Constructor constructor = clazz.getConstructor(HttpServletRequest.class); - return constructor.newInstance(new Object[] {context}); + return constructor.newInstance(context); } catch (NoSuchMethodException ex) { ReflectionUtils.handleReflectionException(ex); } catch (InvocationTargetException ex) {