This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag org.apache.sling.caconfig.spi-1.2.0 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-caconfig-spi.git
commit 45440318d107716459a816d8da4871a4b27abed3 Author: Stefan Seifert <[email protected]> AuthorDate: Mon Nov 28 22:42:33 2016 +0000 SLING-6338 support nested configuration classes when detecting configuration metadata git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/contextaware-config/spi@1771825 13f79535-47bb-0310-9956-ffa450edef68 --- .../sling/caconfig/spi/metadata/PropertyMetadata.java | 15 +++++++++++++++ .../sling/caconfig/spi/metadata/PropertyMetadataTest.java | 5 +++++ 2 files changed, 20 insertions(+) diff --git a/src/main/java/org/apache/sling/caconfig/spi/metadata/PropertyMetadata.java b/src/main/java/org/apache/sling/caconfig/spi/metadata/PropertyMetadata.java index 40f3e17..447c8ec 100644 --- a/src/main/java/org/apache/sling/caconfig/spi/metadata/PropertyMetadata.java +++ b/src/main/java/org/apache/sling/caconfig/spi/metadata/PropertyMetadata.java @@ -52,6 +52,7 @@ public final class PropertyMetadata<T> extends AbstractMetadata { private final Class<T> type; private T defaultValue; + private ConfigurationMetadata configurationMetadata; /** * @param name Property name @@ -122,6 +123,20 @@ public final class PropertyMetadata<T> extends AbstractMetadata { public void setDefaultValue(T value) { this.defaultValue = value; } + + /** + * @return Metadata for nested configuration + */ + public ConfigurationMetadata getConfigurationMetadata() { + return configurationMetadata; + } + + /** + * @param configurationMetadata Metadata for nested configuration + */ + public void setConfigurationMetadata(ConfigurationMetadata configurationMetadata) { + this.configurationMetadata = configurationMetadata; + } @Override public String toString() { diff --git a/src/test/java/org/apache/sling/caconfig/spi/metadata/PropertyMetadataTest.java b/src/test/java/org/apache/sling/caconfig/spi/metadata/PropertyMetadataTest.java index 63be8f2..42b1563 100644 --- a/src/test/java/org/apache/sling/caconfig/spi/metadata/PropertyMetadataTest.java +++ b/src/test/java/org/apache/sling/caconfig/spi/metadata/PropertyMetadataTest.java @@ -19,6 +19,7 @@ package org.apache.sling.caconfig.spi.metadata; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertSame; import java.util.Map; @@ -40,10 +41,14 @@ public class PropertyMetadataTest { Map<String,String> props = ImmutableMap.of("p1", "v1"); underTest.setProperties(props); + ConfigurationMetadata configMetadata = new ConfigurationMetadata("test"); + underTest.setConfigurationMetadata(configMetadata); + assertEquals("label1", underTest.getLabel()); assertEquals("desc1", underTest.getDescription()); assertEquals("value1", underTest.getDefaultValue()); assertEquals(props, underTest.getProperties()); + assertSame(configMetadata, underTest.getConfigurationMetadata()); } @Test -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
