You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by tv...@apache.org on 2021/03/29 19:50:19 UTC
[commons-jcs] 13/14: Shorter code through lambdas
This is an automated email from the ASF dual-hosted git repository.
tv pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-jcs.git
commit d1f069c63b827ec28c2d3b2323c6715da3b8b1a6
Author: Thomas Vandahl <tv...@apache.org>
AuthorDate: Mon Mar 29 21:48:42 2021 +0200
Shorter code through lambdas
---
.../commons/jcs3/auxiliary/disk/indexed/IndexedDiskCache.java | 4 +++-
.../auxiliary/disk/indexed/IndexedDiskElementDescriptor.java | 10 ++++------
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/commons-jcs-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/indexed/IndexedDiskCache.java b/commons-jcs-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/indexed/IndexedDiskCache.java
index 00f5e54..5fbb888 100644
--- a/commons-jcs-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/indexed/IndexedDiskCache.java
+++ b/commons-jcs-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/indexed/IndexedDiskCache.java
@@ -1259,7 +1259,7 @@ public class IndexedDiskCache<K, V> extends AbstractDiskCache<K, V>
private IndexedDiskElementDescriptor[] createPositionSortedDescriptorList()
{
final List<IndexedDiskElementDescriptor> defragList = new ArrayList<>(keyHash.values());
- Collections.sort(defragList, new PositionComparator());
+ Collections.sort(defragList, (ded1, ded2) -> Long.compare(ded1.pos, ded2.pos));
return defragList.toArray(new IndexedDiskElementDescriptor[0]);
}
@@ -1481,7 +1481,9 @@ public class IndexedDiskCache<K, V> extends AbstractDiskCache<K, V>
/**
* Compares IndexedDiskElementDescriptor based on their position.
* <p>
+ * @deprecated Use lambda instead
*/
+ @Deprecated
protected static final class PositionComparator implements Comparator<IndexedDiskElementDescriptor>, Serializable
{
/** serialVersionUID */
diff --git a/commons-jcs-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/indexed/IndexedDiskElementDescriptor.java b/commons-jcs-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/indexed/IndexedDiskElementDescriptor.java
index a889574..b74e50f 100644
--- a/commons-jcs-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/indexed/IndexedDiskElementDescriptor.java
+++ b/commons-jcs-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/indexed/IndexedDiskElementDescriptor.java
@@ -105,14 +105,12 @@ public class IndexedDiskElementDescriptor
return 1;
}
- if ( o.len == len )
+ int lenCompare = Integer.compare(len, o.len);
+ if (lenCompare == 0)
{
return Long.compare(o.pos, pos);
}
- if ( o.len > len )
- {
- return -1;
- }
- return 1;
+
+ return lenCompare;
}
}