diff --git a/config/generation.config.js b/config/generation.config.js index 195adafe67..3b41a756e3 100644 --- a/config/generation.config.js +++ b/config/generation.config.js @@ -19,6 +19,7 @@ module.exports = { '!clients/algoliasearch-client-java-2/algoliasearch-core/src/main/java/com/algolia/exceptions/**', '!clients/algoliasearch-client-java-2/algoliasearch-core/src/main/java/com/algolia/utils/**', + 'tests/output/java/build.gradle', 'tests/output/java/src/test/java/com/algolia/methods/**', // this could be added automatically by the script, but with overhead 'tests/output/java/src/test/java/com/algolia/client/**', diff --git a/generators/src/main/java/com/algolia/codegen/cts/manager/CtsManager.java b/generators/src/main/java/com/algolia/codegen/cts/manager/CtsManager.java index 16ab7eeef1..5ca987b797 100644 --- a/generators/src/main/java/com/algolia/codegen/cts/manager/CtsManager.java +++ b/generators/src/main/java/com/algolia/codegen/cts/manager/CtsManager.java @@ -9,14 +9,9 @@ public abstract class CtsManager { public abstract void addSupportingFiles(List supportingFiles); - public List getPackageDependencies() { - return null; - } - protected void addExtraToBundle(Map bundle) {} public void addDataToBundle(Map bundle) { - bundle.put("packageDependencies", this.getPackageDependencies()); this.addExtraToBundle(bundle); } diff --git a/generators/src/main/java/com/algolia/codegen/cts/manager/JavaCtsManager.java b/generators/src/main/java/com/algolia/codegen/cts/manager/JavaCtsManager.java index 5ab7457afe..bfc2413ca9 100644 --- a/generators/src/main/java/com/algolia/codegen/cts/manager/JavaCtsManager.java +++ b/generators/src/main/java/com/algolia/codegen/cts/manager/JavaCtsManager.java @@ -1,9 +1,25 @@ package com.algolia.codegen.cts.manager; +import com.algolia.codegen.Utils; import java.util.*; import org.openapitools.codegen.SupportingFile; public class JavaCtsManager extends CtsManager { - public void addSupportingFiles(List supportingFiles) {} + public void addSupportingFiles(List supportingFiles) { + supportingFiles.add( + new SupportingFile("build.mustache", ".", "build.gradle") + ); + } + + protected void addExtraToBundle(Map bundle) { + bundle.put( + "packageVersion", + Utils + .readJsonFile("config/clients.config.json") + .get("java") + .get("packageVersion") + .asText() + ); + } } diff --git a/generators/src/main/java/com/algolia/codegen/cts/manager/JavaScriptCtsManager.java b/generators/src/main/java/com/algolia/codegen/cts/manager/JavaScriptCtsManager.java index 38b2e27750..0ac2d66c90 100644 --- a/generators/src/main/java/com/algolia/codegen/cts/manager/JavaScriptCtsManager.java +++ b/generators/src/main/java/com/algolia/codegen/cts/manager/JavaScriptCtsManager.java @@ -13,7 +13,7 @@ public void addSupportingFiles(List supportingFiles) { ); } - public List getPackageDependencies() { + private List getPackageDependencies() { List result = new ArrayList(); JsonNode openApiToolsConfig = Utils.readJsonFile( @@ -45,6 +45,7 @@ public List getPackageDependencies() { } protected void addExtraToBundle(Map bundle) { + bundle.put("packageDependencies", this.getPackageDependencies()); bundle.put("utilsPackageVersion", this.getUtilsPackageVersion()); } diff --git a/tests/CTS/methods/requests/templates/java/build.mustache b/tests/CTS/methods/requests/templates/java/build.mustache new file mode 100644 index 0000000000..9a45e9463a --- /dev/null +++ b/tests/CTS/methods/requests/templates/java/build.mustache @@ -0,0 +1,31 @@ +plugins { + id 'java' +} + +repositories { + mavenCentral() +} + +dependencies { + testImplementation 'com.algolia:algoliasearch-client-java:{{packageVersion}}-SNAPSHOT' + testImplementation 'org.junit.jupiter:junit-jupiter:5.8.2' + testImplementation 'org.skyscreamer:jsonassert:1.5.0' + testImplementation 'com.google.code.gson:gson:2.8.9' +} + +group = 'com.algolia' +version = '1.0' +description = 'java-tests' +java.sourceCompatibility = JavaVersion.VERSION_1_8 + +tasks.withType(JavaCompile) { + options.encoding = 'UTF-8' +} + +test() { + useJUnitPlatform() + testLogging { + events "passed", "skipped", "failed" + showStandardStreams = true + } +}