Skip to content

Commit 2d04ade

Browse files
committed
move the implementation of getPackageDependencies to the js level
1 parent 0303223 commit 2d04ade

File tree

5 files changed

+32
-28
lines changed

5 files changed

+32
-28
lines changed

config/clients.config.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
{
22
"java": {
33
"folder": "clients/algoliasearch-client-java-2",
4-
"packageName": "algoliasearch-client-java-2",
54
"packageVersion": "0.0.1",
65
"modelFolder": "algoliasearch-core/src/main/java/com/algolia/model",
76
"apiFolder": "algoliasearch-core/src/main/java/com/algolia/api",
@@ -23,7 +22,6 @@
2322
},
2423
"php": {
2524
"folder": "clients/algoliasearch-client-php",
26-
"packageName": "algoliasearch-client-php",
2725
"packageVersion": "0.0.1",
2826
"modelFolder": "lib/Model",
2927
"customGenerator": "algolia-php",

generators/src/main/java/com/algolia/codegen/cts/manager/CtsManager.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@ public abstract class CtsManager {
99

1010
public abstract void addSupportingFiles(List<SupportingFile> supportingFiles);
1111

12-
public abstract Object[] getPackageDependencies();
12+
public List<Object> getPackageDependencies() {
13+
return null;
14+
}
1315

1416
protected void addExtraToBundle(Map<String, Object> bundle) {}
1517

generators/src/main/java/com/algolia/codegen/cts/manager/JavaCtsManager.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,4 @@
66
public class JavaCtsManager extends CtsManager {
77

88
public void addSupportingFiles(List<SupportingFile> supportingFiles) {}
9-
10-
public Object[] getPackageDependencies() {
11-
return null;
12-
}
139
}

generators/src/main/java/com/algolia/codegen/cts/manager/JavaScriptCtsManager.java

Lines changed: 29 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -13,23 +13,35 @@ public void addSupportingFiles(List<SupportingFile> supportingFiles) {
1313
);
1414
}
1515

16-
public Object[] getPackageDependencies() {
17-
return this.getFilteredPackageVersions(
18-
List.of(
19-
"@experimental-api-clients-automation/algoliasearch-lite",
20-
"@experimental-api-clients-automation/client-abtesting",
21-
"@experimental-api-clients-automation/client-analytics",
22-
"@experimental-api-clients-automation/client-common",
23-
"@experimental-api-clients-automation/client-insights",
24-
"@experimental-api-clients-automation/client-personalization",
25-
"@experimental-api-clients-automation/client-predict",
26-
"@experimental-api-clients-automation/client-query-suggestions",
27-
"@experimental-api-clients-automation/client-search",
28-
"@experimental-api-clients-automation/client-sources",
29-
"@experimental-api-clients-automation/recommend",
30-
"@experimental-api-clients-automation/requester-node-http"
31-
)
32-
);
16+
public List<Object> getPackageDependencies() {
17+
List<Object> result = new ArrayList<Object>();
18+
19+
JsonNode openApiToolsConfig = Utils.readJsonFile(
20+
"config/openapitools.json"
21+
);
22+
Iterator<Map.Entry<String, JsonNode>> fieldIterator = openApiToolsConfig
23+
.get("generator-cli")
24+
.get("generators")
25+
.fields();
26+
27+
while (fieldIterator.hasNext()) {
28+
Map.Entry<String, JsonNode> field = fieldIterator.next();
29+
if (!field.getKey().startsWith("javascript-")) {
30+
continue;
31+
}
32+
JsonNode generator = field.getValue();
33+
JsonNode additionalProperties = generator.get("additionalProperties");
34+
String packageName = additionalProperties.get("packageName").asText();
35+
String packageVersion = additionalProperties
36+
.get("packageVersion")
37+
.asText();
38+
39+
Map<String, String> newEntry = new HashMap<>();
40+
newEntry.put("packageName", packageName);
41+
newEntry.put("packageVersion", packageVersion);
42+
result.add(newEntry);
43+
}
44+
return result;
3345
}
3446

3547
protected void addExtraToBundle(Map<String, Object> bundle) {

generators/src/main/java/com/algolia/codegen/cts/manager/PhpCtsManager.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,4 @@
66
public class PhpCtsManager extends CtsManager {
77

88
public void addSupportingFiles(List<SupportingFile> supportingFiles) {}
9-
10-
public Object[] getPackageDependencies() {
11-
return null;
12-
}
139
}

0 commit comments

Comments
 (0)