suppress unchecked warnings and modernize collection APIs

Haehnchen · Haehnchen · commit f95b201a424b · 2025-12-17T15:11:08.000+01:00
diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/codeInsight/GotoCompletionContributor.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/codeInsight/GotoCompletionContributor.java
@@ -7,9 +7,7 @@
 /**
  * @author Daniel Espendiller <daniel@espendiller.net>
  *
- * @deprecated Use core features
  */
-@Deprecated
 public interface GotoCompletionContributor {
     @Nullable
     GotoCompletionProvider getProvider(@NotNull PsiElement psiElement);
diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/codeInsight/GotoCompletionProvider.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/codeInsight/GotoCompletionProvider.java
@@ -11,9 +11,7 @@
 /**
  * @author Daniel Espendiller <daniel@espendiller.net>
  *
- * @deprecated Use core features
  */
-@Deprecated
 public abstract class GotoCompletionProvider implements GotoCompletionProviderInterfaceEx {
     @NotNull
     private final PsiElement element;
diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/codeInsight/GotoCompletionRegistrar.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/codeInsight/GotoCompletionRegistrar.java
@@ -4,10 +4,7 @@
 
 /**
  * @author Daniel Espendiller <daniel@espendiller.net>
- *
- * @deprecated Use core features
  */
-@Deprecated
 public interface GotoCompletionRegistrar {
     void register(@NotNull GotoCompletionRegistrarParameter registrar);
 }
diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/codeInsight/GotoCompletionRegistrarParameter.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/codeInsight/GotoCompletionRegistrarParameter.java
@@ -7,9 +7,7 @@
 /**
  * @author Daniel Espendiller <daniel@espendiller.net>
  *
- * @deprecated Use core features
  */
-@Deprecated
 public interface GotoCompletionRegistrarParameter {
     void register(@NotNull ElementPattern<? extends PsiElement> pattern, GotoCompletionContributor contributor);
 }
diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/querybuilder/dict/QueryBuilderPropertyAlias.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/querybuilder/dict/QueryBuilderPropertyAlias.java
@@ -31,7 +31,7 @@ public String getAlias() {
     }
 
     public Collection<PsiElement> getPsiTargets() {
-        return field == null ? Collections.EMPTY_LIST : field.getTargets();
+        return field == null ? Collections.emptyList() : field.getTargets();
     }
 
     @Nullable
diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/querybuilder/processor/QueryBuilderChainProcessor.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/querybuilder/processor/QueryBuilderChainProcessor.java
@@ -194,6 +194,7 @@ public enum InstanceType {
     }
 
     @Nullable
+    @SuppressWarnings("unchecked")
     private static <T extends PsiElement> T getLastParentOfType(@Nullable PsiElement element, @NotNull Class<T> aClass) {
         if (element == null) return null;
 
diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/intentions/yaml/YamlServiceTagIntention.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/intentions/yaml/YamlServiceTagIntention.java
@@ -45,6 +45,7 @@ public boolean isAvailable(@NotNull Project project, Editor editor, @NotNull Psi
     }
 
     @Override
+    @SuppressWarnings("deprecation")
     public void invoke(@NotNull Project project, Editor editor, @NotNull PsiElement psiElement) throws IncorrectOperationException {
 
         YAMLKeyValue serviceKeyValue = YamlHelper.findServiceInContext(psiElement);
diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/intentions/yaml/dict/YamlUpdateArgumentServicesCallback.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/intentions/yaml/dict/YamlUpdateArgumentServicesCallback.java
@@ -35,6 +35,7 @@ public YamlUpdateArgumentServicesCallback(Project project, YAMLKeyValue argument
     }
 
     @Override
+    @SuppressWarnings("deprecation")
     public void insert(List<String> items) {
 
         YAMLValue yamlCompoundValue = argumentsKeyValue.getValue();
diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/profiler/dict/HttpProfilerRequest.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/profiler/dict/HttpProfilerRequest.java
@@ -68,6 +68,7 @@ public int getStatusCode() {
 
     @Nullable
     @Override
+    @SuppressWarnings("unchecked")
     public <T> T getCollector(Class<T> classFactory) {
         for (Object collector : collectors) {
             if(classFactory.isAssignableFrom(collector.getClass())) {
diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/profiler/dict/LocalProfilerRequest.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/profiler/dict/LocalProfilerRequest.java
@@ -61,6 +61,7 @@ public int getStatusCode() {
         }
     }
 
+    @SuppressWarnings("unchecked")
     public <T> T getCollector(Class<T> classFactory) {
         for (Object collector : collectors) {
             if(classFactory.isAssignableFrom(collector.getClass())) {
diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/routing/RouteHelper.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/routing/RouteHelper.java
@@ -21,6 +21,7 @@
 import com.intellij.psi.xml.XmlTag;
 import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.indexing.FileBasedIndex;
+import com.jetbrains.php.config.PhpLanguageLevel;
 import com.jetbrains.php.lang.parser.PhpElementTypes;
 import com.jetbrains.php.lang.psi.PhpFile;
 import com.jetbrains.php.lang.psi.PhpPsiUtil;
@@ -390,7 +391,7 @@ public static PsiElement[] getMethodsOnControllerShortcut(@NotNull Project proje
             if(controllerServiceAction != null) {
                 return new PsiElement[] {controllerServiceAction.getMethod()};
             }
-        } else if(PhpNameUtil.isValidNamespaceFullName(controllerName, true)) {
+        } else if(PhpNameUtil.isValidNamespaceFullName(controllerName, true, PhpLanguageLevel.current(project))) {
             // FooBundle\Controller\BarController (__invoke)
             Method invoke = PhpElementsUtil.getClassMethod(project, controllerName, "__invoke");
             if(invoke != null) {
diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/TwigPattern.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/TwigPattern.java
@@ -27,7 +27,8 @@
  * @author Daniel Espendiller <daniel@espendiller.net>
  */
 public class TwigPattern {
-    private static final ElementPattern[] PARAMETER_WHITE_LIST = new ElementPattern[]{
+    @SuppressWarnings("unchecked")
+    private static final ElementPattern<?>[] PARAMETER_WHITE_LIST = new ElementPattern[]{
         PlatformPatterns.psiElement(PsiWhiteSpace.class),
         PlatformPatterns.psiElement(TwigTokenTypes.WHITE_SPACE),
         PlatformPatterns.psiElement(TwigTokenTypes.NUMBER),
@@ -939,12 +940,12 @@ public static ElementPattern<PsiElement> getTransDefaultDomainPattern() {
      * transchoice(2, null, 'bar')
      */
     public static ElementPattern<PsiElement> getTransDomainPattern() {
-        ElementPattern[] whitespace = {
+        ElementPattern<?>[] whitespace = {
             PlatformPatterns.psiElement(PsiWhiteSpace.class),
             PlatformPatterns.psiElement(TwigTokenTypes.WHITE_SPACE)
         };
 
-        ElementPattern[] placeholder = {
+        ElementPattern<?>[] placeholder = {
             PlatformPatterns.psiElement(PsiWhiteSpace.class),
             PlatformPatterns.psiElement(TwigTokenTypes.WHITE_SPACE),
             PlatformPatterns.psiElement(TwigTokenTypes.IDENTIFIER),
@@ -1097,7 +1098,9 @@ public static ElementPattern<PsiComment> getTwigTypeDocBlockPattern() {
             patterns.add(PlatformPatterns.psiElement(TwigTokenTypes.COMMENT_TEXT).withText(PlatformPatterns.string().matches(s)).withLanguage(TwigLanguage.INSTANCE));
         }
 
-        return PlatformPatterns.or(patterns.toArray(new ElementPattern[0]));
+        @SuppressWarnings("unchecked")
+        final ElementPattern<PsiComment>[] array = patterns.toArray(new ElementPattern[0]);
+        return PlatformPatterns.or(array);
     }
 
     /**
@@ -1574,7 +1577,7 @@ public static ElementPattern<PsiElement> getVariableTypePattern() {
     @NotNull
     public static PsiElementPattern getFirstFunctionParameterAsStringPattern() {
         // string wrapped elements
-        ElementPattern[] elementPatterns = {
+        ElementPattern<?>[] elementPatterns = {
             PlatformPatterns.psiElement(TwigTokenTypes.WHITE_SPACE),
             PlatformPatterns.psiElement(PsiWhiteSpace.class),
             PlatformPatterns.psiElement(TwigTokenTypes.SINGLE_QUOTE),
@@ -1592,7 +1595,7 @@ public static PsiElementPattern getFirstFunctionParameterAsStringPattern() {
     @NotNull
     public static PsiElementPattern getParameterAsStringPattern() {
         // string wrapped elements
-        ElementPattern[] elementPatterns = {
+        ElementPattern<?>[] elementPatterns = {
             PlatformPatterns.psiElement(TwigTokenTypes.WHITE_SPACE),
             PlatformPatterns.psiElement(PsiWhiteSpace.class),
             PlatformPatterns.psiElement(TwigTokenTypes.SINGLE_QUOTE),
diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/ui/MethodParameterDialog.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/ui/MethodParameterDialog.java
@@ -34,10 +34,10 @@ public class MethodParameterDialog extends JDialog {
 
     private final Project project;
 
-    static class ComboBoxRenderer extends ColoredListCellRenderer {
+    static class ComboBoxRenderer extends ColoredListCellRenderer<String> {
         @Override
-        protected void customizeCellRenderer(JList list, Object value, int index, boolean selected, boolean hasFocus) {
-            append((String) value);
+        protected void customizeCellRenderer(JList<? extends String> list, String value, int index, boolean selected, boolean hasFocus) {
+            append(value);
         }
     }
 
diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/PhpElementsUtil.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/PhpElementsUtil.java
@@ -236,7 +236,7 @@ static public Map<String, Pair<PsiElement, PsiElement>> getArrayKeyValueMapWithK
                     continue;
                 }
 
-                keys.put(key, new Pair(arrayHashElement.getKey(), arrayHashElement.getValue()));
+                keys.put(key, new Pair<>(arrayHashElement.getKey(), arrayHashElement.getValue()));
             }
         }
 
diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/PhpStringLiteralExpressionReference.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/PhpStringLiteralExpressionReference.java
@@ -57,6 +57,7 @@ public PsiReference[] getReferencesByElement(@NotNull PsiElement psiElement, @No
         return new PsiReference[0];
     }
 
+    @SuppressWarnings("unchecked")
     private PsiReference[] getPsiReferenceBase(PsiElement psiElement) {
 
         try {
diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/PsiElementUtils.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/PsiElementUtils.java
@@ -158,6 +158,7 @@ public static int getParameterIndexValue(@Nullable PsiElement parameterListChild
     }
 
     @Nullable
+    @SuppressWarnings("unchecked")
     public static <T extends PsiElement> T getNextSiblingOfType(@Nullable PsiElement sibling, ElementPattern<PsiElement> pattern) {
         if (sibling == null) return null;
         for (PsiElement child = sibling.getNextSibling(); child != null; child = child.getNextSibling()) {
@@ -170,6 +171,7 @@ public static <T extends PsiElement> T getNextSiblingOfType(@Nullable PsiElement
     }
 
     @NotNull
+    @SuppressWarnings("unchecked")
     public static <T extends PsiElement> Collection<T> getNextSiblingOfTypes(@Nullable PsiElement sibling, ElementPattern<PsiElement> pattern) {
         if (sibling == null) return Collections.emptySet();
 
@@ -184,6 +186,7 @@ public static <T extends PsiElement> Collection<T> getNextSiblingOfTypes(@Nullab
     }
 
     @NotNull
+    @SuppressWarnings("unchecked")
     public static <T extends PsiElement> Collection<T> getNextSiblingOfTypes(@Nullable PsiElement sibling, Class<T> pattern) {
         if (sibling == null) return Collections.emptySet();
 
@@ -199,6 +202,7 @@ public static <T extends PsiElement> Collection<T> getNextSiblingOfTypes(@Nullab
     }
 
     @Nullable
+    @SuppressWarnings("unchecked")
     public static <T extends PsiElement> T getPrevSiblingOfType(@Nullable PsiElement sibling, ElementPattern<T> pattern) {
         if (sibling == null) return null;
         for (PsiElement child = sibling.getPrevSibling(); child != null; child = child.getPrevSibling()) {
@@ -221,6 +225,7 @@ public static void getPrevSiblingOnCallback(@Nullable PsiElement sibling, Proces
     }
 
     @Nullable
+    @SuppressWarnings("unchecked")
     public static <T extends PsiElement> T getChildrenOfType(@Nullable PsiElement element, ElementPattern<T> pattern) {
         if (element == null) return null;
 
@@ -235,6 +240,7 @@ public static <T extends PsiElement> T getChildrenOfType(@Nullable PsiElement el
     }
 
     @NotNull
+    @SuppressWarnings("unchecked")
     public static <T extends PsiElement> Collection<T> getChildrenOfTypeAsList(@Nullable PsiElement element, ElementPattern<T> pattern) {
 
         Collection<T> collection = new ArrayList<>();
@@ -353,6 +359,7 @@ public static PsiElement getParentOfType(@Nullable PsiElement element, @NotNull
         return null;
     }
 
+    @SuppressWarnings("unchecked")
     public static <T extends PsiElement> List<T> getPrevSiblingsOfType(@Nullable PsiElement sibling, ElementPattern<T> pattern) {
 
         List<T> elements = new ArrayList<>();
diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/psi/PsiElementAssertUtil.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/psi/PsiElementAssertUtil.java
@@ -18,12 +18,14 @@ public static boolean isNotNullAndIsElementType(@Nullable PsiElement psiElement,
     }
 
     @Nullable
+    @SuppressWarnings("unchecked")
     public static <T extends PsiElement> T getParentOfTypeOrNull(@NotNull PsiElement element, @NotNull Class<T> aClass) {
         PsiElement parent = element.getParent();
         return aClass.isInstance(parent) ? (T) parent : null;
     }
 
     @Nullable
+    @SuppressWarnings("unchecked")
     public static <T extends PsiNamedElement> T getParentOfTypeWithNameOrNull(@NotNull PsiElement element, @NotNull Class<T> aClass, @NotNull String name) {
         PsiElement parent = element.getParent();
         if(!aClass.isInstance(parent) || !(parent instanceof PsiNamedElement) || !name.equals(((PsiNamedElement) parent).getName())) {
@@ -34,6 +36,7 @@ public static <T extends PsiNamedElement> T getParentOfTypeWithNameOrNull(@NotNu
     }
 
     @Nullable
+    @SuppressWarnings("unchecked")
     public static <T extends PsiElement> T getInstanceOfOrNull(@Nullable PsiElement element, @NotNull Class<T> aClass) {
         if(element == null) return null;
         return aClass.isInstance(element) ? (T) element : null;
diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/service/ServiceXmlParserFactory.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/service/ServiceXmlParserFactory.java
@@ -64,6 +64,7 @@ private boolean isModified(Collection<File> serviceFiles) {
     }
 
     @Nullable
+    @SuppressWarnings("unchecked")
     synchronized public <T extends ServiceParserInterface> T parser(Class<T> serviceParser) {
         Collection<File> settingsServiceFiles = Symfony2ProjectComponent.getContainerFiles(this.project);
 
diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/yaml/YamlPsiElementFactory.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/yaml/YamlPsiElementFactory.java
@@ -14,6 +14,7 @@
  */
 public class YamlPsiElementFactory {
     @Nullable
+    @SuppressWarnings("unchecked")
     public static <T extends PsiElement> T createFromText(@NotNull Project p, final Class<T> aClass, String text) {
         final PsiElement[] ret = new PsiElement[]{null};
 
diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/webDeployment/utils/RemoteWebServerUtil.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/webDeployment/utils/RemoteWebServerUtil.java
@@ -45,6 +45,7 @@ public synchronized static RemoteFileStorageInterface[] getExtension(@NotNull Pr
     }
 
     @Nullable
+    @SuppressWarnings("unchecked")
     public static <T> T getExtensionInstance(@Nullable Project project, @NotNull Class<T> aClass) {
         if(!STORAGE_INSTANCES.containsKey(project)) {
             return null;
@@ -59,6 +60,7 @@ public static <T> T getExtensionInstance(@Nullable Project project, @NotNull Cla
         return null;
     }
 
+    @SuppressWarnings("unchecked")
     public static void collectRemoteFiles(final @NotNull Project project) {
         WebServerConfig defaultServer = findDefaultServer(project);
         if(defaultServer == null) {

Original file line number	Diff line number	Diff line change
`@@ -7,9 +7,7 @@`
`7`	`7`	`/**`
`8`	`8`	`* @author Daniel Espendiller <daniel@espendiller.net>`
`9`	`9`	`*`
`10`		`- * @deprecated Use core features`
`11`	`10`	`*/`
`12`		`-@Deprecated`
`13`	`11`	`public interface GotoCompletionRegistrarParameter {`
`14`	`12`	`void register(@NotNull ElementPattern<? extends PsiElement> pattern, GotoCompletionContributor contributor);`
`15`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ public String getAlias() {`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`public Collection<PsiElement> getPsiTargets() {`
`34`		`- return field == null ? Collections.EMPTY_LIST : field.getTargets();`
	`34`	`+ return field == null ? Collections.emptyList() : field.getTargets();`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`@Nullable`
Original file line number	Diff line number	Diff line change
`@@ -194,6 +194,7 @@ public enum InstanceType {`
`194`	`194`	`}`
`195`	`195`
`196`	`196`	`@Nullable`
	`197`	`+ @SuppressWarnings("unchecked")`
`197`	`198`	`private static <T extends PsiElement> T getLastParentOfType(@Nullable PsiElement element, @NotNull Class<T> aClass) {`
`198`	`199`	`if (element == null) return null;`
`199`	`200`
Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,7 @@ public boolean isAvailable(@NotNull Project project, Editor editor, @NotNull Psi`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`@Override`
	`48`	`+ @SuppressWarnings("deprecation")`
`48`	`49`	`public void invoke(@NotNull Project project, Editor editor, @NotNull PsiElement psiElement) throws IncorrectOperationException {`
`49`	`50`
`50`	`51`	`YAMLKeyValue serviceKeyValue = YamlHelper.findServiceInContext(psiElement);`
Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,7 @@ public YamlUpdateArgumentServicesCallback(Project project, YAMLKeyValue argument`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`@Override`
	`38`	`+ @SuppressWarnings("deprecation")`
`38`	`39`	`public void insert(List<String> items) {`
`39`	`40`
`40`	`41`	`YAMLValue yamlCompoundValue = argumentsKeyValue.getValue();`
Original file line number	Diff line number	Diff line change
`@@ -61,6 +61,7 @@ public int getStatusCode() {`
`61`	`61`	`}`
`62`	`62`	`}`
`63`	`63`
	`64`	`+ @SuppressWarnings("unchecked")`
`64`	`65`	`public <T> T getCollector(Class<T> classFactory) {`
`65`	`66`	`for (Object collector : collectors) {`
`66`	`67`	`if(classFactory.isAssignableFrom(collector.getClass())) {`