svn commit: r1788160 - in /sling/trunk/bundles/extensions/caconfig/impl/src: main/java/org/apache/sling/caconfig/impl/ test/java/org/apache/sling/caconfig/management/impl/

[sseifert]

Author: sseifert
Date: Wed Mar 22 20:38:10 2017
New Revision: 1788160

URL: http://svn.apache.org/viewvc?rev=1788160&view=rev
Log:
SLING-6695 Persistence Strategy Adapter: Do not modify collection parent name

Modified:
    
sling/trunk/bundles/extensions/caconfig/impl/src/main/java/org/apache/sling/caconfig/impl/ConfigurationPersistenceStrategyBridge.java
    
sling/trunk/bundles/extensions/caconfig/impl/src/test/java/org/apache/sling/caconfig/management/impl/ConfigurationPersistenceStrategyMultiplexerImplTest.java

Modified: 
sling/trunk/bundles/extensions/caconfig/impl/src/main/java/org/apache/sling/caconfig/impl/ConfigurationPersistenceStrategyBridge.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/caconfig/impl/src/main/java/org/apache/sling/caconfig/impl/ConfigurationPersistenceStrategyBridge.java?rev=1788160&r1=1788159&r2=1788160&view=diff
==============================================================================
--- 
sling/trunk/bundles/extensions/caconfig/impl/src/main/java/org/apache/sling/caconfig/impl/ConfigurationPersistenceStrategyBridge.java
 (original)
+++ 
sling/trunk/bundles/extensions/caconfig/impl/src/main/java/org/apache/sling/caconfig/impl/ConfigurationPersistenceStrategyBridge.java
 Wed Mar 22 20:38:10 2017
@@ -143,7 +143,8 @@ public final class ConfigurationPersiste
 
         @Override
         public Resource getCollectionParentResource(Resource resource) {
-            return delegate.getResource(resource);
+            // with SPI/Impl 1.2 it was not possible to manipulate collection 
parent resource
+            return resource;
         }
 
         @Override
@@ -158,7 +159,8 @@ public final class ConfigurationPersiste
 
         @Override
         public String getCollectionParentResourcePath(String resourcePath) {
-            return delegate.getResourcePath(resourcePath);
+            // with SPI/Impl 1.2 it was not possible to manipulate collection 
parent resource
+            return resourcePath;
         }
 
         @Override
@@ -173,7 +175,8 @@ public final class ConfigurationPersiste
 
         @Override
         public String getCollectionParentConfigName(String configName, String 
relatedConfigPath) {
-            return delegate.getResourcePath(configName);
+            // with SPI/Impl 1.2 it was not possible to manipulate collection 
parent resource
+            return configName;
         }
 
         @Override

Modified: 
sling/trunk/bundles/extensions/caconfig/impl/src/test/java/org/apache/sling/caconfig/management/impl/ConfigurationPersistenceStrategyMultiplexerImplTest.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/caconfig/impl/src/test/java/org/apache/sling/caconfig/management/impl/ConfigurationPersistenceStrategyMultiplexerImplTest.java?rev=1788160&r1=1788159&r2=1788160&view=diff
==============================================================================
--- 
sling/trunk/bundles/extensions/caconfig/impl/src/test/java/org/apache/sling/caconfig/management/impl/ConfigurationPersistenceStrategyMultiplexerImplTest.java
 (original)
+++ 
sling/trunk/bundles/extensions/caconfig/impl/src/test/java/org/apache/sling/caconfig/management/impl/ConfigurationPersistenceStrategyMultiplexerImplTest.java
 Wed Mar 22 20:38:10 2017
@@ -170,16 +170,16 @@ public class ConfigurationPersistenceStr
         }, Constants.SERVICE_RANKING, 1000);
         
         assertSame(resource2, underTest.getResource(resource1));
-        assertSame(resource2, 
underTest.getCollectionParentResource(resource1));
+        assertSame(resource1, 
underTest.getCollectionParentResource(resource1));
         assertSame(resource2, underTest.getCollectionItemResource(resource1));
         assertEquals(resource2.getPath(), 
underTest.getResourcePath(resource1.getPath()));
-        assertEquals(resource2.getPath(), 
underTest.getCollectionParentResourcePath(resource1.getPath()));
+        assertEquals(resource1.getPath(), 
underTest.getCollectionParentResourcePath(resource1.getPath()));
         assertEquals(resource2.getPath(), 
underTest.getCollectionItemResourcePath(resource1.getPath()));
         assertEquals(resource2.getPath(), 
underTest.getConfigName(resource1.getPath(), null));
-        assertEquals(resource2.getPath(), 
underTest.getCollectionParentConfigName(resource1.getPath(), null));
+        assertEquals(resource1.getPath(), 
underTest.getCollectionParentConfigName(resource1.getPath(), null));
         assertEquals(resource2.getPath(), 
underTest.getCollectionItemConfigName(resource1.getPath(), null));
         assertEquals(ImmutableList.of(resource2.getPath(), 
resource1.getPath()), 
ImmutableList.copyOf(underTest.getAllConfigNames(resource1.getPath())));
-        assertEquals(ImmutableList.of(resource2.getPath(), 
resource1.getPath()), 
ImmutableList.copyOf(underTest.getAllCollectionParentConfigNames(resource1.getPath())));
+        assertEquals(ImmutableList.of(resource1.getPath()), 
ImmutableList.copyOf(underTest.getAllCollectionParentConfigNames(resource1.getPath())));
         assertEquals(ImmutableList.of(resource2.getPath(), 
resource1.getPath()), 
ImmutableList.copyOf(underTest.getAllCollectionItemConfigNames(resource1.getPath())));
         assertTrue(underTest.persistConfiguration(context.resourceResolver(), 
"/conf/test1", new ConfigurationPersistData(resource1.getValueMap())));
         
assertTrue(underTest.persistConfigurationCollection(context.resourceResolver(), 
"/conf/testCol",