fix: Removed JDK 8+ usage

redis · Apr 21, 2023 · 58c7e62 · 58c7e62
1 parent e84b983
commit 58c7e62
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/plugins/riot/riot.gradle b/plugins/riot/riot.gradle
@@ -36,7 +36,7 @@ startScripts {
 
 jar {
     manifest {
-        attributes('Main-Class': 'org.jreleaser.cli.Main')
+        attributes('Main-Class': 'com.redis.riot.cli.Main')
     }
 }
 
@@ -75,8 +75,8 @@ dependencies {
     testImplementation('org.springframework.boot:spring-boot-starter-test') {
         exclude group: 'org.junit.vintage', module: 'junit-vintage-engine'
     }
-    testImplementation group: 'org.testcontainers', name: 'postgresql', version: testcontVersion
-    testImplementation group: 'org.testcontainers', name: 'oracle-xe', version: testcontVersion
+    testImplementation group: 'org.testcontainers', name: 'postgresql', version: testcontainersVersion
+    testImplementation group: 'org.testcontainers', name: 'oracle-xe', version: testcontainersVersion
 }
 
 bootStartScripts.enabled = false
@@ -92,6 +92,7 @@ distributions {
     }
 }
 
+/*
 jdks {
     zulu17Linux {
         platform = 'linux-x86_64'
@@ -154,6 +155,7 @@ jdks {
         checksum = '5a6f1d640034166a0fefd9d8924c12b040f120cd019b46b40895ccc8e9a9fc9e'
     }
 }
+*/
 
 copyDependencies {
     dependsOn classes

diff --git a/plugins/riot/src/main/java/com/redis/riot/cli/PingOptions.java b/plugins/riot/src/main/java/com/redis/riot/cli/PingOptions.java
@@ -22,7 +22,7 @@ public class PingOptions {
 	@Option(names = "--count", description = "Number of pings to perform per iteration (default: ${DEFAULT-VALUE}).", paramLabel = "<count>")
 	private int count = DEFAULT_COUNT;
 	@Option(names = "--sleep", description = "Sleep duration in seconds between iterations (default: ${DEFAULT-VALUE}).", paramLabel = "<sec>")
-	private long sleep = DEFAULT_SLEEP_DURATION.toSeconds();
+	private long sleep = DEFAULT_SLEEP_DURATION.getSeconds();
 	@Option(names = "--unit", description = "Time unit used to display latencies (default: ${DEFAULT-VALUE}).", paramLabel = "<unit>")
 	private TimeUnit timeUnit = DEFAULT_TIME_UNIT;
 	@Option(names = "--distribution", description = "Show latency distribution.")
@@ -44,7 +44,7 @@ public static Set<Double> defaultPercentiles() {
 	}
 
 	private static Set<Double> doubleSet(double... doubles) {
-		return Arrays.stream(doubles).boxed().collect(Collectors.toUnmodifiableSet());
+		return Arrays.stream(doubles).boxed().collect(Collectors.toSet());
 	}
 
 	public int getIterations() {