[sling-org-apache-sling-api] 01/01: SLING-8975 Sling API: Resource.getResourceType should be @Nullable

[ss...@apache.org]

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

sseifert pushed a commit to branch feature/SLING-8975-resource-type-nullable
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-api.git

commit 461adb475cc4a1cc8b225800494dbb40ac8af9f4
Author: sseifert <ss...@pro-vision.de>
AuthorDate: Wed Jan 8 23:31:35 2020 +0100

    SLING-8975 Sling API: Resource.getResourceType should be @Nullable
---
 src/main/java/org/apache/sling/api/resource/Resource.java     | 2 +-
 src/main/java/org/apache/sling/api/resource/package-info.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/apache/sling/api/resource/Resource.java b/src/main/java/org/apache/sling/api/resource/Resource.java
index 5907637..63f6260 100644
--- a/src/main/java/org/apache/sling/api/resource/Resource.java
+++ b/src/main/java/org/apache/sling/api/resource/Resource.java
@@ -153,7 +153,7 @@ public interface Resource extends Adaptable {
      * existing, this method returns {@link #RESOURCE_TYPE_NON_EXISTING}.
      * @return The resource type
      */
-    @NotNull String getResourceType();
+    @Nullable String getResourceType();
 
     /**
      * Returns the super type of the resource if the resource defines its
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;