Skip to content

Commit 1962119

Browse files
adriantamadriantam
authored
chore(java-sdk): update for interfaces and dependency bumps (#251)
2 parents 1be617a + e4845d0 commit 1962119

File tree

7 files changed

+25
-25
lines changed

7 files changed

+25
-25
lines changed

‎config/clients/java/template/.github/workflows/main.yml.mustache‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ jobs:
1414
matrix:
1515
java: [ '11', '17', '20' ]
1616
steps:
17-
- uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.2
17+
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v3.5.2
1818
- name: Set up JDK
19-
uses: actions/setup-java@cd89f46ac9d01407894225f350157564c9c7cee2 # v3.12.0
19+
uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4.0.0
2020
with:
2121
{{=< >=}}
2222
java-version: ${{ matrix.java }}
@@ -37,10 +37,10 @@ jobs:
3737
needs: [test]
3838

3939
steps:
40-
- uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.2
40+
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v3.5.2
4141

4242
- name: Set up JDK
43-
uses: actions/setup-java@cd89f46ac9d01407894225f350157564c9c7cee2 # v3.12.0
43+
uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4.0.0
4444
with:
4545
java-version: 11
4646
distribution: 'temurin'
@@ -49,7 +49,7 @@ jobs:
4949
uses: gradle/wrapper-validation-action@56b90f209b02bf6d1deae490e9ef18b21a389cd4 # v1.1.0
5050

5151
- name: Publish package
52-
uses: gradle/gradle-build-action@ef76a971e2fa3f867b617efd72f2fbd72cf6f8bc # v2.8.0
52+
uses: gradle/gradle-build-action@87a9a15658c426a54dd469d4fc7dc1a73ca9d4a6 # v2.10.0
5353
with:
5454
# Tasks created by https://github.com/gradle-nexus/publish-plugin
5555
arguments: publishToSonatype closeAndReleaseSonatypeStagingRepository
@@ -68,10 +68,10 @@ jobs:
6868
needs: [test]
6969

7070
steps:
71-
- uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.2
71+
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v3.5.2
7272

7373
- name: Set up JDK
74-
uses: actions/setup-java@cd89f46ac9d01407894225f350157564c9c7cee2 # v3.12.0
74+
uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4.0.0
7575
with:
7676
java-version: 11
7777
distribution: 'temurin'
@@ -80,7 +80,7 @@ jobs:
8080
uses: gradle/wrapper-validation-action@56b90f209b02bf6d1deae490e9ef18b21a389cd4 # v1.1.0
8181

8282
- name: Publish package
83-
uses: gradle/gradle-build-action@ef76a971e2fa3f867b617efd72f2fbd72cf6f8bc # v2.8.0
83+
uses: gradle/gradle-build-action@87a9a15658c426a54dd469d4fc7dc1a73ca9d4a6 # v2.10.0
8484
with:
8585
# Tasks created by https://docs.gradle.org/current/userguide/publishing_maven.html
8686
arguments: publishAllPublicationsToGitHubPackagesRepository
@@ -95,9 +95,9 @@ jobs:
9595
needs: [publish-maven-central, publish-github-packages]
9696

9797
steps:
98-
- uses: actions/checkout@v3
98+
- uses: actions/checkout@v4
9999

100-
- uses: Roang-zero1/github-create-release-action@5cf058ddffa6fa04e5cda07c98570c757dc4a0e1
100+
- uses: Roang-zero1/github-create-release-action@57eb9bdce7a964e48788b9e78b5ac766cb684803
101101
with:
102102
version_regex: ^v[[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+
103103
env:

‎config/clients/java/template/OpenFgaApiIntegrationTest.java.mustache‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ public class OpenFgaApiIntegrationTest {
283283
String authModelId = writeAuthModel(storeId);
284284
WriteAssertionsRequest writeRequest = new WriteAssertionsRequest()
285285
.assertions(List.of(new Assertion()
286-
.tupleKey(new CheckRequestTupleKey()
286+
.tupleKey(new AssertionTupleKey()
287287
.user(DEFAULT_USER)
288288
.relation("reader")
289289
._object(DEFAULT_DOC))
@@ -297,7 +297,7 @@ public class OpenFgaApiIntegrationTest {
297297
// Then
298298
String responseJson = mapper.writeValueAsString(response.getAssertions());
299299
assertEquals(
300-
"[{\"tuple_key\":{\"user\":\"user:81684243-9356-4421-8fbf-a4f8d36aa31b\",\"relation\":\"reader\",\"object\":\"document:2021-budget\"},\"expectation\":true}]",
300+
"[{\"tuple_key\":{\"object\":\"document:2021-budget\",\"relation\":\"reader\",\"user\":\"user:81684243-9356-4421-8fbf-a4f8d36aa31b\"},\"expectation\":true}]",
301301
responseJson);
302302
}
303303

‎config/clients/java/template/OpenFgaApiTest.java.mustache‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1808,12 +1808,12 @@ public class OpenFgaApiTest {
18081808
// Given
18091809
String putUrl = "https://localhost/stores/01YCP46JKYM8FJCQ37NMBYHE5X/assertions/01G5JAVJ41T49E9TT3SKVS7X1J";
18101810
String expectedBody = String.format(
1811-
"{\"assertions\":[{\"tuple_key\":{\"user\":\"%s\",\"relation\":\"%s\",\"object\":\"%s\"},\"expectation\":true}]}",
1812-
DEFAULT_USER, DEFAULT_RELATION, DEFAULT_OBJECT);
1811+
"{\"assertions\":[{\"tuple_key\":{\"object\":\"%s\",\"relation\":\"%s\",\"user\":\"%s\"},\"expectation\":true}]}",
1812+
DEFAULT_OBJECT, DEFAULT_RELATION, DEFAULT_USER);
18131813
mockHttpClient.onPut(putUrl).withBody(is(expectedBody)).doReturn(200, EMPTY_RESPONSE_BODY);
18141814
WriteAssertionsRequest request = new WriteAssertionsRequest()
18151815
.assertions(List.of(new Assertion()
1816-
.tupleKey(new CheckRequestTupleKey()
1816+
.tupleKey(new AssertionTupleKey()
18171817
._object(DEFAULT_OBJECT)
18181818
.relation(DEFAULT_RELATION)
18191819
.user(DEFAULT_USER))

‎config/clients/java/template/build.gradle.mustache‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ plugins {
44
// Quality
55
id 'jacoco'
66
id 'jvm-test-suite'
7-
id 'com.diffplug.spotless' version '6.20.0'
7+
id 'com.diffplug.spotless' version '6.23.3'
88
99
// IDE
1010
id 'idea'
@@ -55,8 +55,8 @@ ext {
5555
{{#swagger2AnnotationLibrary}}
5656
swagger_annotations_version = "2.2.9"
5757
{{/swagger2AnnotationLibrary}}
58-
jackson_version = "2.14.1"
59-
junit_version = "5.7.1"
58+
jackson_version = "2.16.0"
59+
junit_version = "5.10.1"
6060
{{#hasFormParamsInSpec}}
6161
httpmime_version = "4.5.13"
6262
{{/hasFormParamsInSpec}}
@@ -74,7 +74,7 @@ dependencies {
7474
implementation "com.fasterxml.jackson.core:jackson-annotations:$jackson_version"
7575
implementation "com.fasterxml.jackson.core:jackson-databind:$jackson_version"
7676
implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version"
77-
implementation "org.openapitools:jackson-databind-nullable:0.2.1"
77+
implementation "org.openapitools:jackson-databind-nullable:0.2.6"
7878
{{#hasFormParamsInSpec}}
7979
implementation "org.apache.httpcomponents:httpmime:$httpmime_version"
8080
{{/hasFormParamsInSpec}}
@@ -88,7 +88,7 @@ testing {
8888
dependencies {
8989
implementation project()
9090
implementation "org.junit.jupiter:junit-jupiter:$junit_version"
91-
implementation "org.mockito:mockito-core:3.+"
91+
implementation "org.mockito:mockito-core:5.+"
9292
runtimeOnly "org.junit.platform:junit-platform-launcher"
9393
9494
// This test-only dependency is convenient but not widely used.

‎config/clients/java/template/client-ClientAssertion.java.mustache‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
package {{invokerPackage}};
33

44
import {{modelPackage}}.Assertion;
5-
import {{modelPackage}}.CheckRequestTupleKey;
5+
import {{modelPackage}}.AssertionTupleKey;
66
import java.util.List;
77
import java.util.stream.Collectors;
88

@@ -61,7 +61,7 @@ public class ClientAssertion {
6161
}
6262

6363
public Assertion asAssertion() {
64-
var tupleKey = new CheckRequestTupleKey().user(user).relation(relation)._object(_object);
64+
var tupleKey = new AssertionTupleKey().user(user).relation(relation)._object(_object);
6565
return new Assertion().tupleKey(tupleKey).expectation(expectation);
6666
}
6767

‎config/clients/java/template/client-OpenFgaClientIntegrationTest.java.mustache‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,7 @@ public class OpenFgaClientIntegrationTest {
311311
// Then
312312
String responseJson = mapper.writeValueAsString(response.getAssertions());
313313
assertEquals(
314-
"[{\"tuple_key\":{\"user\":\"user:81684243-9356-4421-8fbf-a4f8d36aa31b\",\"relation\":\"reader\",\"object\":\"document:2021-budget\"},\"expectation\":true}]",
314+
"[{\"tuple_key\":{\"object\":\"document:2021-budget\",\"relation\":\"reader\",\"user\":\"user:81684243-9356-4421-8fbf-a4f8d36aa31b\"},\"expectation\":true}]",
315315
responseJson);
316316
}
317317

‎config/clients/java/template/client-OpenFgaClientTest.java.mustache‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2211,8 +2211,8 @@ public class OpenFgaClientTest {
22112211
String putUrl =
22122212
String.format("https://localhost/stores/%s/assertions/%s", DEFAULT_STORE_ID, DEFAULT_AUTH_MODEL_ID);
22132213
String expectedBody = String.format(
2214-
"{\"assertions\":[{\"tuple_key\":{\"user\":\"%s\",\"relation\":\"%s\",\"object\":\"%s\"},\"expectation\":true}]}",
2215-
DEFAULT_USER, DEFAULT_RELATION, DEFAULT_OBJECT);
2214+
"{\"assertions\":[{\"tuple_key\":{\"object\":\"%s\",\"relation\":\"%s\",\"user\":\"%s\"},\"expectation\":true}]}",
2215+
DEFAULT_OBJECT, DEFAULT_RELATION, DEFAULT_USER);
22162216
mockHttpClient.onPut(putUrl).withBody(is(expectedBody)).doReturn(200, EMPTY_RESPONSE_BODY);
22172217
List<ClientAssertion> assertions = List.of(new ClientAssertion()
22182218
.user(DEFAULT_USER)

0 commit comments

Comments
 (0)