[sling-org-apache-sling-scripting-thymeleaf] branch master updated: SLING-7798 Switch from JSR-305 annotations to JetBrains Nullable/NotNull annotations

[ol...@apache.org]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 5db3c07  SLING-7798 Switch from JSR-305 annotations to JetBrains Nullable/NotNull annotations
5db3c07 is described below

commit 5db3c0732bba625cf2f5d8b6c28b063b1de56181
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Sat Aug 11 12:33:20 2018 +0200

    SLING-7798 Switch from JSR-305 annotations to JetBrains Nullable/NotNull annotations
---
 pom.xml                                                           | 8 ++++----
 .../scripting/thymeleaf/AbsentMessageRepresentationProvider.java  | 4 +++-
 .../apache/sling/scripting/thymeleaf/TemplateModeProvider.java    | 4 +++-
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index a680d4e..a384952 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.sling</groupId>
     <artifactId>sling</artifactId>
-    <version>33</version>
+    <version>34</version>
     <relativePath />
   </parent>
 
@@ -199,10 +199,10 @@
       <version>1.11.3</version>
       <scope>test</scope>
     </dependency>
-    <!-- jsr305 -->
+    <!-- nullability -->
     <dependency>
-      <groupId>com.google.code.findbugs</groupId>
-      <artifactId>jsr305</artifactId>
+      <groupId>org.jetbrains</groupId>
+      <artifactId>annotations</artifactId>
     </dependency>
     <!-- logging -->
     <dependency>
diff --git a/src/main/java/org/apache/sling/scripting/thymeleaf/AbsentMessageRepresentationProvider.java b/src/main/java/org/apache/sling/scripting/thymeleaf/AbsentMessageRepresentationProvider.java
index 28c3232..de4e988 100644
--- a/src/main/java/org/apache/sling/scripting/thymeleaf/AbsentMessageRepresentationProvider.java
+++ b/src/main/java/org/apache/sling/scripting/thymeleaf/AbsentMessageRepresentationProvider.java
@@ -18,12 +18,14 @@
  */
 package org.apache.sling.scripting.thymeleaf;
 
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 import org.osgi.annotation.versioning.ProviderType;
 import org.thymeleaf.context.ITemplateContext;
 
 @ProviderType
 public interface AbsentMessageRepresentationProvider {
 
-    String provideAbsentMessageRepresentation(final ITemplateContext templateContext, final Class<?> origin, final String key, final Object[] messageParameters);
+    @Nullable String provideAbsentMessageRepresentation(@Nullable final ITemplateContext templateContext, @Nullable final Class<?> origin, @NotNull final String key, @Nullable final Object[] messageParameters);
 
 }
diff --git a/src/main/java/org/apache/sling/scripting/thymeleaf/TemplateModeProvider.java b/src/main/java/org/apache/sling/scripting/thymeleaf/TemplateModeProvider.java
index f32b95a..e60746f 100644
--- a/src/main/java/org/apache/sling/scripting/thymeleaf/TemplateModeProvider.java
+++ b/src/main/java/org/apache/sling/scripting/thymeleaf/TemplateModeProvider.java
@@ -19,12 +19,14 @@
 package org.apache.sling.scripting.thymeleaf;
 
 import org.apache.sling.api.resource.Resource;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 import org.osgi.annotation.versioning.ProviderType;
 import org.thymeleaf.templatemode.TemplateMode;
 
 @ProviderType
 public interface TemplateModeProvider {
 
-    TemplateMode provideTemplateMode(final Resource resource);
+    @Nullable TemplateMode provideTemplateMode(@NotNull final Resource resource);
 
 }