improve cache api

scm-core/src/main/java/sonia/scm/cache/Cache.java

@@ -29,6 +29,8 @@
  *
  */
 
+
+
 package sonia.scm.cache;
 
 /**
@@ -38,7 +40,7 @@ package sonia.scm.cache;
  * @param <K>
  * @param <V>
  */
-public interface SimpleCache<K, V>
+public interface Cache<K, V>
 {
 
   /**
@@ -47,6 +49,14 @@ public interface SimpleCache<K, V>
    */
   public void clear();
 
+  /**
+   * Method description
+   *
+   *
+   * @param key
+   */
+  public boolean contains(K key);
+
   /**
    * Method description
    *

scm-core/src/main/java/sonia/scm/cache/CacheManager.java

@@ -29,6 +29,8 @@
  *
  */
 
+
+
 package sonia.scm.cache;
 
 /**
@@ -50,21 +52,6 @@ public interface CacheManager
    *
    * @return
    */
-  public <K, V> ExtendedCache<K, V> getExtendedCache(Class<K> key,
-          Class<V> value, String name);
-
-  /**
-   * Method description
-   *
-   *
-   * @param key
-   * @param value
-   * @param name
-   * @param <K>
-   * @param <V>
-   *
-   * @return
-   */
-  public <K, V> SimpleCache<K, V> getSimpleCache(Class<K> key, Class<V> value,
+  public <K, V> Cache<K, V> getCache(Class<K> key, Class<V> value,
           String name);
 }

scm-core/src/main/java/sonia/scm/cache/ExtendedCache.java

@@ -1,78 +0,0 @@
-/**
- * Copyright (c) 2010, Sebastian Sdorra
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- * 3. Neither the name of SCM-Manager; nor the names of its
- *    contributors may be used to endorse or promote products derived from this
- *    software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * http://bitbucket.org/sdorra/scm-manager
- *
- */
-
-package sonia.scm.cache;
-
-//~--- JDK imports ------------------------------------------------------------
-
-import java.util.Collection;
-
-/**
- *
- * @author Sebastian Sdorra
- *
- * @param <K>
- * @param <V>
- */
-public interface ExtendedCache<K, V> extends SimpleCache<K, V>
-{
-
-  /**
-   * Method description
-   *
-   *
-   * @param key
-   * @param value
-   */
-  public void putCollection(K key, Collection<V> value);
-
-  /**
-   * Method description
-   *
-   *
-   * @param key
-   *
-   * @return
-   */
-  public boolean removeCollection(K key);
-
-  //~--- get methods ----------------------------------------------------------
-
-  /**
-   * Method description
-   *
-   *
-   * @param key
-   *
-   * @return
-   */
-  public Collection<V> getCollection(K key);
-}