From b70148c12d6f0237892256cfad73c21f30cb46fa Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Wed, 26 Mar 2014 21:47:56 +0100 Subject: [PATCH] Consistent PropertyAccessor method order as declared in the interface Issue: SPR-11609 --- .../context/expression/BeanFactoryAccessor.java | 12 ++++++------ .../context/expression/MapAccessor.java | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/spring-context/src/main/java/org/springframework/context/expression/BeanFactoryAccessor.java b/spring-context/src/main/java/org/springframework/context/expression/BeanFactoryAccessor.java index f6ee4820f48..5cbaa6e0ba5 100644 --- a/spring-context/src/main/java/org/springframework/context/expression/BeanFactoryAccessor.java +++ b/spring-context/src/main/java/org/springframework/context/expression/BeanFactoryAccessor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2012 the original author or authors. + * Copyright 2002-2014 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -32,6 +32,11 @@ import org.springframework.expression.TypedValue; */ public class BeanFactoryAccessor implements PropertyAccessor { + @Override + public Class[] getSpecificTargetClasses() { + return new Class[] {BeanFactory.class}; + } + @Override public boolean canRead(EvaluationContext context, Object target, String name) throws AccessException { return (((BeanFactory) target).containsBean(name)); @@ -52,9 +57,4 @@ public class BeanFactoryAccessor implements PropertyAccessor { throw new AccessException("Beans in a BeanFactory are read-only"); } - @Override - public Class[] getSpecificTargetClasses() { - return new Class[] {BeanFactory.class}; - } - } diff --git a/spring-context/src/main/java/org/springframework/context/expression/MapAccessor.java b/spring-context/src/main/java/org/springframework/context/expression/MapAccessor.java index 340a18b59d9..ce1b2f9197d 100644 --- a/spring-context/src/main/java/org/springframework/context/expression/MapAccessor.java +++ b/spring-context/src/main/java/org/springframework/context/expression/MapAccessor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2012 the original author or authors. + * Copyright 2002-2014 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -33,6 +33,11 @@ import org.springframework.expression.TypedValue; */ public class MapAccessor implements PropertyAccessor { + @Override + public Class[] getSpecificTargetClasses() { + return new Class[] {Map.class}; + } + @Override public boolean canRead(EvaluationContext context, Object target, String name) throws AccessException { Map map = (Map) target; @@ -61,11 +66,6 @@ public class MapAccessor implements PropertyAccessor { map.put(name, newValue); } - @Override - public Class[] getSpecificTargetClasses() { - return new Class[] {Map.class}; - } - /** * Exception thrown from {@code read} in order to reset a cached