Mailing-List: contact commits-help@commons.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@commons.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1186869 - in
 /commons/proper/ognl/branches/new-cache-approach/src/main/java/org/apache/commons/ognl/internal:
 ReentrantReadWriteLockCache.java ReentrantReadWriteLockClassCache.java
Date: Thu, 20 Oct 2011 15:54:40 -0000
To: commits@commons.apache.org
From: mcucchiara@apache.org
Message-Id: <20111020155440.A833B23889D7@eris.apache.org>

Author: mcucchiara
Date: Thu Oct 20 15:54:40 2011
New Revision: 1186869

URL: http://svn.apache.org/viewvc?rev=1186869&view=rev
Log:
New ReentrantReadWriteLock Cache

Added:
    commons/proper/ognl/branches/new-cache-approach/src/main/java/org/apache/commons/ognl/internal/ReentrantReadWriteLockCache.java
    commons/proper/ognl/branches/new-cache-approach/src/main/java/org/apache/commons/ognl/internal/ReentrantReadWriteLockClassCache.java

Added: commons/proper/ognl/branches/new-cache-approach/src/main/java/org/apache/commons/ognl/internal/ReentrantReadWriteLockCache.java
URL: http://svn.apache.org/viewvc/commons/proper/ognl/branches/new-cache-approach/src/main/java/org/apache/commons/ognl/internal/ReentrantReadWriteLockCache.java?rev=1186869&view=auto
==============================================================================
--- commons/proper/ognl/branches/new-cache-approach/src/main/java/org/apache/commons/ognl/internal/ReentrantReadWriteLockCache.java (added)
+++ commons/proper/ognl/branches/new-cache-approach/src/main/java/org/apache/commons/ognl/internal/ReentrantReadWriteLockCache.java Thu Oct 20 15:54:40 2011
@@ -0,0 +1,142 @@
+/*
+ * $Id: $
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.commons.ognl.internal;
+
+
+import org.apache.commons.ognl.internal.entry.CacheEntryFactory;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReadWriteLock;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
+
+/**
+ * User: mcucchiara
+ * Date: 20/10/11
+ * Time: 10.14
+ */
+public class ReentrantReadWriteLockCache<K, V>
+    implements Cache<K, V>
+{
+    private final ReadWriteLock lock = new ReentrantReadWriteLock( );
+
+    private final Lock readLock = lock.readLock( );
+
+    private final Lock writeLock = lock.writeLock( );
+
+    final Map<K, V> cache = new HashMap<K, V>( );
+
+    private CacheEntryFactory<K, V> cacheEntryFactory;
+
+    public ReentrantReadWriteLockCache( )
+    {
+    }
+
+    public ReentrantReadWriteLockCache( CacheEntryFactory<K, V> cacheEntryFactory )
+    {
+        this.cacheEntryFactory = cacheEntryFactory;
+    }
+
+    public void clear( )
+    {
+        synchronized ( cache )
+        {
+            cache.clear( );
+        }
+    }
+
+    public int getSize( )
+    {
+        synchronized ( cache )
+        {
+            return cache.size( );
+        }
+    }
+
+
+    public V get( K key )
+        throws CacheException
+    {
+        V v;
+        boolean shouldCreate;
+        readLock.lock( );
+        try
+        {
+            v = cache.get( key );
+            shouldCreate = shouldCreate( cacheEntryFactory, v );
+        }
+        finally
+        {
+            readLock.unlock( );
+        }
+        if ( shouldCreate )
+        {
+            try
+            {
+                writeLock.lock( );
+                v = cache.get( key );
+                if(!shouldCreate( cacheEntryFactory, v ) )
+                {
+                    return v;
+                }
+                v = cacheEntryFactory.create( key );
+                cache.put( key, v );
+                return v;
+            }
+            finally
+            {
+                writeLock.unlock( );
+            }
+
+        }
+
+        return v;
+    }
+
+    protected boolean shouldCreate( CacheEntryFactory<K, V> cacheEntryFactory, V v )
+        throws CacheException
+    {
+        if ( cacheEntryFactory != null )
+        {
+            if ( v == null )
+            {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public V put( K key, V value )
+    {
+        writeLock.lock( );
+        try
+        {
+            cache.put( key, value );
+            return value;
+        }
+        finally
+        {
+            writeLock.unlock( );
+        }
+    }
+}
\ No newline at end of file

Added: commons/proper/ognl/branches/new-cache-approach/src/main/java/org/apache/commons/ognl/internal/ReentrantReadWriteLockClassCache.java
URL: http://svn.apache.org/viewvc/commons/proper/ognl/branches/new-cache-approach/src/main/java/org/apache/commons/ognl/internal/ReentrantReadWriteLockClassCache.java?rev=1186869&view=auto
==============================================================================
--- commons/proper/ognl/branches/new-cache-approach/src/main/java/org/apache/commons/ognl/internal/ReentrantReadWriteLockClassCache.java (added)
+++ commons/proper/ognl/branches/new-cache-approach/src/main/java/org/apache/commons/ognl/internal/ReentrantReadWriteLockClassCache.java Thu Oct 20 15:54:40 2011
@@ -0,0 +1,52 @@
+/*
+ * $Id: $
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one  
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information       
+ * regarding copyright ownership.  The ASF licenses this file  
+ * to you under the Apache License, Version 2.0 (the           
+ * "License"); you may not use this file except in compliance  
+ * with the License.  You may obtain a copy of the License at  
+ *                                                             
+ *   http://www.apache.org/licenses/LICENSE-2.0                
+ *                                                             
+ * Unless required by applicable law or agreed to in writing,  
+ * software distributed under the License is distributed on an 
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY      
+ * KIND, either express or implied.  See the License for the   
+ * specific language governing permissions and limitations     
+ * under the License.
+ */
+
+package org.apache.commons.ognl.internal;
+
+import org.apache.commons.ognl.ClassCacheInspector;
+import org.apache.commons.ognl.internal.entry.CacheEntryFactory;
+
+
+public class ReentrantReadWriteLockClassCache<T>
+    extends HashMapCache<Class<?>,T>
+    implements ClassCache<T>
+{
+    private ClassCacheInspector inspector;
+
+    public ReentrantReadWriteLockClassCache( CacheEntryFactory<Class<?>, T> entryFactory )
+    {
+        super( entryFactory );
+    }
+
+    public void setClassInspector( ClassCacheInspector inspector )
+    {
+        this.inspector = inspector;
+    }
+
+    public T put( Class<?> key, T value )
+    {
+        if ( inspector != null && !inspector.shouldCache( key ) )
+        {
+            return value;
+        }
+        return super.put( key, value );
+    }
+}