Skip to content

Commit a589dfa

Browse files
shortcutsshortcuts
committed
feat: common mustache helper
1 parent 1b3a1a8 commit a589dfa

12 files changed

+23
-51
lines changed

‎generators/src/main/java/com/algolia/codegen/AlgoliaCSharpGenerator.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -121,10 +121,7 @@ public void processOpts() {
121121
supportingFiles.add(new SupportingFile("netcore_project.mustache", "Algolia.Search.csproj"));
122122
supportingFiles.add(new SupportingFile("Configuration.mustache", "Clients", packageName + "Configuration.cs"));
123123

124-
supportingFiles.add(new SupportingFile("LICENSE", "../", "LICENSE"));
125-
supportingFiles.add(new SupportingFile("issue.yml", "../.github/workflows", "issue.yml"));
126-
supportingFiles.add(new SupportingFile("Bug_report.yml", "../.github/ISSUE_TEMPLATE", "Bug_report.yml"));
127-
supportingFiles.add(new SupportingFile("do-not-edit-this-repository.yml", "../.github/workflows", "do-not-edit-this-repository.yml"));
124+
Helpers.addCommonSupportingFiles(supportingFiles, "../");
128125

129126
reservedWords.removeIf(word -> word.equals("Configuration"));
130127
}

‎generators/src/main/java/com/algolia/codegen/AlgoliaDartGenerator.java

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -100,13 +100,9 @@ public void processOpts() {
100100

101101
supportingFiles.add(new SupportingFile("version.mustache", srcFolder, "version.dart"));
102102
supportingFiles.add(new SupportingFile("LICENSE", "", "LICENSE"));
103-
104103
supportingFiles.add(new SupportingFile("LICENSE", "../client_core/", "LICENSE"));
105-
supportingFiles.add(new SupportingFile("issue.yml", "../../.github/workflows", "issue.yml"));
106-
supportingFiles.add(new SupportingFile("Bug_report.yml", "../../.github/ISSUE_TEMPLATE", "Bug_report.yml"));
107-
supportingFiles.add(
108-
new SupportingFile("do-not-edit-this-repository.yml", "../../.github/workflows", "do-not-edit-this-repository.yml")
109-
);
104+
105+
Helpers.addCommonSupportingFiles(supportingFiles, "../../");
110106

111107
// Search config
112108
additionalProperties.put("isSearchClient", client.equals("search"));

‎generators/src/main/java/com/algolia/codegen/AlgoliaGoGenerator.java

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,7 @@ public void processOpts() {
5454
supportingFiles.add(new SupportingFile("configuration.mustache", "", "configuration.go"));
5555
supportingFiles.add(new SupportingFile("client.mustache", "", "client.go"));
5656

57-
supportingFiles.add(new SupportingFile("LICENSE", "../../", "LICENSE"));
58-
supportingFiles.add(new SupportingFile("issue.yml", "../../.github/workflows", "issue.yml"));
59-
supportingFiles.add(new SupportingFile("Bug_report.yml", "../../.github/ISSUE_TEMPLATE", "Bug_report.yml"));
60-
supportingFiles.add(
61-
new SupportingFile("do-not-edit-this-repository.yml", "../../.github/workflows", "do-not-edit-this-repository.yml")
62-
);
57+
Helpers.addCommonSupportingFiles(supportingFiles, "../../");
6358

6459
try {
6560
additionalProperties.put("packageVersion", Helpers.getClientConfigField("go", "packageVersion"));

‎generators/src/main/java/com/algolia/codegen/AlgoliaJavaGenerator.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,7 @@ public void processOpts() {
5555
supportingFiles.add(new SupportingFile("gradle.properties.mustache", "", "gradle.properties"));
5656
additionalProperties.put("isSearchClient", client.equals("search"));
5757

58-
supportingFiles.add(new SupportingFile("LICENSE", "", "LICENSE"));
59-
supportingFiles.add(new SupportingFile("issue.yml", ".github/workflows", "issue.yml"));
60-
supportingFiles.add(new SupportingFile("Bug_report.yml", ".github/ISSUE_TEMPLATE", "Bug_report.yml"));
61-
supportingFiles.add(new SupportingFile("do-not-edit-this-repository.yml", ".github/workflows", "do-not-edit-this-repository.yml"));
58+
Helpers.addCommonSupportingFiles(supportingFiles, "");
6259

6360
reservedWords.removeIf(word -> word.equals("configuration"));
6461

‎generators/src/main/java/com/algolia/codegen/AlgoliaJavascriptGenerator.java

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -59,14 +59,9 @@ public void processOpts() {
5959
// root export files
6060
supportingFiles.add(new SupportingFile("index.mustache", "", "index.js"));
6161
supportingFiles.add(new SupportingFile("index.d.mustache", "", "index.d.ts"));
62-
6362
supportingFiles.add(new SupportingFile("LICENSE", "", "LICENSE"));
64-
supportingFiles.add(new SupportingFile("LICENSE", "", "../../LICENSE"));
65-
supportingFiles.add(new SupportingFile("issue.yml", "../../.github/workflows", "issue.yml"));
66-
supportingFiles.add(new SupportingFile("Bug_report.yml", "../../.github/ISSUE_TEMPLATE", "Bug_report.yml"));
67-
supportingFiles.add(
68-
new SupportingFile("do-not-edit-this-repository.yml", "../../.github/workflows", "do-not-edit-this-repository.yml")
69-
);
63+
64+
Helpers.addCommonSupportingFiles(supportingFiles, "../../");
7065

7166
supportingFiles.add(new SupportingFile("README.mustache", "", "README.md"));
7267

‎generators/src/main/java/com/algolia/codegen/AlgoliaKotlinGenerator.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -112,10 +112,7 @@ public void processOpts() {
112112
supportingFiles.add(new SupportingFile("gradle.properties.mustache", "", "gradle.properties"));
113113
supportingFiles.add(new SupportingFile("README_BOM.mustache", "client-bom", "README.md"));
114114

115-
supportingFiles.add(new SupportingFile("LICENSE", "", "LICENSE"));
116-
supportingFiles.add(new SupportingFile("issue.yml", ".github/workflows", "issue.yml"));
117-
supportingFiles.add(new SupportingFile("Bug_report.yml", ".github/ISSUE_TEMPLATE", "Bug_report.yml"));
118-
supportingFiles.add(new SupportingFile("do-not-edit-this-repository.yml", ".github/workflows", "do-not-edit-this-repository.yml"));
115+
Helpers.addCommonSupportingFiles(supportingFiles, "");
119116

120117
additionalProperties.put("packageVersion", Helpers.getClientConfigField("kotlin", "packageVersion"));
121118
}

‎generators/src/main/java/com/algolia/codegen/AlgoliaPhpGenerator.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,7 @@ public void processOpts() {
5151
supportingFiles.add(new SupportingFile("client_config.mustache", "lib/Configuration", getClientName(client) + "Config.php"));
5252
supportingFiles.add(new SupportingFile("Algolia.mustache", "lib", "Algolia.php"));
5353

54-
supportingFiles.add(new SupportingFile("LICENSE", "", "LICENSE"));
55-
supportingFiles.add(new SupportingFile("issue.yml", ".github/workflows", "issue.yml"));
56-
supportingFiles.add(new SupportingFile("Bug_report.yml", ".github/ISSUE_TEMPLATE", "Bug_report.yml"));
57-
supportingFiles.add(new SupportingFile("do-not-edit-this-repository.yml", ".github/workflows", "do-not-edit-this-repository.yml"));
54+
Helpers.addCommonSupportingFiles(supportingFiles, "");
5855

5956
additionalProperties.put("isSearchClient", client.equals("search"));
6057
additionalProperties.put("configClassname", getClientName(client) + "Config");

‎generators/src/main/java/com/algolia/codegen/AlgoliaPythonGenerator.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -87,10 +87,7 @@ public void processOpts() {
8787
supportingFiles.add(new SupportingFile("__init__.mustache", "http", "__init__.py"));
8888
supportingFiles.add(new SupportingFile("config.mustache", packageName, "config.py"));
8989

90-
supportingFiles.add(new SupportingFile("LICENSE", "../", "LICENSE"));
91-
supportingFiles.add(new SupportingFile("issue.yml", "../.github/workflows", "issue.yml"));
92-
supportingFiles.add(new SupportingFile("Bug_report.yml", "../.github/ISSUE_TEMPLATE", "Bug_report.yml"));
93-
supportingFiles.add(new SupportingFile("do-not-edit-this-repository.yml", "../.github/workflows", "do-not-edit-this-repository.yml"));
90+
Helpers.addCommonSupportingFiles(supportingFiles, "../");
9491
}
9592

9693
@Override

‎generators/src/main/java/com/algolia/codegen/AlgoliaRubyGenerator.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,7 @@ public void processOpts() {
4242
apiTestTemplateFiles.clear();
4343
modelTestTemplateFiles.clear();
4444

45-
supportingFiles.add(new SupportingFile("LICENSE", "", "LICENSE"));
46-
supportingFiles.add(new SupportingFile("issue.yml", ".github/workflows", "issue.yml"));
47-
supportingFiles.add(new SupportingFile("Bug_report.yml", ".github/ISSUE_TEMPLATE", "Bug_report.yml"));
48-
supportingFiles.add(new SupportingFile("do-not-edit-this-repository.yml", ".github/workflows", "do-not-edit-this-repository.yml"));
45+
Helpers.addCommonSupportingFiles(supportingFiles, "");
4946

5047
// Remove some files we don't want to output or change their paths
5148
supportingFiles.removeIf(

‎generators/src/main/java/com/algolia/codegen/AlgoliaScalaGenerator.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,10 +75,7 @@ public void processOpts() {
7575
supportingFiles.add(new SupportingFile("version.mustache", "", "version.sbt"));
7676
supportingFiles.add(new SupportingFile("jsonSupport.mustache", modelFolder, "JsonSupport.scala"));
7777

78-
supportingFiles.add(new SupportingFile("LICENSE", "", "LICENSE"));
79-
supportingFiles.add(new SupportingFile("issue.yml", ".github/workflows", "issue.yml"));
80-
supportingFiles.add(new SupportingFile("Bug_report.yml", ".github/ISSUE_TEMPLATE", "Bug_report.yml"));
81-
supportingFiles.add(new SupportingFile("do-not-edit-this-repository.yml", ".github/workflows", "do-not-edit-this-repository.yml"));
78+
Helpers.addCommonSupportingFiles(supportingFiles, "");
8279

8380
additionalProperties.put("isSearchClient", client.equals("search"));
8481
typeMapping.put("AnyType", "Any");

‎generators/src/main/java/com/algolia/codegen/AlgoliaSwiftGenerator.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -197,10 +197,7 @@ public void processOpts() {
197197
supportingFiles.add(
198198
new SupportingFile("client_configuration.mustache", sourceFolder, getClientName(CLIENT) + "ClientConfiguration.swift")
199199
);
200-
supportingFiles.add(new SupportingFile("LICENSE", "", "LICENSE"));
201-
supportingFiles.add(new SupportingFile("issue.yml", ".github/workflows", "issue.yml"));
202-
supportingFiles.add(new SupportingFile("Bug_report.yml", ".github/ISSUE_TEMPLATE", "Bug_report.yml"));
203-
supportingFiles.add(new SupportingFile("do-not-edit-this-repository.yml", ".github/workflows", "do-not-edit-this-repository.yml"));
200+
Helpers.addCommonSupportingFiles(supportingFiles, "");
204201

205202
supportingFiles.add(new SupportingFile("Package.mustache", "Package.swift"));
206203
supportingFiles.add(new SupportingFile("podspec.mustache", projectName + ".podspec"));

‎generators/src/main/java/com/algolia/codegen/utils/Helpers.java

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
import org.openapitools.codegen.CodegenOperation;
1515
import org.openapitools.codegen.CodegenServer;
1616
import org.openapitools.codegen.CodegenServerVariable;
17+
import org.openapitools.codegen.SupportingFile;
1718
import org.openapitools.codegen.model.OperationsMap;
1819

1920
public class Helpers {
@@ -258,6 +259,15 @@ public static void prettyPrint(Object o) {
258259
Json.prettyPrint(o);
259260
}
260261

262+
public static void addCommonSupportingFiles(List<SupportingFile> supportingFiles, String root) {
263+
supportingFiles.add(new SupportingFile("LICENSE", "", root + "LICENSE"));
264+
supportingFiles.add(new SupportingFile("issue.yml", root + ".github/workflows", "issue.yml"));
265+
supportingFiles.add(new SupportingFile("Bug_report.yml", root + ".github/ISSUE_TEMPLATE", "Bug_report.yml"));
266+
supportingFiles.add(
267+
new SupportingFile("do-not-edit-this-repository.yml", root + ".github/workflows", "do-not-edit-this-repository.yml")
268+
);
269+
}
270+
261271
public static String getLanguageVersion(String language) throws IOException {
262272
String versionFile = language.equals("javascript")
263273
? ".nvmrc"

0 commit comments

Comments
 (0)