Merge pull request #802 from bohdan-harniuk/uct-inspections-prioritise-messages

andrewbess · web-flow · commit d233ec914b0a · 2021-11-24T19:09:43.000+01:00
UCT-766: Prioritised messages, code refactoring
diff --git a/src/com/magento/idea/magento2uct/execution/GenerateUctReportCommand.java b/src/com/magento/idea/magento2uct/execution/GenerateUctReportCommand.java
@@ -32,8 +32,10 @@
 import com.magento.idea.magento2uct.inspections.UctProblemsHolder;
 import com.magento.idea.magento2uct.packages.SupportedIssue;
 import com.magento.idea.magento2uct.settings.UctSettingsService;
+import com.magento.idea.magento2uct.util.inspection.FilterDescriptorResultsUtil;
 import com.magento.idea.magento2uct.util.inspection.SortDescriptorResultsUtil;
 import java.nio.file.Paths;
+import java.util.List;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -128,32 +130,25 @@ public void execute() {
                             }
                             outputUtil.printProblemFile(filename);
                         }
+                        final List<ProblemDescriptor> problems = SortDescriptorResultsUtil.sort(
+                                FilterDescriptorResultsUtil.filter(fileProblemsHolder)
+                        );
 
-                        for (final ProblemDescriptor descriptor
-                                : SortDescriptorResultsUtil.sort(
-                                        fileProblemsHolder.getResults()
-                        )) {
-                            final Integer code = fileProblemsHolder.getErrorCodeForDescriptor(
-                                    descriptor
+                        for (final ProblemDescriptor descriptor : problems) {
+                            final SupportedIssue issue = fileProblemsHolder.getIssue(descriptor);
+
+                            final String errorMessage = descriptor
+                                    .getDescriptionTemplate()
+                                    .substring(6)
+                                    .trim();
+                            summary.addToSummary(issue.getLevel());
+                            reportBuilder.addIssue(
+                                    descriptor.getLineNumber() + 1,
+                                    filename,
+                                    errorMessage,
+                                    issue
                             );
-                            if (code != null) {
-                                final SupportedIssue issue = SupportedIssue.getByCode(code);
-
-                                if (issue != null) {
-                                    final String errorMessage = descriptor
-                                            .getDescriptionTemplate()
-                                            .substring(6)
-                                            .trim();
-                                    summary.addToSummary(issue.getLevel());
-                                    reportBuilder.addIssue(
-                                            descriptor.getLineNumber() + 1,
-                                            filename,
-                                            errorMessage,
-                                            issue
-                                    );
-                                }
-                                outputUtil.printIssue(descriptor, code);
-                            }
+                            outputUtil.printIssue(descriptor, issue.getCode());
                         }
                     }
                 }
diff --git a/src/com/magento/idea/magento2uct/inspections/UctProblemsHolder.java b/src/com/magento/idea/magento2uct/inspections/UctProblemsHolder.java
@@ -9,18 +9,19 @@
 import com.intellij.codeInspection.ProblemDescriptor;
 import com.intellij.codeInspection.ProblemsHolder;
 import com.intellij.psi.PsiFile;
