Merge pull request #1530 from magento/1527-string-utils

1527: java.lang.NoClassDefFoundError: org/codehaus/plexus/util/StringUtils fix

Author: VitaliyBoyko

CHANGELOG.md

@@ -6,6 +6,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0).
 
 ## 5.1.1
 
+### Fixed
+
+- java.lang.NoClassDefFoundError: org/codehaus/plexus/util/StringUtils [#1530](https://github.com/magento/magento2-phpstorm-plugin/pull/1530)
+
 ## 5.1.0
 
 ### Fixed

src/com/magento/idea/magento2plugin/actions/generation/dialog/event/eavdialog/DataPatchNameAdapter.java

@@ -11,7 +11,7 @@
 import javax.swing.event.DocumentEvent;
 import javax.swing.text.BadLocationException;
 import javax.swing.text.Document;
-import org.codehaus.plexus.util.StringUtils;
+import org.apache.commons.lang.StringUtils;
 import org.jetbrains.annotations.NotNull;
 
 public class DataPatchNameAdapter extends DocumentAdapter {
@@ -73,15 +73,15 @@ private void updateDataPatchFileName(final String attributeCode) {
         String fileName = "";
 
         for (final String fileNamePart : SplitEavAttributeCodeUtil.execute(attributeCode)) {
-            fileName = String.join("", fileName, StringUtils.capitalise(fileNamePart));
+            fileName = String.join("", fileName, StringUtils.capitalize(fileNamePart));
         }
 
         dataPatchNameTextField.setText(
                 String.join(
                         "",
                         NAME_PREFIX,
                         fileName,
-                        StringUtils.capitalise(entityType), NAME_SUFFIX
+                        StringUtils.capitalize(entityType), NAME_SUFFIX
                 )
         );
     }

src/com/magento/idea/magento2plugin/actions/generation/dialog/event/eavdialog/SourceModelNameAdapter.java

@@ -11,7 +11,7 @@
 import javax.swing.event.DocumentEvent;
 import javax.swing.text.BadLocationException;
 import javax.swing.text.Document;
-import org.codehaus.plexus.util.StringUtils;
+import org.apache.commons.lang.StringUtils;
 import org.jetbrains.annotations.NotNull;
 
 public class SourceModelNameAdapter extends DocumentAdapter {
@@ -46,7 +46,7 @@ private void updateSourceModelName(final String attributeCode) {
         final StringBuilder sourceModelClassName = new StringBuilder();
 
         for (final String codePart : SplitEavAttributeCodeUtil.execute(attributeCode)) {
-            sourceModelClassName.append(StringUtils.capitalise(codePart));
+            sourceModelClassName.append(StringUtils.capitalize(codePart));
         }
 
         sourceModelNameTexField.setText(sourceModelClassName.toString());

tests/com/magento/idea/magento2plugin/linemarker/LinemarkerFixtureTestCase.java

@@ -59,7 +59,6 @@ protected void assertHasNoLinemarkerWithTooltipAndIcon(
                 = "Failed that documents not contains linemarker with the tooltip `%s`";
 
         final List<LineMarkerInfo<?>> lineMarkers = getDocumentLineMarkers();
-        assertNotEmpty(lineMarkers);
         for (final LineMarkerInfo lineMarkerInfo: lineMarkers) {
             final String lineMarkerTooltip = lineMarkerInfo.getLineMarkerTooltip();
             final Icon lineMarkerIcon = lineMarkerInfo.getIcon();

tests/com/magento/idea/magento2plugin/linemarker/graphqls/GraphQlResolverClassLinemarkerRegistrarTest.java

@@ -15,6 +15,6 @@ public class GraphQlResolverClassLinemarkerRegistrarTest extends LinemarkerFixtu
     public void testWithValidSchemaResolver() {
         myFixture.configureByFile(this.getFixturePath("schema.graphqls", "graphqls"));
 
-        assertHasLinemarkerWithTooltipAndIcon("Navigate to class", "nodes/class.svg");
+        assertHasLinemarkerWithTooltipAndIcon("Navigate to class", "Class");
     }
 }