Author: sseifert
Date: Fri Dec 9 09:34:31 2016
New Revision: 1773347
URL: http://svn.apache.org/viewvc?rev=1773347&view=rev
Log:
improve trace logging
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/def/DefaultConfigurationInheritanceStrategy.java
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/impl/def/DefaultConfigurationPersistenceStrategy.java
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/impl/override/ConfigurationOverrideManager.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/main/java/org/apache/sling/caconfig/resource/impl/def/DefaultConfigurationResourceResolvingStrategy.java
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/resource/impl/def/DefaultContextPathStrategy.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=1773347&r1=1773346&r2=1773347&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
Fri Dec 9 09:34:31 2016
@@ -166,7 +166,7 @@ class ConfigurationBuilderImpl implement
}
}
if (log.isTraceEnabled() && configResource != null) {
- log.trace("Found config resource for context path " +
contentResource.getPath() + ": " + configResource.getPath() + " "
+ log.trace("+ Found config resource for context path " +
contentResource.getPath() + ": " + configResource.getPath() + " "
+ MapUtil.traceOutput(configResource.getValueMap()));
}
return converter.convert(configResource, clazz, conversionName);
Modified:
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/impl/def/DefaultConfigurationInheritanceStrategy.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/impl/def/DefaultConfigurationInheritanceStrategy.java?rev=1773347&r1=1773346&r2=1773347&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/impl/def/DefaultConfigurationInheritanceStrategy.java
(original)
+++
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/impl/def/DefaultConfigurationInheritanceStrategy.java
Fri Dec 9 09:34:31 2016
@@ -91,7 +91,7 @@ public class DefaultConfigurationInherit
return parentProps;
}
Resource next = inheritanceChain.next();
- log.trace("Property inheritance: Merge with properties from {}",
next.getPath());
+ log.trace("! Property inheritance: Merge with properties from {}",
next.getPath());
Map<String,Object> merged = new HashMap<>(next.getValueMap());
merged.putAll(parentProps);
if (isPropertyInheritance(next)) {
Modified:
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/impl/def/DefaultConfigurationPersistenceStrategy.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/impl/def/DefaultConfigurationPersistenceStrategy.java?rev=1773347&r1=1773346&r2=1773347&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/impl/def/DefaultConfigurationPersistenceStrategy.java
(original)
+++
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/impl/def/DefaultConfigurationPersistenceStrategy.java
Fri Dec 9 09:34:31 2016
@@ -27,7 +27,6 @@ import org.apache.sling.api.resource.Per
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ResourceResolver;
import org.apache.sling.api.resource.ResourceUtil;
-import org.apache.sling.api.resource.ValueMap;
import org.apache.sling.caconfig.resource.impl.util.MapUtil;
import org.apache.sling.caconfig.resource.impl.util.PropertiesFilterUtil;
import org.apache.sling.caconfig.spi.ConfigurationCollectionPersistData;
@@ -104,7 +103,7 @@ public class DefaultConfigurationPersist
if (!config.enabled()) {
return false;
}
- Resource configResourceParent = getOrCreateResource(resourceResolver,
configResourceCollectionParentPath, ValueMap.EMPTY);
+ Resource configResourceParent = getOrCreateResource(resourceResolver,
configResourceCollectionParentPath, data.getProperties());
// delete existing children and create new ones
deleteChildren(configResourceParent);
@@ -113,11 +112,6 @@ public class DefaultConfigurationPersist
getOrCreateResource(resourceResolver, path, item.getProperties());
}
- // if resource collection parent properties are given replace them as
well
- if (data.getProperties() != null) {
- replaceProperties(configResourceParent, data.getProperties());
- }
-
commit(resourceResolver);
return true;
}
@@ -130,7 +124,7 @@ public class DefaultConfigurationPersist
Resource resource = resourceResolver.getResource(configResourcePath);
if (resource != null) {
try {
- log.trace("Delete resource {}", resource.getPath());
+ log.trace("! Delete resource {}", resource.getPath());
resourceResolver.delete(resource);
}
catch (PersistenceException ex) {
@@ -144,7 +138,9 @@ public class DefaultConfigurationPersist
private Resource getOrCreateResource(ResourceResolver resourceResolver,
String path, Map<String,Object> properties) {
try {
Resource resource =
ResourceUtil.getOrCreateResource(resourceResolver, path, (String)null,
(String)null, false);
- replaceProperties(resource, properties);
+ if (properties != null) {
+ replaceProperties(resource, properties);
+ }
return resource;
}
catch (PersistenceException ex) {
@@ -156,7 +152,7 @@ public class DefaultConfigurationPersist
ResourceResolver resourceResolver = resource.getResourceResolver();
try {
for (Resource child : resource.getChildren()) {
- log.trace("Delete resource {}", child.getPath());
+ log.trace("! Delete resource {}", child.getPath());
resourceResolver.delete(child);
}
}
@@ -167,7 +163,7 @@ public class DefaultConfigurationPersist
private void replaceProperties(Resource resource, Map<String,Object>
properties) {
if (log.isTraceEnabled()) {
- log.trace("Replace properties of resource {} with {}",
resource.getPath(), MapUtil.traceOutput(properties));
+ log.trace("! Store properties for resource {}: {}",
resource.getPath(), MapUtil.traceOutput(properties));
}
ModifiableValueMap modValueMap =
resource.adaptTo(ModifiableValueMap.class);
// remove all existing properties that are not filterd
Modified:
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/impl/override/ConfigurationOverrideManager.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/impl/override/ConfigurationOverrideManager.java?rev=1773347&r1=1773346&r2=1773347&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/impl/override/ConfigurationOverrideManager.java
(original)
+++
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/impl/override/ConfigurationOverrideManager.java
Fri Dec 9 09:34:31 2016
@@ -116,7 +116,7 @@ public class ConfigurationOverrideManage
return configResource;
}
if (log.isTraceEnabled()) {
- log.trace("Override properties for context path " + contextPath +
", name '" + configName + "', "
+ log.trace("! Override properties for context path " + contextPath
+ ", name '" + configName + "', "
+ "config path " + configResource.getPath() + ": "
+ MapUtil.traceOutput(configResource.getValueMap()) + " ->
" + MapUtil.traceOutput(overrideProperties));
}
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=1773347&r1=1773346&r2=1773347&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
Fri Dec 9 09:34:31 2016
@@ -76,7 +76,7 @@ public class ConfigurationManagerImpl im
public ConfigurationData getConfiguration(Resource resource, String
configName) {
ConfigNameUtil.ensureValidConfigName(configName);
if (log.isDebugEnabled()) {
- log.debug("Get configuration for context path {}, name '{}', class
{}", resource.getPath(), configName);
+ log.debug("Get configuration for context path {}, name '{}'",
resource.getPath(), configName);
}
ConfigurationMetadata configMetadata =
getConfigurationMetadata(configName);
Resource configResource = null;
@@ -104,7 +104,7 @@ public class ConfigurationManagerImpl im
}
if (log.isTraceEnabled() && configResource != null) {
- log.trace("Found config resource for context path " +
resource.getPath() + ": " + configResource.getPath() + " "
+ log.trace("+ Found config resource for context path " +
resource.getPath() + ": " + configResource.getPath() + " "
+
MapUtil.traceOutput(configResource.getValueMap()) + ", "
+ "writeback config resource: " +
writebackConfigResourcePath);
}
@@ -127,7 +127,7 @@ public class ConfigurationManagerImpl im
public ConfigurationCollectionData getConfigurationCollection(Resource
resource, String configName) {
ConfigNameUtil.ensureValidConfigName(configName);
if (log.isDebugEnabled()) {
- log.debug("Get configuration collection for context path {}, name
'{}', class {}", resource.getPath(), configName);
+ log.debug("Get configuration collection for context path {}, name
'{}'", resource.getPath(), configName);
}
ConfigurationMetadata configMetadata =
getConfigurationMetadata(configName);
List<ConfigurationData> configData = new ArrayList<>();
@@ -161,7 +161,7 @@ public class ConfigurationManagerImpl im
}
if (log.isTraceEnabled() && configResource != null) {
- log.trace("Found config resource for context path " +
resource.getPath() + ": " + configResource.getPath() + " "
+ log.trace("+ Found config resource for context path "
+ resource.getPath() + ": " + configResource.getPath() + " "
+
MapUtil.traceOutput(configResource.getValueMap()) + ", "
+ "writeback config resource: " +
writebackConfigResourcePath);
}
@@ -294,7 +294,7 @@ public class ConfigurationManagerImpl im
ConfigNameUtil.ensureValidConfigName(configName);
ConfigurationMetadata metadata =
configurationMetadataProvider.getConfigurationMetadata(configName);
if (metadata != null) {
- log.trace("Configuration metadata found for: {}", configName);
+ log.trace("+ Configuration metadata found for: {}", configName);
return metadata;
}
@@ -304,13 +304,13 @@ public class ConfigurationManagerImpl im
if (partialConfigMetadata != null) {
ConfigurationMetadata nestedConfigMetadata =
getNestedConfigurationMetadata(partialConfigMetadata, configName,
partialConfigName);
if (nestedConfigMetadata != null) {
- log.trace("Nested configuration metadata found for: {}",
configName);
+ log.trace("+ Nested configuration metadata found for: {}",
configName);
return nestedConfigMetadata;
}
}
}
- log.trace("No configuration metadata found for: {}", configName);
+ log.trace("- No configuration metadata found for: {}", configName);
return null;
}
Modified:
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/resource/impl/def/DefaultConfigurationResourceResolvingStrategy.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/resource/impl/def/DefaultConfigurationResourceResolvingStrategy.java?rev=1773347&r1=1773346&r2=1773347&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/resource/impl/def/DefaultConfigurationResourceResolvingStrategy.java
(original)
+++
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/resource/impl/def/DefaultConfigurationResourceResolvingStrategy.java
Fri Dec 9 09:34:31 2016
@@ -158,7 +158,7 @@ public class DefaultConfigurationResourc
final ContextResource contextResource =
relativePaths.remove(relativePaths.size() - 1);
val = checkPath(contextResource,
useFromRelativePathsWith + "/" + contextResource.getConfigRef(), bucketNames);
if (val != null) {
- log.trace("Found reference for context path {}:
{}", contextResource.getResource().getPath(), val);
+ log.trace("+ Found reference for context path {}:
{}", contextResource.getResource().getPath(), val);
}
if ( relativePaths.isEmpty() ) {
useFromRelativePathsWith = null;
@@ -184,7 +184,7 @@ public class DefaultConfigurationResourc
}
if (val != null) {
- log.trace("Found reference for context path {}:
{}", contextResource.getResource().getPath(), val);
+ log.trace("+ Found reference for context path {}:
{}", contextResource.getResource().getPath(), val);
}
}
}
@@ -288,11 +288,15 @@ public class DefaultConfigurationResourc
String path = (String)input;
for (String bucketName : bucketNames) {
final String name = bucketName + "/" + configName;
- Resource resource =
resourceResolver.getResource(buildResourcePath(path, name));
+ final String configPath = buildResourcePath(path, name);
+ Resource resource =
resourceResolver.getResource(configPath);
if (resource != null) {
- log.trace("Matching config resource for inheritance
chain: {}", resource.getPath());
+ log.trace("+ Found matching config resource for
inheritance chain: {}", configPath);
return resource;
}
+ else {
+ log.trace("- No matching config resource for
inheritance chain: {}", configPath);
+ }
}
return null;
}
@@ -324,12 +328,12 @@ public class DefaultConfigurationResourc
for(int i=deciders.size()-1;i>=0;i--) {
final InheritanceDecision decision =
deciders.get(i).decide(resource, bucketName);
if ( decision == InheritanceDecision.EXCLUDE ) {
- log.trace("Block resource collection inheritance for
bucket {}, resource {} because {} retruned EXCLUDE.",
+ log.trace("- Block resource collection inheritance for
bucket {}, resource {} because {} retruned EXCLUDE.",
bucketName, resource.getPath(), deciders.get(i));
result = false;
break;
} else if ( decision == InheritanceDecision.BLOCK ) {
- log.trace("Block resource collection inheritance for
bucket {}, resource {} because {} retruned BLOCK.",
+ log.trace("- Block resource collection inheritance for
bucket {}, resource {} because {} retruned BLOCK.",
bucketName, resource.getPath(), deciders.get(i));
result = false;
blockedItems.add(resource.getName());
@@ -355,22 +359,28 @@ public class DefaultConfigurationResourc
String bucketNameUsed = null;
for (String bucketName : bucketNames) {
String name = bucketName + "/" + configName;
- item = resourceResolver.getResource(buildResourcePath(path,
name));
+ String configPath = buildResourcePath(path, name);
+ item = resourceResolver.getResource(configPath);
if (item != null) {
bucketNameUsed = bucketName;
break;
}
+ else {
+ log.trace("- No collection parent resource found: {}",
configPath);
+ }
}
if (item != null) {
- log.trace("Check children of collection parent resource {}",
item.getPath());
- for (Resource child : item.getChildren()) {
- if (isValidResourceCollectionItem(child)
- && !result.containsKey(child.getName())
- && include(deciders, bucketNameUsed, child,
blockedItems)) {
- log.trace("Found collection resource item {}",
item.getPath());
- result.put(child.getName(), child);
- }
+ log.trace("o Check children of collection parent resource:
{}", item.getPath());
+ if (item.hasChildren()) {
+ for (Resource child : item.getChildren()) {
+ if (isValidResourceCollectionItem(child)
+ && !result.containsKey(child.getName())
+ && include(deciders, bucketNameUsed, child,
blockedItems)) {
+ log.trace("+ Found collection resource item {}",
child.getPath());
+ result.put(child.getName(), child);
+ }
+ }
}
// check collection inheritance mode on current level - should
we check on next-highest level as well?
@@ -446,11 +456,11 @@ public class DefaultConfigurationResourc
Iterator<String> configPaths = this.findConfigRefs(contentResource,
Collections.singleton(bucketName));
if (configPaths.hasNext()) {
String configPath = buildResourcePath(configPaths.next(), name);
- log.trace("Building configuration path {} for resource {}: {}",
name, contentResource.getPath(), configPath);
+ log.trace("+ Building configuration path for name '{}' for
resource {}: {}", name, contentResource.getPath(), configPath);
return configPath;
}
else {
- log.trace("No configuration path {} found for resource {}.", name,
contentResource.getPath());
+ log.trace("- No configuration path for name '{}' found for
resource {}", name, contentResource.getPath());
return null;
}
}
Modified:
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/resource/impl/def/DefaultContextPathStrategy.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/resource/impl/def/DefaultContextPathStrategy.java?rev=1773347&r1=1773346&r2=1773347&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/resource/impl/def/DefaultContextPathStrategy.java
(original)
+++
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/resource/impl/def/DefaultContextPathStrategy.java
Fri Dec 9 09:34:31 2016
@@ -120,7 +120,7 @@ public class DefaultContextPathStrategy
while (resource != null) {
String configRef = getConfigRef(resource);
if (configRef != null) {
- log.trace("Found context path {}, configRef {}",
resource.getPath(), configRef);
+ log.trace("+ Found context path {}, configRef {}",
resource.getPath(), configRef);
return new ContextResource(resource, configRef);
}
// if getParent() returns null, stop
