From oak-commits-return-2969-apmail-jackrabbit-oak-commits-archive=jackrabbit.apache.org@jackrabbit.apache.org Tue Feb 26 11:00:12 2013 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 D9AF0E04A for ; Tue, 26 Feb 2013 11:00:12 +0000 (UTC) Received: (qmail 70722 invoked by uid 500); 26 Feb 2013 11:00:12 -0000 Delivered-To: apmail-jackrabbit-oak-commits-archive@jackrabbit.apache.org Received: (qmail 70705 invoked by uid 500); 26 Feb 2013 11:00:12 -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-dev@jackrabbit.apache.org Delivered-To: mailing list oak-commits@jackrabbit.apache.org Received: (qmail 70693 invoked by uid 99); 26 Feb 2013 11:00:12 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 26 Feb 2013 11:00:12 +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; Tue, 26 Feb 2013 11:00:09 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 257472388B34; Tue, 26 Feb 2013 10:59:50 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1450129 - /jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/RepositoryImpl.java Date: Tue, 26 Feb 2013 10:59:50 -0000 To: oak-commits@jackrabbit.apache.org From: angela@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130226105950.257472388B34@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: angela Date: Tue Feb 26 10:59:49 2013 New Revision: 1450129 URL: http://svn.apache.org/r1450129 Log: minor improvement: add annotations Modified: jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/RepositoryImpl.java Modified: jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/RepositoryImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/RepositoryImpl.java?rev=1450129&r1=1450128&r2=1450129&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/RepositoryImpl.java (original) +++ jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/RepositoryImpl.java Tue Feb 26 10:59:49 2013 @@ -17,7 +17,8 @@ package org.apache.jackrabbit.oak.jcr; import java.util.concurrent.ScheduledExecutorService; - +import javax.annotation.Nonnull; +import javax.annotation.Nullable; import javax.jcr.Credentials; import javax.jcr.Repository; import javax.jcr.RepositoryException; @@ -44,15 +45,12 @@ public class RepositoryImpl implements R private final Descriptors descriptors = new Descriptors(new SimpleValueFactory()); private final ContentRepository contentRepository; - private final ScheduledExecutorService executor; - private final SecurityProvider securityProvider; - public RepositoryImpl( - ContentRepository contentRepository, - ScheduledExecutorService executor, - SecurityProvider securityProvider) { + public RepositoryImpl(@Nonnull ContentRepository contentRepository, + @Nonnull ScheduledExecutorService executor, + @Nonnull SecurityProvider securityProvider) { this.contentRepository = contentRepository; this.executor = executor; this.securityProvider = securityProvider; @@ -119,8 +117,7 @@ public class RepositoryImpl implements R * @see javax.jcr.Repository#login(javax.jcr.Credentials, String) */ @Override - public Session login(Credentials credentials, String workspaceName) throws RepositoryException { - // TODO: needs complete refactoring + public Session login(@Nullable Credentials credentials, @Nullable String workspaceName) throws RepositoryException { try { ContentSession contentSession = contentRepository.login(credentials, workspaceName); return new SessionDelegate(this, executor, contentSession, securityProvider, false).getSession();