You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by pa...@apache.org on 2018/12/06 01:25:11 UTC
groovy git commit: fix Javadoc warnings
Repository: groovy
Updated Branches:
refs/heads/master e28949291 -> ab0fc8133
fix Javadoc warnings
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/ab0fc813
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/ab0fc813
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/ab0fc813
Branch: refs/heads/master
Commit: ab0fc8133f66eab79063990ff1300bb17f9cdda0
Parents: e289492
Author: Paul King <pa...@asert.com.au>
Authored: Thu Dec 6 11:25:01 2018 +1000
Committer: Paul King <pa...@asert.com.au>
Committed: Thu Dec 6 11:25:01 2018 +1000
----------------------------------------------------------------------
.../codehaus/groovy/runtime/memoize/StampedCommonCache.java | 7 ++++---
.../groovy/runtime/memoize/UnlimitedConcurrentCache.java | 2 +-
.../org/apache/groovy/parser/antlr4/SemanticPredicates.java | 4 ----
3 files changed, 5 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/groovy/blob/ab0fc813/src/main/java/org/codehaus/groovy/runtime/memoize/StampedCommonCache.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/codehaus/groovy/runtime/memoize/StampedCommonCache.java b/src/main/java/org/codehaus/groovy/runtime/memoize/StampedCommonCache.java
index f465248..e9342ef 100644
--- a/src/main/java/org/codehaus/groovy/runtime/memoize/StampedCommonCache.java
+++ b/src/main/java/org/codehaus/groovy/runtime/memoize/StampedCommonCache.java
@@ -28,8 +28,9 @@ import java.util.concurrent.locks.StampedLock;
/**
* Represents a simple key-value cache, which is thread safe and backed by a {@link Map} instance.
* StampedCommonCache has better performance than {@link ConcurrentCommonCache},
- * but it is not reentrant, in other words, <b>it may cause deadlock</b> if {@link #getAndPut(K, ValueProvider)} OR {@link #getAndPut(K, ValueProvider, boolean)} is called recursively:
- * readlock -> upgrade to writelock -> readlock(fails to get and wait forever)
+ * but it is not reentrant, in other words, <b>it may cause deadlock</b> if {@link #getAndPut(Object, MemoizeCache.ValueProvider)}
+ * or {@link #getAndPut(Object, MemoizeCache.ValueProvider, boolean)} is called recursively:
+ * readlock -> upgrade to writelock -> readlock (fails to get and waits forever)
*
* @param <K> type of the keys
* @param <V> type of the values
@@ -54,7 +55,7 @@ public class StampedCommonCache<K, V> implements EvictableCache<K, V>, ValueConv
*
* @param initialCapacity initial capacity of the cache
* @param maxSize max size of the cache
- * @param evictionStrategy LRU or FIFO, see {@link EvictionStrategy}
+ * @param evictionStrategy LRU or FIFO, see {@link EvictableCache.EvictionStrategy}
*/
public StampedCommonCache(int initialCapacity, int maxSize, EvictionStrategy evictionStrategy) {
commonCache = new CommonCache<K, V>(initialCapacity, maxSize, evictionStrategy);
http://git-wip-us.apache.org/repos/asf/groovy/blob/ab0fc813/src/main/java/org/codehaus/groovy/runtime/memoize/UnlimitedConcurrentCache.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/codehaus/groovy/runtime/memoize/UnlimitedConcurrentCache.java b/src/main/java/org/codehaus/groovy/runtime/memoize/UnlimitedConcurrentCache.java
index cfefb08..1e8f8e4 100644
--- a/src/main/java/org/codehaus/groovy/runtime/memoize/UnlimitedConcurrentCache.java
+++ b/src/main/java/org/codehaus/groovy/runtime/memoize/UnlimitedConcurrentCache.java
@@ -184,7 +184,7 @@ public final class UnlimitedConcurrentCache<K, V> implements EvictableCache<K, V
/**
* Try to get the value from cache.
- * If not found, create the value by {@link ValueProvider} and put it into the cache, at last return the value.
+ * If not found, create the value by {@link MemoizeCache.ValueProvider} and put it into the cache, at last return the value.
*
* @param key
* @param valueProvider provide the value if the associated value not found
http://git-wip-us.apache.org/repos/asf/groovy/blob/ab0fc813/subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/SemanticPredicates.java
----------------------------------------------------------------------
diff --git a/subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/SemanticPredicates.java b/subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/SemanticPredicates.java
index 9c1f709..8381ac1 100644
--- a/subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/SemanticPredicates.java
+++ b/subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/SemanticPredicates.java
@@ -45,9 +45,6 @@ import static org.apache.groovy.parser.antlr4.util.StringUtils.matches;
/**
* Some semantic predicates for altering the behaviour of the lexer and parser
- *
- * @author <a href="mailto:realbluesun@hotmail.com">Daniel.Sun</a>
- * Created on 2016/08/20
*/
public class SemanticPredicates {
private static final Pattern NONSPACES_PATTERN = Pattern.compile("\\S+?");
@@ -114,7 +111,6 @@ public class SemanticPredicates {
* Method name should not end with "2: arguments" and "3: closure"
*
* @param context the preceding expression
- * @return
*/
public static boolean isFollowingArgumentsOrClosure(ExpressionContext context) {
if (context instanceof PostfixExprAltContext) {