Skip to content

[Bug] 646: Fixed NullPointerException for the firstSortOrder.compareTo #818

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
Nov 30, 2021
Merged

[Bug] 646: Fixed NullPointerException for the firstSortOrder.compareTo #818

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
48 changes: 41 additions & 7 deletions src/com/magento/idea/magento2plugin/linemarker/php/WebApiLineMarkerProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import com.intellij.codeInsight.navigation.NavigationGutterIconBuilder;
import com.intellij.psi.PsiElement;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.psi.xml.XmlAttribute;
import com.intellij.psi.xml.XmlTag;
import com.jetbrains.php.lang.psi.elements.Method;
import com.jetbrains.php.lang.psi.elements.PhpClass;
Expand Down Expand Up @@ -180,20 +181,53 @@ private Map<String, List<XmlTag>> extractRoutesForMethodRecursively(
*/
private void sortRoutes(final List<XmlTag> routes) {
routes.sort(
(firstTag, secondTag) -> {
final String substring = firstTag.getName().substring(2, 5);
final Integer firstSortOrder = httpMethodsSortOrder.get(substring);
final Integer secondSortOrder = httpMethodsSortOrder.get(
secondTag.getName().substring(2, 5)
);
(tag1, tag2) -> {
final String firstUrl = GetTagAttributeValueUtil.getValue(tag1, "url");
final String secondUrl = GetTagAttributeValueUtil.getValue(tag2, "url");
final String method1 = GetTagAttributeValueUtil.getValue(tag1, "method");
final String method2 = GetTagAttributeValueUtil.getValue(tag2, "method");

if (method1.isEmpty() || method2.isEmpty()) {
return firstUrl.compareTo(secondUrl);
}

if (!httpMethodsSortOrder.containsKey(method1)
|| !httpMethodsSortOrder.containsKey(method2)) {
return firstUrl.compareTo(secondUrl);
}
final Integer firstSortOrder = httpMethodsSortOrder.get(method1);
final Integer secondSortOrder = httpMethodsSortOrder.get(method2);

if (firstSortOrder.compareTo(secondSortOrder) == 0) {
// Sort by route if HTTP methods are equal
return firstTag.getName().compareTo(secondTag.getName());
return firstUrl.compareTo(secondUrl);
}

return firstSortOrder.compareTo(secondSortOrder);
}
);
}
}

@SuppressWarnings("PMD.UseUtilityClass")
private static class GetTagAttributeValueUtil {

public static @NotNull String getValue(
final XmlTag tag,
final @NotNull String attributeName
) {
final XmlAttribute attribute = tag.getAttribute(attributeName);

if (attribute == null) {
return "";
}
final String value = attribute.getValue();

if (value == null) {
return "";
}

return value.trim();
}
}
}