18
18
import com .magento .idea .magento2plugin .actions .generation .generator .util .FileFromTemplateGenerator ;
19
19
import com .magento .idea .magento2plugin .indexes .ModuleIndex ;
20
20
import com .magento .idea .magento2plugin .magento .files .ComposerJson ;
21
- import com .magento .idea .magento2plugin .util .CamelCaseToHyphen ;
22
21
import java .util .List ;
23
22
import java .util .Properties ;
24
23
import org .jetbrains .annotations .NotNull ;
28
27
29
28
public class ModuleComposerJsonGenerator extends FileGenerator {
30
29
30
+ private static final String ANY_VERSION = "*" ;
31
31
private final ModuleComposerJsonData moduleComposerJsonData ;
32
32
private final FileFromTemplateGenerator fileFromTemplateGenerator ;
33
33
private final DirectoryGenerator directoryGenerator ;
34
- private final CamelCaseToHyphen camelCaseToHyphen ;
35
34
private final ModuleIndex moduleIndex ;
36
35
37
36
/**
@@ -48,7 +47,6 @@ public ModuleComposerJsonGenerator(
48
47
this .moduleComposerJsonData = moduleComposerJsonData ;
49
48
this .fileFromTemplateGenerator = new FileFromTemplateGenerator (project );
50
49
this .directoryGenerator = DirectoryGenerator .getInstance ();
51
- this .camelCaseToHyphen = CamelCaseToHyphen .getInstance ();
52
50
this .moduleIndex = new ModuleIndex (project );
53
51
}
54
52
@@ -183,19 +181,18 @@ private Pair<String, String> getDependencyData(
183
181
composerJsonFile .getText ()
184
182
);
185
183
final JSONObject jsonObject = (JSONObject ) obj ;
186
- final String versionJsonElement = jsonObject .get ("version" ) == null
187
- ? "*" : jsonObject .get ("version" ).toString ();
188
184
189
185
if (jsonObject .get ("name" ) == null ) {
190
186
return Pair .create ("" , "" );
191
187
}
192
188
moduleName = jsonObject .get ("name" ).toString ().trim ();
193
- version = versionJsonElement ;
189
+ version = jsonObject .get ("version" ) == null
190
+ ? ANY_VERSION : jsonObject .get ("version" ).toString ();
194
191
195
- if (!versionJsonElement .equals ("*" )) {
192
+ if (!ANY_VERSION .equals (version )) {
196
193
final int minorVersionSeparator = version .lastIndexOf ('.' );
197
194
version = new StringBuilder (version )
198
- .replace (minorVersionSeparator + 1 , version .length (),"*" )
195
+ .replace (minorVersionSeparator + 1 , version .length (), ANY_VERSION )
199
196
.toString ();
200
197
}
201
198
}
0 commit comments