Skip to content

Commit

Permalink
Update spring javaformat version to 0.0.39
Browse files Browse the repository at this point in the history
  • Loading branch information
@eddumelendez
eddumelendez committed Sep 17, 2023
1 parent cd80677 commit 8978be3
Show file tree
Hide file tree
Showing 8 changed files with 109 additions and 94 deletions.
2 changes: 1 addition & 1 deletion pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
<plugin>
<groupId>io.spring.javaformat</groupId>
<artifactId>spring-javaformat-maven-plugin</artifactId>
<version>0.0.35</version>
<version>0.0.39</version>
<executions>
<execution>
<phase>validate</phase>
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/io/sdkman/automigration/adapters/PackageAdapter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,9 @@ public static Map<String, List<String>> toQueryParams(FoojayQueryParams foojayQu
// @formatter:on

return Stream
.concat(Stream.concat(defaultQueryParams.entrySet().stream(), graalVmQueryParams.entrySet().stream()),
arm32QueryParams.entrySet().stream())
.collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
.concat(Stream.concat(defaultQueryParams.entrySet().stream(), graalVmQueryParams.entrySet().stream()),
arm32QueryParams.entrySet().stream())
.collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
}

private static Map<String, List<String>> addQueryParamsIfGraalVm(String distribution, String javaVersion) {
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/io/sdkman/automigration/config/RestTemplateConfig.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ public class RestTemplateConfig {
@Bean
public RestTemplate restTemplate(RestTemplateBuilder restTemplateBuilder) {
return restTemplateBuilder.requestFactory(NoRedirectSimpleClientHttpRequestFactory.class)
.errorHandler(new ServerResponseErrorHandler()).build();
.errorHandler(new ServerResponseErrorHandler())
.build();
}

}
23 changes: 12 additions & 11 deletions src/main/java/io/sdkman/automigration/controllers/JavaMigration.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ public JavaMigration(FoojayClient foojayClient, SdkmanClient sdkmanClient,

public void execute(Map<String, List<String>> queryParams, Boolean defaultCandidate) {
var foojayQueryParams = Stream
.concat(queryParams.entrySet().stream(), FoojayClient.defaultQueryParams.entrySet().stream())
.collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
.concat(queryParams.entrySet().stream(), FoojayClient.defaultQueryParams.entrySet().stream())
.collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));

var resultPackageResponse = this.foojayClient.queryPackages(this.foojayProperties.url(), foojayQueryParams);
// @formatter:off
Expand Down Expand Up @@ -89,15 +89,16 @@ private void findAndPublish(PackageResponse packageResponse, String sdkmanVendor
}
var ephemeralResponse = this.foojayClient.queryUrl(packageResponse.links().pkgInfoUri());
ephemeralResponse.filter(payload -> payload.result() != null && payload.result().size() == 1)
.map(ResultIdsResponse::result).flatMap(idsResponses -> idsResponses.stream().findFirst())
.ifPresent(idsResponse -> {
var versionRequest = VersionAdapter.toVersionRequest(sdkmanVendor, version, sdkmanReleasePlatform,
idsResponse, defaultCandidate);
logger.log(Level.INFO, versionRequest.toString());
var newVersionResponse = this.sdkmanClient.newVersion(this.sdkmanProperties.release().url(),
versionRequest);
newVersionResponse.ifPresent(response -> logger.log(Level.INFO, response));
});
.map(ResultIdsResponse::result)
.flatMap(idsResponses -> idsResponses.stream().findFirst())
.ifPresent(idsResponse -> {
var versionRequest = VersionAdapter.toVersionRequest(sdkmanVendor, version, sdkmanReleasePlatform,
idsResponse, defaultCandidate);
logger.log(Level.INFO, versionRequest.toString());
var newVersionResponse = this.sdkmanClient.newVersion(this.sdkmanProperties.release().url(),
versionRequest);
newVersionResponse.ifPresent(response -> logger.log(Level.INFO, response));
});
}

}
5 changes: 3 additions & 2 deletions src/main/java/io/sdkman/automigration/entrypoints/CommandLine.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,8 @@ CommandLineRunner runner() {

var distributionConfigurationPropertyName = resolveConfigurationPropertyName(distribution, features);
var vendorProperties = Binder.get(this.environment)
.bind(distributionConfigurationPropertyName, Bindable.of(VendorProperties.class)).orElse(null);
.bind(distributionConfigurationPropertyName, Bindable.of(VendorProperties.class))
.orElse(null);

process(vendorProperties.linux(), distribution, version, javaVersion, releaseStatus, "linux", javafxBundled,
defaultCandidate, features);
Expand All @@ -53,7 +54,7 @@ CommandLineRunner runner() {

private static ConfigurationPropertyName resolveConfigurationPropertyName(String distribution, String features) {
var distributionConfigurationPropertyName = ConfigurationPropertyName.of("sdkman")
.append(distribution.replace("_", "-"));
.append(distribution.replace("_", "-"));
if (StringUtils.hasText(features)) {
return distributionConfigurationPropertyName.append(features);
}
Expand Down
4 changes: 3 additions & 1 deletion src/main/java/io/sdkman/automigration/http/FoojayClient.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,9 @@ public FoojayClient(RestTemplate restTemplate) {
public Optional<ResultPackageResponse> queryPackages(String url, Map<String, List<String>> queryParams) {
var packageUrl = url.concat("/packages");
var newUrl = UriComponentsBuilder.fromHttpUrl(packageUrl)
.queryParams(CollectionUtils.toMultiValueMap(queryParams)).encode().toUriString();
.queryParams(CollectionUtils.toMultiValueMap(queryParams))
.encode()
.toUriString();
var response = this.restTemplate.getForEntity(newUrl, ResultPackageResponse.class);
if (response.getStatusCode() == HttpStatus.OK && response.hasBody()) {
return Optional.of(response.getBody());
Expand Down
158 changes: 84 additions & 74 deletions src/test/java/io/sdkman/automigration/SdkmanDiscoMigrationTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,46 +55,51 @@ class SdkmanDiscoMigrationTest {
// @formatter:on

private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
.withConfiguration(AutoConfigurations.of(MockRestServiceServerAutoConfiguration.class))
.withUserConfiguration(SdkmanDiscoMigration.class).withPropertyValues(this.propertyValues);
.withConfiguration(AutoConfigurations.of(MockRestServiceServerAutoConfiguration.class))
.withUserConfiguration(SdkmanDiscoMigration.class)
.withPropertyValues(this.propertyValues);

@Test
void testWithDistributionsAndSdkmanReleaseWithChecksum() {
this.contextRunner.withPropertyValues("foojay.distribution.version=8", "sdkman.release.consumer-key=any-key",
"sdkman.release.consumer-token=any-token", "sdkman.liberica.linux[1].architecture=arm64",
"sdkman.liberica.linux[1].archive-type=tar.gz").run(context -> {
var mockServer = context.getBean(MockRestServiceServer.class);
var commandLineRunner = context.getBean(CommandLineRunner.class);
foojayPackagesMockServer(mockServer, "liberica", "8", TAR_GZ, LINUX, AMD64,
FoojayResponse.liberica80322amd64());
sdkmanBrokerMockServer(mockServer, "8.0.322-librca", HttpStatus.NOT_FOUND, LINUX_64);
foojayIdsMockServer(mockServer, FoojayResponse.idsResponseAmd64WithChecksum());
sdkmanReleaseMockServer(mockServer, SdkmanReleaseRequest.candidateAmd64WithNoChecksum());
this.contextRunner
.withPropertyValues("foojay.distribution.version=8", "sdkman.release.consumer-key=any-key",
"sdkman.release.consumer-token=any-token", "sdkman.liberica.linux[1].architecture=arm64",
"sdkman.liberica.linux[1].archive-type=tar.gz")
.run(context -> {
var mockServer = context.getBean(MockRestServiceServer.class);
var commandLineRunner = context.getBean(CommandLineRunner.class);
foojayPackagesMockServer(mockServer, "liberica", "8", TAR_GZ, LINUX, AMD64,
FoojayResponse.liberica80322amd64());
sdkmanBrokerMockServer(mockServer, "8.0.322-librca", HttpStatus.NOT_FOUND, LINUX_64);
foojayIdsMockServer(mockServer, FoojayResponse.idsResponseAmd64WithChecksum());
sdkmanReleaseMockServer(mockServer, SdkmanReleaseRequest.candidateAmd64WithNoChecksum());

foojayPackagesMockServer(mockServer, "liberica", "8", TAR_GZ, LINUX, ARM_64,
FoojayResponse.liberica80322arm64());
sdkmanBrokerMockServer(mockServer, "8.0.322-librca", HttpStatus.NOT_FOUND, LINUX_ARM64);
foojayIdsMockServer(mockServer, FoojayResponse.idsResponseArm64WithChecksum());
sdkmanReleaseMockServer(mockServer, SdkmanReleaseRequest.candidateArm64WithNoChecksum());
commandLineRunner.run();
mockServer.verify();
});
foojayPackagesMockServer(mockServer, "liberica", "8", TAR_GZ, LINUX, ARM_64,
FoojayResponse.liberica80322arm64());
sdkmanBrokerMockServer(mockServer, "8.0.322-librca", HttpStatus.NOT_FOUND, LINUX_ARM64);
foojayIdsMockServer(mockServer, FoojayResponse.idsResponseArm64WithChecksum());
sdkmanReleaseMockServer(mockServer, SdkmanReleaseRequest.candidateArm64WithNoChecksum());
commandLineRunner.run();
mockServer.verify();
});
}

@Test
void testWithDistributionsAndSdkmanReleaseWithNoChecksum() {
this.contextRunner.withPropertyValues("foojay.distribution.version=8", "sdkman.release.consumer-key=any-key",
"sdkman.release.consumer-token=any-token").run(context -> {
var mockServer = context.getBean(MockRestServiceServer.class);
var commandLineRunner = context.getBean(CommandLineRunner.class);
foojayPackagesMockServer(mockServer, "liberica", "8", TAR_GZ, LINUX, AMD64,
FoojayResponse.liberica80322amd64());
sdkmanBrokerMockServer(mockServer, "8.0.322-librca", HttpStatus.NOT_FOUND, LINUX_64);
foojayIdsMockServer(mockServer, FoojayResponse.idsResponseWithNoChecksum());
sdkmanReleaseMockServer(mockServer, SdkmanReleaseRequest.candidateAmd64WithNoChecksum());
commandLineRunner.run();
mockServer.verify();
});
this.contextRunner
.withPropertyValues("foojay.distribution.version=8", "sdkman.release.consumer-key=any-key",
"sdkman.release.consumer-token=any-token")
.run(context -> {
var mockServer = context.getBean(MockRestServiceServer.class);
var commandLineRunner = context.getBean(CommandLineRunner.class);
foojayPackagesMockServer(mockServer, "liberica", "8", TAR_GZ, LINUX, AMD64,
FoojayResponse.liberica80322amd64());
sdkmanBrokerMockServer(mockServer, "8.0.322-librca", HttpStatus.NOT_FOUND, LINUX_64);
foojayIdsMockServer(mockServer, FoojayResponse.idsResponseWithNoChecksum());
sdkmanReleaseMockServer(mockServer, SdkmanReleaseRequest.candidateAmd64WithNoChecksum());
commandLineRunner.run();
mockServer.verify();
});
}

@Test
Expand Down Expand Up @@ -134,54 +139,58 @@ void testWithDistributionsAndVersionIsNull() {

@Test
void testWithGraalVmDistributionsAndSdkmanReleaseWithNoChecksum() {
this.contextRunner.withPropertyValues("foojay.distribution.version=22", "foojay.java.version=17",
"foojay.java.distribution=liberica_native", "sdkman.liberica_native.linux[0].architecture=amd64",
"sdkman.liberica_native.linux[0].archive-type=tar.gz", "sdkman.release.consumer-key=any-key",
"sdkman.release.consumer-token=any-token").run(context -> {
var mockServer = context.getBean(MockRestServiceServer.class);
var commandLineRunner = context.getBean(CommandLineRunner.class);
foojayPackagesMockServer(mockServer, "liberica", "22", TAR_GZ, LINUX, AMD64,
FoojayResponse.libericaNik80322amd64());
sdkmanBrokerMockServer(mockServer, "22.1.r17-nik", HttpStatus.NOT_FOUND, LINUX_64);
foojayIdsMockServer(mockServer, FoojayResponse.libericaNikIdsResponseWithNoChecksum());
sdkmanReleaseMockServer(mockServer, SdkmanReleaseRequest.libericaNikCandidateAmd64WithNoChecksum());
commandLineRunner.run();
mockServer.verify();
});
this.contextRunner
.withPropertyValues("foojay.distribution.version=22", "foojay.java.version=17",
"foojay.java.distribution=liberica_native", "sdkman.liberica_native.linux[0].architecture=amd64",
"sdkman.liberica_native.linux[0].archive-type=tar.gz", "sdkman.release.consumer-key=any-key",
"sdkman.release.consumer-token=any-token")
.run(context -> {
var mockServer = context.getBean(MockRestServiceServer.class);
var commandLineRunner = context.getBean(CommandLineRunner.class);
foojayPackagesMockServer(mockServer, "liberica", "22", TAR_GZ, LINUX, AMD64,
FoojayResponse.libericaNik80322amd64());
sdkmanBrokerMockServer(mockServer, "22.1.r17-nik", HttpStatus.NOT_FOUND, LINUX_64);
foojayIdsMockServer(mockServer, FoojayResponse.libericaNikIdsResponseWithNoChecksum());
sdkmanReleaseMockServer(mockServer, SdkmanReleaseRequest.libericaNikCandidateAmd64WithNoChecksum());
commandLineRunner.run();
mockServer.verify();
});
}

@Test
void shouldReleaseDefaultCandidate() {
this.contextRunner.withPropertyValues("foojay.distribution.version=8", "sdkman.release.consumer-key=any-key",
"sdkman.release.consumer-token=any-token", "sdkman.default.candidate=true").run(context -> {
var mockServer = context.getBean(MockRestServiceServer.class);
var commandLineRunner = context.getBean(CommandLineRunner.class);
foojayPackagesMockServer(mockServer, "liberica", "8", TAR_GZ, LINUX, AMD64,
FoojayResponse.liberica80322amd64());
sdkmanBrokerMockServer(mockServer, "8.0.322-librca", HttpStatus.NOT_FOUND, LINUX_64);
foojayIdsMockServer(mockServer, FoojayResponse.idsResponseWithNoChecksum());
sdkmanReleaseMockServer(mockServer, SdkmanReleaseRequest.defaultCandidateAmd64WithNoChecksum());
commandLineRunner.run();
mockServer.verify();
});
this.contextRunner
.withPropertyValues("foojay.distribution.version=8", "sdkman.release.consumer-key=any-key",
"sdkman.release.consumer-token=any-token", "sdkman.default.candidate=true")
.run(context -> {
var mockServer = context.getBean(MockRestServiceServer.class);
var commandLineRunner = context.getBean(CommandLineRunner.class);
foojayPackagesMockServer(mockServer, "liberica", "8", TAR_GZ, LINUX, AMD64,
FoojayResponse.liberica80322amd64());
sdkmanBrokerMockServer(mockServer, "8.0.322-librca", HttpStatus.NOT_FOUND, LINUX_64);
foojayIdsMockServer(mockServer, FoojayResponse.idsResponseWithNoChecksum());
sdkmanReleaseMockServer(mockServer, SdkmanReleaseRequest.defaultCandidateAmd64WithNoChecksum());
commandLineRunner.run();
mockServer.verify();
});
}

@Test
void shouldReturnCandidateWhenFeaturesIsUsed() {
this.contextRunner.withPropertyValues("foojay.distribution.version=17", "sdkman.release.consumer-key=any-key",
"sdkman.release.consumer-token=any-token", "foojay.java.distribution=zulu", "foojay.java.features=crac",
"sdkman.zulu.crac.linux[0].architecture=amd64", "sdkman.zulu.crac.linux[0].archive-type=tar.gz")
.run(context -> {
var mockServer = context.getBean(MockRestServiceServer.class);
var commandLineRunner = context.getBean(CommandLineRunner.class);
foojayPackagesMockServer(mockServer, "zulu", "17", TAR_GZ, LINUX, AMD64,
Files.readString(Path.of("src/test/resources/feature-zulu-crac-response.json")));
sdkmanBrokerMockServer(mockServer, "17.0.7.crac-zulu", HttpStatus.NOT_FOUND, LINUX_64);
foojayIdsMockServer(mockServer, FoojayResponse.zuluCracIdsResponse());
sdkmanReleaseMockServer(mockServer, SdkmanReleaseRequest.zuluCracCandidate());
commandLineRunner.run();
mockServer.verify();
});
.run(context -> {
var mockServer = context.getBean(MockRestServiceServer.class);
var commandLineRunner = context.getBean(CommandLineRunner.class);
foojayPackagesMockServer(mockServer, "zulu", "17", TAR_GZ, LINUX, AMD64,
Files.readString(Path.of("src/test/resources/feature-zulu-crac-response.json")));
sdkmanBrokerMockServer(mockServer, "17.0.7.crac-zulu", HttpStatus.NOT_FOUND, LINUX_64);
foojayIdsMockServer(mockServer, FoojayResponse.zuluCracIdsResponse());
sdkmanReleaseMockServer(mockServer, SdkmanReleaseRequest.zuluCracCandidate());
commandLineRunner.run();
mockServer.verify();
});
}

private void sdkmanReleaseMockServer(MockRestServiceServer mockServer, String request) {
Expand All @@ -204,9 +213,9 @@ private void sdkmanBrokerMockServer(MockRestServiceServer mockServer, String ver

private void foojayIdsMockServer(MockRestServiceServer mockServer, String response) {
mockServer
.expect(ExpectedCount.once(),
requestTo("https://api.foojay.io/disco/v3.0/ids/8d2136c6472ce970f80ee4fedcc92f99"))
.andRespond(withStatus(HttpStatus.OK).contentType(MediaType.APPLICATION_JSON).body(response));
.expect(ExpectedCount.once(),
requestTo("https://api.foojay.io/disco/v3.0/ids/8d2136c6472ce970f80ee4fedcc92f99"))
.andRespond(withStatus(HttpStatus.OK).contentType(MediaType.APPLICATION_JSON).body(response));
}

private void foojayPackagesMockServer(MockRestServiceServer mockServer, String distribution, String version,
Expand All @@ -219,8 +228,9 @@ private void foojayPackagesMockServer(MockRestServiceServer mockServer, String d
assertThat(uriComponents.getPath()).isEqualTo("/disco/v3.0/packages");
assertThat(uriComponents.getQueryParams()).containsAllEntriesOf(expectedQueryParams);

}).andExpect(method(HttpMethod.GET))
.andRespond(withStatus(HttpStatus.OK).contentType(MediaType.APPLICATION_JSON).body(response));
})
.andExpect(method(HttpMethod.GET))
.andRespond(withStatus(HttpStatus.OK).contentType(MediaType.APPLICATION_JSON).body(response));
}

private static Map<String, List<String>> javaDistributionQueryParams(String distribution, String version,
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/io/sdkman/automigration/adapters/VersionAdapterTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ void versionRequestWithDefaultCandidate() throws IOException {
"813eb415bd91e5dcb846fea4ffcf07befb254f5a", "sha1");
var request = VersionAdapter.toVersionRequest("librca", "8.0.322", Platform.LINUX_64, idsResponse, true);
assertThat(this.json.write(request))
.isStrictlyEqualToJson(SdkmanReleaseRequest.defaultCandidateAmd64WithNoChecksum());
.isStrictlyEqualToJson(SdkmanReleaseRequest.defaultCandidateAmd64WithNoChecksum());
}

}

0 comments on commit 8978be3

Please sign in to comment.