Return-Path: X-Original-To: apmail-onami-commits-archive@minotaur.apache.org Delivered-To: apmail-onami-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 F3D26E511 for ; Sat, 2 Mar 2013 10:37:28 +0000 (UTC) Received: (qmail 54633 invoked by uid 500); 2 Mar 2013 10:37:28 -0000 Delivered-To: apmail-onami-commits-archive@onami.apache.org Received: (qmail 54581 invoked by uid 500); 2 Mar 2013 10:37:28 -0000 Mailing-List: contact commits-help@onami.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@onami.incubator.apache.org Delivered-To: mailing list commits@onami.incubator.apache.org Received: (qmail 54569 invoked by uid 99); 2 Mar 2013 10:37:27 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 02 Mar 2013 10:37:27 +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; Sat, 02 Mar 2013 10:37:25 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id EAF382388980; Sat, 2 Mar 2013 10:37:06 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1451874 - /incubator/onami/trunk/scopes/src/main/java/org/apache/onami/scopes/ Date: Sat, 02 Mar 2013 10:37:06 -0000 To: commits@onami.incubator.apache.org From: simonetripodi@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130302103706.EAF382388980@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: simonetripodi Date: Sat Mar 2 10:37:06 2013 New Revision: 1451874 URL: http://svn.apache.org/r1451874 Log: @trivial: code format, no functional modifications Modified: incubator/onami/trunk/scopes/src/main/java/org/apache/onami/scopes/ConcurrentLazySingleton.java incubator/onami/trunk/scopes/src/main/java/org/apache/onami/scopes/ConcurrentLazySingletonScope.java incubator/onami/trunk/scopes/src/main/java/org/apache/onami/scopes/ConcurrentLazySingletonScopeImpl.java incubator/onami/trunk/scopes/src/main/java/org/apache/onami/scopes/LazySingleton.java incubator/onami/trunk/scopes/src/main/java/org/apache/onami/scopes/LazySingletonScope.java incubator/onami/trunk/scopes/src/main/java/org/apache/onami/scopes/LazySingletonScopeImpl.java incubator/onami/trunk/scopes/src/main/java/org/apache/onami/scopes/ScopesModule.java Modified: incubator/onami/trunk/scopes/src/main/java/org/apache/onami/scopes/ConcurrentLazySingleton.java URL: http://svn.apache.org/viewvc/incubator/onami/trunk/scopes/src/main/java/org/apache/onami/scopes/ConcurrentLazySingleton.java?rev=1451874&r1=1451873&r2=1451874&view=diff ============================================================================== --- incubator/onami/trunk/scopes/src/main/java/org/apache/onami/scopes/ConcurrentLazySingleton.java (original) +++ incubator/onami/trunk/scopes/src/main/java/org/apache/onami/scopes/ConcurrentLazySingleton.java Sat Mar 2 10:37:06 2013 @@ -35,8 +35,8 @@ import java.lang.annotation.Target; * on the object key and, thus, can construct multiple types of singletons * concurrently. */ -@Target({ ElementType.TYPE, ElementType.METHOD }) -@Retention(RetentionPolicy.RUNTIME) +@Target( { ElementType.TYPE, ElementType.METHOD } ) +@Retention( RetentionPolicy.RUNTIME ) @ScopeAnnotation public @interface ConcurrentLazySingleton { Modified: incubator/onami/trunk/scopes/src/main/java/org/apache/onami/scopes/ConcurrentLazySingletonScope.java URL: http://svn.apache.org/viewvc/incubator/onami/trunk/scopes/src/main/java/org/apache/onami/scopes/ConcurrentLazySingletonScope.java?rev=1451874&r1=1451873&r2=1451874&view=diff ============================================================================== --- incubator/onami/trunk/scopes/src/main/java/org/apache/onami/scopes/ConcurrentLazySingletonScope.java (original) +++ incubator/onami/trunk/scopes/src/main/java/org/apache/onami/scopes/ConcurrentLazySingletonScope.java Sat Mar 2 10:37:06 2013 @@ -28,6 +28,7 @@ import com.google.inject.Scope; */ public class ConcurrentLazySingletonScope { + private static final Scope instance = new ConcurrentLazySingletonScopeImpl(); /** @@ -39,4 +40,5 @@ public class ConcurrentLazySingletonScop { return instance; } + } Modified: incubator/onami/trunk/scopes/src/main/java/org/apache/onami/scopes/ConcurrentLazySingletonScopeImpl.java URL: http://svn.apache.org/viewvc/incubator/onami/trunk/scopes/src/main/java/org/apache/onami/scopes/ConcurrentLazySingletonScopeImpl.java?rev=1451874&r1=1451873&r2=1451874&view=diff ============================================================================== --- incubator/onami/trunk/scopes/src/main/java/org/apache/onami/scopes/ConcurrentLazySingletonScopeImpl.java (original) +++ incubator/onami/trunk/scopes/src/main/java/org/apache/onami/scopes/ConcurrentLazySingletonScopeImpl.java Sat Mar 2 10:37:06 2013 @@ -31,6 +31,7 @@ import java.util.Map; class ConcurrentLazySingletonScopeImpl implements Scope { + private static final Object NULL = new Object(); private static final Map, LockRecord> locks = new HashMap, LockRecord>(); @@ -92,8 +93,8 @@ class ConcurrentLazySingletonScopeImpl Object localInstance = instance; // This is safe because instance has type T or is equal to NULL - @SuppressWarnings({ "unchecked", "UnnecessaryLocalVariable" }) T returnedInstance = - ( localInstance != NULL ) ? (T) localInstance : null; + @SuppressWarnings({ "unchecked", "UnnecessaryLocalVariable" }) + T returnedInstance = ( localInstance != NULL ) ? (T) localInstance : null; return returnedInstance; } @@ -140,4 +141,5 @@ class ConcurrentLazySingletonScopeImpl { return "ConcurrentLazySingletonScope.SCOPE"; } + } Modified: incubator/onami/trunk/scopes/src/main/java/org/apache/onami/scopes/LazySingleton.java URL: http://svn.apache.org/viewvc/incubator/onami/trunk/scopes/src/main/java/org/apache/onami/scopes/LazySingleton.java?rev=1451874&r1=1451873&r2=1451874&view=diff ============================================================================== --- incubator/onami/trunk/scopes/src/main/java/org/apache/onami/scopes/LazySingleton.java (original) +++ incubator/onami/trunk/scopes/src/main/java/org/apache/onami/scopes/LazySingleton.java Sat Mar 2 10:37:06 2013 @@ -30,8 +30,8 @@ import java.lang.annotation.Target; * Scope annotation that marks a class as singleton that should NOT be * allocated eagerly */ -@Target({ ElementType.TYPE, ElementType.METHOD }) -@Retention(RetentionPolicy.RUNTIME) +@Target( { ElementType.TYPE, ElementType.METHOD } ) +@Retention( RetentionPolicy.RUNTIME ) @ScopeAnnotation public @interface LazySingleton { Modified: incubator/onami/trunk/scopes/src/main/java/org/apache/onami/scopes/LazySingletonScope.java URL: http://svn.apache.org/viewvc/incubator/onami/trunk/scopes/src/main/java/org/apache/onami/scopes/LazySingletonScope.java?rev=1451874&r1=1451873&r2=1451874&view=diff ============================================================================== --- incubator/onami/trunk/scopes/src/main/java/org/apache/onami/scopes/LazySingletonScope.java (original) +++ incubator/onami/trunk/scopes/src/main/java/org/apache/onami/scopes/LazySingletonScope.java Sat Mar 2 10:37:06 2013 @@ -26,6 +26,7 @@ import com.google.inject.Scope; */ public class LazySingletonScope { + /** * Returns the scope * @@ -41,4 +42,5 @@ public class LazySingletonScope private LazySingletonScope() { } + } Modified: incubator/onami/trunk/scopes/src/main/java/org/apache/onami/scopes/LazySingletonScopeImpl.java URL: http://svn.apache.org/viewvc/incubator/onami/trunk/scopes/src/main/java/org/apache/onami/scopes/LazySingletonScopeImpl.java?rev=1451874&r1=1451873&r2=1451874&view=diff ============================================================================== --- incubator/onami/trunk/scopes/src/main/java/org/apache/onami/scopes/LazySingletonScopeImpl.java (original) +++ incubator/onami/trunk/scopes/src/main/java/org/apache/onami/scopes/LazySingletonScopeImpl.java Sat Mar 2 10:37:06 2013 @@ -30,8 +30,10 @@ import com.google.inject.Scopes; final class LazySingletonScopeImpl implements Scope { + public Provider scope( Key key, Provider unscoped ) { return Scopes.SINGLETON.scope( key, unscoped ); } + } Modified: incubator/onami/trunk/scopes/src/main/java/org/apache/onami/scopes/ScopesModule.java URL: http://svn.apache.org/viewvc/incubator/onami/trunk/scopes/src/main/java/org/apache/onami/scopes/ScopesModule.java?rev=1451874&r1=1451873&r2=1451874&view=diff ============================================================================== --- incubator/onami/trunk/scopes/src/main/java/org/apache/onami/scopes/ScopesModule.java (original) +++ incubator/onami/trunk/scopes/src/main/java/org/apache/onami/scopes/ScopesModule.java Sat Mar 2 10:37:06 2013 @@ -27,10 +27,12 @@ import com.google.inject.AbstractModule; public class ScopesModule extends AbstractModule { + @Override protected void configure() { bindScope( LazySingleton.class, LazySingletonScope.get() ); bindScope( ConcurrentLazySingleton.class, ConcurrentLazySingletonScope.get() ); } + }