deprecated ConcurrentMap

This commit is contained in:
Juergen Hoeller 2009-02-05 21:07:53 +00:00
parent 92588cddc6
commit ea54c6391e
2 changed files with 9 additions and 4 deletions

View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2007 the original author or authors. * Copyright 2002-2009 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -45,8 +45,8 @@ import org.springframework.util.ClassUtils;
/** /**
* Factory for collections, being aware of Commons Collection 3.x's extended * Factory for collections, being aware of Commons Collection 3.x's extended
* collections as well as of JDK 1.5+ concurrent collections and backport-concurrent * collections as well as of JDK 1.5+ concurrent collections.
* collections. Mainly for internal use within the framework. * Mainly for internal use within the framework.
* *
* <p>The goal of this class is to avoid runtime dependencies on JDK 1.5+ and * <p>The goal of this class is to avoid runtime dependencies on JDK 1.5+ and
* Commons Collections 3.x, simply using the best collection implementation * Commons Collections 3.x, simply using the best collection implementation
@ -209,6 +209,7 @@ public abstract class CollectionFactory {
* @see java.util.TreeSet * @see java.util.TreeSet
* @see java.util.LinkedHashSet * @see java.util.LinkedHashSet
*/ */
@SuppressWarnings("unchecked")
public static Collection createApproximateCollection(Object collection, int initialCapacity) { public static Collection createApproximateCollection(Object collection, int initialCapacity) {
if (collection instanceof LinkedList) { if (collection instanceof LinkedList) {
return new LinkedList(); return new LinkedList();
@ -272,6 +273,7 @@ public abstract class CollectionFactory {
/** /**
* ConcurrentMap adapter for the JDK ConcurrentHashMap class. * ConcurrentMap adapter for the JDK ConcurrentHashMap class.
*/ */
@Deprecated
private static class JdkConcurrentHashMap<K,V> extends ConcurrentHashMap<K,V> implements ConcurrentMap<K,V> { private static class JdkConcurrentHashMap<K,V> extends ConcurrentHashMap<K,V> implements ConcurrentMap<K,V> {
private JdkConcurrentHashMap(int initialCapacity) { private JdkConcurrentHashMap(int initialCapacity) {

View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2007 the original author or authors. * Copyright 2002-2009 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -29,7 +29,10 @@ import java.util.Map;
* *
* @author Juergen Hoeller * @author Juergen Hoeller
* @since 2.5 * @since 2.5
* @deprecated as of Spring 3.0, since standard {@link java.util.concurrent.ConcurrentMap}
* is available on Java 5+ anyway
*/ */
@Deprecated
public interface ConcurrentMap<K,V> extends Map<K,V> { public interface ConcurrentMap<K,V> extends Map<K,V> {
V putIfAbsent(K key, V value); V putIfAbsent(K key, V value);