Cleanup JDK provider in tests #26891
Merged
Conversation
This file contains hidden or 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
Reviewer's GuideThis PR simplifies JDK handling by removing legacy built-in and custom distribution providers, unifying downloads to use Temurin across both Docker build scripts and the product tests launcher. Flow diagram for unified Temurin JDK download in Docker build scriptflowchart TD
A["Read Temurin release from .temurin-release"] --> B["Select architecture (arm64, amd64, ppc64le)"]
B --> C["Generate Temurin download URL"]
C --> D["Pass JDK download link to docker build"]
File-Level Changes
Tips and commandsInteracting with Sourcery
Customizing Your ExperienceAccess your dashboard to:
Getting Help
|
![sourcery-ai[bot]](https://avatars.githubusercontent.com/in/48477?s=60&v=4){kind=small}
There was a problem hiding this comment.
Hey there - I've reviewed your changes - here's some feedback:
- In build.sh, add a check to ensure TEMURIN_RELEASE (and the .temurin-release file) is present and non‐empty before attempting to build images to avoid silent failures.
- Add unit tests for TemurinJdkProvider#getDownloadUri to assert that it generates the correct download URLs for each supported architecture.
- Consider consolidating the architecture‐to‐name mappings (aarch64/x64/ppc64le) into a shared utility or config to avoid duplicating the logic in both the shell script and Java provider.
Prompt for AI Agents
Please address the comments from this code review:
## Overall Comments
- In build.sh, add a check to ensure TEMURIN_RELEASE (and the .temurin-release file) is present and non‐empty before attempting to build images to avoid silent failures.
- Add unit tests for TemurinJdkProvider#getDownloadUri to assert that it generates the correct download URLs for each supported architecture.
- Consider consolidating the architecture‐to‐name mappings (aarch64/x64/ppc64le) into a shared utility or config to avoid duplicating the logic in both the shell script and Java provider.
## Individual Comments
### Comment 1
<location> `testing/trino-product-tests-launcher/src/test/java/io/trino/tests/product/launcher/env/TestConfigurations.java:64` </location>
<code_context>
public void testJdkProviderName()
{
- assertThat(nameForJdkProviderName(BuiltInJdkProvider.class)).isEqualTo("builtin");
+ assertThat(nameForJdkProviderName(TemurinJdkProvider.class)).isEqualTo("temurin");
assertThat(canonicalJdkProviderName("BuiltIN")).isEqualTo("builtin");
assertThat(canonicalJdkProviderName("built-IN")).isEqualTo("builtin");
</code_context>
<issue_to_address>
**suggestion (testing):** Missing tests for TemurinJdkProvider edge cases and error handling.
Please add tests for invalid release names, null download paths, and unsupported architectures to improve coverage of error handling.
Suggested implementation:
```java
@Test
public void testJdkProviderName()
{
assertThat(nameForJdkProviderName(TemurinJdkProvider.class)).isEqualTo("temurin");
assertThat(canonicalJdkProviderName("BuiltIN")).isEqualTo("builtin");
assertThat(canonicalJdkProviderName("built-IN")).isEqualTo("builtin");
}
@Test
public void testTemurinJdkProviderInvalidReleaseName()
{
TemurinJdkProvider provider = new TemurinJdkProvider();
Exception exception = assertThrows(IllegalArgumentException.class, () -> {
provider.getDownloadUrl("invalid-release", "linux-x64");
});
assertThat(exception.getMessage()).contains("Invalid release name");
}
@Test
public void testTemurinJdkProviderNullDownloadPath()
{
TemurinJdkProvider provider = new TemurinJdkProvider();
Exception exception = assertThrows(NullPointerException.class, () -> {
provider.getDownloadUrl(null, "linux-x64");
});
assertThat(exception.getMessage()).contains("release name is null");
}
@Test
public void testTemurinJdkProviderUnsupportedArchitecture()
{
TemurinJdkProvider provider = new TemurinJdkProvider();
Exception exception = assertThrows(IllegalArgumentException.class, () -> {
provider.getDownloadUrl("17", "unsupported-arch");
});
assertThat(exception.getMessage()).contains("Unsupported architecture");
}
```
- Ensure that TemurinJdkProvider#getDownloadUrl(String release, String arch) throws appropriate exceptions for invalid release names, null release names, and unsupported architectures.
- If the method signatures or exception messages differ, adjust the test cases accordingly.
</issue_to_address>Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.
...uct-tests-launcher/src/test/java/io/trino/tests/product/launcher/env/TestConfigurations.java
Show resolved
Hide resolved
Contributor
Author
|
This makes it easier to forward test new JDK version (and upgrade these too) |
We only use Temurin for both testing and while producing docker images so there is no point in keeping more complicated implementation if it's not used.
wendigo
force-pushed
the
serafin/java-cleanup
branch
from
0449f86 to
041dc20
Compare
losipiuk
approved these changes
Oct 9, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
We only use Temurin for both testing and while producing docker images so there is no point in keeping more complicated implementation if it's not used.
Description
Additional context and related issues
Release notes
(x) This is not user-visible or is docs only, and no release notes are required.
( ) Release notes are required. Please propose a release note for me.
( ) Release notes are required, with the following suggested text:
Summary by Sourcery
Switch JDK provisioning to use Temurin exclusively and remove legacy JDK provider logic
New Features:
Enhancements:
Tests:
Chores: