Skip to content

Commit 3dcfc39

Browse files
committed
963: fixed pmd
1 parent da1a26c commit 3dcfc39

File tree

1 file changed

+5
-8
lines changed

1 file changed

+5
-8
lines changed

src/com/magento/idea/magento2plugin/actions/generation/generator/ModuleComposerJsonGenerator.java

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
import com.magento.idea.magento2plugin.actions.generation.generator.util.FileFromTemplateGenerator;
1919
import com.magento.idea.magento2plugin.indexes.ModuleIndex;
2020
import com.magento.idea.magento2plugin.magento.files.ComposerJson;
21-
import com.magento.idea.magento2plugin.util.CamelCaseToHyphen;
2221
import java.util.List;
2322
import java.util.Properties;
2423
import org.jetbrains.annotations.NotNull;
@@ -28,10 +27,10 @@
2827

2928
public class ModuleComposerJsonGenerator extends FileGenerator {
3029

30+
private static final String ANY_VERSION = "*";
3131
private final ModuleComposerJsonData moduleComposerJsonData;
3232
private final FileFromTemplateGenerator fileFromTemplateGenerator;
3333
private final DirectoryGenerator directoryGenerator;
34-
private final CamelCaseToHyphen camelCaseToHyphen;
3534
private final ModuleIndex moduleIndex;
3635

3736
/**
@@ -48,7 +47,6 @@ public ModuleComposerJsonGenerator(
4847
this.moduleComposerJsonData = moduleComposerJsonData;
4948
this.fileFromTemplateGenerator = new FileFromTemplateGenerator(project);
5049
this.directoryGenerator = DirectoryGenerator.getInstance();
51-
this.camelCaseToHyphen = CamelCaseToHyphen.getInstance();
5250
this.moduleIndex = new ModuleIndex(project);
5351
}
5452

@@ -183,19 +181,18 @@ private Pair<String, String> getDependencyData(
183181
composerJsonFile.getText()
184182
);
185183
final JSONObject jsonObject = (JSONObject) obj;
186-
final String versionJsonElement = jsonObject.get("version") == null
187-
? "*" : jsonObject.get("version").toString();
188184

189185
if (jsonObject.get("name") == null) {
190186
return Pair.create("", "");
191187
}
192188
moduleName = jsonObject.get("name").toString().trim();
193-
version = versionJsonElement;
189+
version = jsonObject.get("version") == null
190+
? ANY_VERSION : jsonObject.get("version").toString();
194191

195-
if (!versionJsonElement.equals("*")) {
192+
if (!ANY_VERSION.equals(version)) {
196193
final int minorVersionSeparator = version.lastIndexOf('.');
197194
version = new StringBuilder(version)
198-
.replace(minorVersionSeparator + 1, version.length(),"*")
195+
.replace(minorVersionSeparator + 1, version.length(), ANY_VERSION)
199196
.toString();
200197
}
201198
}

0 commit comments

Comments
 (0)