From eab01cb614d857a56fc8d6acff0c392984eba511 Mon Sep 17 00:00:00 2001 From: Serhii Akulov Date: Wed, 9 Feb 2022 22:05:58 +0200 Subject: [PATCH 1/4] 963: Bug during composer json generation --- .../generator/ModuleComposerJsonGenerator.java | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/src/com/magento/idea/magento2plugin/actions/generation/generator/ModuleComposerJsonGenerator.java b/src/com/magento/idea/magento2plugin/actions/generation/generator/ModuleComposerJsonGenerator.java index 85e867ec6..c90e7a6d9 100644 --- a/src/com/magento/idea/magento2plugin/actions/generation/generator/ModuleComposerJsonGenerator.java +++ b/src/com/magento/idea/magento2plugin/actions/generation/generator/ModuleComposerJsonGenerator.java @@ -184,16 +184,15 @@ private Pair getDependencyData( composerJsonFile.getText() ); final JSONObject jsonObject = (JSONObject) obj; - final String versionJsonElement = jsonObject.get("version").toString(); + final String versionJsonElement = jsonObject.get("version") != null + ? jsonObject.get("version").toString() : "*"; final String nameJsonElement = jsonObject.get("name").toString(); - if (versionJsonElement != null) { - version = versionJsonElement; - final int minorVersionSeparator = version.lastIndexOf('.'); - version = new StringBuilder(version) - .replace(minorVersionSeparator + 1, version.length(),"*") - .toString(); - } + version = versionJsonElement; + final int minorVersionSeparator = version.lastIndexOf('.'); + version = new StringBuilder(version) + .replace(minorVersionSeparator + 1, version.length(),"*") + .toString(); if (nameJsonElement != null) { moduleName = nameJsonElement; From 10dac23b0b7e4c41187372dc6c13a36e8bb0a369 Mon Sep 17 00:00:00 2001 From: Serhii Akulov Date: Wed, 9 Feb 2022 22:16:48 +0200 Subject: [PATCH 2/4] 963: Fixed pmd error --- .../generation/generator/ModuleComposerJsonGenerator.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/com/magento/idea/magento2plugin/actions/generation/generator/ModuleComposerJsonGenerator.java b/src/com/magento/idea/magento2plugin/actions/generation/generator/ModuleComposerJsonGenerator.java index c90e7a6d9..6ba4d0628 100644 --- a/src/com/magento/idea/magento2plugin/actions/generation/generator/ModuleComposerJsonGenerator.java +++ b/src/com/magento/idea/magento2plugin/actions/generation/generator/ModuleComposerJsonGenerator.java @@ -184,8 +184,8 @@ private Pair getDependencyData( composerJsonFile.getText() ); final JSONObject jsonObject = (JSONObject) obj; - final String versionJsonElement = jsonObject.get("version") != null - ? jsonObject.get("version").toString() : "*"; + final String versionJsonElement = jsonObject.get("version") == null + ? "*" : jsonObject.get("version").toString(); final String nameJsonElement = jsonObject.get("name").toString(); version = versionJsonElement; From da1a26c0d5c843a84cc67d41ece995aa60723850 Mon Sep 17 00:00:00 2001 From: Serhii Akulov Date: Thu, 10 Feb 2022 21:32:53 +0200 Subject: [PATCH 3/4] 963: fixed name and version bug --- .../ModuleComposerJsonGenerator.java | 23 ++++++++++--------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/src/com/magento/idea/magento2plugin/actions/generation/generator/ModuleComposerJsonGenerator.java b/src/com/magento/idea/magento2plugin/actions/generation/generator/ModuleComposerJsonGenerator.java index 6ba4d0628..ad95bc0ff 100644 --- a/src/com/magento/idea/magento2plugin/actions/generation/generator/ModuleComposerJsonGenerator.java +++ b/src/com/magento/idea/magento2plugin/actions/generation/generator/ModuleComposerJsonGenerator.java @@ -158,10 +158,9 @@ private String getDependenciesString(final List dependenciesList) { private Pair getDependencyData( final String dependency ) { - String version = "*"; - String moduleName = camelCaseToHyphen.convert(dependency).replace( - "_-", "/" - ); + String version = ""; + String moduleName = ""; + try { final PsiDirectory moduleDir = moduleIndex.getModuleDirectoryByModuleName(dependency); @@ -186,16 +185,18 @@ private Pair getDependencyData( final JSONObject jsonObject = (JSONObject) obj; final String versionJsonElement = jsonObject.get("version") == null ? "*" : jsonObject.get("version").toString(); - final String nameJsonElement = jsonObject.get("name").toString(); + if (jsonObject.get("name") == null) { + return Pair.create("", ""); + } + moduleName = jsonObject.get("name").toString().trim(); version = versionJsonElement; - final int minorVersionSeparator = version.lastIndexOf('.'); - version = new StringBuilder(version) - .replace(minorVersionSeparator + 1, version.length(),"*") - .toString(); - if (nameJsonElement != null) { - moduleName = nameJsonElement; + if (!versionJsonElement.equals("*")) { + final int minorVersionSeparator = version.lastIndexOf('.'); + version = new StringBuilder(version) + .replace(minorVersionSeparator + 1, version.length(),"*") + .toString(); } } } else { From 3dcfc39f6d8766cb59ca2868652ba7da41b8a47d Mon Sep 17 00:00:00 2001 From: Serhii Akulov Date: Thu, 10 Feb 2022 21:43:13 +0200 Subject: [PATCH 4/4] 963: fixed pmd --- .../generator/ModuleComposerJsonGenerator.java | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/src/com/magento/idea/magento2plugin/actions/generation/generator/ModuleComposerJsonGenerator.java b/src/com/magento/idea/magento2plugin/actions/generation/generator/ModuleComposerJsonGenerator.java index ad95bc0ff..631220870 100644 --- a/src/com/magento/idea/magento2plugin/actions/generation/generator/ModuleComposerJsonGenerator.java +++ b/src/com/magento/idea/magento2plugin/actions/generation/generator/ModuleComposerJsonGenerator.java @@ -18,7 +18,6 @@ import com.magento.idea.magento2plugin.actions.generation.generator.util.FileFromTemplateGenerator; import com.magento.idea.magento2plugin.indexes.ModuleIndex; import com.magento.idea.magento2plugin.magento.files.ComposerJson; -import com.magento.idea.magento2plugin.util.CamelCaseToHyphen; import java.util.List; import java.util.Properties; import org.jetbrains.annotations.NotNull; @@ -28,10 +27,10 @@ public class ModuleComposerJsonGenerator extends FileGenerator { + private static final String ANY_VERSION = "*"; private final ModuleComposerJsonData moduleComposerJsonData; private final FileFromTemplateGenerator fileFromTemplateGenerator; private final DirectoryGenerator directoryGenerator; - private final CamelCaseToHyphen camelCaseToHyphen; private final ModuleIndex moduleIndex; /** @@ -48,7 +47,6 @@ public ModuleComposerJsonGenerator( this.moduleComposerJsonData = moduleComposerJsonData; this.fileFromTemplateGenerator = new FileFromTemplateGenerator(project); this.directoryGenerator = DirectoryGenerator.getInstance(); - this.camelCaseToHyphen = CamelCaseToHyphen.getInstance(); this.moduleIndex = new ModuleIndex(project); } @@ -183,19 +181,18 @@ private Pair getDependencyData( composerJsonFile.getText() ); final JSONObject jsonObject = (JSONObject) obj; - final String versionJsonElement = jsonObject.get("version") == null - ? "*" : jsonObject.get("version").toString(); if (jsonObject.get("name") == null) { return Pair.create("", ""); } moduleName = jsonObject.get("name").toString().trim(); - version = versionJsonElement; + version = jsonObject.get("version") == null + ? ANY_VERSION : jsonObject.get("version").toString(); - if (!versionJsonElement.equals("*")) { + if (!ANY_VERSION.equals(version)) { final int minorVersionSeparator = version.lastIndexOf('.'); version = new StringBuilder(version) - .replace(minorVersionSeparator + 1, version.length(),"*") + .replace(minorVersionSeparator + 1, version.length(), ANY_VERSION) .toString(); } }