MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-01-08 15:09:39 +07:00
Code Issues Packages Projects Releases Wiki Activity

generics cleanup

Browse Source 
GitOrigin-RevId: 6f06cd04fcb6fa3496c8efec1174d63ae5c625ae
This commit is contained in:
Eugene Zhuravlev
2023-03-06 17:14:42 +01:00
committed by intellij-monorepo-bot
parent c43b548133
commit 7c4067bb89
4 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
jps/jps-builders/src/org/jetbrains/jps/builders/java/dependencyView/IntIntPersistentMultiMaplet.java
View File

@@ -20,7 +20,7 @@ public final class IntIntPersistentMultiMaplet extends IntIntMultiMaplet {
public IntIntPersistentMultiMaplet(final File file, final KeyDescriptor<Integer> keyExternalizer) throws IOException {
myMap = new PersistentHashMap<>(file, keyExternalizer, new IntSetExternalizer());
myCache = new SLRUCache<Integer, IntSet>(CACHE_SIZE, CACHE_SIZE) {
myCache = new SLRUCache<>(CACHE_SIZE, CACHE_SIZE) {
@NotNull
@Override
public IntSet createValue(Integer key) {

19
jps/jps-builders/src/org/jetbrains/jps/builders/java/dependencyView/IntObjectPersistentMultiMaplet.java
View File

@@ -16,11 +16,11 @@ import java.util.function.ObjIntConsumer;
import java.util.function.Supplier;
public final class IntObjectPersistentMultiMaplet<V> extends IntObjectMultiMaplet<V> {
private static final Collection NULL_COLLECTION = Collections.emptySet();
private static final Collection<?> NULL_COLLECTION = Collections.emptySet();
private static final int CACHE_SIZE = 128;
private final PersistentHashMap<Integer, Collection<V>> myMap;
private final DataExternalizer<V> myValueExternalizer;
private final SLRUCache<Integer, Collection> myCache;
private final SLRUCache<Integer, Collection<V>> myCache;
public IntObjectPersistentMultiMaplet(final File file,
final KeyDescriptor<Integer> keyExternalizer,
@@ -28,13 +28,14 @@ public final class IntObjectPersistentMultiMaplet<V> extends IntObjectMultiMaple
final Supplier<? extends Collection<V>> collectionFactory) throws IOException {
myValueExternalizer = valueExternalizer;
myMap = new PersistentHashMap<>(file, keyExternalizer, new CollectionDataExternalizer<>(valueExternalizer, collectionFactory));
myCache = new SLRUCache<Integer, Collection>(CACHE_SIZE, CACHE_SIZE) {
myCache = new SLRUCache<>(CACHE_SIZE, CACHE_SIZE) {
@NotNull
@Override
public Collection createValue(Integer key) {
public Collection<V> createValue(Integer key) {
try {
final Collection<V> collection = myMap.get(key);
return collection == null? NULL_COLLECTION : collection;
//noinspection unchecked
return collection == null? (Collection<V>)NULL_COLLECTION : collection;
}
catch (IOException e) {
throw new BuildDataCorruptedException(e);
@@ -102,7 +103,7 @@ public final class IntObjectPersistentMultiMaplet<V> extends IntObjectMultiMaple
@Override
public void removeAll(int key, Collection<V> values) {
try {
final Collection collection = myCache.get(key);
final Collection<V> collection = myCache.get(key);
if (collection != NULL_COLLECTION) {
if (collection.removeAll(values)) {
@@ -111,7 +112,7 @@ public final class IntObjectPersistentMultiMaplet<V> extends IntObjectMultiMaple
myMap.remove(key);
}
else {
myMap.put(key, (Collection<V>)collection);
myMap.put(key, collection);
}
}
}
@@ -124,7 +125,7 @@ public final class IntObjectPersistentMultiMaplet<V> extends IntObjectMultiMaple
@Override
public void removeFrom(final int key, final V value) {
try {
final Collection collection = myCache.get(key);
final Collection<V> collection = myCache.get(key);
if (collection != NULL_COLLECTION) {
if (collection.remove(value)) {
@@ -133,7 +134,7 @@ public final class IntObjectPersistentMultiMaplet<V> extends IntObjectMultiMaple
myMap.remove(key);
}
else {
myMap.put(key, (Collection<V>)collection);
myMap.put(key, collection);
}
}
}

4
jps/jps-builders/src/org/jetbrains/jps/builders/java/dependencyView/NaturalIntIntPersistentMultiMaplet.java
View File

@@ -18,7 +18,7 @@ final class NaturalIntIntPersistentMultiMaplet extends IntIntMultiMaplet {
private static final int CACHE_SIZE = 128;
private final PersistentHashMap<Integer, IntSet> myMap;
private final SLRUCache<Integer, IntSet> myCache;
private static final DataExternalizer<IntSet> EXTERNALIZER = new DataExternalizer<IntSet>() {
private static final DataExternalizer<IntSet> EXTERNALIZER = new DataExternalizer<>() {
@Override
public void save(@NotNull final DataOutput out, final IntSet value) throws IOException {
IntIterator iterator = value.iterator();
@@ -57,7 +57,7 @@ final class NaturalIntIntPersistentMultiMaplet extends IntIntMultiMaplet {
finally {
PersistentHashMapValueStorage.CreationTimeOptions.COMPACT_CHUNKS_WITH_VALUE_DESERIALIZATION.set(prevValue);
}
myCache = new SLRUCache<Integer, IntSet>(CACHE_SIZE, 2 * CACHE_SIZE) {
myCache = new SLRUCache<>(CACHE_SIZE, 2 * CACHE_SIZE) {
@NotNull
@Override
public IntSet createValue(Integer key) {

2
jps/jps-builders/src/org/jetbrains/jps/builders/java/dependencyView/ObjectObjectPersistentMultiMaplet.java
View File

@@ -31,7 +31,7 @@ public class ObjectObjectPersistentMultiMaplet<K, V> extends ObjectObjectMultiMa
final Supplier<? extends Collection<V>> collectionFactory) throws IOException {
myValueExternalizer = valueExternalizer;
myMap = new PersistentHashMap<>(file, keyExternalizer, new CollectionDataExternalizer<>(valueExternalizer, collectionFactory));
myCache = new SLRUCache<K, Collection<V>>(CACHE_SIZE, CACHE_SIZE * 3, keyExternalizer) {
myCache = new SLRUCache<>(CACHE_SIZE, CACHE_SIZE * 3, keyExternalizer) {
@NotNull
@Override
public Collection<V> createValue(K key) {