Skip to content

Commit 1101e4e

Browse files
HaehnchenHaehnchen
authored
Merge pull request #2086 from Haehnchen/feature/deprecated-thashmap
replace deprecated THashMap
2 parents 02ba051 + 6d20eb9 commit 1101e4e

12 files changed

+33
-34
lines changed

‎src/main/java/fr/adrienbrault/idea/symfony2plugin/stubs/indexes/ContainerBuilderStubIndex.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@
2121
import fr.adrienbrault.idea.symfony2plugin.stubs.indexes.externalizer.ObjectStreamDataExternalizer;
2222
import fr.adrienbrault.idea.symfony2plugin.util.PhpElementsUtil;
2323
import fr.adrienbrault.idea.symfony2plugin.util.ProjectUtil;
24-
import gnu.trove.THashMap;
2524
import one.util.streamex.StreamEx;
2625
import org.apache.commons.lang.StringUtils;
2726
import org.jetbrains.annotations.NotNull;
2827

28+
import java.util.HashMap;
2929
import java.util.HashSet;
3030
import java.util.Map;
3131
import java.util.Set;
@@ -63,7 +63,7 @@ public DataIndexer<String, ContainerBuilderCall, FileContent> getIndexer() {
6363

6464
return inputData -> {
6565

66-
Map<String, ContainerBuilderCall> map = new THashMap<>();
66+
Map<String, ContainerBuilderCall> map = new HashMap<>();
6767

6868
PsiFile psiFile = inputData.getPsiFile();
6969
if(!(psiFile instanceof PhpFile) ||

‎src/main/java/fr/adrienbrault/idea/symfony2plugin/stubs/indexes/DoctrineMetadataFileStubIndex.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
import fr.adrienbrault.idea.symfony2plugin.doctrine.dict.DoctrineModelSerializable;
1313
import fr.adrienbrault.idea.symfony2plugin.stubs.indexes.externalizer.ObjectStreamDataExternalizer;
1414
import fr.adrienbrault.idea.symfony2plugin.stubs.indexes.inputFilter.FileInputFilter;
15-
import gnu.trove.THashMap;
1615
import org.jetbrains.annotations.NotNull;
1716

1817
import java.util.Collection;
18+
import java.util.HashMap;
1919
import java.util.Map;
2020

2121
/**
@@ -25,16 +25,16 @@ public class DoctrineMetadataFileStubIndex extends FileBasedIndexExtension<Strin
2525

2626
public static final ID<String, DoctrineModelSerializable> KEY = ID.create("fr.adrienbrault.idea.symfony2plugin.doctrine_metadata");
2727
private final KeyDescriptor<String> myKeyDescriptor = new EnumeratorStringDescriptor();
28-
private static ObjectStreamDataExternalizer<DoctrineModelSerializable> EXTERNALIZER = new ObjectStreamDataExternalizer<>();
28+
private static final ObjectStreamDataExternalizer<DoctrineModelSerializable> EXTERNALIZER = new ObjectStreamDataExternalizer<>();
2929

30-
private static int MAX_FILE_BYTE_SIZE = 1048576;
30+
private static final int MAX_FILE_BYTE_SIZE = 1048576;
3131

3232
private static class MyStringStringFileContentDataIndexer implements DataIndexer<String, DoctrineModelSerializable, FileContent> {
3333
@NotNull
3434
@Override
3535
public Map<String, DoctrineModelSerializable> map(@NotNull FileContent fileContent) {
3636

37-
Map<String, DoctrineModelSerializable> map = new THashMap<>();
37+
Map<String, DoctrineModelSerializable> map = new HashMap<>();
3838

3939
PsiFile psiFile = fileContent.getPsiFile();
4040
if(!Symfony2ProjectComponent.isEnabledForIndex(psiFile.getProject()) || !isValidForIndex(fileContent, psiFile)) {

‎src/main/java/fr/adrienbrault/idea/symfony2plugin/stubs/indexes/FileResourcesIndex.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,19 @@
1010
import fr.adrienbrault.idea.symfony2plugin.stubs.indexes.externalizer.ObjectStreamDataExternalizer;
1111
import fr.adrienbrault.idea.symfony2plugin.stubs.indexes.inputFilter.FileInputFilter;
1212
import fr.adrienbrault.idea.symfony2plugin.util.FileResourceVisitorUtil;
13-
import gnu.trove.THashMap;
1413
import org.jetbrains.annotations.NotNull;
1514

1615
import java.util.Collections;
16+
import java.util.HashMap;
1717
import java.util.Map;
1818

1919
/**
2020
* @author Daniel Espendiller <daniel@espendiller.net>
2121
*/
2222
public class FileResourcesIndex extends FileBasedIndexExtension<String, FileResource> {
2323

24-
private static int MAX_FILE_BYTE_SIZE = 1048576;
25-
private static ObjectStreamDataExternalizer<FileResource> EXTERNALIZER = new ObjectStreamDataExternalizer<>();
24+
private static final int MAX_FILE_BYTE_SIZE = 1048576;
25+
private static final ObjectStreamDataExternalizer<FileResource> EXTERNALIZER = new ObjectStreamDataExternalizer<>();
2626

2727
public static final ID<String, FileResource> KEY = ID.create("fr.adrienbrault.idea.symfony2plugin.file_resources");
2828
private final KeyDescriptor<String> myKeyDescriptor = new EnumeratorStringDescriptor();
@@ -42,7 +42,7 @@ public DataIndexer<String, FileResource, FileContent> getIndexer() {
4242
return Collections.emptyMap();
4343
}
4444

45-
final Map<String, FileResource> items = new THashMap<>();
45+
final Map<String, FileResource> items = new HashMap<>();
4646

4747
FileResourceVisitorUtil.visitFile(psiFile, consumer -> {
4848
String resource = consumer.getResource();

‎src/main/java/fr/adrienbrault/idea/symfony2plugin/stubs/indexes/RoutesStubIndex.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@
1919
import fr.adrienbrault.idea.symfony2plugin.stubs.indexes.inputFilter.FileInputFilter;
2020
import fr.adrienbrault.idea.symfony2plugin.stubs.indexes.visitor.AnnotationRouteElementWalkingVisitor;
2121
import fr.adrienbrault.idea.symfony2plugin.util.ProjectUtil;
22-
import gnu.trove.THashMap;
2322
import org.jetbrains.annotations.NotNull;
2423
import org.jetbrains.yaml.psi.YAMLDocument;
2524
import org.jetbrains.yaml.psi.YAMLFile;
2625

26+
import java.util.HashMap;
2727
import java.util.Map;
2828

2929
/**
@@ -33,7 +33,7 @@ public class RoutesStubIndex extends FileBasedIndexExtension<String, StubIndexed
3333

3434
public static final ID<String, StubIndexedRoute> KEY = ID.create("fr.adrienbrault.idea.symfony2plugin.routes_object");
3535
private final KeyDescriptor<String> myKeyDescriptor = new EnumeratorStringDescriptor();
36-
private static ObjectStreamDataExternalizer<StubIndexedRoute> EXTERNALIZER = new ObjectStreamDataExternalizer<>();
36+
private static final ObjectStreamDataExternalizer<StubIndexedRoute> EXTERNALIZER = new ObjectStreamDataExternalizer<>();
3737

3838
@NotNull
3939
@Override
@@ -45,7 +45,7 @@ public ID<String, StubIndexedRoute> getName() {
4545
@Override
4646
public DataIndexer<String, StubIndexedRoute, FileContent> getIndexer() {
4747
return inputData -> {
48-
Map<String, StubIndexedRoute> map = new THashMap<>();
48+
Map<String, StubIndexedRoute> map = new HashMap<>();
4949

5050
PsiFile psiFile = inputData.getPsiFile();
5151
if(!Symfony2ProjectComponent.isEnabledForIndex(psiFile.getProject())) {

‎src/main/java/fr/adrienbrault/idea/symfony2plugin/stubs/indexes/SerializerClassUsageStubIndex.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
import com.jetbrains.php.lang.PhpFileType;
1010
import fr.adrienbrault.idea.symfony2plugin.Symfony2ProjectComponent;
1111
import fr.adrienbrault.idea.symfony2plugin.util.SerializerUtil;
12-
import gnu.trove.THashMap;
1312
import org.jetbrains.annotations.NotNull;
1413

1514
import java.util.Collections;
15+
import java.util.HashMap;
1616
import java.util.Map;
1717

1818
/**
@@ -40,7 +40,7 @@ public DataIndexer<String, Void, FileContent> getIndexer() {
4040
return Collections.emptyMap();
4141
}
4242

43-
final Map<String, Void> map = new THashMap<>();
43+
final Map<String, Void> map = new HashMap<>();
4444

4545
SerializerUtil.visitSerializerMethodReference(psiFile, pair -> map.put(pair.getFirst(), null));
4646

‎src/main/java/fr/adrienbrault/idea/symfony2plugin/stubs/indexes/ServicesDefinitionStubIndex.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,31 +12,31 @@
1212
import fr.adrienbrault.idea.symfony2plugin.stubs.indexes.externalizer.ObjectStreamDataExternalizer;
1313
import fr.adrienbrault.idea.symfony2plugin.stubs.indexes.inputFilter.FileInputFilter;
1414
import fr.adrienbrault.idea.symfony2plugin.util.ProjectUtil;
15-
import gnu.trove.THashMap;
1615
import org.jetbrains.annotations.NotNull;
1716

1817
import java.io.File;
1918
import java.util.Collection;
19+
import java.util.HashMap;
2020
import java.util.Map;
2121

2222
/**
2323
* @author Daniel Espendiller <daniel@espendiller.net>
2424
*/
2525
public class ServicesDefinitionStubIndex extends FileBasedIndexExtension<String, ServiceSerializable> {
2626

27-
private static int MAX_FILE_BYTE_SIZE = 5242880;
27+
private static final int MAX_FILE_BYTE_SIZE = 5242880;
2828

2929
public static final ID<String, ServiceSerializable> KEY = ID.create("fr.adrienbrault.idea.symfony2plugin.service_definition");
3030
private final KeyDescriptor<String> myKeyDescriptor = new EnumeratorStringDescriptor();
31-
private static ObjectStreamDataExternalizer<ServiceSerializable> EXTERNALIZER = new ObjectStreamDataExternalizer<>();
31+
private static final ObjectStreamDataExternalizer<ServiceSerializable> EXTERNALIZER = new ObjectStreamDataExternalizer<>();
3232

3333
@NotNull
3434
@Override
3535
public DataIndexer<String, ServiceSerializable, FileContent> getIndexer() {
3636

3737
return inputData -> {
3838

39-
Map<String, ServiceSerializable> map = new THashMap<>();
39+
Map<String, ServiceSerializable> map = new HashMap<>();
4040

4141
PsiFile psiFile = inputData.getPsiFile();
4242
if(!Symfony2ProjectComponent.isEnabledForIndex(psiFile.getProject()) || !isValidForIndex(inputData, psiFile)) {

‎src/main/java/fr/adrienbrault/idea/symfony2plugin/stubs/indexes/ServicesTagStubIndex.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@
1010
import fr.adrienbrault.idea.symfony2plugin.form.util.FormUtil;
1111
import fr.adrienbrault.idea.symfony2plugin.stubs.indexes.externalizer.StringSetDataExternalizer;
1212
import fr.adrienbrault.idea.symfony2plugin.stubs.indexes.inputFilter.FileInputFilter;
13-
import gnu.trove.THashMap;
1413
import org.jetbrains.annotations.NotNull;
1514
import org.jetbrains.yaml.psi.YAMLFile;
1615

16+
import java.util.HashMap;
1717
import java.util.Map;
1818
import java.util.Set;
1919

@@ -31,7 +31,7 @@ public DataIndexer<String, Set<String>, FileContent> getIndexer() {
3131

3232
return inputData -> {
3333

34-
Map<String, Set<String>> map = new THashMap<>();
34+
Map<String, Set<String>> map = new HashMap<>();
3535

3636
PsiFile psiFile = inputData.getPsiFile();
3737
if(!Symfony2ProjectComponent.isEnabledForIndex(psiFile.getProject())) {

‎src/main/java/fr/adrienbrault/idea/symfony2plugin/stubs/indexes/TranslationStubIndex.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
import fr.adrienbrault.idea.symfony2plugin.translation.collector.YamlTranslationVisitor;
1717
import fr.adrienbrault.idea.symfony2plugin.translation.dict.TranslationUtil;
1818
import fr.adrienbrault.idea.symfony2plugin.util.ProjectUtil;
19-
import gnu.trove.THashMap;
2019
import org.apache.commons.lang.ArrayUtils;
2120
import org.apache.commons.lang.StringUtils;
2221
import org.jetbrains.annotations.NotNull;
@@ -75,7 +74,7 @@ public Map<String, Set<String>> map(@NotNull FileContent inputData) {
7574
return Collections.emptyMap();
7675
}
7776

78-
Map<String, Set<String>> map = new THashMap<>();
77+
Map<String, Set<String>> map = new HashMap<>();
7978
map.put(domainName, translationKeySet);
8079

8180
return map;
@@ -90,7 +89,7 @@ public Map<String, Set<String>> map(@NotNull FileContent inputData) {
9089
return Collections.emptyMap();
9190
}
9291

93-
Map<String, Set<String>> map = new THashMap<>();
92+
Map<String, Set<String>> map = new HashMap<>();
9493
map.put(domainName, translationKeySet);
9594
return map;
9695
}
@@ -162,7 +161,7 @@ private Map<String, Set<String>> getXlfStringMap(@NotNull FileContent inputData)
162161
}
163162

164163
// wrap with domain
165-
Map<String, Set<String>> map = new THashMap<>();
164+
Map<String, Set<String>> map = new HashMap<>();
166165
map.put(domainName, set);
167166
return map;
168167
}

‎src/main/java/fr/adrienbrault/idea/symfony2plugin/stubs/indexes/TwigControllerStubIndex.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@
1010
import com.jetbrains.twig.TwigFileType;
1111
import fr.adrienbrault.idea.symfony2plugin.Symfony2ProjectComponent;
1212
import fr.adrienbrault.idea.symfony2plugin.templating.util.TwigUtil;
13-
import gnu.trove.THashMap;
1413
import org.jetbrains.annotations.NotNull;
1514

1615
import java.util.Collections;
16+
import java.util.HashMap;
1717
import java.util.Map;
1818

1919
/**
@@ -41,7 +41,7 @@ public DataIndexer<String, Void, FileContent> getIndexer() {
4141
return Collections.emptyMap();
4242
}
4343

44-
final Map<String, Void> map = new THashMap<>();
44+
final Map<String, Void> map = new HashMap<>();
4545
TwigUtil.visitControllerFunctions(psiFile, pair -> {
4646
String name = pair.getFirst();
4747
if (name.length() < 255) {

‎src/main/java/fr/adrienbrault/idea/symfony2plugin/stubs/indexes/TwigExtendsStubIndex.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
import com.jetbrains.twig.TwigFileType;
1111
import fr.adrienbrault.idea.symfony2plugin.Symfony2ProjectComponent;
1212
import fr.adrienbrault.idea.symfony2plugin.templating.util.TwigUtil;
13-
import gnu.trove.THashMap;
1413
import org.jetbrains.annotations.NotNull;
1514

15+
import java.util.HashMap;
1616
import java.util.Map;
1717

1818
/**
@@ -33,7 +33,7 @@ public ID<String, Void> getName() {
3333
@Override
3434
public DataIndexer<String, Void, FileContent> getIndexer() {
3535
return inputData -> {
36-
Map<String, Void> map = new THashMap<>();
36+
Map<String, Void> map = new HashMap<>();
3737

3838
PsiFile psiFile = inputData.getPsiFile();
3939
if(!Symfony2ProjectComponent.isEnabledForIndex(psiFile.getProject())) {

0 commit comments

Comments
 (0)