This is an automated email from the ASF dual-hosted git repository.
sseifert pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-caconfig-impl.git
The following commit(s) were added to refs/heads/master by this push:
new 16af393 trivial code changes to avoid null warnings that should not
change the logic
16af393 is described below
commit 16af393f824b30fe46fcc2c7c0b5f9a5178c99f5
Author: sseifert <[email protected]>
AuthorDate: Thu Apr 4 13:46:55 2019 +0200
trivial code changes to avoid null warnings that should not change the logic
---
.../caconfig/impl/ConfigurationBuilderImpl.java | 10 ++--
...notationClassConfigurationMetadataProvider.java | 1 +
.../management/impl/ConfigurationManagerImpl.java | 66 +++++++++++-----------
.../impl/console/ConfigurationMetadataPrinter.java | 3 +
.../console/ConfigurationWebConsolePlugin.java | 3 +
.../impl/ConfigurationResourceResolverImpl.java | 6 +-
6 files changed, 48 insertions(+), 41 deletions(-)
diff --git
a/src/main/java/org/apache/sling/caconfig/impl/ConfigurationBuilderImpl.java
b/src/main/java/org/apache/sling/caconfig/impl/ConfigurationBuilderImpl.java
index 2cdb7aa..0ca27cd 100644
--- a/src/main/java/org/apache/sling/caconfig/impl/ConfigurationBuilderImpl.java
+++ b/src/main/java/org/apache/sling/caconfig/impl/ConfigurationBuilderImpl.java
@@ -171,12 +171,10 @@ class ConfigurationBuilderImpl implements
ConfigurationBuilder {
}
final Collection<T> result = new ArrayList<>();
- if (resourceInheritanceChains != null) {
- for (final Iterator<Resource> resourceInheritanceChain :
resourceInheritanceChains) {
- final T obj = convert(resourceInheritanceChain, clazz,
converter, configName, true);
- if (obj != null) {
- result.add(obj);
- }
+ for (final Iterator<Resource> resourceInheritanceChain :
resourceInheritanceChains) {
+ final T obj = convert(resourceInheritanceChain, clazz,
converter, configName, true);
+ if (obj != null) {
+ result.add(obj);
}
}
return result;
diff --git
a/src/main/java/org/apache/sling/caconfig/impl/metadata/AnnotationClassConfigurationMetadataProvider.java
b/src/main/java/org/apache/sling/caconfig/impl/metadata/AnnotationClassConfigurationMetadataProvider.java
index c13ab75..28ccc14 100644
---
a/src/main/java/org/apache/sling/caconfig/impl/metadata/AnnotationClassConfigurationMetadataProvider.java
+++
b/src/main/java/org/apache/sling/caconfig/impl/metadata/AnnotationClassConfigurationMetadataProvider.java
@@ -87,6 +87,7 @@ public class AnnotationClassConfigurationMetadataProvider
implements Configurati
* @param configName Configuration name
* @return Configuration mapping or null if none found
*/
+ @SuppressWarnings("null")
ConfigurationMapping getConfigurationMapping(String configName) {
ConfigurationMapping matchingConfigMapping = null;
BundleConfigurationMapping matchingBundleMapping = null;
diff --git
a/src/main/java/org/apache/sling/caconfig/management/impl/ConfigurationManagerImpl.java
b/src/main/java/org/apache/sling/caconfig/management/impl/ConfigurationManagerImpl.java
index 244632e..cdf070b 100644
---
a/src/main/java/org/apache/sling/caconfig/management/impl/ConfigurationManagerImpl.java
+++
b/src/main/java/org/apache/sling/caconfig/management/impl/ConfigurationManagerImpl.java
@@ -111,7 +111,7 @@ public class ConfigurationManagerImpl implements
ConfigurationManager {
}
}
- if (log.isTraceEnabled() && configResource != null) {
+ if (log.isTraceEnabled()) {
log.trace("+ Found config resource for context path " +
resource.getPath() + ": " + configResource.getPath() + " "
+
MapUtil.traceOutput(configResource.getValueMap()) + ", "
+ "writeback config resource: " +
writebackConfigResourcePath);
@@ -164,42 +164,40 @@ public class ConfigurationManagerImpl implements
ConfigurationManager {
}
String writebackConfigResourceCollectionParentPath = null;
- if (configResourceInheritanceChains != null) {
- for (Iterator<Resource> configResourceInheritanceChain :
configResourceInheritanceChains) {
- ResettableIterator resettableConfigResourceInheritanceChain =
new ListIteratorWrapper(configResourceInheritanceChain);
- Resource configResource =
applyPersistenceAndInheritance(resource.getPath(), configName,
resettableConfigResourceInheritanceChain, true, resource.getResourceResolver());
- resettableConfigResourceInheritanceChain.reset();
- Resource untransformedConfigResource =
(Resource)resettableConfigResourceInheritanceChain.next();
- if (configResource != null) {
- // get writeback resource for "reverse inheritance
detection"
- Resource writebackConfigResource = null;
-
- String writebackConfigResourcePath = null;
- for (String configBucketName :
configurationResourceResolverConfig.configBucketNames()) {
- writebackConfigResourceCollectionParentPath =
configurationResourceResolvingStrategy.getResourceCollectionParentPath(resource,
configBucketName, configName);
- if (writebackConfigResourceCollectionParentPath !=
null) {
- writebackConfigResourceCollectionParentPath =
configurationPersistenceStrategy.getCollectionParentResourcePath(writebackConfigResourceCollectionParentPath);
- writebackConfigResourcePath =
writebackConfigResourceCollectionParentPath + "/" +
untransformedConfigResource.getName();
- writebackConfigResource =
configResource.getResourceResolver().getResource(writebackConfigResourcePath);
- if (writebackConfigResource != null) {
- writebackConfigResource =
configurationPersistenceStrategy.getCollectionItemResource(writebackConfigResource);
- break;
- }
+ for (Iterator<Resource> configResourceInheritanceChain :
configResourceInheritanceChains) {
+ ResettableIterator resettableConfigResourceInheritanceChain = new
ListIteratorWrapper(configResourceInheritanceChain);
+ Resource configResource =
applyPersistenceAndInheritance(resource.getPath(), configName,
resettableConfigResourceInheritanceChain, true, resource.getResourceResolver());
+ resettableConfigResourceInheritanceChain.reset();
+ Resource untransformedConfigResource =
(Resource)resettableConfigResourceInheritanceChain.next();
+ if (configResource != null) {
+ // get writeback resource for "reverse inheritance detection"
+ Resource writebackConfigResource = null;
+
+ String writebackConfigResourcePath = null;
+ for (String configBucketName :
configurationResourceResolverConfig.configBucketNames()) {
+ writebackConfigResourceCollectionParentPath =
configurationResourceResolvingStrategy.getResourceCollectionParentPath(resource,
configBucketName, configName);
+ if (writebackConfigResourceCollectionParentPath != null) {
+ writebackConfigResourceCollectionParentPath =
configurationPersistenceStrategy.getCollectionParentResourcePath(writebackConfigResourceCollectionParentPath);
+ writebackConfigResourcePath =
writebackConfigResourceCollectionParentPath + "/" +
untransformedConfigResource.getName();
+ writebackConfigResource =
configResource.getResourceResolver().getResource(writebackConfigResourcePath);
+ if (writebackConfigResource != null) {
+ writebackConfigResource =
configurationPersistenceStrategy.getCollectionItemResource(writebackConfigResource);
+ break;
}
}
-
- if (log.isTraceEnabled() && configResource != null) {
- log.trace("+ Found config resource for context path "
+ resource.getPath() + ": " + configResource.getPath() + " "
- +
MapUtil.traceOutput(configResource.getValueMap()) + ", "
- + "writeback config resource: " +
writebackConfigResourcePath);
- }
- resettableConfigResourceInheritanceChain.reset();
- configData.add(new ConfigurationDataImpl(configMetadata,
configResource, writebackConfigResource,
-
applyPersistence(resettableConfigResourceInheritanceChain, true),
- resource, configName, this,
configurationManagementSettings,
- configurationOverrideMultiplexer,
configurationPersistenceStrategy,
- true, untransformedConfigResource.getName()));
}
+
+ if (log.isTraceEnabled()) {
+ log.trace("+ Found config resource for context path " +
resource.getPath() + ": " + configResource.getPath() + " "
+ +
MapUtil.traceOutput(configResource.getValueMap()) + ", "
+ + "writeback config resource: " +
writebackConfigResourcePath);
+ }
+ resettableConfigResourceInheritanceChain.reset();
+ configData.add(new ConfigurationDataImpl(configMetadata,
configResource, writebackConfigResource,
+
applyPersistence(resettableConfigResourceInheritanceChain, true),
+ resource, configName, this,
configurationManagementSettings,
+ configurationOverrideMultiplexer,
configurationPersistenceStrategy,
+ true, untransformedConfigResource.getName()));
}
}
// fallback for writeback path detection when no configuration
resources does exist yet
diff --git
a/src/main/java/org/apache/sling/caconfig/management/impl/console/ConfigurationMetadataPrinter.java
b/src/main/java/org/apache/sling/caconfig/management/impl/console/ConfigurationMetadataPrinter.java
index 5d0bf79..04a7587 100644
---
a/src/main/java/org/apache/sling/caconfig/management/impl/console/ConfigurationMetadataPrinter.java
+++
b/src/main/java/org/apache/sling/caconfig/management/impl/console/ConfigurationMetadataPrinter.java
@@ -38,6 +38,9 @@ class ConfigurationMetadataPrinter implements
ServiceConfigurationPrinter<Config
for (String configName : service.getConfigurationNames()) {
ConfigurationMetadata metadata =
service.getConfigurationMetadata(configName);
+ if (metadata == null) {
+ continue;
+ }
pw.print(INDENT);
pw.print(BULLET);
pw.println(metadata.getName());
diff --git
a/src/main/java/org/apache/sling/caconfig/management/impl/console/ConfigurationWebConsolePlugin.java
b/src/main/java/org/apache/sling/caconfig/management/impl/console/ConfigurationWebConsolePlugin.java
index c81c6b2..360b5f5 100644
---
a/src/main/java/org/apache/sling/caconfig/management/impl/console/ConfigurationWebConsolePlugin.java
+++
b/src/main/java/org/apache/sling/caconfig/management/impl/console/ConfigurationWebConsolePlugin.java
@@ -224,6 +224,9 @@ public class ConfigurationWebConsolePlugin extends
AbstractWebConsolePlugin {
for (String propertyName : data.getPropertyNames()) {
ValueInfo<?> valueInfo =
data.getValueInfo(propertyName);
+ if (valueInfo == null) {
+ continue;
+ }
tableRows(pw);
td(pw, propertyName);
td(pw, valueInfo.getEffectiveValue());
diff --git
a/src/main/java/org/apache/sling/caconfig/resource/impl/ConfigurationResourceResolverImpl.java
b/src/main/java/org/apache/sling/caconfig/resource/impl/ConfigurationResourceResolverImpl.java
index 41495b2..56c3429 100644
---
a/src/main/java/org/apache/sling/caconfig/resource/impl/ConfigurationResourceResolverImpl.java
+++
b/src/main/java/org/apache/sling/caconfig/resource/impl/ConfigurationResourceResolverImpl.java
@@ -51,7 +51,11 @@ public class ConfigurationResourceResolverImpl implements
ConfigurationResourceR
@Override
public @NotNull Collection<Resource> getResourceCollection(@NotNull
Resource resource, @NotNull String bucketName, @NotNull String configName) {
ConfigNameUtil.ensureValidConfigName(configName);
- return
configurationResourceResolvingStrategy.getResourceCollection(resource,
Collections.singleton(bucketName), configName);
+ Collection<Resource> result =
configurationResourceResolvingStrategy.getResourceCollection(resource,
Collections.singleton(bucketName), configName);
+ if (result == null) {
+ result = Collections.emptyList();
+ }
+ return result;
}
@Override
