Skip to content

Commit ae4d23b

Browse files
millotpmillotp
committed
sqash
1 parent 7df1376 commit ae4d23b

File tree

12 files changed

+29
-29
lines changed

12 files changed

+29
-29
lines changed

‎clients/algoliasearch-client-java-2/algoliasearch-core/build.gradle

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@ plugins {
44
id 'com.github.johnrengelman.shadow' version '7.0.0'
55
}
66

7-
description = 'algoliasearch-client-java-2'
8-
java.sourceCompatibility = JavaVersion.VERSION_1_8
9-
107
repositories {
118
mavenCentral()
129
}

‎clients/algoliasearch-client-java-2/algoliasearch-core/gradle.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
POM_ARTIFACT_ID=algoliasearch-client-java

‎clients/algoliasearch-client-java-2/gradlew

100644100755
File mode changed.

‎clients/algoliasearch-client-java-2/settings.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
rootProject.name = "algoliasearch-client-java-2"
1+
rootProject.name = "algoliasearch-client-java"
22

33
include(":algoliasearch-core")

‎config/generation.config.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,11 @@ module.exports = {
1111

1212
// Java
1313
'!clients/algoliasearch-client-java-2/*.gradle',
14+
'!clients/algoliasearch-client-java-2/gradlew',
1415
'!clients/algoliasearch-client-java-2/.gitignore',
1516
'!clients/algoliasearch-client-java-2/gradle/wrapper/**',
1617
'!clients/algoliasearch-client-java-2/algoliasearch-core/build.gradle',
18+
'!clients/algoliasearch-client-java-2/algoliasearch-core/gradle.properties',
1719
'!clients/algoliasearch-client-java-2/algoliasearch-core/src/main/java/com/algolia/exceptions/**',
1820
'!clients/algoliasearch-client-java-2/algoliasearch-core/src/main/java/com/algolia/utils/**',
1921

‎config/openapitools.json

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -135,111 +135,103 @@
135135
},
136136
"java-search": {
137137
"output": "#{cwd}/clients/algoliasearch-client-java-2",
138-
"artifactId": "algoliasearch-client-java-2",
139138
"groupId": "com.algolia",
140139
"apiPackage": "com.algolia.api",
141140
"invokerPackage": "com.algolia",
142141
"modelPackage": "com.algolia.model.search",
143142
"library": "okhttp-gson",
144143
"gitRepoId": "algoliasearch-client-java-2",
145144
"additionalProperties": {
146-
"packageName": "algoliasearch-client-java-2"
145+
"packageName": "algoliasearch-client-java"
147146
}
148147
},
149148
"java-recommend": {
150149
"output": "#{cwd}/clients/algoliasearch-client-java-2",
151-
"artifactId": "algoliasearch-client-java-2",
152150
"groupId": "com.algolia",
153151
"apiPackage": "com.algolia.api",
154152
"invokerPackage": "com.algolia",
155153
"modelPackage": "com.algolia.model.recommend",
156154
"library": "okhttp-gson",
157155
"gitRepoId": "algoliasearch-client-java-2",
158156
"additionalProperties": {
159-
"packageName": "algoliasearch-client-java-2"
157+
"packageName": "algoliasearch-client-java"
160158
}
161159
},
162160
"java-personalization": {
163161
"output": "#{cwd}/clients/algoliasearch-client-java-2",
164-
"artifactId": "algoliasearch-client-java-2",
165162
"groupId": "com.algolia",
166163
"apiPackage": "com.algolia.api",
167164
"invokerPackage": "com.algolia",
168165
"modelPackage": "com.algolia.model.personalization",
169166
"library": "okhttp-gson",
170167
"gitRepoId": "algoliasearch-client-java-2",
171168
"additionalProperties": {
172-
"packageName": "algoliasearch-client-java-2",
169+
"packageName": "algoliasearch-client-java",
173170
"hasRegionalHost": true
174171
}
175172
},
176173
"java-analytics": {
177174
"output": "#{cwd}/clients/algoliasearch-client-java-2",
178-
"artifactId": "algoliasearch-client-java-2",
179175
"groupId": "com.algolia",
180176
"apiPackage": "com.algolia.api",
181177
"invokerPackage": "com.algolia",
182178
"modelPackage": "com.algolia.model.analytics",
183179
"library": "okhttp-gson",
184180
"gitRepoId": "algoliasearch-client-java-2",
185181
"additionalProperties": {
186-
"packageName": "algoliasearch-client-java-2",
182+
"packageName": "algoliasearch-client-java",
187183
"hasRegionalHost": true
188184
}
189185
},
190186
"java-insights": {
191187
"output": "#{cwd}/clients/algoliasearch-client-java-2",
192-
"artifactId": "algoliasearch-client-java-2",
193188
"groupId": "com.algolia",
194189
"apiPackage": "com.algolia.api",
195190
"invokerPackage": "com.algolia",
196191
"modelPackage": "com.algolia.model.insights",
197192
"library": "okhttp-gson",
198193
"gitRepoId": "algoliasearch-client-java-2",
199194
"additionalProperties": {
200-
"packageName": "algoliasearch-client-java-2",
195+
"packageName": "algoliasearch-client-java",
201196
"hasRegionalHost": true
202197
}
203198
},
204199
"java-abtesting": {
205200
"output": "#{cwd}/clients/algoliasearch-client-java-2",
206-
"artifactId": "algoliasearch-client-java-2",
207201
"groupId": "com.algolia",
208202
"apiPackage": "com.algolia.api",
209203
"invokerPackage": "com.algolia",
210204
"modelPackage": "com.algolia.model.abtesting",
211205
"library": "okhttp-gson",
212206
"gitRepoId": "algoliasearch-client-java-2",
213207
"additionalProperties": {
214-
"packageName": "algoliasearch-client-java-2",
208+
"packageName": "algoliasearch-client-java",
215209
"hasRegionalHost": true
216210
}
217211
},
218212
"java-query-suggestions": {
219213
"output": "#{cwd}/clients/algoliasearch-client-java-2",
220-
"artifactId": "algoliasearch-client-java-2",
221214
"groupId": "com.algolia",
222215
"apiPackage": "com.algolia.api",
223216
"invokerPackage": "com.algolia",
224217
"modelPackage": "com.algolia.model.querySuggestions",
225218
"library": "okhttp-gson",
226219
"gitRepoId": "algoliasearch-client-java-2",
227220
"additionalProperties": {
228-
"packageName": "algoliasearch-client-java-2",
221+
"packageName": "algoliasearch-client-java",
229222
"hasRegionalHost": true
230223
}
231224
},
232225
"java-predict": {
233226
"output": "#{cwd}/clients/algoliasearch-client-java-2",
234-
"artifactId": "algoliasearch-client-java-2",
235227
"groupId": "com.algolia",
236228
"apiPackage": "com.algolia.api",
237229
"invokerPackage": "com.algolia",
238230
"modelPackage": "com.algolia.model.predict",
239231
"library": "okhttp-gson",
240232
"gitRepoId": "algoliasearch-client-java-2",
241233
"additionalProperties": {
242-
"packageName": "algoliasearch-client-java-2"
234+
"packageName": "algoliasearch-client-java"
243235
}
244236
},
245237
"php-search": {

‎playground/java/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ repositories {
99

1010
dependencies {
1111
implementation 'io.github.cdimascio:dotenv-java:2.2.2'
12-
implementation 'com.algolia:algoliasearch-core:0.0.1-SNAPSHOT'
12+
implementation 'com.algolia:algoliasearch-client-java:0.0.1-SNAPSHOT'
1313
}
1414

1515
group = 'com.algolia'

‎playground/java/settings.gradle

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
11
rootProject.name = 'java-playground'
22

3-
includeBuild '../../clients/algoliasearch-client-java-2'
3+
includeBuild('../../clients/algoliasearch-client-java-2') {
4+
dependencySubstitution {
5+
substitute module('com.algolia:algoliasearch-client-java') using project(':algoliasearch-core')
6+
}
7+
}

‎tests/output/java/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ repositories {
77
}
88

99
dependencies {
10-
testImplementation 'com.algolia:algoliasearch-core:0.0.1-SNAPSHOT'
10+
testImplementation 'com.algolia:algoliasearch-client-java:0.0.1-SNAPSHOT'
1111
testImplementation 'org.junit.jupiter:junit-jupiter:5.8.2'
1212
testImplementation 'org.skyscreamer:jsonassert:1.5.0'
1313
testImplementation 'com.google.code.gson:gson:2.8.9'

‎tests/output/java/settings.gradle

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
11
rootProject.name = 'java-tests'
22

3-
includeBuild '../../../clients/algoliasearch-client-java-2'
3+
includeBuild('../../../clients/algoliasearch-client-java-2') {
4+
dependencySubstitution {
5+
substitute module('com.algolia:algoliasearch-client-java') using project(':algoliasearch-core')
6+
}
7+
}

‎website/docs/api-clients/installation.mdx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ $res = $client->getUserTokenProfile('<YOUR_TOKEN>');
157157

158158
<TabItem value="java">
159159

160-
To get started, add the [algoliasearch-core](https://oss.sonatype.org/content/repositories/snapshots/com/algolia/algoliasearch-core/0.0.1-SNAPSHOT/) dependency to your project, either with [Maven](https://maven.apache.org/):
160+
To get started, add the [algoliasearch-client-java](https://oss.sonatype.org/content/repositories/snapshots/com/algolia/algoliasearch-client-java/0.0.1-SNAPSHOT/) dependency to your project, either with [Maven](https://maven.apache.org/):
161161
```xml
162162
<repositories>
163163
<repository>
@@ -174,7 +174,7 @@ To get started, add the [algoliasearch-core](https://oss.sonatype.org/content/re
174174

175175
<dependency>
176176
<groupId>com.algolia</groupId>
177-
<artifactId>algoliasearch-core</artifactId>
177+
<artifactId>algoliasearch-client-java</artifactId>
178178
<version>0.0.1-SNAPSHOT</version>
179179
</dependency>
180180
```
@@ -186,7 +186,7 @@ repositories() {
186186
}
187187
188188
dependencies {
189-
testImplementation 'com.algolia:algoliasearch-core:0.0.1-SNAPSHOT'
189+
testImplementation 'com.algolia:algoliasearch-client-java:0.0.1-SNAPSHOT'
190190
}
191191
```
192192

‎website/docs/automation/release-process.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ Each language repository should have their own release process, and should run o
4343

4444
### Java
4545

46-
Java is released to [sonatype](https://oss.sonatype.org/) before being sent to [Maven](https://search.maven.org/artifact/com.algolia/algoliasearch-core) central repository, the `jar` need to be signed before publishing, and then verified on sonatype by using `closeAndRelease` target on Gradle.
46+
Java is released to [sonatype](https://oss.sonatype.org/) before being sent to [Maven](https://search.maven.org/artifact/com.algolia/algoliasearch-client-java) central repository, the `jar` need to be signed before publishing, and then verified on sonatype by using `closeAndRelease` target on Gradle.
4747
All of this is handled in the [release action](https://github.com/algolia/algoliasearch-client-java-2/tree/next/.github/workflows/release.yml), executed on the [Java repository](https://github.com/algolia/algoliasearch-client-java-2).
4848
If you want to release manually, you need to copy some secrets to either:
4949

@@ -76,7 +76,7 @@ repositories {
7676
}
7777
7878
dependencies {
79-
implementation 'com.algolia:algoliasearch-core:0.0.1-SNAPSHOT'
79+
implementation 'com.algolia:algoliasearch-client-java:0.0.1-SNAPSHOT'
8080
}
8181
```
8282

0 commit comments

Comments
 (0)