Skip to content

Commit d9b834a

Browse files
committed
correctly build java
1 parent c564ca6 commit d9b834a

File tree

6 files changed

+52
-25
lines changed

6 files changed

+52
-25
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public void addTestsSupportingFiles(List<SupportingFile> supportingFiles) {
3838

3939
@Override
4040
public void addSnippetsSupportingFiles(List<SupportingFile> supportingFiles, String output) {
41-
supportingFiles.add(new SupportingFile("tests/build.mustache", output + "/java", "build.gradle"));
41+
supportingFiles.add(new SupportingFile("snippets/build.mustache", output + "/java", "build.gradle"));
4242
supportingFiles.add(new SupportingFile("snippets/settings.mustache", output + "/java", "settings.gradle"));
4343
}
4444

scripts/buildLanguages.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,10 @@ async function buildLanguage(language: Language, gens: Generator[], buildType: B
4242
break;
4343
case 'java':
4444
case 'kotlin':
45-
await run(`./gradle/gradlew -p ${cwd} assemble`, { language });
45+
await run(
46+
`./gradle/gradlew -p ${cwd} ${buildType === 'client' || buildType === 'playground' ? 'assemble' : 'build'}`,
47+
{ language },
48+
);
4649
break;
4750
case 'php':
4851
// await runComposerInstall();

templates/java/guides/search/saveObjectsMovies.mustache

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ import com.fasterxml.jackson.core.type.TypeReference;
99
import com.fasterxml.jackson.databind.JsonNode;
1010
import com.fasterxml.jackson.databind.ObjectMapper;
1111

12-
public class Main {
12+
public class saveObjectsMovies {
1313
public static void main(String[] args) throws Exception {
1414
// Fetch sample dataset
1515
URL url = new URI("https://dashboard.algolia.com/sample_datasets/movie.json").toURL();
1616
InputStream stream = url.openStream();
1717
ObjectMapper mapper = new ObjectMapper();
18-
List<JsonNode> result = mapper.readValue(stream, new TypeReference<List<JsonNode>>() {});
18+
List<JsonNode> objects = mapper.readValue(stream, new TypeReference<List<JsonNode>>() {});
1919
stream.close();
2020

2121
// Connect and authenticate with your Algolia app
Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
plugins {
2+
id 'java'
3+
}
4+
5+
repositories {
6+
mavenCentral()
7+
}
8+
9+
java {
10+
toolchain {
11+
languageVersion = JavaLanguageVersion.of({{languageVersion}})
12+
vendor = JvmVendorSpec.ADOPTIUM
13+
}
14+
}
15+
16+
dependencies {
17+
testImplementation 'com.algolia:algoliasearch:{{packageVersion}}'
18+
testImplementation 'org.junit.jupiter:junit-jupiter:5.11.1'
19+
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
20+
testImplementation 'org.skyscreamer:jsonassert:1.5.3'
21+
testImplementation 'com.fasterxml.jackson.core:jackson-core:2.18.0'
22+
testImplementation 'io.github.cdimascio:dotenv-java:2.3.2' // use an old version to support java 8
23+
}
24+
25+
tasks.withType(JavaCompile) {
26+
options.encoding = 'UTF-8'
27+
}
28+
29+
test() {
30+
systemProperty "file.encoding", "UTF-8"
31+
useJUnitPlatform()
32+
testLogging {
33+
events "passed", "skipped", "failed"
34+
showStandardStreams = true
35+
}
36+
}

templates/java/snippets/method.mustache

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,15 @@ package com.algolia.methods.snippets;
44
{{> snippets/import}}
55
// IMPORT<
66

7+
import java.util.*;
8+
79
class Snippet{{client}} {
810
{{#blocksRequests}}
911
{{#snippets}}
1012
// Snippet for the {{method}} method.
1113
//
1214
// {{{description}}}
13-
void snippetFor{{#lambda.pascalcase}}{{method}}{{/lambda.pascalcase}}{{testIndex}}() {
15+
void snippetFor{{#lambda.pascalcase}}{{method}}{{/lambda.pascalcase}}{{testIndex}}() throws Exception {
1416
// >SEPARATOR {{method}} {{testName}}
1517
// Initialize the client
1618
{{> snippets/init}}
Lines changed: 6 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,22 @@
11
plugins {
2-
id 'java'
2+
id 'java-library'
33
}
44

55
repositories {
66
mavenCentral()
77
}
88

9+
dependencies {
10+
testImplementation 'com.algolia:algoliasearch:{{packageVersion}}'
11+
}
12+
913
java {
1014
toolchain {
11-
languageVersion = JavaLanguageVersion.of({{languageVersion}})
15+
languageVersion = JavaLanguageVersion.of(17)
1216
vendor = JvmVendorSpec.ADOPTIUM
1317
}
1418
}
1519

16-
dependencies {
17-
testImplementation 'com.algolia:algoliasearch:{{packageVersion}}'
18-
testImplementation 'org.junit.jupiter:junit-jupiter:5.11.1'
19-
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
20-
testImplementation 'org.skyscreamer:jsonassert:1.5.3'
21-
testImplementation 'com.fasterxml.jackson.core:jackson-core:2.18.0'
22-
testImplementation 'io.github.cdimascio:dotenv-java:2.3.2' // use an old version to support java 8
23-
}
24-
2520
tasks.withType(JavaCompile) {
2621
options.encoding = 'UTF-8'
2722
}
28-
29-
test() {
30-
systemProperty "file.encoding", "UTF-8"
31-
useJUnitPlatform()
32-
testLogging {
33-
events "passed", "skipped", "failed"
34-
showStandardStreams = true
35-
}
36-
}

0 commit comments

Comments
 (0)