diff options
| author | Jon Bratseth <bratseth@yahoo-inc.com> | 2016-10-30 01:33:41 +0200 |
|---|---|---|
| committer | Jon Bratseth <bratseth@yahoo-inc.com> | 2016-10-30 01:33:41 +0200 |
| commit | 0dd0cda7d8449708aa8347c01475583d5326a20e (patch) | |
| tree | 8fdd6677df9e654de71faa8595342b9ab88ef279 /vespajlib | |
| parent | bcb6b8dc4b68657c3474f4f878e8f8f7409469c9 (diff) | |
| parent | 9abe245c819f9405b162ca5bb7f38f04439ec042 (diff) | |
Merge branch 'frodelu/json-access-log' of github.com:yahoo/vespa into frodelu/json-access-log
Diffstat (limited to 'vespajlib')
3 files changed, 9 insertions, 4 deletions
diff --git a/vespajlib/src/main/java/com/yahoo/collections/ConcurrentResourcePool.java b/vespajlib/src/main/java/com/yahoo/collections/ConcurrentResourcePool.java index 23fed831d1f..f40407260bf 100644 --- a/vespajlib/src/main/java/com/yahoo/collections/ConcurrentResourcePool.java +++ b/vespajlib/src/main/java/com/yahoo/collections/ConcurrentResourcePool.java @@ -1,15 +1,16 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.collections; -import java.util.ArrayDeque; -import java.util.Deque; import java.util.Iterator; import java.util.Queue; import java.util.concurrent.ConcurrentLinkedQueue; /** * @author baldersheim + * TODO: remove on vespa 7 or before + * Use com.yahoo.yolean.concurrent.ConcurrentResourcePool instead. */ +@Deprecated public class ConcurrentResourcePool<T> implements Iterable<T> { private final Queue<T> pool = new ConcurrentLinkedQueue<>(); diff --git a/vespajlib/src/main/java/com/yahoo/collections/ResourceFactory.java b/vespajlib/src/main/java/com/yahoo/collections/ResourceFactory.java index d6fe032e0e3..297dd794a16 100644 --- a/vespajlib/src/main/java/com/yahoo/collections/ResourceFactory.java +++ b/vespajlib/src/main/java/com/yahoo/collections/ResourceFactory.java @@ -3,8 +3,10 @@ package com.yahoo.collections; /** * @author baldersheim - * @since 5.2 + * TODO: remove on vespa 7 or before + * Use com.yahoo.yolean.concurrent.ResourceFactory instead. */ +@Deprecated public abstract class ResourceFactory<T> { public abstract T create(); diff --git a/vespajlib/src/main/java/com/yahoo/collections/ResourcePool.java b/vespajlib/src/main/java/com/yahoo/collections/ResourcePool.java index 112a77b069d..2f4fef88ff5 100644 --- a/vespajlib/src/main/java/com/yahoo/collections/ResourcePool.java +++ b/vespajlib/src/main/java/com/yahoo/collections/ResourcePool.java @@ -10,8 +10,10 @@ import java.util.Iterator; * factory.</p> * * @author baldersheim - * @since 5.2 + * TODO: remove on vespa 7 or before + * Use com.yahoo.yolean.concurrent.ResourceFactory instead. */ +@Deprecated public final class ResourcePool<T> implements Iterable<T> { private final Deque<T> pool = new ArrayDeque<>(); |