Merge branch '4.0.0-develop' of github.com:magento/magento2-phpstorm-plugin into web-api-checks

Author: Vitaliy Boyko

CHANGELOG.md

@@ -6,6 +6,13 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0).
 
 ## 4.0.0
 
+## 3.2.1
+
+### Fixed
+
+- Directory validator
+- Entity data mapper file template
+
 ## 3.2.0
 
 ### Added

build.gradle

@@ -4,7 +4,7 @@
  */
 
 plugins {
-    id 'org.jetbrains.intellij' version '0.6.5'
+    id 'org.jetbrains.intellij' version '0.7.2'
     id 'checkstyle'
     id 'pmd'
     id 'org.jetbrains.changelog' version '0.6.2'

src/com/magento/idea/magento2plugin/actions/generation/dialog/validator/dialog/NewEmailTemplateDialogValidator.java

@@ -23,8 +23,10 @@
 import com.magento.idea.magento2plugin.util.xml.XmlPsiTreeUtil;
 import java.util.Collection;
 import javax.swing.JOptionPane;
+import org.jetbrains.annotations.NotNull;
 
 public class NewEmailTemplateDialogValidator {
+
     private final ValidatorBundle validatorBundle;
     private final CommonBundle commonBundle;
     private final Project project;
@@ -44,7 +46,7 @@ public NewEmailTemplateDialogValidator(final Project project) {
      * @param dialog NewEmailTemplateDialog
      * @return boolean
      */
-    public boolean validate(final NewEmailTemplateDialog dialog) {
+    public boolean validate(final @NotNull NewEmailTemplateDialog dialog) {
         final EmailTemplatesXmlData emailTemplatesXmlData = dialog.getEmailTemplateData();
         final String errorTitle = commonBundle.message("common.error");
         final EmailTemplateHtmlData emailTemplateHtmlData = dialog.getEmailTemplateHtmlData();
@@ -92,7 +94,9 @@ public boolean validate(final NewEmailTemplateDialog dialog) {
      *
      * @return bool
      */
-    private boolean isTemplateTagAlreadyExists(final EmailTemplatesXmlData emailTemplatesXmlData) {
+    private boolean isTemplateTagAlreadyExists(
+            final @NotNull EmailTemplatesXmlData emailTemplatesXmlData
+    ) {
         final EmailTemplatesXml emailTemplatesXml = new EmailTemplatesXml();
         final XmlFile emailTemplatesFile = (XmlFile) FileBasedIndexUtil.findModuleConfigFile(
                 emailTemplatesXml.getFileName(),
@@ -134,7 +138,7 @@ private boolean isTemplateTagAlreadyExists(final EmailTemplatesXmlData emailTemp
      * @return boolean
      */
     private boolean isTemplateFileAlreadyExists(
-            final EmailTemplateHtmlData emailTemplateData
+            final @NotNull EmailTemplateHtmlData emailTemplateData
     ) {
         final PsiFile templateFile = FileBasedIndexUtil.findModuleViewFile(
                 emailTemplateData.getFileName(),

src/com/magento/idea/magento2plugin/actions/generation/dialog/validator/rule/AclResourceIdRule.java

@@ -6,13 +6,15 @@
 package com.magento.idea.magento2plugin.actions.generation.dialog.validator.rule;
 
 import com.magento.idea.magento2plugin.util.RegExUtil;
+import org.jetbrains.annotations.NotNull;
 
 public class AclResourceIdRule implements ValidationRule {
+
     public static final String MESSAGE = "validator.magentoAclResourceIdInvalid";
     private static final ValidationRule INSTANCE = new AclResourceIdRule();
 
     @Override
-    public boolean check(final String value) {
+    public boolean check(final @NotNull String value) {
         return value.matches(RegExUtil.Magento.XML_IDENTIFIER);
     }
 

src/com/magento/idea/magento2plugin/actions/generation/dialog/validator/rule/AlphaWithDashRule.java

@@ -6,13 +6,15 @@
 package com.magento.idea.magento2plugin.actions.generation.dialog.validator.rule;
 
 import com.magento.idea.magento2plugin.util.RegExUtil;
+import org.jetbrains.annotations.NotNull;
 
 public class AlphaWithDashRule implements ValidationRule {
+
     public static final String MESSAGE = "validator.alphaAndDashCharacters";
     private static final ValidationRule INSTANCE = new AlphaWithDashRule();
 
     @Override
-    public boolean check(final String value) {
+    public boolean check(final @NotNull String value) {
         return value.matches(RegExUtil.ALPHA_WITH_DASH);
     }
 

src/com/magento/idea/magento2plugin/actions/generation/dialog/validator/rule/AlphaWithPeriodRule.java

@@ -6,13 +6,15 @@
 package com.magento.idea.magento2plugin.actions.generation.dialog.validator.rule;
 
 import com.magento.idea.magento2plugin.util.RegExUtil;
+import org.jetbrains.annotations.NotNull;
 
 public class AlphaWithPeriodRule implements ValidationRule {
+
     public static final String MESSAGE = "validator.alphaAndPeriodCharacters";
     private static final ValidationRule INSTANCE = new AlphaWithPeriodRule();
 
     @Override
-    public boolean check(final String value) {
+    public boolean check(final @NotNull String value) {
         return value.matches(RegExUtil.ALPHA_WITH_PERIOD);
     }
 

src/com/magento/idea/magento2plugin/actions/generation/dialog/validator/rule/AlphanumericRule.java

@@ -6,13 +6,15 @@
 package com.magento.idea.magento2plugin.actions.generation.dialog.validator.rule;
 
 import com.magento.idea.magento2plugin.util.RegExUtil;
+import org.jetbrains.annotations.NotNull;
 
 public class AlphanumericRule implements ValidationRule {
+
     public static final String MESSAGE = "validator.alphaNumericCharacters";
     private static final ValidationRule INSTANCE = new AlphanumericRule();
 
     @Override
-    public boolean check(final String value) {
+    public boolean check(final @NotNull String value) {
         return value.matches(RegExUtil.ALPHANUMERIC);
     }
 

src/com/magento/idea/magento2plugin/actions/generation/dialog/validator/rule/AlphanumericWithUnderscoreRule.java

@@ -6,13 +6,15 @@
 package com.magento.idea.magento2plugin.actions.generation.dialog.validator.rule;
 
 import com.magento.idea.magento2plugin.util.RegExUtil;
+import org.jetbrains.annotations.NotNull;
 
 public class AlphanumericWithUnderscoreRule implements ValidationRule {
+
     public static final String MESSAGE = "validator.alphaNumericAndUnderscoreCharacters";
     private static final ValidationRule INSTANCE = new AlphanumericWithUnderscoreRule();
 
     @Override
-    public boolean check(final String value) {
+    public boolean check(final @NotNull String value) {
         return value.matches(RegExUtil.ALPHANUMERIC_WITH_UNDERSCORE);
     }
 

src/com/magento/idea/magento2plugin/actions/generation/dialog/validator/rule/BoxNotEmptyRule.java

@@ -5,12 +5,15 @@
 
 package com.magento.idea.magento2plugin.actions.generation.dialog.validator.rule;
 
+import org.jetbrains.annotations.NotNull;
+
 public class BoxNotEmptyRule implements ValidationRule {
+
     public static final String MESSAGE = "validator.box.notEmpty";
     private static final ValidationRule INSTANCE = new BoxNotEmptyRule();
 
     @Override
-    public boolean check(final String value) {
+    public boolean check(final @NotNull String value) {
         return !value.isEmpty();
     }
 

src/com/magento/idea/magento2plugin/actions/generation/dialog/validator/rule/CliCommandRule.java

@@ -6,13 +6,15 @@
 package com.magento.idea.magento2plugin.actions.generation.dialog.validator.rule;
 
 import com.magento.idea.magento2plugin.util.RegExUtil;
+import org.jetbrains.annotations.NotNull;
 
 public class CliCommandRule implements ValidationRule {
+
     public static final String MESSAGE = "validator.command.isNotValid";
     private static final ValidationRule INSTANCE = new CliCommandRule();
 
     @Override
-    public boolean check(final String value) {
+    public boolean check(final @NotNull String value) {
         return value.matches(RegExUtil.CLI_COMMAND_NAME);
     }