You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ss...@apache.org on 2017/03/19 15:33:49 UTC
svn commit: r1787633 - in /sling/trunk/bundles/extensions/caconfig/impl/src:
main/java/org/apache/sling/caconfig/impl/
main/java/org/apache/sling/caconfig/impl/override/
main/java/org/apache/sling/caconfig/management/impl/
main/java/org/apache/sling/ca...
Author: sseifert
Date: Sun Mar 19 15:33:48 2017
New Revision: 1787633
URL: http://svn.apache.org/viewvc?rev=1787633&view=rev
Log:
SLING-6442 export ConfigurationOverrideMultiplexer
Added:
sling/trunk/bundles/extensions/caconfig/impl/src/main/java/org/apache/sling/caconfig/impl/override/ConfigurationOverrideMultiplexerImpl.java
- copied, changed from r1787624, sling/trunk/bundles/extensions/caconfig/impl/src/main/java/org/apache/sling/caconfig/impl/override/ConfigurationOverrideManager.java
sling/trunk/bundles/extensions/caconfig/impl/src/main/java/org/apache/sling/caconfig/management/multiplexer/ConfigurationOverrideMultiplexer.java (with props)
sling/trunk/bundles/extensions/caconfig/impl/src/test/java/org/apache/sling/caconfig/impl/override/ConfigurationOverrideMultiplexerImplTest.java
- copied, changed from r1787624, sling/trunk/bundles/extensions/caconfig/impl/src/test/java/org/apache/sling/caconfig/impl/override/ConfigurationOverrideManagerTest.java
Removed:
sling/trunk/bundles/extensions/caconfig/impl/src/main/java/org/apache/sling/caconfig/impl/override/ConfigurationOverrideManager.java
sling/trunk/bundles/extensions/caconfig/impl/src/test/java/org/apache/sling/caconfig/impl/override/ConfigurationOverrideManagerTest.java
Modified:
sling/trunk/bundles/extensions/caconfig/impl/src/main/java/org/apache/sling/caconfig/impl/ConfigurationBuilderImpl.java
sling/trunk/bundles/extensions/caconfig/impl/src/main/java/org/apache/sling/caconfig/impl/ConfigurationResolverImpl.java
sling/trunk/bundles/extensions/caconfig/impl/src/main/java/org/apache/sling/caconfig/management/impl/ConfigurationDataImpl.java
sling/trunk/bundles/extensions/caconfig/impl/src/main/java/org/apache/sling/caconfig/management/impl/ConfigurationManagerImpl.java
sling/trunk/bundles/extensions/caconfig/impl/src/main/java/org/apache/sling/caconfig/management/impl/ValueInfoImpl.java
sling/trunk/bundles/extensions/caconfig/impl/src/test/java/org/apache/sling/caconfig/impl/ConfigurationTestUtils.java
sling/trunk/bundles/extensions/caconfig/impl/src/test/java/org/apache/sling/caconfig/management/impl/ConfigurationDataImplTest.java
Modified: sling/trunk/bundles/extensions/caconfig/impl/src/main/java/org/apache/sling/caconfig/impl/ConfigurationBuilderImpl.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/caconfig/impl/src/main/java/org/apache/sling/caconfig/impl/ConfigurationBuilderImpl.java?rev=1787633&r1=1787632&r2=1787633&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/caconfig/impl/src/main/java/org/apache/sling/caconfig/impl/ConfigurationBuilderImpl.java (original)
+++ sling/trunk/bundles/extensions/caconfig/impl/src/main/java/org/apache/sling/caconfig/impl/ConfigurationBuilderImpl.java Sun Mar 19 15:33:48 2017
@@ -38,7 +38,7 @@ import org.apache.sling.caconfig.Configu
import org.apache.sling.caconfig.ConfigurationResolver;
import org.apache.sling.caconfig.impl.ConfigurationProxy.ChildResolver;
import org.apache.sling.caconfig.impl.metadata.AnnotationClassParser;
-import org.apache.sling.caconfig.impl.override.ConfigurationOverrideManager;
+import org.apache.sling.caconfig.management.multiplexer.ConfigurationOverrideMultiplexer;
import org.apache.sling.caconfig.management.multiplexer.ConfigurationPersistenceStrategyMultiplexer;
import org.apache.sling.caconfig.resource.impl.util.ConfigNameUtil;
import org.apache.sling.caconfig.resource.impl.util.MapUtil;
@@ -57,7 +57,7 @@ class ConfigurationBuilderImpl implement
private final ConfigurationResourceResolvingStrategy configurationResourceResolvingStrategy;
private final ConfigurationPersistenceStrategyMultiplexer configurationPersistenceStrategy;
private final ConfigurationInheritanceStrategy configurationInheritanceStrategy;
- private final ConfigurationOverrideManager configurationOverrideManager;
+ private final ConfigurationOverrideMultiplexer configurationOverrideMultiplexer;
private final ConfigurationMetadataProvider configurationMetadataProvider;
private final Collection<String> configBucketNames;
@@ -70,7 +70,7 @@ class ConfigurationBuilderImpl implement
final ConfigurationResourceResolvingStrategy configurationResourceResolvingStrategy,
final ConfigurationPersistenceStrategyMultiplexer configurationPersistenceStrategy,
final ConfigurationInheritanceStrategy configurationInheritanceStrategy,
- final ConfigurationOverrideManager configurationOverrideManager,
+ final ConfigurationOverrideMultiplexer configurationOverrideMultiplexer,
final ConfigurationMetadataProvider configurationMetadataProvider,
final Collection<String> configBucketNames) {
this.contentResource = resource;
@@ -78,7 +78,7 @@ class ConfigurationBuilderImpl implement
this.configurationResourceResolvingStrategy = configurationResourceResolvingStrategy;
this.configurationPersistenceStrategy = configurationPersistenceStrategy;
this.configurationInheritanceStrategy = configurationInheritanceStrategy;
- this.configurationOverrideManager = configurationOverrideManager;
+ this.configurationOverrideMultiplexer = configurationOverrideMultiplexer;
this.configurationMetadataProvider = configurationMetadataProvider;
this.configBucketNames = configBucketNames;
}
@@ -185,7 +185,7 @@ class ConfigurationBuilderImpl implement
// apply resource inheritance
configResource = configurationInheritanceStrategy.getResource(transformedResources);
// apply overrides
- configResource = configurationOverrideManager.overrideProperties(contentResource.getPath(), name, configResource);
+ configResource = configurationOverrideMultiplexer.overrideProperties(contentResource.getPath(), name, configResource);
// build name
if (configResource != null && isCollection) {
conversionName = conversionName + "/" + configResource.getName();
Modified: sling/trunk/bundles/extensions/caconfig/impl/src/main/java/org/apache/sling/caconfig/impl/ConfigurationResolverImpl.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/caconfig/impl/src/main/java/org/apache/sling/caconfig/impl/ConfigurationResolverImpl.java?rev=1787633&r1=1787632&r2=1787633&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/caconfig/impl/src/main/java/org/apache/sling/caconfig/impl/ConfigurationResolverImpl.java (original)
+++ sling/trunk/bundles/extensions/caconfig/impl/src/main/java/org/apache/sling/caconfig/impl/ConfigurationResolverImpl.java Sun Mar 19 15:33:48 2017
@@ -28,9 +28,9 @@ import org.apache.commons.lang3.ArrayUti
import org.apache.sling.api.resource.Resource;
import org.apache.sling.caconfig.ConfigurationBuilder;
import org.apache.sling.caconfig.ConfigurationResolver;
-import org.apache.sling.caconfig.impl.override.ConfigurationOverrideManager;
import org.apache.sling.caconfig.management.multiplexer.ConfigurationInheritanceStrategyMultiplexer;
import org.apache.sling.caconfig.management.multiplexer.ConfigurationMetadataProviderMultiplexer;
+import org.apache.sling.caconfig.management.multiplexer.ConfigurationOverrideMultiplexer;
import org.apache.sling.caconfig.management.multiplexer.ConfigurationPersistenceStrategyMultiplexer;
import org.apache.sling.caconfig.management.multiplexer.ConfigurationResourceResolvingStrategyMultiplexer;
import org.osgi.service.component.annotations.Activate;
@@ -51,7 +51,7 @@ public class ConfigurationResolverImpl i
@Reference
private ConfigurationInheritanceStrategyMultiplexer configurationInheritanceStrategy;
@Reference
- private ConfigurationOverrideManager configurationOverrideManager;
+ private ConfigurationOverrideMultiplexer configurationOverrideMultiplexer;
@Reference
private ConfigurationMetadataProviderMultiplexer configurationMetadataProvider;
@@ -83,7 +83,7 @@ public class ConfigurationResolverImpl i
public ConfigurationBuilder get(Resource resource) {
return new ConfigurationBuilderImpl(resource, this,
configurationResourceResolvingStrategy, configurationPersistenceStrategy,
- configurationInheritanceStrategy, configurationOverrideManager, configurationMetadataProvider,
+ configurationInheritanceStrategy, configurationOverrideMultiplexer, configurationMetadataProvider,
configBucketNames);
}
Copied: sling/trunk/bundles/extensions/caconfig/impl/src/main/java/org/apache/sling/caconfig/impl/override/ConfigurationOverrideMultiplexerImpl.java (from r1787624, sling/trunk/bundles/extensions/caconfig/impl/src/main/java/org/apache/sling/caconfig/impl/override/ConfigurationOverrideManager.java)
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/caconfig/impl/src/main/java/org/apache/sling/caconfig/impl/override/ConfigurationOverrideMultiplexerImpl.java?p2=sling/trunk/bundles/extensions/caconfig/impl/src/main/java/org/apache/sling/caconfig/impl/override/ConfigurationOverrideMultiplexerImpl.java&p1=sling/trunk/bundles/extensions/caconfig/impl/src/main/java/org/apache/sling/caconfig/impl/override/ConfigurationOverrideManager.java&r1=1787624&r2=1787633&rev=1787633&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/caconfig/impl/src/main/java/org/apache/sling/caconfig/impl/override/ConfigurationOverrideManager.java (original)
+++ sling/trunk/bundles/extensions/caconfig/impl/src/main/java/org/apache/sling/caconfig/impl/override/ConfigurationOverrideMultiplexerImpl.java Sun Mar 19 15:33:48 2017
@@ -29,6 +29,7 @@ import org.apache.commons.lang3.StringUt
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.wrappers.ValueMapDecorator;
import org.apache.sling.caconfig.impl.ConfigurationResourceWrapper;
+import org.apache.sling.caconfig.management.multiplexer.ConfigurationOverrideMultiplexer;
import org.apache.sling.caconfig.resource.impl.util.MapUtil;
import org.apache.sling.caconfig.spi.ConfigurationOverrideProvider;
import org.apache.sling.commons.osgi.Order;
@@ -46,19 +47,19 @@ import org.slf4j.LoggerFactory;
* Detects all {@link ConfigurationOverrideProvider} implementations in the container
* and consolidates their result based on service ranking.
*/
-@Component(service = ConfigurationOverrideManager.class,
+@Component(service = ConfigurationOverrideMultiplexer.class,
reference={
@Reference(name="configurationOverrideProvider", service=ConfigurationOverrideProvider.class,
bind="bindConfigurationOverrideProvider", unbind="unbindConfigurationOverrideProvider",
cardinality=ReferenceCardinality.MULTIPLE,
policy=ReferencePolicy.DYNAMIC, policyOption=ReferencePolicyOption.GREEDY)
})
-public class ConfigurationOverrideManager implements ChangeListener {
+public class ConfigurationOverrideMultiplexerImpl implements ConfigurationOverrideMultiplexer, ChangeListener {
private RankedServices<ConfigurationOverrideProvider> items = new RankedServices<>(Order.DESCENDING, this);
private volatile Collection<OverrideItem> allOverrides = Collections.emptyList();
- private static final Logger log = LoggerFactory.getLogger(ConfigurationOverrideManager.class);
+ private static final Logger log = LoggerFactory.getLogger(ConfigurationOverrideMultiplexerImpl.class);
protected void bindConfigurationOverrideProvider(ConfigurationOverrideProvider item, Map<String, Object> props) {
items.bind(item, props);
Modified: sling/trunk/bundles/extensions/caconfig/impl/src/main/java/org/apache/sling/caconfig/management/impl/ConfigurationDataImpl.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/caconfig/impl/src/main/java/org/apache/sling/caconfig/management/impl/ConfigurationDataImpl.java?rev=1787633&r1=1787632&r2=1787633&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/caconfig/impl/src/main/java/org/apache/sling/caconfig/management/impl/ConfigurationDataImpl.java (original)
+++ sling/trunk/bundles/extensions/caconfig/impl/src/main/java/org/apache/sling/caconfig/management/impl/ConfigurationDataImpl.java Sun Mar 19 15:33:48 2017
@@ -34,10 +34,10 @@ import org.apache.sling.api.resource.Res
import org.apache.sling.api.resource.ResourceUtil;
import org.apache.sling.api.resource.ValueMap;
import org.apache.sling.api.wrappers.ValueMapDecorator;
-import org.apache.sling.caconfig.impl.override.ConfigurationOverrideManager;
import org.apache.sling.caconfig.management.ConfigurationData;
import org.apache.sling.caconfig.management.ConfigurationManager;
import org.apache.sling.caconfig.management.ValueInfo;
+import org.apache.sling.caconfig.management.multiplexer.ConfigurationOverrideMultiplexer;
import org.apache.sling.caconfig.resource.impl.util.PropertiesFilterUtil;
import org.apache.sling.caconfig.spi.ConfigurationPersistenceStrategy2;
import org.apache.sling.caconfig.spi.metadata.ConfigurationMetadata;
@@ -52,7 +52,7 @@ final class ConfigurationDataImpl implem
private final Resource contextResource;
private final String configName;
private final ConfigurationManager configurationManager;
- private final ConfigurationOverrideManager configurationOverrideManager;
+ private final ConfigurationOverrideMultiplexer configurationOverrideMultiplexer;
private final ConfigurationPersistenceStrategy2 configurationPersistenceStrategy;
private final boolean configResourceCollection;
private final String collectionItemName;
@@ -67,7 +67,7 @@ final class ConfigurationDataImpl implem
Resource resolvedConfigurationResource, Resource writebackConfigurationResource,
Iterator<Resource> configurationResourceInheritanceChain,
Resource contextResource, String configName,
- ConfigurationManager configurationManager, ConfigurationOverrideManager configurationOverrideManager,
+ ConfigurationManager configurationManager, ConfigurationOverrideMultiplexer configurationOverrideMultiplexer,
ConfigurationPersistenceStrategy2 configurationPersistenceStrategy,
boolean configResourceCollection, String collectionItemName) {
this.configMetadata = configMetadata;
@@ -78,21 +78,21 @@ final class ConfigurationDataImpl implem
this.contextResource = contextResource;
this.configName = configName;
this.configurationManager = configurationManager;
- this.configurationOverrideManager = configurationOverrideManager;
+ this.configurationOverrideMultiplexer = configurationOverrideMultiplexer;
this.configurationPersistenceStrategy = configurationPersistenceStrategy;
this.configResourceCollection = configResourceCollection;
this.collectionItemName = collectionItemName;
- this.isAllOverridden = contextResource != null ? configurationOverrideManager.isAllOverridden(contextResource.getPath(), configName) : false;
+ this.isAllOverridden = contextResource != null ? configurationOverrideMultiplexer.isAllOverridden(contextResource.getPath(), configName) : false;
}
public ConfigurationDataImpl(ConfigurationMetadata configMetadata,
Resource contextResource, String configName,
- ConfigurationManager configurationManager, ConfigurationOverrideManager configurationOverrideManager,
+ ConfigurationManager configurationManager, ConfigurationOverrideMultiplexer configurationOverrideMultiplexer,
ConfigurationPersistenceStrategy2 configurationPersistenceStrategy,
boolean configResourceCollection) {
this(configMetadata, null, null, null,
contextResource, configName,
- configurationManager, configurationOverrideManager,
+ configurationManager, configurationOverrideMultiplexer,
configurationPersistenceStrategy,
configResourceCollection, null);
}
@@ -226,7 +226,7 @@ final class ConfigurationDataImpl implem
configurationResourceInheritanceChain,
contextResource,
configName,
- configurationOverrideManager,
+ configurationOverrideMultiplexer,
isAllOverridden);
}
Modified: sling/trunk/bundles/extensions/caconfig/impl/src/main/java/org/apache/sling/caconfig/management/impl/ConfigurationManagerImpl.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/caconfig/impl/src/main/java/org/apache/sling/caconfig/management/impl/ConfigurationManagerImpl.java?rev=1787633&r1=1787632&r2=1787633&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/caconfig/impl/src/main/java/org/apache/sling/caconfig/management/impl/ConfigurationManagerImpl.java (original)
+++ sling/trunk/bundles/extensions/caconfig/impl/src/main/java/org/apache/sling/caconfig/management/impl/ConfigurationManagerImpl.java Sun Mar 19 15:33:48 2017
@@ -36,12 +36,12 @@ import org.apache.commons.collections.it
import org.apache.commons.lang3.StringUtils;
import org.apache.sling.api.resource.Resource;
import org.apache.sling.caconfig.impl.ConfigurationResourceResolverConfig;
-import org.apache.sling.caconfig.impl.override.ConfigurationOverrideManager;
import org.apache.sling.caconfig.management.ConfigurationCollectionData;
import org.apache.sling.caconfig.management.ConfigurationData;
import org.apache.sling.caconfig.management.ConfigurationManager;
import org.apache.sling.caconfig.management.multiplexer.ConfigurationInheritanceStrategyMultiplexer;
import org.apache.sling.caconfig.management.multiplexer.ConfigurationMetadataProviderMultiplexer;
+import org.apache.sling.caconfig.management.multiplexer.ConfigurationOverrideMultiplexer;
import org.apache.sling.caconfig.management.multiplexer.ConfigurationPersistenceStrategyMultiplexer;
import org.apache.sling.caconfig.management.multiplexer.ConfigurationResourceResolvingStrategyMultiplexer;
import org.apache.sling.caconfig.resource.impl.util.ConfigNameUtil;
@@ -68,7 +68,7 @@ public class ConfigurationManagerImpl im
@Reference
private ConfigurationInheritanceStrategyMultiplexer configurationInheritanceStrategy;
@Reference
- private ConfigurationOverrideManager configurationOverrideManager;
+ private ConfigurationOverrideMultiplexer configurationOverrideMultiplexer;
@Reference
private ConfigurationResourceResolverConfig configurationResourceResolverConfig;
@@ -114,13 +114,13 @@ public class ConfigurationManagerImpl im
resettableConfigResourceInheritanceChain.reset();
return new ConfigurationDataImpl(configMetadata, configResource, writebackConfigResource,
applyPersistence(resettableConfigResourceInheritanceChain, false),
- resource, configName, this, configurationOverrideManager, configurationPersistenceStrategy, false, null);
+ resource, configName, this, configurationOverrideMultiplexer, configurationPersistenceStrategy, false, null);
}
}
if (configMetadata != null) {
// if no config resource found but config metadata exist return empty config data with default values
return new ConfigurationDataImpl(configMetadata,
- resource, configName, this, configurationOverrideManager, configurationPersistenceStrategy, false);
+ resource, configName, this, configurationOverrideMultiplexer, configurationPersistenceStrategy, false);
}
return null;
}
@@ -181,7 +181,7 @@ public class ConfigurationManagerImpl im
resettableConfigResourceInheritanceChain.reset();
configData.add(new ConfigurationDataImpl(configMetadata, configResource, writebackConfigResource,
applyPersistence(resettableConfigResourceInheritanceChain, true),
- resource, configName, this, configurationOverrideManager, configurationPersistenceStrategy,
+ resource, configName, this, configurationOverrideMultiplexer, configurationPersistenceStrategy,
true, untransformedConfigResource.getName()));
}
}
@@ -236,7 +236,7 @@ public class ConfigurationManagerImpl im
Resource configResource = configurationInheritanceStrategy.getResource(transformedConfigResources);
// apply overrides
- return configurationOverrideManager.overrideProperties(contextPath, configName, configResource);
+ return configurationOverrideMultiplexer.overrideProperties(contextPath, configName, configResource);
}
@Override
@@ -275,7 +275,7 @@ public class ConfigurationManagerImpl im
ConfigurationMetadata configMetadata = getConfigurationMetadata(configName);
if (configMetadata != null) {
return new ConfigurationDataImpl(configMetadata,
- resource, configName, this, configurationOverrideManager, configurationPersistenceStrategy, true);
+ resource, configName, this, configurationOverrideMultiplexer, configurationPersistenceStrategy, true);
}
return null;
}
Modified: sling/trunk/bundles/extensions/caconfig/impl/src/main/java/org/apache/sling/caconfig/management/impl/ValueInfoImpl.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/caconfig/impl/src/main/java/org/apache/sling/caconfig/management/impl/ValueInfoImpl.java?rev=1787633&r1=1787632&r2=1787633&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/caconfig/impl/src/main/java/org/apache/sling/caconfig/management/impl/ValueInfoImpl.java (original)
+++ sling/trunk/bundles/extensions/caconfig/impl/src/main/java/org/apache/sling/caconfig/management/impl/ValueInfoImpl.java Sun Mar 19 15:33:48 2017
@@ -25,8 +25,8 @@ import java.util.Map;
import org.apache.commons.lang3.StringUtils;
import org.apache.sling.api.resource.Resource;
-import org.apache.sling.caconfig.impl.override.ConfigurationOverrideManager;
import org.apache.sling.caconfig.management.ValueInfo;
+import org.apache.sling.caconfig.management.multiplexer.ConfigurationOverrideMultiplexer;
import org.apache.sling.caconfig.spi.metadata.PropertyMetadata;
final class ValueInfoImpl<T> implements ValueInfo<T> {
@@ -41,13 +41,13 @@ final class ValueInfoImpl<T> implements
private final List<Resource> configurationResourceInheritanceChain;
private final Resource contextResource;
private final String configName;
- private final ConfigurationOverrideManager configurationOverrideManager;
+ private final ConfigurationOverrideMultiplexer configurationOverrideMultiplexer;
private final boolean isAllOverridden;
public ValueInfoImpl(String name, T value, T effectiveValue, PropertyMetadata<T> propertyMetadata,
Resource resolvedConfigurationResource, Resource writebackConfigurationResource,
List<Resource> configurationResourceInheritanceChain,
- Resource contextResource, String configName, ConfigurationOverrideManager configurationOverrideManager,
+ Resource contextResource, String configName, ConfigurationOverrideMultiplexer configurationOverrideMultiplexer,
boolean isAllOverridden) {
this.name = name;
this.value = value;
@@ -59,7 +59,7 @@ final class ValueInfoImpl<T> implements
this.configurationResourceInheritanceChain = configurationResourceInheritanceChain;
this.contextResource = contextResource;
this.configName = configName;
- this.configurationOverrideManager = configurationOverrideManager;
+ this.configurationOverrideMultiplexer = configurationOverrideMultiplexer;
this.isAllOverridden = isAllOverridden;
}
@@ -159,7 +159,7 @@ final class ValueInfoImpl<T> implements
if (isAllOverridden) {
return true;
}
- Map<String,Object> overrideProperties = configurationOverrideManager.overrideProperties(
+ Map<String,Object> overrideProperties = configurationOverrideMultiplexer.overrideProperties(
contextResource.getPath(), configName, Collections.<String,Object>emptyMap());
if (overrideProperties != null) {
return overrideProperties.containsKey(name)
Added: sling/trunk/bundles/extensions/caconfig/impl/src/main/java/org/apache/sling/caconfig/management/multiplexer/ConfigurationOverrideMultiplexer.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/caconfig/impl/src/main/java/org/apache/sling/caconfig/management/multiplexer/ConfigurationOverrideMultiplexer.java?rev=1787633&view=auto
==============================================================================
--- sling/trunk/bundles/extensions/caconfig/impl/src/main/java/org/apache/sling/caconfig/management/multiplexer/ConfigurationOverrideMultiplexer.java (added)
+++ sling/trunk/bundles/extensions/caconfig/impl/src/main/java/org/apache/sling/caconfig/management/multiplexer/ConfigurationOverrideMultiplexer.java Sun Mar 19 15:33:48 2017
@@ -0,0 +1,60 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.sling.caconfig.management.multiplexer;
+
+import java.util.Map;
+
+import javax.annotation.CheckForNull;
+import javax.annotation.Nonnull;
+
+import org.apache.sling.api.resource.Resource;
+
+/**
+ * Detects all {@link org.apache.sling.caconfig.spi.ConfigurationOverrideProvider} implementations in the container
+ * and consolidates their result based on service ranking.
+ */
+public interface ConfigurationOverrideMultiplexer {
+
+ /**
+ * Checks if the whole configuration for the given context path and name is overridden.
+ * @param contextPath Context path
+ * @param configName Config name
+ * @return true if the whole configuration is overridden.
+ */
+ boolean isAllOverridden(@Nonnull String contextPath, @Nonnull String configName);
+
+ /**
+ * Override properties for given context path and configuration name.
+ * @param contextPath Path of context resource for which configuration was resolved
+ * @param configName Configuration name
+ * @param properties Resolved configuration properties
+ * @return Overwritten or replaced properties - or null if no override took place
+ */
+ @CheckForNull Map<String,Object> overrideProperties(@Nonnull String contextPath, @Nonnull String configName, @Nonnull Map<String,Object> properties);
+
+ /**
+ * Override properties in given configuration resource (if any overrides are defined).
+ * @param contextPath Context path
+ * @param configName Configuration name
+ * @param configResource Resolved configuration resource
+ * @return Resource with overwritten configuration properties - or original configuration resource if no override took place
+ */
+ @CheckForNull Resource overrideProperties(@Nonnull String contextPath, @Nonnull String configName, @CheckForNull Resource configResource);
+
+}
Propchange: sling/trunk/bundles/extensions/caconfig/impl/src/main/java/org/apache/sling/caconfig/management/multiplexer/ConfigurationOverrideMultiplexer.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: sling/trunk/bundles/extensions/caconfig/impl/src/main/java/org/apache/sling/caconfig/management/multiplexer/ConfigurationOverrideMultiplexer.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sun Mar 19 15:33:48 2017
@@ -0,0 +1 @@
+LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Author
Propchange: sling/trunk/bundles/extensions/caconfig/impl/src/main/java/org/apache/sling/caconfig/management/multiplexer/ConfigurationOverrideMultiplexer.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: sling/trunk/bundles/extensions/caconfig/impl/src/test/java/org/apache/sling/caconfig/impl/ConfigurationTestUtils.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/caconfig/impl/src/test/java/org/apache/sling/caconfig/impl/ConfigurationTestUtils.java?rev=1787633&r1=1787632&r2=1787633&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/caconfig/impl/src/test/java/org/apache/sling/caconfig/impl/ConfigurationTestUtils.java (original)
+++ sling/trunk/bundles/extensions/caconfig/impl/src/test/java/org/apache/sling/caconfig/impl/ConfigurationTestUtils.java Sun Mar 19 15:33:48 2017
@@ -22,7 +22,7 @@ import org.apache.sling.caconfig.Configu
import org.apache.sling.caconfig.impl.def.DefaultConfigurationInheritanceStrategy;
import org.apache.sling.caconfig.impl.def.DefaultConfigurationPersistenceStrategy;
import org.apache.sling.caconfig.impl.metadata.ConfigurationMetadataProviderMultiplexerImpl;
-import org.apache.sling.caconfig.impl.override.ConfigurationOverrideManager;
+import org.apache.sling.caconfig.impl.override.ConfigurationOverrideMultiplexerImpl;
import org.apache.sling.caconfig.management.impl.ConfigurationPersistenceStrategyMultiplexerImpl;
import org.apache.sling.caconfig.resource.impl.ConfigurationResourceTestUtils;
import org.apache.sling.testing.mock.sling.junit.SlingContext;
@@ -43,7 +43,7 @@ public final class ConfigurationTestUtil
context.registerInjectActivateService(new ConfigurationPersistenceStrategyMultiplexerImpl());
context.registerInjectActivateService(new DefaultConfigurationInheritanceStrategy());
context.registerInjectActivateService(new ConfigurationInheritanceStrategyMultiplexerImpl());
- context.registerInjectActivateService(new ConfigurationOverrideManager());
+ context.registerInjectActivateService(new ConfigurationOverrideMultiplexerImpl());
context.registerInjectActivateService(new ConfigurationMetadataProviderMultiplexerImpl());
return context.registerInjectActivateService(new ConfigurationResolverImpl(), properties);
}
@@ -57,7 +57,7 @@ public final class ConfigurationTestUtil
ConfigurationResourceTestUtils.registerConfigurationResourceResolverWithoutDefaultImpl(context);
context.registerInjectActivateService(new ConfigurationPersistenceStrategyMultiplexerImpl());
context.registerInjectActivateService(new ConfigurationInheritanceStrategyMultiplexerImpl());
- context.registerInjectActivateService(new ConfigurationOverrideManager());
+ context.registerInjectActivateService(new ConfigurationOverrideMultiplexerImpl());
context.registerInjectActivateService(new ConfigurationMetadataProviderMultiplexerImpl());
return context.registerInjectActivateService(new ConfigurationResolverImpl(), properties);
}
Copied: sling/trunk/bundles/extensions/caconfig/impl/src/test/java/org/apache/sling/caconfig/impl/override/ConfigurationOverrideMultiplexerImplTest.java (from r1787624, sling/trunk/bundles/extensions/caconfig/impl/src/test/java/org/apache/sling/caconfig/impl/override/ConfigurationOverrideManagerTest.java)
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/caconfig/impl/src/test/java/org/apache/sling/caconfig/impl/override/ConfigurationOverrideMultiplexerImplTest.java?p2=sling/trunk/bundles/extensions/caconfig/impl/src/test/java/org/apache/sling/caconfig/impl/override/ConfigurationOverrideMultiplexerImplTest.java&p1=sling/trunk/bundles/extensions/caconfig/impl/src/test/java/org/apache/sling/caconfig/impl/override/ConfigurationOverrideManagerTest.java&r1=1787624&r2=1787633&rev=1787633&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/caconfig/impl/src/test/java/org/apache/sling/caconfig/impl/override/ConfigurationOverrideManagerTest.java (original)
+++ sling/trunk/bundles/extensions/caconfig/impl/src/test/java/org/apache/sling/caconfig/impl/override/ConfigurationOverrideMultiplexerImplTest.java Sun Mar 19 15:33:48 2017
@@ -32,16 +32,16 @@ import org.osgi.framework.Constants;
import com.google.common.collect.ImmutableMap;
-public class ConfigurationOverrideManagerTest {
+public class ConfigurationOverrideMultiplexerImplTest {
@Rule
public SlingContext context = new SlingContext();
- private ConfigurationOverrideManager underTest;
+ private ConfigurationOverrideMultiplexerImpl underTest;
@Before
public void setUp() {
- underTest = context.registerInjectActivateService(new ConfigurationOverrideManager());
+ underTest = context.registerInjectActivateService(new ConfigurationOverrideMultiplexerImpl());
}
@Test
Modified: sling/trunk/bundles/extensions/caconfig/impl/src/test/java/org/apache/sling/caconfig/management/impl/ConfigurationDataImplTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/caconfig/impl/src/test/java/org/apache/sling/caconfig/management/impl/ConfigurationDataImplTest.java?rev=1787633&r1=1787632&r2=1787633&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/caconfig/impl/src/test/java/org/apache/sling/caconfig/management/impl/ConfigurationDataImplTest.java (original)
+++ sling/trunk/bundles/extensions/caconfig/impl/src/test/java/org/apache/sling/caconfig/management/impl/ConfigurationDataImplTest.java Sun Mar 19 15:33:48 2017
@@ -26,10 +26,10 @@ import static org.junit.Assert.assertTru
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ValueMap;
import org.apache.sling.caconfig.impl.def.DefaultConfigurationPersistenceStrategy;
-import org.apache.sling.caconfig.impl.override.ConfigurationOverrideManager;
import org.apache.sling.caconfig.management.ConfigurationData;
import org.apache.sling.caconfig.management.ConfigurationManager;
import org.apache.sling.caconfig.management.ValueInfo;
+import org.apache.sling.caconfig.management.multiplexer.ConfigurationOverrideMultiplexer;
import org.apache.sling.caconfig.spi.ConfigurationPersistenceStrategy2;
import org.apache.sling.caconfig.spi.metadata.ConfigurationMetadata;
import org.apache.sling.caconfig.spi.metadata.PropertyMetadata;
@@ -52,7 +52,7 @@ public class ConfigurationDataImplTest {
@Mock
private Resource contextResource;
@Mock
- private ConfigurationOverrideManager configurationOverrideManager;
+ private ConfigurationOverrideMultiplexer configurationOverrideMultiplexer;
@Mock
private ConfigurationManager configurationManager;
private ConfigurationPersistenceStrategy2 configurationPersistenceStrategy;
@@ -78,7 +78,7 @@ public class ConfigurationDataImplTest {
@Test
public void testWithResourceMetadata() {
ConfigurationData underTest = new ConfigurationDataImpl(configMetadata, configResource, configResource, null,
- contextResource, "test", configurationManager, configurationOverrideManager, configurationPersistenceStrategy,
+ contextResource, "test", configurationManager, configurationOverrideMultiplexer, configurationPersistenceStrategy,
true, "item1");
assertEquals("test", underTest.getConfigName());
@@ -122,7 +122,7 @@ public class ConfigurationDataImplTest {
@Test
public void testWithResourceOnly() {
ConfigurationData underTest = new ConfigurationDataImpl(null, configResource, configResource, null,
- contextResource, "test", configurationManager, configurationOverrideManager, configurationPersistenceStrategy,
+ contextResource, "test", configurationManager, configurationOverrideMultiplexer, configurationPersistenceStrategy,
false, null);
assertEquals("test", underTest.getConfigName());
@@ -152,7 +152,7 @@ public class ConfigurationDataImplTest {
@Test
public void testMetadataOnly() {
ConfigurationData underTest = new ConfigurationDataImpl(configMetadata,
- contextResource, "test", configurationManager, configurationOverrideManager, configurationPersistenceStrategy,
+ contextResource, "test", configurationManager, configurationOverrideMultiplexer, configurationPersistenceStrategy,
false);
assertEquals("test", underTest.getConfigName());
@@ -186,7 +186,7 @@ public class ConfigurationDataImplTest {
"jcr:primaryType", "myType");
ConfigurationData underTest = new ConfigurationDataImpl(null, resource, resource, null,
- contextResource, "test", configurationManager, configurationOverrideManager, configurationPersistenceStrategy,
+ contextResource, "test", configurationManager, configurationOverrideMultiplexer, configurationPersistenceStrategy,
false, null);
assertEquals(ImmutableSet.of("prop1", "prop4"), underTest.getPropertyNames());