+import com.magento.idea.magento2uct.packages.SupportedIssue;
 import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.InputMismatchException;
 import java.util.List;
 import java.util.Map;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
 public class UctProblemsHolder extends ProblemsHolder {
 
-    private final Map<ProblemDescriptor, Integer> myProblemCodes = new HashMap<>();
-    private Integer reservedErrorCode;
+    private final Map<ProblemDescriptor, SupportedIssue> myProblemCodes = new HashMap<>();
+    private SupportedIssue issue;
 
     /**
      * UCT problems holder constructor.
@@ -38,36 +39,42 @@ public UctProblemsHolder(
     }
 
     /**
-     * Set reserved error code.
+     * Set reserved issue.
      *
-     * @param errorCode int
+     * @param issue SupportedIssue
      */
-    public void setReservedErrorCode(final int errorCode) {
-        reservedErrorCode = errorCode;
+    public void setIssue(final @NotNull SupportedIssue issue) {
+        this.issue = issue;
     }
 
     /**
-     * Get issue code by problem descriptor.
+     * Get issue by problem descriptor.
      *
      * @param problemDescriptor ProblemDescriptor
      *
      * @return Integer
      */
-    public @Nullable Integer getErrorCodeForDescriptor(
+    public @NotNull SupportedIssue getIssue(
             final @NotNull ProblemDescriptor problemDescriptor
     ) {
         return myProblemCodes.get(problemDescriptor);
     }
 
     @Override
     public void registerProblem(final @NotNull ProblemDescriptor problemDescriptor) {
+        if (issue == null) {
+            throw new InputMismatchException(
+                    "For the UCT CLI inspection it is mandatory to set an issue via "
+                            + "UctProblemsHolder.setIssue method"
+            );
+        }
         final int problemCount = getMyProblems().size();
         super.registerProblem(problemDescriptor);
 
         // if problem has been added successfully
-        if (problemCount != getMyProblems().size() && reservedErrorCode != null) {
-            myProblemCodes.put(problemDescriptor, reservedErrorCode);
-            reservedErrorCode = null;//NOPMD
+        if (problemCount != getMyProblems().size()) {
+            myProblemCodes.put(problemDescriptor, issue);
+            issue = null;//NOPMD
         }
     }
 
diff --git a/src/com/magento/idea/magento2uct/inspections/php/api/CalledNonApiMethod.java b/src/com/magento/idea/magento2uct/inspections/php/api/CalledNonApiMethod.java
@@ -32,9 +32,7 @@ protected void execute(
         final String message = SupportedIssue.CALLED_NON_API_METHOD.getMessage(method.getFQN());
 
         if (problemsHolder instanceof UctProblemsHolder) {
-            ((UctProblemsHolder) problemsHolder).setReservedErrorCode(
-                    SupportedIssue.CALLED_NON_API_METHOD.getCode()
-            );
+            ((UctProblemsHolder) problemsHolder).setIssue(SupportedIssue.CALLED_NON_API_METHOD);
         }
         problemsHolder.registerProblem(methodReference, message, ProblemHighlightType.WARNING);
     }
diff --git a/src/com/magento/idea/magento2uct/inspections/php/api/CalledNonInterfaceMethod.java b/src/com/magento/idea/magento2uct/inspections/php/api/CalledNonInterfaceMethod.java
@@ -69,8 +69,8 @@ protected void execute(
         }
 
         if (problemsHolder instanceof UctProblemsHolder) {
-            ((UctProblemsHolder) problemsHolder).setReservedErrorCode(
-                    SupportedIssue.CALLED_NON_INTERFACE_METHOD.getCode()
+            ((UctProblemsHolder) problemsHolder).setIssue(
+                    SupportedIssue.CALLED_NON_INTERFACE_METHOD
             );
         }
         problemsHolder.registerProblem(
diff --git a/src/com/magento/idea/magento2uct/inspections/php/api/ExtendedNonApiClass.java b/src/com/magento/idea/magento2uct/inspections/php/api/ExtendedNonApiClass.java
@@ -35,8 +35,8 @@ protected void execute(
         );
 
         if (problemsHolder instanceof UctProblemsHolder) {
-            ((UctProblemsHolder) problemsHolder).setReservedErrorCode(
-                    SupportedIssue.EXTENDED_NON_API_CLASS.getCode()
+            ((UctProblemsHolder) problemsHolder).setIssue(
+                    SupportedIssue.EXTENDED_NON_API_CLASS
             );
         }
 
diff --git a/src/com/magento/idea/magento2uct/inspections/php/api/ImplementedNonApiInterface.java b/src/com/magento/idea/magento2uct/inspections/php/api/ImplementedNonApiInterface.java
@@ -33,8 +33,8 @@ protected void execute(
         );
 
         if (problemsHolder instanceof UctProblemsHolder) {
-            ((UctProblemsHolder) problemsHolder).setReservedErrorCode(
-                    SupportedIssue.IMPLEMENTED_NON_API_INTERFACE.getCode()
+            ((UctProblemsHolder) problemsHolder).setIssue(
+                    SupportedIssue.IMPLEMENTED_NON_API_INTERFACE
             );
         }
         problemsHolder.registerProblem(reference, message, ProblemHighlightType.WARNING);
diff --git a/src/com/magento/idea/magento2uct/inspections/php/api/ImportedNonApiClass.java b/src/com/magento/idea/magento2uct/inspections/php/api/ImportedNonApiClass.java
@@ -31,8 +31,8 @@ protected void execute(
         final String message = SupportedIssue.IMPORTED_NON_API_CLASS.getMessage(use.getFQN());
 
         if (problemsHolder instanceof UctProblemsHolder) {
-            ((UctProblemsHolder) problemsHolder).setReservedErrorCode(
-                    SupportedIssue.IMPORTED_NON_API_CLASS.getCode()
+            ((UctProblemsHolder) problemsHolder).setIssue(
+                    SupportedIssue.IMPORTED_NON_API_CLASS
             );
         }
         problemsHolder.registerProblem(use, message, ProblemHighlightType.WARNING);
diff --git a/src/com/magento/idea/magento2uct/inspections/php/api/ImportedNonApiInterface.java b/src/com/magento/idea/magento2uct/inspections/php/api/ImportedNonApiInterface.java
@@ -31,8 +31,8 @@ protected void execute(
         final String message = SupportedIssue.IMPORTED_NON_API_INTERFACE.getMessage(use.getFQN());
 
         if (problemsHolder instanceof UctProblemsHolder) {
-            ((UctProblemsHolder) problemsHolder).setReservedErrorCode(
-                    SupportedIssue.IMPORTED_NON_API_INTERFACE.getCode()
+            ((UctProblemsHolder) problemsHolder).setIssue(
+                    SupportedIssue.IMPORTED_NON_API_INTERFACE
             );
         }
         problemsHolder.registerProblem(use, message, ProblemHighlightType.WARNING);
diff --git a/src/com/magento/idea/magento2uct/inspections/php/api/InheritedNonApiInterface.java b/src/com/magento/idea/magento2uct/inspections/php/api/InheritedNonApiInterface.java
@@ -31,8 +31,8 @@ protected void execute(
         final String message = SupportedIssue.INHERITED_NON_API_INTERFACE.getMessage(fqn);
 
         if (problemsHolder instanceof UctProblemsHolder) {
-            ((UctProblemsHolder) problemsHolder).setReservedErrorCode(
-                    SupportedIssue.INHERITED_NON_API_INTERFACE.getCode()
+            ((UctProblemsHolder) problemsHolder).setIssue(
+                    SupportedIssue.INHERITED_NON_API_INTERFACE
             );
         }
         problemsHolder.registerProblem(reference, message, ProblemHighlightType.WARNING);
diff --git a/src/com/magento/idea/magento2uct/inspections/php/api/OverriddenNonApiConstant.java b/src/com/magento/idea/magento2uct/inspections/php/api/OverriddenNonApiConstant.java
@@ -36,8 +36,8 @@ protected void execute(
         );
 
         if (problemsHolder instanceof UctProblemsHolder) {
-            ((UctProblemsHolder) problemsHolder).setReservedErrorCode(
-                    SupportedIssue.OVERRIDDEN_NON_API_CONSTANT.getCode()
+            ((UctProblemsHolder) problemsHolder).setIssue(
+                    SupportedIssue.OVERRIDDEN_NON_API_CONSTANT
             );
         }
         problemsHolder.registerProblem(field, message, ProblemHighlightType.WARNING);
diff --git a/src/com/magento/idea/magento2uct/inspections/php/api/OverriddenNonApiProperty.java b/src/com/magento/idea/magento2uct/inspections/php/api/OverriddenNonApiProperty.java
@@ -36,8 +36,8 @@ protected void execute(
         );
 
         if (problemsHolder instanceof UctProblemsHolder) {
-            ((UctProblemsHolder) problemsHolder).setReservedErrorCode(
-                    SupportedIssue.OVERRIDDEN_NON_API_PROPERTY.getCode()
+            ((UctProblemsHolder) problemsHolder).setIssue(
+                    SupportedIssue.OVERRIDDEN_NON_API_PROPERTY
             );
         }
         problemsHolder.registerProblem(property, message, ProblemHighlightType.WARNING);
diff --git a/src/com/magento/idea/magento2uct/inspections/php/api/PossibleDependencyOnImplDetails.java b/src/com/magento/idea/magento2uct/inspections/php/api/PossibleDependencyOnImplDetails.java
@@ -34,8 +34,8 @@ protected void execute(
             if (VersionStateManager.getInstance(project).isApi(implementedInterface.getFQN())) {
 
                 if (problemsHolder instanceof UctProblemsHolder) {
-                    ((UctProblemsHolder) problemsHolder).setReservedErrorCode(
-                            SupportedIssue.POSSIBLE_DEPENDENCY_ON_IMPL_DETAILS.getCode()
+                    ((UctProblemsHolder) problemsHolder).setIssue(
+                            SupportedIssue.POSSIBLE_DEPENDENCY_ON_IMPL_DETAILS
                     );
                 }
 
diff --git a/src/com/magento/idea/magento2uct/inspections/php/api/UsedNonApiConstant.java b/src/com/magento/idea/magento2uct/inspections/php/api/UsedNonApiConstant.java
@@ -46,8 +46,8 @@ protected void execute(
         );
 
         if (problemsHolder instanceof UctProblemsHolder) {
-            ((UctProblemsHolder) problemsHolder).setReservedErrorCode(
-                    SupportedIssue.USED_NON_API_CONSTANT.getCode()
+            ((UctProblemsHolder) problemsHolder).setIssue(
+                    SupportedIssue.USED_NON_API_CONSTANT
             );
         }
         problemsHolder.registerProblem(constantReference, message, ProblemHighlightType.WARNING);
diff --git a/src/com/magento/idea/magento2uct/inspections/php/api/UsedNonApiProperty.java b/src/com/magento/idea/magento2uct/inspections/php/api/UsedNonApiProperty.java
@@ -36,9 +36,7 @@ protected void execute(
         );
 
         if (problemsHolder instanceof UctProblemsHolder) {
-            ((UctProblemsHolder) problemsHolder).setReservedErrorCode(
-                    SupportedIssue.USED_NON_API_PROPERTY.getCode()
-            );
+            ((UctProblemsHolder) problemsHolder).setIssue(SupportedIssue.USED_NON_API_PROPERTY);
         }
         problemsHolder.registerProblem(propertyReference, message, ProblemHighlightType.WARNING);
     }
diff --git a/src/com/magento/idea/magento2uct/inspections/php/api/UsedNonApiType.java b/src/com/magento/idea/magento2uct/inspections/php/api/UsedNonApiType.java
@@ -32,9 +32,7 @@ protected void execute(
         final String message = SupportedIssue.USED_NON_API_TYPE.getMessage(phpClass.getFQN());
 
         if (problemsHolder instanceof UctProblemsHolder) {
-            ((UctProblemsHolder) problemsHolder).setReservedErrorCode(
-                    SupportedIssue.USED_NON_API_TYPE.getCode()
-            );
+            ((UctProblemsHolder) problemsHolder).setIssue(SupportedIssue.USED_NON_API_TYPE);
         }
         problemsHolder.registerProblem(reference, message, ProblemHighlightType.WARNING);
     }
diff --git a/src/com/magento/idea/magento2uct/inspections/php/deprecation/CallingDeprecatedMethod.java b/src/com/magento/idea/magento2uct/inspections/php/deprecation/CallingDeprecatedMethod.java
@@ -30,8 +30,8 @@ protected void execute(
 
         if (VersionStateManager.getInstance(project).isDeprecated(type)) {
             if (problemsHolder instanceof UctProblemsHolder) {
-                ((UctProblemsHolder) problemsHolder).setReservedErrorCode(
-                        SupportedIssue.CALLING_DEPRECATED_METHOD.getCode()
+                ((UctProblemsHolder) problemsHolder).setIssue(
+                        SupportedIssue.CALLING_DEPRECATED_METHOD
                 );
             }
             final String deprecatedIn = VersionStateManager.getInstance(project)
diff --git a/src/com/magento/idea/magento2uct/inspections/php/deprecation/ExtendingDeprecatedClass.java b/src/com/magento/idea/magento2uct/inspections/php/deprecation/ExtendingDeprecatedClass.java
@@ -38,8 +38,8 @@ protected void execute(
         for (final ClassReference classReference : childExtends.getReferenceElements()) {
             if (parentFqn.equals(classReference.getFQN())) {
                 if (problemsHolder instanceof UctProblemsHolder) {
-                    ((UctProblemsHolder) problemsHolder).setReservedErrorCode(
-                            SupportedIssue.EXTENDING_DEPRECATED_CLASS.getCode()
+                    ((UctProblemsHolder) problemsHolder).setIssue(
+                            SupportedIssue.EXTENDING_DEPRECATED_CLASS
                     );
                 }
                 problemsHolder.registerProblem(
diff --git a/src/com/magento/idea/magento2uct/inspections/php/deprecation/ImplementedDeprecatedInterface.java b/src/com/magento/idea/magento2uct/inspections/php/deprecation/ImplementedDeprecatedInterface.java
@@ -27,8 +27,8 @@ protected void execute(
     ) {
         if (VersionStateManager.getInstance(project).isDeprecated(interfaceFqn)) {
             if (problemsHolder instanceof UctProblemsHolder) {
-                ((UctProblemsHolder) problemsHolder).setReservedErrorCode(
-                        SupportedIssue.IMPLEMENTED_DEPRECATED_INTERFACE.getCode()
+                ((UctProblemsHolder) problemsHolder).setIssue(
+                        SupportedIssue.IMPLEMENTED_DEPRECATED_INTERFACE
                 );
             }
             final String deprecatedIn = VersionStateManager.getInstance(project)
diff --git a/src/com/magento/idea/magento2uct/inspections/php/deprecation/ImportingDeprecatedClass.java b/src/com/magento/idea/magento2uct/inspections/php/deprecation/ImportingDeprecatedClass.java
@@ -30,8 +30,8 @@ protected void execute(
                 return;
             }
             if (problemsHolder instanceof UctProblemsHolder) {
-                ((UctProblemsHolder) problemsHolder).setReservedErrorCode(
-                        SupportedIssue.IMPORTING_DEPRECATED_CLASS.getCode()
+                ((UctProblemsHolder) problemsHolder).setIssue(
+                        SupportedIssue.IMPORTING_DEPRECATED_CLASS
                 );
             }
             final String deprecatedIn = VersionStateManager.getInstance(project)
diff --git a/src/com/magento/idea/magento2uct/inspections/php/deprecation/ImportingDeprecatedInterface.java b/src/com/magento/idea/magento2uct/inspections/php/deprecation/ImportingDeprecatedInterface.java
@@ -30,8 +30,8 @@ protected void execute(
                 return;
             }
             if (problemsHolder instanceof UctProblemsHolder) {
-                ((UctProblemsHolder) problemsHolder).setReservedErrorCode(
-                        SupportedIssue.IMPORTING_DEPRECATED_INTERFACE.getCode()
+                ((UctProblemsHolder) problemsHolder).setIssue(
+                        SupportedIssue.IMPORTING_DEPRECATED_INTERFACE
                 );
             }
             final String deprecatedIn = VersionStateManager.getInstance(project)
diff --git a/src/com/magento/idea/magento2uct/inspections/php/deprecation/InheritedDeprecatedInterface.java b/src/com/magento/idea/magento2uct/inspections/php/deprecation/InheritedDeprecatedInterface.java
@@ -27,8 +27,8 @@ protected void execute(
     ) {
         if (VersionStateManager.getInstance(project).isDeprecated(interfaceFqn)) {
             if (problemsHolder instanceof UctProblemsHolder) {
-                ((UctProblemsHolder) problemsHolder).setReservedErrorCode(
-                        SupportedIssue.INHERITED_DEPRECATED_INTERFACE.getCode()
+                ((UctProblemsHolder) problemsHolder).setIssue(
+                        SupportedIssue.INHERITED_DEPRECATED_INTERFACE
                 );
             }
             final String deprecatedIn = VersionStateManager.getInstance(project)
diff --git a/src/com/magento/idea/magento2uct/inspections/php/deprecation/OverridingDeprecatedConstant.java b/src/com/magento/idea/magento2uct/inspections/php/deprecation/OverridingDeprecatedConstant.java
@@ -33,8 +33,8 @@ protected void execute(
         }
 
         if (problemsHolder instanceof UctProblemsHolder) {
-            ((UctProblemsHolder) problemsHolder).setReservedErrorCode(
-                    SupportedIssue.OVERRIDING_DEPRECATED_CONSTANT.getCode()
+            ((UctProblemsHolder) problemsHolder).setIssue(
+                    SupportedIssue.OVERRIDING_DEPRECATED_CONSTANT
             );
         }
         final String deprecatedIn = VersionStateManager.getInstance(project)
diff --git a/src/com/magento/idea/magento2uct/inspections/php/deprecation/OverridingDeprecatedProperty.java b/src/com/magento/idea/magento2uct/inspections/php/deprecation/OverridingDeprecatedProperty.java
@@ -33,8 +33,8 @@ protected void execute(
         }
 
         if (problemsHolder instanceof UctProblemsHolder) {
-            ((UctProblemsHolder) problemsHolder).setReservedErrorCode(
-                    SupportedIssue.OVERRIDING_DEPRECATED_PROPERTY.getCode()
+            ((UctProblemsHolder) problemsHolder).setIssue(
+                    SupportedIssue.OVERRIDING_DEPRECATED_PROPERTY
             );
         }
         final String deprecatedIn = VersionStateManager.getInstance(project)
diff --git a/src/com/magento/idea/magento2uct/inspections/php/deprecation/UsingDeprecatedClass.java b/src/com/magento/idea/magento2uct/inspections/php/deprecation/UsingDeprecatedClass.java
@@ -31,8 +31,8 @@ protected void execute(
             return;
         }
         if (problemsHolder instanceof UctProblemsHolder) {
-            ((UctProblemsHolder) problemsHolder).setReservedErrorCode(
-                    SupportedIssue.USING_DEPRECATED_CLASS.getCode()
+            ((UctProblemsHolder) problemsHolder).setIssue(
+                    SupportedIssue.USING_DEPRECATED_CLASS
             );
         }
         final String deprecatedIn = VersionStateManager.getInstance(project)
diff --git a/src/com/magento/idea/magento2uct/inspections/php/deprecation/UsingDeprecatedConstant.java b/src/com/magento/idea/magento2uct/inspections/php/deprecation/UsingDeprecatedConstant.java
@@ -51,8 +51,8 @@ protected void execute(
         }
 
         if (problemsHolder instanceof UctProblemsHolder) {
-            ((UctProblemsHolder) problemsHolder).setReservedErrorCode(
-                    SupportedIssue.USING_DEPRECATED_CONSTANT.getCode()
+            ((UctProblemsHolder) problemsHolder).setIssue(
+                    SupportedIssue.USING_DEPRECATED_CONSTANT
             );
         }
         final String deprecatedIn = VersionStateManager.getInstance(project)
diff --git a/src/com/magento/idea/magento2uct/inspections/php/deprecation/UsingDeprecatedInterface.java b/src/com/magento/idea/magento2uct/inspections/php/deprecation/UsingDeprecatedInterface.java
@@ -32,8 +32,8 @@ protected void execute(
         }
 
         if (problemsHolder instanceof UctProblemsHolder) {
-            ((UctProblemsHolder) problemsHolder).setReservedErrorCode(
-                    SupportedIssue.USING_DEPRECATED_INTERFACE.getCode()
+            ((UctProblemsHolder) problemsHolder).setIssue(
+                    SupportedIssue.USING_DEPRECATED_INTERFACE
             );
         }
         final String deprecatedIn = VersionStateManager.getInstance(project)
diff --git a/src/com/magento/idea/magento2uct/inspections/php/deprecation/UsingDeprecatedProperty.java b/src/com/magento/idea/magento2uct/inspections/php/deprecation/UsingDeprecatedProperty.java
diff --git a/src/com/magento/idea/magento2uct/inspections/php/existence/CalledNonExistentMethod.java b/src/com/magento/idea/magento2uct/inspections/php/existence/CalledNonExistentMethod.java
diff --git a/src/com/magento/idea/magento2uct/inspections/php/existence/ExtendedNonExistentClass.java b/src/com/magento/idea/magento2uct/inspections/php/existence/ExtendedNonExistentClass.java
diff --git a/src/com/magento/idea/magento2uct/inspections/php/existence/ImplementedNonExistentInterface.java b/src/com/magento/idea/magento2uct/inspections/php/existence/ImplementedNonExistentInterface.java
diff --git a/src/com/magento/idea/magento2uct/inspections/php/existence/ImportingNonExistentClass.java b/src/com/magento/idea/magento2uct/inspections/php/existence/ImportingNonExistentClass.java
diff --git a/src/com/magento/idea/magento2uct/inspections/php/existence/ImportingNonExistentInterface.java b/src/com/magento/idea/magento2uct/inspections/php/existence/ImportingNonExistentInterface.java
diff --git a/src/com/magento/idea/magento2uct/inspections/php/existence/InheritedNonExistentInterface.java b/src/com/magento/idea/magento2uct/inspections/php/existence/InheritedNonExistentInterface.java
diff --git a/src/com/magento/idea/magento2uct/inspections/php/existence/OverriddenNonExistentConstant.java b/src/com/magento/idea/magento2uct/inspections/php/existence/OverriddenNonExistentConstant.java
diff --git a/src/com/magento/idea/magento2uct/inspections/php/existence/OverriddenNonExistentProperty.java b/src/com/magento/idea/magento2uct/inspections/php/existence/OverriddenNonExistentProperty.java
diff --git a/src/com/magento/idea/magento2uct/inspections/php/existence/UsedNonExistentConstant.java b/src/com/magento/idea/magento2uct/inspections/php/existence/UsedNonExistentConstant.java
diff --git a/src/com/magento/idea/magento2uct/inspections/php/existence/UsedNonExistentProperty.java b/src/com/magento/idea/magento2uct/inspections/php/existence/UsedNonExistentProperty.java
diff --git a/src/com/magento/idea/magento2uct/inspections/php/existence/UsedNonExistentType.java b/src/com/magento/idea/magento2uct/inspections/php/existence/UsedNonExistentType.java
diff --git a/src/com/magento/idea/magento2uct/util/inspection/FilterDescriptorResultsUtil.java b/src/com/magento/idea/magento2uct/util/inspection/FilterDescriptorResultsUtil.java

Original file line number	Diff line number	Diff line change
`@@ -32,9 +32,7 @@ protected void execute(`
`32`	`32`	`final String message = SupportedIssue.CALLED_NON_API_METHOD.getMessage(method.getFQN());`
`33`	`33`
`34`	`34`	`if (problemsHolder instanceof UctProblemsHolder) {`
`35`		`- ((UctProblemsHolder) problemsHolder).setReservedErrorCode(`
`36`		`- SupportedIssue.CALLED_NON_API_METHOD.getCode()`
`37`		`- );`
	`35`	`+ ((UctProblemsHolder) problemsHolder).setIssue(SupportedIssue.CALLED_NON_API_METHOD);`
`38`	`36`	`}`
`39`	`37`	`problemsHolder.registerProblem(methodReference, message, ProblemHighlightType.WARNING);`
`40`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -69,8 +69,8 @@ protected void execute(`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`if (problemsHolder instanceof UctProblemsHolder) {`
`72`		`- ((UctProblemsHolder) problemsHolder).setReservedErrorCode(`
`73`		`- SupportedIssue.CALLED_NON_INTERFACE_METHOD.getCode()`
	`72`	`+ ((UctProblemsHolder) problemsHolder).setIssue(`
	`73`	`+ SupportedIssue.CALLED_NON_INTERFACE_METHOD`
`74`	`74`	`);`
`75`	`75`	`}`
`76`	`76`	`problemsHolder.registerProblem(`
Original file line number	Diff line number	Diff line change
`@@ -35,8 +35,8 @@ protected void execute(`
`35`	`35`	`);`
`36`	`36`
`37`	`37`	`if (problemsHolder instanceof UctProblemsHolder) {`
`38`		`- ((UctProblemsHolder) problemsHolder).setReservedErrorCode(`
`39`		`- SupportedIssue.EXTENDED_NON_API_CLASS.getCode()`
	`38`	`+ ((UctProblemsHolder) problemsHolder).setIssue(`
	`39`	`+ SupportedIssue.EXTENDED_NON_API_CLASS`
`40`	`40`	`);`
`41`	`41`	`}`
`42`	`42`
Original file line number	Diff line number	Diff line change
`@@ -34,8 +34,8 @@ protected void execute(`
`34`	`34`	`if (VersionStateManager.getInstance(project).isApi(implementedInterface.getFQN())) {`
`35`	`35`
`36`	`36`	`if (problemsHolder instanceof UctProblemsHolder) {`
`37`		`- ((UctProblemsHolder) problemsHolder).setReservedErrorCode(`
`38`		`- SupportedIssue.POSSIBLE_DEPENDENCY_ON_IMPL_DETAILS.getCode()`
	`37`	`+ ((UctProblemsHolder) problemsHolder).setIssue(`
	`38`	`+ SupportedIssue.POSSIBLE_DEPENDENCY_ON_IMPL_DETAILS`
`39`	`39`	`);`
`40`	`40`	`}`
`41`	`41`
Original file line number	Diff line number	Diff line change
`@@ -36,9 +36,7 @@ protected void execute(`
`36`	`36`	`);`
`37`	`37`
`38`	`38`	`if (problemsHolder instanceof UctProblemsHolder) {`
`39`		`- ((UctProblemsHolder) problemsHolder).setReservedErrorCode(`
`40`		`- SupportedIssue.USED_NON_API_PROPERTY.getCode()`
`41`		`- );`
	`39`	`+ ((UctProblemsHolder) problemsHolder).setIssue(SupportedIssue.USED_NON_API_PROPERTY);`
`42`	`40`	`}`
`43`	`41`	`problemsHolder.registerProblem(propertyReference, message, ProblemHighlightType.WARNING);`
`44`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,8 +30,8 @@ protected void execute(`
`30`	`30`	`return;`
`31`	`31`	`}`
`32`	`32`	`if (problemsHolder instanceof UctProblemsHolder) {`
`33`		`- ((UctProblemsHolder) problemsHolder).setReservedErrorCode(`
`34`		`- SupportedIssue.IMPORTING_DEPRECATED_CLASS.getCode()`
	`33`	`+ ((UctProblemsHolder) problemsHolder).setIssue(`
	`34`	`+ SupportedIssue.IMPORTING_DEPRECATED_CLASS`
`35`	`35`	`);`
`36`	`36`	`}`
`37`	`37`	`final String deprecatedIn = VersionStateManager.getInstance(project)`
Original file line number	Diff line number	Diff line change
`@@ -33,8 +33,8 @@ protected void execute(`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`if (problemsHolder instanceof UctProblemsHolder) {`
`36`		`- ((UctProblemsHolder) problemsHolder).setReservedErrorCode(`
`37`		`- SupportedIssue.OVERRIDING_DEPRECATED_CONSTANT.getCode()`
	`36`	`+ ((UctProblemsHolder) problemsHolder).setIssue(`
	`37`	`+ SupportedIssue.OVERRIDING_DEPRECATED_CONSTANT`
`38`	`38`	`);`
`39`	`39`	`}`
`40`	`40`	`final String deprecatedIn = VersionStateManager.getInstance(project)`
Original file line number	Diff line number	Diff line change
`@@ -31,8 +31,8 @@ protected void execute(`
`31`	`31`	`return;`
`32`	`32`	`}`
`33`	`33`	`if (problemsHolder instanceof UctProblemsHolder) {`
`34`		`- ((UctProblemsHolder) problemsHolder).setReservedErrorCode(`
`35`		`- SupportedIssue.USING_DEPRECATED_CLASS.getCode()`
	`34`	`+ ((UctProblemsHolder) problemsHolder).setIssue(`
	`35`	`+ SupportedIssue.USING_DEPRECATED_CLASS`
`36`	`36`	`);`
`37`	`37`	`}`
`38`	`38`	`final String deprecatedIn = VersionStateManager.getInstance(project)`
Original file line number	Diff line number	Diff line change
`@@ -51,8 +51,8 @@ protected void execute(`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`if (problemsHolder instanceof UctProblemsHolder) {`
`54`		`- ((UctProblemsHolder) problemsHolder).setReservedErrorCode(`
`55`		`- SupportedIssue.USING_DEPRECATED_CONSTANT.getCode()`
	`54`	`+ ((UctProblemsHolder) problemsHolder).setIssue(`
	`55`	`+ SupportedIssue.USING_DEPRECATED_CONSTANT`
`56`	`56`	`);`
`57`	`57`	`}`
`58`	`58`	`final String deprecatedIn = VersionStateManager.getInstance(project)`
Original file line number	Diff line number	Diff line change
`@@ -32,8 +32,8 @@ protected void execute(`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`if (problemsHolder instanceof UctProblemsHolder) {`
`35`		`- ((UctProblemsHolder) problemsHolder).setReservedErrorCode(`
`36`		`- SupportedIssue.USING_DEPRECATED_INTERFACE.getCode()`
	`35`	`+ ((UctProblemsHolder) problemsHolder).setIssue(`
	`36`	`+ SupportedIssue.USING_DEPRECATED_INTERFACE`
`37`	`37`	`);`
`38`	`38`	`}`
`39`	`39`	`final String deprecatedIn = VersionStateManager.getInstance(project)`