Repository: wicket Updated Branches: refs/heads/wicket-7.x cbc6cd018 -> a63fb75bd
WICKET-5623 renamed inner classes, added javadoc Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/a63fb75b Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/a63fb75b Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/a63fb75b Branch: refs/heads/wicket-7.x Commit: a63fb75bd3d64b4a9dd57c0d97f84b1f1ec1a3d9 Parents: cbc6cd0 Author: Sven Meier <[email protected]> Authored: Fri Aug 19 11:49:49 2016 +0200 Committer: Sven Meier <[email protected]> Committed: Fri Aug 19 19:06:09 2016 +0200 ---------------------------------------------------------------------- .../wicket/core/util/lang/PropertyResolver.java | 19 ++++++++++++------- .../wicket/util/lang/PropertyResolverTest.java | 8 ++++---- 2 files changed, 16 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/a63fb75b/wicket-core/src/main/java/org/apache/wicket/core/util/lang/PropertyResolver.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/core/util/lang/PropertyResolver.java b/wicket-core/src/main/java/org/apache/wicket/core/util/lang/PropertyResolver.java index ad51533..5d888b1 100644 --- a/wicket-core/src/main/java/org/apache/wicket/core/util/lang/PropertyResolver.java +++ b/wicket-core/src/main/java/org/apache/wicket/core/util/lang/PropertyResolver.java @@ -66,7 +66,7 @@ import org.slf4j.LoggerFactory; * If the property is a Map then the following expression can be a key in that map like: 'myMap.key'. * </dd> * </dl> - * <strong>Note that the {@link DefaultGetAndSetLocator} by default provides access to private members + * <strong>Note that the {@link DefaultPropertyLocator} by default provides access to private members * and methods. If guaranteeing encapsulation of the target objects is a big concern, you should consider * using an alternative implementation.</strong> * <p> @@ -474,6 +474,8 @@ public final class PropertyResolver } /** + * A property to get and set. + * * @author jcompagner */ public interface IGetAndSet @@ -1257,7 +1259,7 @@ public final class PropertyResolver { setLocator(application, new IPropertyLocator() { - private DefaultGetAndSetLocator locator = new DefaultGetAndSetLocator(); + private DefaultPropertyLocator locator = new DefaultPropertyLocator(); @Override public IGetAndSet get(Class<?> clz, String name) { @@ -1298,7 +1300,7 @@ public final class PropertyResolver IPropertyLocator result = applicationToLocators.get(key); if (result == null) { - IPropertyLocator tmpResult = applicationToLocators.putIfAbsent(key, result = new CachingGetAndSetLocator(new DefaultGetAndSetLocator())); + IPropertyLocator tmpResult = applicationToLocators.putIfAbsent(key, result = new CachingPropertyLocator(new DefaultPropertyLocator())); if (tmpResult != null) { result = tmpResult; @@ -1365,7 +1367,10 @@ public final class PropertyResolver IGetAndSet get(Class<?> clz, String exp); } - public static class CachingGetAndSetLocator implements IPropertyLocator + /** + * A wrapper for another {@link IPropertyLocator} that caches results of {@link #get(Class, String)}. + */ + public static class CachingPropertyLocator implements IPropertyLocator { private final ConcurrentHashMap<String, IGetAndSet> map = Generics.newConcurrentHashMap(16); @@ -1391,7 +1396,7 @@ public final class PropertyResolver private IPropertyLocator locator; - public CachingGetAndSetLocator(IPropertyLocator locator) { + public CachingPropertyLocator(IPropertyLocator locator) { this.locator = locator; } @@ -1417,9 +1422,9 @@ public final class PropertyResolver } /** - * Default implementation supporting <em>Java Beans</em> properties, maps, lists and method invocations. + * Default locator supporting <em>Java Beans</em> properties, maps, lists and method invocations. */ - public static class DefaultGetAndSetLocator implements IPropertyLocator + public static class DefaultPropertyLocator implements IPropertyLocator { @Override public IGetAndSet get(Class<?> clz, String exp) { http://git-wip-us.apache.org/repos/asf/wicket/blob/a63fb75b/wicket-core/src/test/java/org/apache/wicket/util/lang/PropertyResolverTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/util/lang/PropertyResolverTest.java b/wicket-core/src/test/java/org/apache/wicket/util/lang/PropertyResolverTest.java index e76e1d6..1a3278d 100644 --- a/wicket-core/src/test/java/org/apache/wicket/util/lang/PropertyResolverTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/util/lang/PropertyResolverTest.java @@ -32,8 +32,8 @@ import org.apache.wicket.IConverterLocator; import org.apache.wicket.WicketRuntimeException; import org.apache.wicket.core.util.lang.PropertyResolver; import org.apache.wicket.core.util.lang.PropertyResolver.AbstractGetAndSet; -import org.apache.wicket.core.util.lang.PropertyResolver.CachingGetAndSetLocator; -import org.apache.wicket.core.util.lang.PropertyResolver.DefaultGetAndSetLocator; +import org.apache.wicket.core.util.lang.PropertyResolver.CachingPropertyLocator; +import org.apache.wicket.core.util.lang.PropertyResolver.DefaultPropertyLocator; import org.apache.wicket.core.util.lang.PropertyResolver.IGetAndSet; import org.apache.wicket.core.util.lang.PropertyResolver.IPropertyLocator; import org.apache.wicket.core.util.lang.PropertyResolverConverter; @@ -760,7 +760,7 @@ public class PropertyResolverTest extends WicketTestCase nestedCustom.setProperty("string", "string2"); document.setProperty("nested", nestedCustom); - PropertyResolver.setLocator(tester.getApplication(), new CachingGetAndSetLocator(new CustomGetAndSetLocator())); + PropertyResolver.setLocator(tester.getApplication(), new CachingPropertyLocator(new CustomGetAndSetLocator())); assertEquals("type", PropertyResolver.getValue("type", document)); assertEquals("string", PropertyResolver.getValue("string", document)); @@ -769,7 +769,7 @@ public class PropertyResolverTest extends WicketTestCase class CustomGetAndSetLocator implements IPropertyLocator { - private IPropertyLocator locator = new DefaultGetAndSetLocator(); + private IPropertyLocator locator = new DefaultPropertyLocator(); @Override public IGetAndSet get(Class<?> clz, String exp) {
