You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by an...@apache.org on 2012/06/06 12:13:24 UTC
svn commit: r1346809 - in /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core: ContentRepositoryImpl.java ContentSessionImpl.java

Author: angela
Date: Wed Jun  6 10:13:23 2012
New Revision: 1346809

URL: http://svn.apache.org/viewvc?rev=1346809&view=rev
Log:
minor improvement

Modified:
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/ContentRepositoryImpl.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/ContentSessionImpl.java

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/ContentRepositoryImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/ContentRepositoryImpl.java?rev=1346809&r1=1346808&r2=1346809&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/ContentRepositoryImpl.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/ContentRepositoryImpl.java Wed Jun  6 10:13:23 2012
@@ -39,6 +39,7 @@ import org.apache.jackrabbit.oak.spi.sta
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import javax.annotation.Nonnull;
 import javax.jcr.Credentials;
 import javax.jcr.NoSuchWorkspaceException;
 import javax.security.auth.login.LoginContext;
@@ -114,6 +115,7 @@ public class ContentRepositoryImpl imple
         return new Indexer(mk);
     }
 
+    @Nonnull
     @Override
     public ContentSession login(Credentials credentials, String workspaceName)
             throws LoginException, NoSuchWorkspaceException {

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/ContentSessionImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/ContentSessionImpl.java?rev=1346809&r1=1346808&r2=1346809&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/ContentSessionImpl.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/ContentSessionImpl.java Wed Jun  6 10:13:23 2012
@@ -25,6 +25,7 @@ import org.apache.jackrabbit.oak.spi.sta
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import javax.annotation.Nonnull;
 import javax.security.auth.login.LoginContext;
 import javax.security.auth.login.LoginException;
 import java.io.IOException;
@@ -53,6 +54,7 @@ class ContentSessionImpl implements Cont
         this.queryEngine = queryEngine;
     }
 
+    @Nonnull
     @Override
     public AuthInfo getAuthInfo() {
         Set<AuthInfo> infoSet = loginContext.getSubject().getPublicCredentials(AuthInfo.class);
@@ -63,6 +65,7 @@ class ContentSessionImpl implements Cont
         }
     }
 
+    @Nonnull
     @Override
     public Root getCurrentRoot() {
         return new RootImpl(store, workspaceName);
@@ -82,11 +85,13 @@ class ContentSessionImpl implements Cont
         return workspaceName;
     }
 
+    @Nonnull
     @Override
     public QueryEngine getQueryEngine() {
         return queryEngine;
     }
 
+    @Nonnull
     @Override
     public CoreValueFactory getCoreValueFactory() {
         return store.getValueFactory();