commit 52873bc46fa2ff8e81d506535e0294ae2773c22f
author sseifert <sseifert@pro-vision.de> Fri Jan 10 12:17:00 2020 +0100
committer sseifert <sseifert@pro-vision.de> Fri Jan 10 12:17:00 2020 +0100
tree 88c713cf5e1bf620d71dab1a66950aba715b4226
parent 5c968507cc26cda997ec458a7cf67ee21059a362

SLING-8984 SyntheticResource and ResourceWrapper: Add missing @NotNull annotations

src/main/java/org/apache/sling/api/resource/ResourceWrapper.java

diff --git a/src/main/java/org/apache/sling/api/resource/ResourceWrapper.java b/src/main/java/org/apache/sling/api/resource/ResourceWrapper.java
index 27b4ce4..7d0d997 100644
--- a/src/main/java/org/apache/sling/api/resource/ResourceWrapper.java
+++ b/src/main/java/org/apache/sling/api/resource/ResourceWrapper.java
@@ -57,7 +57,7 @@
      * {@link #getResource() wrapped resource}.
      */
     @Override
-    public String getPath() {
+    public @NotNull String getPath() {
         return getResource().getPath();
     }
 
@@ -68,7 +68,7 @@
      * @since 2.1.0 (Sling API Bundle 2.1.0)
      */
     @Override
-    public String getName() {
+    public @NotNull String getName() {
         return getResource().getName();
     }
 
@@ -90,7 +90,7 @@
      * @since 2.1.0 (Sling API Bundle 2.1.0)
      */
     @Override
-    public Resource getChild(String relPath) {
+    public Resource getChild(@NotNull String relPath) {
         return getResource().getChild(relPath);
     }
 
@@ -101,7 +101,7 @@
      * @since 2.1.0 (Sling API Bundle 2.1.0)
      */
     @Override
-    public Iterator<Resource> listChildren() {
+    public @NotNull Iterator<Resource> listChildren() {
         return getResource().listChildren();
     }
 
@@ -109,7 +109,7 @@
      * @see org.apache.sling.api.resource.Resource#getChildren()
      */
     @Override
-    public Iterable<Resource> getChildren() {
+    public @NotNull Iterable<Resource> getChildren() {
         return getResource().getChildren();
     }
 
@@ -118,7 +118,7 @@
      * {@link #getResource() wrapped resource}.
      */
     @Override
-    public ResourceMetadata getResourceMetadata() {
+    public @NotNull ResourceMetadata getResourceMetadata() {
         return getResource().getResourceMetadata();
     }
 
@@ -127,7 +127,7 @@
      * {@link #getResource() wrapped resource}.
      */
     @Override
-    public ResourceResolver getResourceResolver() {
+    public @NotNull ResourceResolver getResourceResolver() {
         return getResource().getResourceResolver();
     }
 
@@ -136,7 +136,7 @@
      * {@link #getResource() wrapped resource}.
      */
     @Override
-    public String getResourceType() {
+    public @NotNull String getResourceType() {
         return getResource().getResourceType();
     }
 
@@ -176,7 +176,8 @@
      * {@link #getResource() wrapped resource}.
      */
     @Override
-    public <AdapterType> AdapterType adaptTo(Class<AdapterType> type) {
+    @SuppressWarnings("null")
+    public <AdapterType> AdapterType adaptTo(@NotNull Class<AdapterType> type) {
         return getResource().adaptTo(type);
     }
 
@@ -184,7 +185,7 @@
      * @see org.apache.sling.api.resource.Resource#getValueMap()
      */
     @Override
-    public ValueMap getValueMap() {
+    public @NotNull ValueMap getValueMap() {
         return getResource().getValueMap();
     }
 

src/main/java/org/apache/sling/api/resource/SyntheticResource.java

diff --git a/src/main/java/org/apache/sling/api/resource/SyntheticResource.java b/src/main/java/org/apache/sling/api/resource/SyntheticResource.java
index 67f4d7c..1c8ab9d 100644
--- a/src/main/java/org/apache/sling/api/resource/SyntheticResource.java
+++ b/src/main/java/org/apache/sling/api/resource/SyntheticResource.java
@@ -46,8 +46,8 @@
      * @param path The resource path
      * @param resourceType The type of the resource
      */
-    public SyntheticResource(ResourceResolver resourceResolver, String path,
-            String resourceType) {
+    public SyntheticResource(@NotNull ResourceResolver resourceResolver, @NotNull String path,
+            @NotNull String resourceType) {
         this.resourceResolver = resourceResolver;
         this.path = path;
         this.resourceType = resourceType;
@@ -62,8 +62,8 @@
      * @param rm The resource meta data
      * @param resourceType The type of the resource
      */
-    public SyntheticResource(ResourceResolver resourceResolver, ResourceMetadata rm,
-    		String resourceType) {
+    public SyntheticResource(@NotNull ResourceResolver resourceResolver, @NotNull ResourceMetadata rm,
+            @NotNull String resourceType) {
         this.resourceResolver = resourceResolver;
         this.path = rm.getResolutionPath();
         this.resourceType = resourceType;

src/main/java/org/apache/sling/api/resource/package-info.java

diff --git a/src/main/java/org/apache/sling/api/resource/package-info.java b/src/main/java/org/apache/sling/api/resource/package-info.java
index 8c5083b..7bd85e6 100644
--- a/src/main/java/org/apache/sling/api/resource/package-info.java
+++ b/src/main/java/org/apache/sling/api/resource/package-info.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-@Version("2.12.1")
+@Version("2.12.2")
 package org.apache.sling.api.resource;
 
 import org.osgi.annotation.versioning.Version;