This repository has been archived by the owner on Jun 6, 2024. It is now read-only.
refactor: replace generated ApiClient with a manual one #76
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
paullatzelsperger
added
the
refactoring
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
...ation-service-client/src/main/java/org/eclipse/edc/registration/client/ApiClientFactory.java
Fixed
Show fixed
Hide fixed
...ation-service-client/src/main/java/org/eclipse/edc/registration/client/ApiClientFactory.java
Fixed
Show fixed
Hide fixed
bscholtes1A
suggested changes
Mar 10, 2023
| implementation(libs.jackson.core) | ||
| implementation(libs.bundles.jackson) | ||
| implementation(libs.openapi.jackson.databind.nullable) | ||
|
|
||
| testImplementation("com.squareup.okhttp3:mockwebserver:4.10.0") |
There was a problem hiding this comment.
yes - i'm testing the client against the MockServer. An alternative would be to test directly against the RegistrationServiceApiController, but that would mean spinning up a complete connector runtime.
...ation-service-client/src/main/java/org/eclipse/edc/registration/client/ApiClientFactory.java
Outdated
Show resolved
Hide resolved
...tion-service-client/src/main/java/org/eclipse/edc/registration/client/RegistryApiClient.java
Show resolved
Hide resolved
Will do, thx for noticing |
paullatzelsperger
force-pushed
the
refactor/75_replace_generated_apiclient
branch
from
a593aa6 to
25d4f07
Compare
paullatzelsperger
force-pushed
the
refactor/75_replace_generated_apiclient
branch
from
0f6ebdb to
00e0adc
Compare
| var connectTimeout = Integer.parseInt(propOrEnv(API_CLIENT_CONNECT_TIMEOUT, "30")); | ||
| var readTimeout = Integer.parseInt(propOrEnv(API_CLIENT_READ_TIMEOUT, "60")); | ||
| public static RegistryApiClient createApiClient(String baseUri, Function<TokenParameters, Result<TokenRepresentation>> credentialsProvider, Monitor monitor, ObjectMapper objectMapper) { | ||
| var connectTimeout = Duration.ofSeconds(Integer.parseInt(propOrEnv(API_CLIENT_CONNECT_TIMEOUT, "30"))); |
Check notice
Code scanning / CodeQL
Missing catch of NumberFormatException
| var readTimeout = Integer.parseInt(propOrEnv(API_CLIENT_READ_TIMEOUT, "60")); | ||
| public static RegistryApiClient createApiClient(String baseUri, Function<TokenParameters, Result<TokenRepresentation>> credentialsProvider, Monitor monitor, ObjectMapper objectMapper) { | ||
| var connectTimeout = Duration.ofSeconds(Integer.parseInt(propOrEnv(API_CLIENT_CONNECT_TIMEOUT, "30"))); | ||
| var readTimeout = Duration.ofSeconds(Integer.parseInt(propOrEnv(API_CLIENT_READ_TIMEOUT, "60"))); |
Check notice
Code scanning / CodeQL
Missing catch of NumberFormatException
bscholtes1A
approved these changes
Mar 15, 2023
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What this PR changes/adds
Replaces the auto-generated API client with an "explicitly" implemented one.
Why it does that
both the API controller and the client are in this repository, so it does not make much sense to generate the client.
Further, the generated one used the Java Http client, whereas now we can use the
EdcHttpClient.Further notes
MockWebServerto verify that the client sends the correct requests.Linked Issue(s)
Closes #75
Checklist
no-changelog)