[sling-org-apache-sling-resourcemerger] branch master updated: releng: some more fixes detected by SonarQube

[kwin]

This is an automated email from the ASF dual-hosted git repository.

kwin pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-resourcemerger.git


The following commit(s) were added to refs/heads/master by this push:
     new f65f2bd  releng: some more fixes detected by SonarQube
f65f2bd is described below

commit f65f2bd2ae8f7480ba33bb8244e2394f6f09518d
Author: Konrad Windszus <k...@apache.org>
AuthorDate: Wed Mar 10 09:51:41 2021 +0100

    releng: some more fixes detected by SonarQube
---
 .../org/apache/sling/resourcemerger/impl/CRUDMergedResource.java   | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git 
a/src/main/java/org/apache/sling/resourcemerger/impl/CRUDMergedResource.java 
b/src/main/java/org/apache/sling/resourcemerger/impl/CRUDMergedResource.java
index 28ebd74..f8e7a9c 100644
--- a/src/main/java/org/apache/sling/resourcemerger/impl/CRUDMergedResource.java
+++ b/src/main/java/org/apache/sling/resourcemerger/impl/CRUDMergedResource.java
@@ -34,6 +34,7 @@ import org.apache.sling.api.resource.ValueMap;
 import org.apache.sling.api.wrappers.DeepReadValueMapDecorator;
 import org.apache.sling.api.wrappers.ValueMapDecorator;
 import org.apache.sling.resourcemerger.spi.MergedResourcePicker2;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * {@inheritDoc}
@@ -70,8 +71,8 @@ public class CRUDMergedResource extends MergedResource {
     @SuppressWarnings("unchecked")
     public <AdapterType> AdapterType adaptTo(final Class<AdapterType> type) {
         if (type == ModifiableValueMap.class) {
-            final Iterator<Resource> iter = 
this.picker.pickResources(this.getResourceResolver(), this.relativePath, 
null).iterator();
-            Resource highestRsrc = null;
+            final Iterator<@NotNull Resource> iter = 
this.picker.pickResources(this.getResourceResolver(), this.relativePath, 
null).iterator();
+            @NotNull Resource highestRsrc = null;
             while ( iter.hasNext() ) {
                 highestRsrc = iter.next();
             }
@@ -80,7 +81,7 @@ public class CRUDMergedResource extends MergedResource {
 
                 final Resource copyResource = 
this.getResourceResolver().getResource(paths[paths.length - 1]);
                 try {
-                    final Resource newResource = 
ResourceUtil.getOrCreateResource(this.getResourceResolver(), 
highestRsrc.getPath(), copyResource.getResourceType(), null, false);
+                    final @NotNull Resource newResource = 
ResourceUtil.getOrCreateResource(this.getResourceResolver(), 
highestRsrc.getPath(), copyResource.getResourceType(), null, false);
                     final ModifiableValueMap target = 
newResource.adaptTo(ModifiableValueMap.class);
                     if ( target != null ) {
                         return (AdapterType)new ModifiableProperties(this, 
target);