svn commit: r1800430 - in /sling/trunk/bundles/jcr/api: pom.xml src/main/java/org/apache/sling/jcr/api/NamespaceMapper.java src/main/java/org/apache/sling/jcr/api/SlingRepository.java src/main/java/org/apache/sling/jcr/api/SlingRepositoryInitializer.java

[kwin]

Author: kwin
Date: Fri Jun 30 15:03:33 2017
New Revision: 1800430

URL: http://svn.apache.org/viewvc?rev=1800430&view=rev
Log:
SLING-6991 add JSR305 annotations

Modified:
    sling/trunk/bundles/jcr/api/pom.xml
    
sling/trunk/bundles/jcr/api/src/main/java/org/apache/sling/jcr/api/NamespaceMapper.java
    
sling/trunk/bundles/jcr/api/src/main/java/org/apache/sling/jcr/api/SlingRepository.java
    
sling/trunk/bundles/jcr/api/src/main/java/org/apache/sling/jcr/api/SlingRepositoryInitializer.java

Modified: sling/trunk/bundles/jcr/api/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/api/pom.xml?rev=1800430&r1=1800429&r2=1800430&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/api/pom.xml (original)
+++ sling/trunk/bundles/jcr/api/pom.xml Fri Jun 30 15:03:33 2017
@@ -66,6 +66,10 @@
             <groupId>javax.jcr</groupId>
             <artifactId>jcr</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+        </dependency>
     </dependencies>
 
 </project>

Modified: 
sling/trunk/bundles/jcr/api/src/main/java/org/apache/sling/jcr/api/NamespaceMapper.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/api/src/main/java/org/apache/sling/jcr/api/NamespaceMapper.java?rev=1800430&r1=1800429&r2=1800430&view=diff
==============================================================================
--- 
sling/trunk/bundles/jcr/api/src/main/java/org/apache/sling/jcr/api/NamespaceMapper.java
 (original)
+++ 
sling/trunk/bundles/jcr/api/src/main/java/org/apache/sling/jcr/api/NamespaceMapper.java
 Fri Jun 30 15:03:33 2017
@@ -18,6 +18,7 @@
  */
 package org.apache.sling.jcr.api;
 
+import javax.annotation.Nonnull;
 import javax.jcr.RepositoryException;
 import javax.jcr.Session;
 
@@ -39,6 +40,5 @@ public interface NamespaceMapper {
      * @param session The new session
      * @throws RepositoryException If anything goes wrong
      */
-    void defineNamespacePrefixes(Session session)
-    throws RepositoryException;
+    void defineNamespacePrefixes(@Nonnull Session session) throws 
RepositoryException;
 }

Modified: 
sling/trunk/bundles/jcr/api/src/main/java/org/apache/sling/jcr/api/SlingRepository.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/api/src/main/java/org/apache/sling/jcr/api/SlingRepository.java?rev=1800430&r1=1800429&r2=1800430&view=diff
==============================================================================
--- 
sling/trunk/bundles/jcr/api/src/main/java/org/apache/sling/jcr/api/SlingRepository.java
 (original)
+++ 
sling/trunk/bundles/jcr/api/src/main/java/org/apache/sling/jcr/api/SlingRepository.java
 Fri Jun 30 15:03:33 2017
@@ -18,6 +18,8 @@
  */
 package org.apache.sling.jcr.api;
 
+import javax.annotation.CheckForNull;
+import javax.annotation.Nonnull;
 import javax.jcr.Credentials;
 import javax.jcr.LoginException;
 import javax.jcr.Repository;
@@ -52,7 +54,7 @@ public interface SlingRepository extends
      *
      * @return null if the configured default workspace name is empty, 
SLING-256
      */
-    String getDefaultWorkspace();
+    @CheckForNull String getDefaultWorkspace();
 
     /**
      * Returns a session to the given workspace which has administrative 
powers.
@@ -135,5 +137,5 @@ public interface SlingRepository extends
      * @throws RepositoryException If another error occurs.
      * @since 2.3
      */
-    Session impersonateFromService(String subServiceName, Credentials 
credentials, String workspaceName) throws LoginException, RepositoryException;
+    Session impersonateFromService(String subServiceName, @Nonnull Credentials 
credentials, String workspaceName) throws LoginException, RepositoryException;
 }

Modified: 
sling/trunk/bundles/jcr/api/src/main/java/org/apache/sling/jcr/api/SlingRepositoryInitializer.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/api/src/main/java/org/apache/sling/jcr/api/SlingRepositoryInitializer.java?rev=1800430&r1=1800429&r2=1800430&view=diff
==============================================================================
--- 
sling/trunk/bundles/jcr/api/src/main/java/org/apache/sling/jcr/api/SlingRepositoryInitializer.java
 (original)
+++ 
sling/trunk/bundles/jcr/api/src/main/java/org/apache/sling/jcr/api/SlingRepositoryInitializer.java
 Fri Jun 30 15:03:33 2017
@@ -18,6 +18,8 @@
  */
 package org.apache.sling.jcr.api;
 
+import javax.annotation.Nonnull;
+
 import org.osgi.annotation.versioning.ConsumerType;
 
 /**
@@ -38,5 +40,5 @@ public interface SlingRepositoryInitiali
      *  @throws Exception If anything happens that should prevent
      *      the SlingRepository service from being registered.
      */
-    public void processRepository(SlingRepository repo) throws Exception;
+    public void processRepository(@Nonnull SlingRepository repo) throws 
Exception;
 }