Skip to content

Commit 9486b78

Browse files
authored
chore(cts): update dependency on cts generation for java (#505)
* chore(cts): update dependency on cts generation for java * chore: remove getPackageDependencies from the base class
1 parent 1e02d55 commit 9486b78

File tree

5 files changed

+51
-7
lines changed

5 files changed

+51
-7
lines changed

config/generation.config.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ module.exports = {
1919
'!clients/algoliasearch-client-java-2/algoliasearch-core/src/main/java/com/algolia/exceptions/**',
2020
'!clients/algoliasearch-client-java-2/algoliasearch-core/src/main/java/com/algolia/utils/**',
2121

22+
'tests/output/java/build.gradle',
2223
'tests/output/java/src/test/java/com/algolia/methods/**', // this could be added automatically by the script, but with overhead
2324
'tests/output/java/src/test/java/com/algolia/client/**',
2425

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,9 @@ public abstract class CtsManager {
99

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

12-
public List<Object> getPackageDependencies() {
13-
return null;
14-
}
15-
1612
protected void addExtraToBundle(Map<String, Object> bundle) {}
1713

1814
public void addDataToBundle(Map<String, Object> bundle) {
19-
bundle.put("packageDependencies", this.getPackageDependencies());
2015
this.addExtraToBundle(bundle);
2116
}
2217

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,25 @@
11
package com.algolia.codegen.cts.manager;
22

3+
import com.algolia.codegen.Utils;
34
import java.util.*;
45
import org.openapitools.codegen.SupportingFile;
56

67
public class JavaCtsManager extends CtsManager {
78

8-
public void addSupportingFiles(List<SupportingFile> supportingFiles) {}
9+
public void addSupportingFiles(List<SupportingFile> supportingFiles) {
10+
supportingFiles.add(
11+
new SupportingFile("build.mustache", ".", "build.gradle")
12+
);
13+
}
14+
15+
protected void addExtraToBundle(Map<String, Object> bundle) {
16+
bundle.put(
17+
"packageVersion",
18+
Utils
19+
.readJsonFile("config/clients.config.json")
20+
.get("java")
21+
.get("packageVersion")
22+
.asText()
23+
);
24+
}
925
}

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public void addSupportingFiles(List<SupportingFile> supportingFiles) {
1313
);
1414
}
1515

16-
public List<Object> getPackageDependencies() {
16+
private List<Object> getPackageDependencies() {
1717
List<Object> result = new ArrayList<Object>();
1818

1919
JsonNode openApiToolsConfig = Utils.readJsonFile(
@@ -45,6 +45,7 @@ public List<Object> getPackageDependencies() {
4545
}
4646

4747
protected void addExtraToBundle(Map<String, Object> bundle) {
48+
bundle.put("packageDependencies", this.getPackageDependencies());
4849
bundle.put("utilsPackageVersion", this.getUtilsPackageVersion());
4950
}
5051

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
plugins {
2+
id 'java'
3+
}
4+
5+
repositories {
6+
mavenCentral()
7+
}
8+
9+
dependencies {
10+
testImplementation 'com.algolia:algoliasearch-client-java:{{packageVersion}}-SNAPSHOT'
11+
testImplementation 'org.junit.jupiter:junit-jupiter:5.8.2'
12+
testImplementation 'org.skyscreamer:jsonassert:1.5.0'
13+
testImplementation 'com.google.code.gson:gson:2.8.9'
14+
}
15+
16+
group = 'com.algolia'
17+
version = '1.0'
18+
description = 'java-tests'
19+
java.sourceCompatibility = JavaVersion.VERSION_1_8
20+
21+
tasks.withType(JavaCompile) {
22+
options.encoding = 'UTF-8'
23+
}
24+
25+
test() {
26+
useJUnitPlatform()
27+
testLogging {
28+
events "passed", "skipped", "failed"
29+
showStandardStreams = true
30+
}
31+
}

0 commit comments

Comments
 (0)