Return-Path: X-Original-To: apmail-jackrabbit-oak-commits-archive@minotaur.apache.org Delivered-To: apmail-jackrabbit-oak-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 4BA1691F6 for ; Wed, 6 Jun 2012 10:13:47 +0000 (UTC) Received: (qmail 78946 invoked by uid 500); 6 Jun 2012 10:13:47 -0000 Delivered-To: apmail-jackrabbit-oak-commits-archive@jackrabbit.apache.org Received: (qmail 78915 invoked by uid 500); 6 Jun 2012 10:13:47 -0000 Mailing-List: contact oak-commits-help@jackrabbit.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: oak-commits@jackrabbit.apache.org Delivered-To: mailing list oak-commits@jackrabbit.apache.org Received: (qmail 78774 invoked by uid 99); 6 Jun 2012 10:13:45 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 06 Jun 2012 10:13:45 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 06 Jun 2012 10:13:44 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 1D9F223889E0; Wed, 6 Jun 2012 10:13:24 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1346809 - in /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core: ContentRepositoryImpl.java ContentSessionImpl.java Date: Wed, 06 Jun 2012 10:13:24 -0000 To: oak-commits@jackrabbit.apache.org From: angela@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120606101324.1D9F223889E0@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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 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();