Skip to content

replace deprecated THashMap #2086

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 24, 2023
Merged

replace deprecated THashMap #2086

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...ain/java/fr/adrienbrault/idea/symfony2plugin/stubs/indexes/ContainerBuilderStubIndex.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@
import fr.adrienbrault.idea.symfony2plugin.stubs.indexes.externalizer.ObjectStreamDataExternalizer;
import fr.adrienbrault.idea.symfony2plugin.util.PhpElementsUtil;
import fr.adrienbrault.idea.symfony2plugin.util.ProjectUtil;
import gnu.trove.THashMap;
import one.util.streamex.StreamEx;
import org.apache.commons.lang.StringUtils;
import org.jetbrains.annotations.NotNull;

import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
Expand Down Expand Up @@ -63,7 +63,7 @@ public DataIndexer<String, ContainerBuilderCall, FileContent> getIndexer() {

return inputData -> {

Map<String, ContainerBuilderCall> map = new THashMap<>();
Map<String, ContainerBuilderCall> map = new HashMap<>();

PsiFile psiFile = inputData.getPsiFile();
if(!(psiFile instanceof PhpFile) ||
Expand Down
8 changes: 4 additions & 4 deletions ...java/fr/adrienbrault/idea/symfony2plugin/stubs/indexes/DoctrineMetadataFileStubIndex.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
import fr.adrienbrault.idea.symfony2plugin.doctrine.dict.DoctrineModelSerializable;
import fr.adrienbrault.idea.symfony2plugin.stubs.indexes.externalizer.ObjectStreamDataExternalizer;
import fr.adrienbrault.idea.symfony2plugin.stubs.indexes.inputFilter.FileInputFilter;
import gnu.trove.THashMap;
import org.jetbrains.annotations.NotNull;

import java.util.Collection;
import java.util.HashMap;
import java.util.Map;

/**
Expand All @@ -25,16 +25,16 @@ public class DoctrineMetadataFileStubIndex extends FileBasedIndexExtension<Strin

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

private static int MAX_FILE_BYTE_SIZE = 1048576;
private static final int MAX_FILE_BYTE_SIZE = 1048576;

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

Map<String, DoctrineModelSerializable> map = new THashMap<>();
Map<String, DoctrineModelSerializable> map = new HashMap<>();

PsiFile psiFile = fileContent.getPsiFile();
if(!Symfony2ProjectComponent.isEnabledForIndex(psiFile.getProject()) || !isValidForIndex(fileContent, psiFile)) {
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/fr/adrienbrault/idea/symfony2plugin/stubs/indexes/FileResourcesIndex.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,19 @@
import fr.adrienbrault.idea.symfony2plugin.stubs.indexes.externalizer.ObjectStreamDataExternalizer;
import fr.adrienbrault.idea.symfony2plugin.stubs.indexes.inputFilter.FileInputFilter;
import fr.adrienbrault.idea.symfony2plugin.util.FileResourceVisitorUtil;
import gnu.trove.THashMap;
import org.jetbrains.annotations.NotNull;

import java.util.Collections;
import java.util.HashMap;
import java.util.Map;

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

private static int MAX_FILE_BYTE_SIZE = 1048576;
private static ObjectStreamDataExternalizer<FileResource> EXTERNALIZER = new ObjectStreamDataExternalizer<>();
private static final int MAX_FILE_BYTE_SIZE = 1048576;
private static final ObjectStreamDataExternalizer<FileResource> EXTERNALIZER = new ObjectStreamDataExternalizer<>();

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

final Map<String, FileResource> items = new THashMap<>();
final Map<String, FileResource> items = new HashMap<>();

FileResourceVisitorUtil.visitFile(psiFile, consumer -> {
String resource = consumer.getResource();
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/fr/adrienbrault/idea/symfony2plugin/stubs/indexes/RoutesStubIndex.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@
import fr.adrienbrault.idea.symfony2plugin.stubs.indexes.inputFilter.FileInputFilter;
import fr.adrienbrault.idea.symfony2plugin.stubs.indexes.visitor.AnnotationRouteElementWalkingVisitor;
import fr.adrienbrault.idea.symfony2plugin.util.ProjectUtil;
import gnu.trove.THashMap;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.yaml.psi.YAMLDocument;
import org.jetbrains.yaml.psi.YAMLFile;

import java.util.HashMap;
import java.util.Map;

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

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

@NotNull
@Override
Expand All @@ -45,7 +45,7 @@ public ID<String, StubIndexedRoute> getName() {
@Override
public DataIndexer<String, StubIndexedRoute, FileContent> getIndexer() {
return inputData -> {
Map<String, StubIndexedRoute> map = new THashMap<>();
Map<String, StubIndexedRoute> map = new HashMap<>();

PsiFile psiFile = inputData.getPsiFile();
if(!Symfony2ProjectComponent.isEnabledForIndex(psiFile.getProject())) {
Expand Down
4 changes: 2 additions & 2 deletions ...java/fr/adrienbrault/idea/symfony2plugin/stubs/indexes/SerializerClassUsageStubIndex.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
import com.jetbrains.php.lang.PhpFileType;
import fr.adrienbrault.idea.symfony2plugin.Symfony2ProjectComponent;
import fr.adrienbrault.idea.symfony2plugin.util.SerializerUtil;
import gnu.trove.THashMap;
import org.jetbrains.annotations.NotNull;

import java.util.Collections;
import java.util.HashMap;
import java.util.Map;

/**
Expand Down Expand Up @@ -40,7 +40,7 @@ public DataIndexer<String, Void, FileContent> getIndexer() {
return Collections.emptyMap();
}

final Map<String, Void> map = new THashMap<>();
final Map<String, Void> map = new HashMap<>();

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

Expand Down
8 changes: 4 additions & 4 deletions ...n/java/fr/adrienbrault/idea/symfony2plugin/stubs/indexes/ServicesDefinitionStubIndex.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,31 +12,31 @@
import fr.adrienbrault.idea.symfony2plugin.stubs.indexes.externalizer.ObjectStreamDataExternalizer;
import fr.adrienbrault.idea.symfony2plugin.stubs.indexes.inputFilter.FileInputFilter;
import fr.adrienbrault.idea.symfony2plugin.util.ProjectUtil;
import gnu.trove.THashMap;
import org.jetbrains.annotations.NotNull;

import java.io.File;
import java.util.Collection;
import java.util.HashMap;
import java.util.Map;

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

private static int MAX_FILE_BYTE_SIZE = 5242880;
private static final int MAX_FILE_BYTE_SIZE = 5242880;

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

@NotNull
@Override
public DataIndexer<String, ServiceSerializable, FileContent> getIndexer() {

return inputData -> {

Map<String, ServiceSerializable> map = new THashMap<>();
Map<String, ServiceSerializable> map = new HashMap<>();

PsiFile psiFile = inputData.getPsiFile();
if(!Symfony2ProjectComponent.isEnabledForIndex(psiFile.getProject()) || !isValidForIndex(inputData, psiFile)) {
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/fr/adrienbrault/idea/symfony2plugin/stubs/indexes/ServicesTagStubIndex.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@
import fr.adrienbrault.idea.symfony2plugin.form.util.FormUtil;
import fr.adrienbrault.idea.symfony2plugin.stubs.indexes.externalizer.StringSetDataExternalizer;
import fr.adrienbrault.idea.symfony2plugin.stubs.indexes.inputFilter.FileInputFilter;
import gnu.trove.THashMap;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.yaml.psi.YAMLFile;

import java.util.HashMap;
import java.util.Map;
import java.util.Set;

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

return inputData -> {

Map<String, Set<String>> map = new THashMap<>();
Map<String, Set<String>> map = new HashMap<>();

PsiFile psiFile = inputData.getPsiFile();
if(!Symfony2ProjectComponent.isEnabledForIndex(psiFile.getProject())) {
Expand Down
7 changes: 3 additions & 4 deletions src/main/java/fr/adrienbrault/idea/symfony2plugin/stubs/indexes/TranslationStubIndex.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
import fr.adrienbrault.idea.symfony2plugin.translation.collector.YamlTranslationVisitor;
import fr.adrienbrault.idea.symfony2plugin.translation.dict.TranslationUtil;
import fr.adrienbrault.idea.symfony2plugin.util.ProjectUtil;
import gnu.trove.THashMap;
import org.apache.commons.lang.ArrayUtils;
import org.apache.commons.lang.StringUtils;
import org.jetbrains.annotations.NotNull;
Expand Down Expand Up @@ -75,7 +74,7 @@ public Map<String, Set<String>> map(@NotNull FileContent inputData) {
return Collections.emptyMap();
}

Map<String, Set<String>> map = new THashMap<>();
Map<String, Set<String>> map = new HashMap<>();
map.put(domainName, translationKeySet);

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

Map<String, Set<String>> map = new THashMap<>();
Map<String, Set<String>> map = new HashMap<>();
map.put(domainName, translationKeySet);
return map;
}
Expand Down Expand Up @@ -162,7 +161,7 @@ private Map<String, Set<String>> getXlfStringMap(@NotNull FileContent inputData)
}

// wrap with domain
Map<String, Set<String>> map = new THashMap<>();
Map<String, Set<String>> map = new HashMap<>();
map.put(domainName, set);
return map;
}
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/fr/adrienbrault/idea/symfony2plugin/stubs/indexes/TwigControllerStubIndex.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@
import com.jetbrains.twig.TwigFileType;
import fr.adrienbrault.idea.symfony2plugin.Symfony2ProjectComponent;
import fr.adrienbrault.idea.symfony2plugin.templating.util.TwigUtil;
import gnu.trove.THashMap;
import org.jetbrains.annotations.NotNull;

import java.util.Collections;
import java.util.HashMap;
import java.util.Map;

/**
Expand Down Expand Up @@ -41,7 +41,7 @@ public DataIndexer<String, Void, FileContent> getIndexer() {
return Collections.emptyMap();
}

final Map<String, Void> map = new THashMap<>();
final Map<String, Void> map = new HashMap<>();
TwigUtil.visitControllerFunctions(psiFile, pair -> {
String name = pair.getFirst();
if (name.length() < 255) {
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/fr/adrienbrault/idea/symfony2plugin/stubs/indexes/TwigExtendsStubIndex.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
import com.jetbrains.twig.TwigFileType;
import fr.adrienbrault.idea.symfony2plugin.Symfony2ProjectComponent;
import fr.adrienbrault.idea.symfony2plugin.templating.util.TwigUtil;
import gnu.trove.THashMap;
import org.jetbrains.annotations.NotNull;

import java.util.HashMap;
import java.util.Map;

/**
Expand All @@ -33,7 +33,7 @@ public ID<String, Void> getName() {
@Override
public DataIndexer<String, Void, FileContent> getIndexer() {
return inputData -> {
Map<String, Void> map = new THashMap<>();
Map<String, Void> map = new HashMap<>();

PsiFile psiFile = inputData.getPsiFile();
if(!Symfony2ProjectComponent.isEnabledForIndex(psiFile.getProject())) {
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/fr/adrienbrault/idea/symfony2plugin/stubs/indexes/TwigIncludeStubIndex.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
import fr.adrienbrault.idea.symfony2plugin.stubs.dict.TemplateInclude;
import fr.adrienbrault.idea.symfony2plugin.stubs.indexes.externalizer.ObjectStreamDataExternalizer;
import fr.adrienbrault.idea.symfony2plugin.templating.util.TwigUtil;
import gnu.trove.THashMap;
import org.jetbrains.annotations.NotNull;

import java.util.HashMap;
import java.util.Map;

/**
Expand All @@ -35,7 +35,7 @@ public ID<String, TemplateInclude> getName() {
@Override
public DataIndexer<String, TemplateInclude, FileContent> getIndexer() {
return inputData -> {
final Map<String, TemplateInclude> map = new THashMap<>();
final Map<String, TemplateInclude> map = new HashMap<>();

PsiFile psiFile = inputData.getPsiFile();
if(!Symfony2ProjectComponent.isEnabledForIndex(psiFile.getProject())) {
Expand Down
6 changes: 3 additions & 3 deletions ...in/java/fr/adrienbrault/idea/symfony2plugin/stubs/indexes/TwigMacroFunctionStubIndex.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
import fr.adrienbrault.idea.symfony2plugin.stubs.dict.TwigMacroTagIndex;
import fr.adrienbrault.idea.symfony2plugin.stubs.indexes.externalizer.ObjectStreamDataExternalizer;
import fr.adrienbrault.idea.symfony2plugin.templating.util.TwigUtil;
import gnu.trove.THashMap;
import org.jetbrains.annotations.NotNull;

import java.util.HashMap;
import java.util.Map;

/**
Expand All @@ -23,7 +23,7 @@ public class TwigMacroFunctionStubIndex extends FileBasedIndexExtension<String,

public static final ID<String, TwigMacroTagIndex> KEY = ID.create("fr.adrienbrault.idea.symfony2plugin.twig_macro_function");
private final KeyDescriptor<String> myKeyDescriptor = new EnumeratorStringDescriptor();
private static ObjectStreamDataExternalizer<TwigMacroTagIndex> EXTERNALIZER = new ObjectStreamDataExternalizer<>();
private static final ObjectStreamDataExternalizer<TwigMacroTagIndex> EXTERNALIZER = new ObjectStreamDataExternalizer<>();

@NotNull
@Override
Expand All @@ -35,7 +35,7 @@ public ID<String, TwigMacroTagIndex> getName() {
@Override
public DataIndexer<String, TwigMacroTagIndex, FileContent> getIndexer() {
return inputData -> {
final Map<String, TwigMacroTagIndex> map = new THashMap<>();
final Map<String, TwigMacroTagIndex> map = new HashMap<>();

PsiFile psiFile = inputData.getPsiFile();
if(!Symfony2ProjectComponent.isEnabledForIndex(psiFile.getProject())) {
Expand Down