Author: sseifert
Date: Tue Dec 6 17:41:49 2016
New Revision: 1772927
URL: http://svn.apache.org/viewvc?rev=1772927&view=rev
Log:
cosmetic: internal constant should be named CONFIGS_BUCKET_NAME
Modified:
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/impl/ConfigurationBuilderImpl.java
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/impl/ConfigurationNameConstants.java
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/management/impl/ConfigurationManagerImpl.java
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/management/impl/ConfigurationManagerImplTest.java
Modified:
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/impl/ConfigurationBuilderImpl.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/impl/ConfigurationBuilderImpl.java?rev=1772927&r1=1772926&r2=1772927&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/impl/ConfigurationBuilderImpl.java
(original)
+++
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/impl/ConfigurationBuilderImpl.java
Tue Dec 6 17:41:49 2016
@@ -18,7 +18,7 @@
*/
package org.apache.sling.caconfig.impl;
-import static
org.apache.sling.caconfig.impl.ConfigurationNameConstants.CONFIGS_PARENT_NAME;
+import static
org.apache.sling.caconfig.impl.ConfigurationNameConstants.CONFIGS_BUCKET_NAME;
import java.util.ArrayList;
import java.util.Collection;
@@ -103,7 +103,7 @@ class ConfigurationBuilderImpl implement
if (this.contentResource != null) {
validateConfigurationName(name);
resourceInheritanceChain =
this.configurationResourceResolvingStrategy
- .getResourceInheritanceChain(this.contentResource,
CONFIGS_PARENT_NAME, name);
+ .getResourceInheritanceChain(this.contentResource,
CONFIGS_BUCKET_NAME, name);
}
return convert(resourceInheritanceChain, clazz, converter, name,
false);
}
@@ -120,7 +120,7 @@ class ConfigurationBuilderImpl implement
validateConfigurationName(name);
final Collection<T> result = new ArrayList<>();
for (final Iterator<Resource> resourceInheritanceChain :
this.configurationResourceResolvingStrategy
-
.getResourceCollectionInheritanceChain(this.contentResource,
CONFIGS_PARENT_NAME, name)) {
+
.getResourceCollectionInheritanceChain(this.contentResource,
CONFIGS_BUCKET_NAME, name)) {
final T obj = convert(resourceInheritanceChain, clazz,
converter, name, true);
if (obj != null) {
result.add(obj);
Modified:
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/impl/ConfigurationNameConstants.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/impl/ConfigurationNameConstants.java?rev=1772927&r1=1772926&r2=1772927&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/impl/ConfigurationNameConstants.java
(original)
+++
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/impl/ConfigurationNameConstants.java
Tue Dec 6 17:41:49 2016
@@ -25,9 +25,9 @@ public final class ConfigurationNameCons
}
/**
- * Resource name for configuration data (configuration with key/value
pairs).
+ * Bucket name for configuration data (configuration with key/value pairs).
*/
- public static final String CONFIGS_PARENT_NAME = "sling:configs";
+ public static final String CONFIGS_BUCKET_NAME = "sling:configs";
/**
* Bundle header defining list of class names with all configuration
annotation classes in this bundle.
Modified:
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/management/impl/ConfigurationManagerImpl.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/management/impl/ConfigurationManagerImpl.java?rev=1772927&r1=1772926&r2=1772927&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/management/impl/ConfigurationManagerImpl.java
(original)
+++
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/management/impl/ConfigurationManagerImpl.java
Tue Dec 6 17:41:49 2016
@@ -18,7 +18,7 @@
*/
package org.apache.sling.caconfig.management.impl;
-import static
org.apache.sling.caconfig.impl.ConfigurationNameConstants.CONFIGS_PARENT_NAME;
+import static
org.apache.sling.caconfig.impl.ConfigurationNameConstants.CONFIGS_BUCKET_NAME;
import java.util.ArrayList;
import java.util.Collection;
@@ -70,14 +70,14 @@ public class ConfigurationManagerImpl im
ConfigurationMetadata configMetadata =
getConfigurationMetadata(configName);
Resource configResource = null;
Iterator<Resource> configResourceInheritanceChain =
configurationResourceResolvingStrategy
- .getResourceInheritanceChain(resource, CONFIGS_PARENT_NAME,
configName);
+ .getResourceInheritanceChain(resource, CONFIGS_BUCKET_NAME,
configName);
if (configResourceInheritanceChain != null) {
ResettableIterator resettableConfigResourceInheritanceChain = new
ListIteratorWrapper(configResourceInheritanceChain);
configResource =
applyPersistenceAndInheritance(resource.getPath(), configName,
resettableConfigResourceInheritanceChain);
if (configResource != null) {
// get writeback resource for "reverse inheritance detection"
Resource writebackConfigResource = null;
- String writebackConfigResourcePath =
configurationResourceResolvingStrategy.getResourcePath(resource,
CONFIGS_PARENT_NAME, configName);
+ String writebackConfigResourcePath =
configurationResourceResolvingStrategy.getResourcePath(resource,
CONFIGS_BUCKET_NAME, configName);
if (writebackConfigResourcePath != null) {
writebackConfigResource =
configResource.getResourceResolver().getResource(writebackConfigResourcePath);
if (writebackConfigResource != null) {
@@ -103,12 +103,12 @@ public class ConfigurationManagerImpl im
public ConfigurationCollectionData getConfigurationCollection(Resource
resource, String configName) {
ConfigNameUtil.ensureValidConfigName(configName);
ConfigurationMetadata configMetadata =
getConfigurationMetadata(configName);
- String writebackConfigResourceCollectionParentPath =
configurationResourceResolvingStrategy.getResourceCollectionParentPath(resource,
CONFIGS_PARENT_NAME, configName);
+ String writebackConfigResourceCollectionParentPath =
configurationResourceResolvingStrategy.getResourceCollectionParentPath(resource,
CONFIGS_BUCKET_NAME, configName);
List<ConfigurationData> configData = new ArrayList<>();
// get configuration resource items
Collection<Iterator<Resource>> configResourceInheritanceChains =
configurationResourceResolvingStrategy
- .getResourceCollectionInheritanceChain(resource,
CONFIGS_PARENT_NAME, configName);
+ .getResourceCollectionInheritanceChain(resource,
CONFIGS_BUCKET_NAME, configName);
if (configResourceInheritanceChains != null) {
for (Iterator<Resource> configResourceInheritanceChain :
configResourceInheritanceChains) {
ResettableIterator resettableConfigResourceInheritanceChain =
new ListIteratorWrapper(configResourceInheritanceChain);
@@ -183,7 +183,7 @@ public class ConfigurationManagerImpl im
@Override
public void persistConfiguration(Resource resource, String configName,
ConfigurationPersistData data) {
ConfigNameUtil.ensureValidConfigName(configName);
- String configResourcePath =
configurationResourceResolvingStrategy.getResourcePath(resource,
CONFIGS_PARENT_NAME, configName);
+ String configResourcePath =
configurationResourceResolvingStrategy.getResourcePath(resource,
CONFIGS_BUCKET_NAME, configName);
if (configResourcePath == null) {
throw new ConfigurationPersistenceException("Unable to persist
configuration: Configuration resolving strategy returned no path.");
}
@@ -195,7 +195,7 @@ public class ConfigurationManagerImpl im
@Override
public void persistConfigurationCollection(Resource resource, String
configName, ConfigurationCollectionPersistData data) {
ConfigNameUtil.ensureValidConfigName(configName);
- String configResourceParentPath =
configurationResourceResolvingStrategy.getResourceCollectionParentPath(resource,
CONFIGS_PARENT_NAME, configName);
+ String configResourceParentPath =
configurationResourceResolvingStrategy.getResourceCollectionParentPath(resource,
CONFIGS_BUCKET_NAME, configName);
if (configResourceParentPath == null) {
throw new ConfigurationPersistenceException("Unable to persist
configuration collection: Configuration resolving strategy returned no parent
path.");
}
@@ -218,7 +218,7 @@ public class ConfigurationManagerImpl im
@Override
public void deleteConfiguration(Resource resource, String configName) {
ConfigNameUtil.ensureValidConfigName(configName);
- String configResourcePath =
configurationResourceResolvingStrategy.getResourcePath(resource,
CONFIGS_PARENT_NAME, configName);
+ String configResourcePath =
configurationResourceResolvingStrategy.getResourcePath(resource,
CONFIGS_BUCKET_NAME, configName);
if (configResourcePath == null) {
throw new ConfigurationPersistenceException("Unable to delete
configuration: Configuration resolving strategy returned no path.");
}
Modified:
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/management/impl/ConfigurationManagerImplTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/management/impl/ConfigurationManagerImplTest.java?rev=1772927&r1=1772926&r2=1772927&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/management/impl/ConfigurationManagerImplTest.java
(original)
+++
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/management/impl/ConfigurationManagerImplTest.java
Tue Dec 6 17:41:49 2016
@@ -18,7 +18,7 @@
*/
package org.apache.sling.caconfig.management.impl;
-import static
org.apache.sling.caconfig.impl.ConfigurationNameConstants.CONFIGS_PARENT_NAME;
+import static
org.apache.sling.caconfig.impl.ConfigurationNameConstants.CONFIGS_BUCKET_NAME;
import static
org.apache.sling.caconfig.impl.def.ConfigurationDefNameConstants.PROPERTY_CONFIG_PROPERTY_INHERIT;
import static
org.apache.sling.caconfig.resource.impl.def.ConfigurationResourceNameConstants.PROPERTY_CONFIG_COLLECTION_INHERIT;
import static
org.apache.sling.caconfig.resource.impl.def.ConfigurationResourceNameConstants.PROPERTY_CONFIG_REF;
@@ -96,47 +96,47 @@ public class ConfigurationManagerImplTes
contextResourceNoConfig =
context.create().resource("/content/testNoConfig",
PROPERTY_CONFIG_REF, "/conf/testNoConfig");
- context.create().resource(getConfigPropsPath("/conf/test/" +
CONFIGS_PARENT_NAME + "/" + CONFIG_NAME),
+ context.create().resource(getConfigPropsPath("/conf/test/" +
CONFIGS_BUCKET_NAME + "/" + CONFIG_NAME),
"prop1", "value1",
"prop4", true);
- context.create().resource(getConfigPropsPath("/conf/test/" +
CONFIGS_PARENT_NAME + "/" + CONFIG_COL_NAME + "/1"),
+ context.create().resource(getConfigPropsPath("/conf/test/" +
CONFIGS_BUCKET_NAME + "/" + CONFIG_COL_NAME + "/1"),
"prop1", "value1");
- context.create().resource(getConfigPropsPath("/conf/test/" +
CONFIGS_PARENT_NAME + "/" + CONFIG_COL_NAME + "/2"),
+ context.create().resource(getConfigPropsPath("/conf/test/" +
CONFIGS_BUCKET_NAME + "/" + CONFIG_COL_NAME + "/2"),
"prop4", true);
// test fixture with resource collection inheritance on level 2
- context.create().resource("/conf/test/level2/" + CONFIGS_PARENT_NAME +
"/" + CONFIG_COL_NAME,
+ context.create().resource("/conf/test/level2/" + CONFIGS_BUCKET_NAME +
"/" + CONFIG_COL_NAME,
PROPERTY_CONFIG_COLLECTION_INHERIT, true);
- context.create().resource(getConfigPropsPath("/conf/test/level2/" +
CONFIGS_PARENT_NAME + "/" + CONFIG_COL_NAME + "/1"),
+ context.create().resource(getConfigPropsPath("/conf/test/level2/" +
CONFIGS_BUCKET_NAME + "/" + CONFIG_COL_NAME + "/1"),
"prop1", "value1_level2");
// test fixture with property inheritance and resource collection
inheritance on level 3
-
context.create().resource(getConfigPropsPath("/conf/test/level2/level3/" +
CONFIGS_PARENT_NAME + "/" + CONFIG_NAME),
+
context.create().resource(getConfigPropsPath("/conf/test/level2/level3/" +
CONFIGS_BUCKET_NAME + "/" + CONFIG_NAME),
"prop4", false,
"prop5", "value5_level3",
PROPERTY_CONFIG_PROPERTY_INHERIT, true);
- context.create().resource("/conf/test/level2/level3/" +
CONFIGS_PARENT_NAME + "/" + CONFIG_COL_NAME,
+ context.create().resource("/conf/test/level2/level3/" +
CONFIGS_BUCKET_NAME + "/" + CONFIG_COL_NAME,
PROPERTY_CONFIG_COLLECTION_INHERIT, true);
-
context.create().resource(getConfigPropsPath("/conf/test/level2/level3/" +
CONFIGS_PARENT_NAME + "/" + CONFIG_COL_NAME + "/1"),
+
context.create().resource(getConfigPropsPath("/conf/test/level2/level3/" +
CONFIGS_BUCKET_NAME + "/" + CONFIG_COL_NAME + "/1"),
"prop4", false,
"prop5", "value5_level3",
PROPERTY_CONFIG_PROPERTY_INHERIT, true);
// test fixture nested configuration
- context.create().resource(getConfigPropsPath("/conf/test/level2/" +
CONFIGS_PARENT_NAME + "/" + CONFIG_NESTED_NAME),
+ context.create().resource(getConfigPropsPath("/conf/test/level2/" +
CONFIGS_BUCKET_NAME + "/" + CONFIG_NESTED_NAME),
"prop1", "value1",
"prop4", true);
-
context.create().resource(getConfigPropsPath(getConfigPropsPath("/conf/test/" +
CONFIGS_PARENT_NAME + "/" + CONFIG_NESTED_NAME) + "/propSub"),
+
context.create().resource(getConfigPropsPath(getConfigPropsPath("/conf/test/" +
CONFIGS_BUCKET_NAME + "/" + CONFIG_NESTED_NAME) + "/propSub"),
"prop1", "propSubValue1",
"prop4", true);
-
context.create().resource(getConfigPropsPath(getConfigPropsPath(getConfigPropsPath("/conf/test/"
+ CONFIGS_PARENT_NAME + "/" + CONFIG_NESTED_NAME) + "/propSub") +
"/propSubLevel2"),
+
context.create().resource(getConfigPropsPath(getConfigPropsPath(getConfigPropsPath("/conf/test/"
+ CONFIGS_BUCKET_NAME + "/" + CONFIG_NESTED_NAME) + "/propSub") +
"/propSubLevel2"),
"prop1", "propSubLevel2Value1",
"prop4", true);
-
context.create().resource(getConfigPropsPath(getConfigPropsPath("/conf/test/level2/"
+ CONFIGS_PARENT_NAME + "/" + CONFIG_NESTED_NAME) + "/propSubList/item1"),
+
context.create().resource(getConfigPropsPath(getConfigPropsPath("/conf/test/level2/"
+ CONFIGS_BUCKET_NAME + "/" + CONFIG_NESTED_NAME) + "/propSubList/item1"),
"prop1", "propSubListValue1.1");
-
context.create().resource(getConfigPropsPath(getConfigPropsPath("/conf/test/level2/"
+ CONFIGS_PARENT_NAME + "/" + CONFIG_NESTED_NAME) + "/propSubList/item2"),
+
context.create().resource(getConfigPropsPath(getConfigPropsPath("/conf/test/level2/"
+ CONFIGS_BUCKET_NAME + "/" + CONFIG_NESTED_NAME) + "/propSubList/item2"),
"prop1", "propSubListValue1.2");
-
context.create().resource(getConfigPropsPath(getConfigPropsPath(getConfigPropsPath("/conf/test/"
+ CONFIGS_PARENT_NAME + "/" + CONFIG_NESTED_NAME) + "/propSubList/item1") +
"/propSub"),
+
context.create().resource(getConfigPropsPath(getConfigPropsPath(getConfigPropsPath("/conf/test/"
+ CONFIGS_BUCKET_NAME + "/" + CONFIG_NESTED_NAME) + "/propSubList/item1") +
"/propSub"),
"prop1", "propSubList1_proSubValue1",
"prop4", true);
@@ -225,7 +225,7 @@ public class ConfigurationManagerImplTes
assertEquals("value1", configData.getEffectiveValues().get("prop1",
String.class));
assertEquals((Integer)5, configData.getEffectiveValues().get("prop3",
0));
- String configPath = getConfigPropsPath("/conf/test/" +
CONFIGS_PARENT_NAME + "/" + CONFIG_NAME);
+ String configPath = getConfigPropsPath("/conf/test/" +
CONFIGS_BUCKET_NAME + "/" + CONFIG_NAME);
assertEquals(configPath,
configData.getValueInfo("prop1").getConfigSourcePath());
assertTrue(configData.getValueInfo("prop1").isInherited());
assertFalse(configData.getValueInfo("prop3").isInherited());
@@ -252,8 +252,8 @@ public class ConfigurationManagerImplTes
assertFalse(configData.getEffectiveValues().get("prop4",
Boolean.class));
assertEquals("value5_level3",
configData.getEffectiveValues().get("prop5", String.class));
- String configPath = getConfigPropsPath("/conf/test/" +
CONFIGS_PARENT_NAME + "/" + CONFIG_NAME);
- String configPathLevel3 =
getConfigPropsPath("/conf/test/level2/level3/" + CONFIGS_PARENT_NAME + "/" +
CONFIG_NAME);
+ String configPath = getConfigPropsPath("/conf/test/" +
CONFIGS_BUCKET_NAME + "/" + CONFIG_NAME);
+ String configPathLevel3 =
getConfigPropsPath("/conf/test/level2/level3/" + CONFIGS_BUCKET_NAME + "/" +
CONFIG_NAME);
assertTrue(configData.getValueInfo("prop1").isInherited());
assertEquals(configPath,
configData.getValueInfo("prop1").getConfigSourcePath());
assertFalse(configData.getValueInfo("prop2").isInherited());
@@ -362,7 +362,7 @@ public class ConfigurationManagerImplTes
assertEquals("value1_level2",
configData1.getEffectiveValues().get("prop1", String.class));
assertEquals((Integer)5, configData1.getEffectiveValues().get("prop3",
0));
- String configPath1 = getConfigPropsPath("/conf/test/level2/" +
CONFIGS_PARENT_NAME + "/" + CONFIG_COL_NAME + "/1");
+ String configPath1 = getConfigPropsPath("/conf/test/level2/" +
CONFIGS_BUCKET_NAME + "/" + CONFIG_COL_NAME + "/1");
assertFalse(configData1.getValueInfo("prop1").isInherited());
assertEquals(configPath1,
configData1.getValueInfo("prop1").getConfigSourcePath());
assertFalse(configData1.getValueInfo("prop3").isInherited());
@@ -373,7 +373,7 @@ public class ConfigurationManagerImplTes
assertNull(configData2.getValues().get("prop1", String.class));
assertEquals((Integer)5, configData2.getEffectiveValues().get("prop3",
0));
- String configPath2 = getConfigPropsPath("/conf/test/" +
CONFIGS_PARENT_NAME + "/" + CONFIG_COL_NAME + "/2");
+ String configPath2 = getConfigPropsPath("/conf/test/" +
CONFIGS_BUCKET_NAME + "/" + CONFIG_COL_NAME + "/2");
assertTrue(configData2.getValueInfo("prop4").isInherited());
assertEquals(configPath2,
configData2.getValueInfo("prop4").getConfigSourcePath());
assertFalse(configData2.getValueInfo("prop3").isInherited());
@@ -404,8 +404,8 @@ public class ConfigurationManagerImplTes
assertFalse(configData1.getEffectiveValues().get("prop4",
Boolean.class));
assertEquals("value5_level3",
configData1.getEffectiveValues().get("prop5", String.class));
- String configPathLevel2 = getConfigPropsPath("/conf/test/level2/" +
CONFIGS_PARENT_NAME + "/" + CONFIG_COL_NAME + "/1");
- String configPathLevel3 =
getConfigPropsPath("/conf/test/level2/level3/" + CONFIGS_PARENT_NAME + "/" +
CONFIG_COL_NAME + "/1");
+ String configPathLevel2 = getConfigPropsPath("/conf/test/level2/" +
CONFIGS_BUCKET_NAME + "/" + CONFIG_COL_NAME + "/1");
+ String configPathLevel3 =
getConfigPropsPath("/conf/test/level2/level3/" + CONFIGS_BUCKET_NAME + "/" +
CONFIG_COL_NAME + "/1");
assertTrue(configData1.getValueInfo("prop1").isInherited());
assertEquals(configPathLevel2,
configData1.getValueInfo("prop1").getConfigSourcePath());
assertFalse(configData1.getValueInfo("prop2").isInherited());
@@ -422,7 +422,7 @@ public class ConfigurationManagerImplTes
assertNull(configData2.getValues().get("prop1", String.class));
assertEquals((Integer)5, configData2.getEffectiveValues().get("prop3",
0));
- String configPath2 = getConfigPropsPath("/conf/test/" +
CONFIGS_PARENT_NAME + "/" + CONFIG_COL_NAME + "/2");
+ String configPath2 = getConfigPropsPath("/conf/test/" +
CONFIGS_BUCKET_NAME + "/" + CONFIG_COL_NAME + "/2");
assertTrue(configData2.getValueInfo("prop4").isInherited());
assertEquals(configPath2,
configData2.getValueInfo("prop4").getConfigSourcePath());
assertFalse(configData2.getValueInfo("prop3").isInherited());
@@ -507,7 +507,7 @@ public class ConfigurationManagerImplTes
new ConfigurationPersistData(ImmutableMap.<String,
Object>of("prop1", "value1")));
context.resourceResolver().commit();
- String configPath = getConfigPropsPath("/conf/testNoConfig/" +
CONFIGS_PARENT_NAME + "/" + CONFIG_NAME);
+ String configPath = getConfigPropsPath("/conf/testNoConfig/" +
CONFIGS_BUCKET_NAME + "/" + CONFIG_NAME);
ValueMap props =
context.resourceResolver().getResource(configPath).getValueMap();
assertEquals("value1", props.get("prop1"));
}
@@ -521,11 +521,11 @@ public class ConfigurationManagerImplTes
));
context.resourceResolver().commit();
- String configPath0 = getConfigPropsPath("/conf/testNoConfig/" +
CONFIGS_PARENT_NAME + "/" + CONFIG_COL_NAME + "/0");
+ String configPath0 = getConfigPropsPath("/conf/testNoConfig/" +
CONFIGS_BUCKET_NAME + "/" + CONFIG_COL_NAME + "/0");
ValueMap props0 =
context.resourceResolver().getResource(configPath0).getValueMap();
assertEquals("value1", props0.get("prop1"));
- String configPath1 = getConfigPropsPath("/conf/testNoConfig/" +
CONFIGS_PARENT_NAME + "/" + CONFIG_COL_NAME + "/1");
+ String configPath1 = getConfigPropsPath("/conf/testNoConfig/" +
CONFIGS_BUCKET_NAME + "/" + CONFIG_COL_NAME + "/1");
ValueMap props1 =
context.resourceResolver().getResource(configPath1).getValueMap();
assertEquals((Integer)5, props1.get("prop2"));
}
@@ -707,7 +707,7 @@ public class ConfigurationManagerImplTes
public void testGetConfigurationMetadata_Nested_SubList_Sub() throws
Exception {
// delete resource already existing in test fixture to test with
non-existing resource but existing collection item as parent
context.resourceResolver().delete(context.resourceResolver().getResource(
-
getConfigPropsPath(getConfigPropsPath(getConfigPropsPath("/conf/test/" +
CONFIGS_PARENT_NAME + "/" + CONFIG_NESTED_NAME)
+
getConfigPropsPath(getConfigPropsPath(getConfigPropsPath("/conf/test/" +
CONFIGS_BUCKET_NAME + "/" + CONFIG_NESTED_NAME)
+ "/propSubList/item1") + "/propSub")));
ConfigurationMetadata subListDataItem1Sub =
underTest.getConfigurationMetadata(getConfigPropsPath(getConfigPropsPath(CONFIG_NESTED_NAME)
@@ -720,7 +720,7 @@ public class ConfigurationManagerImplTes
public void testGetConfigurationMetadata_Nested_SubList_SubLevel2() throws
Exception {
// delete resource already existing in test fixture to test with
non-existing resource but existing collection item as parent
context.resourceResolver().delete(context.resourceResolver().getResource(
-
getConfigPropsPath(getConfigPropsPath(getConfigPropsPath("/conf/test/" +
CONFIGS_PARENT_NAME + "/" + CONFIG_NESTED_NAME)
+
getConfigPropsPath(getConfigPropsPath(getConfigPropsPath("/conf/test/" +
CONFIGS_BUCKET_NAME + "/" + CONFIG_NESTED_NAME)
+ "/propSubList/item1") + "/propSub")));
ConfigurationMetadata subListDataItem1SubLevel2 =
underTest.getConfigurationMetadata(getConfigPropsPath(getConfigPropsPath(getConfigPropsPath(CONFIG_NESTED_NAME)
