From 7194ceec8406952927a16a5686368502db011aed Mon Sep 17 00:00:00 2001 From: svc-excavator-bot Date: Mon, 16 Aug 2021 15:29:31 +0000 Subject: [PATCH 1/3] Excavator: Upgrades Baseline to the latest version --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 97b23fedf..276f54d8a 100644 --- a/build.gradle +++ b/build.gradle @@ -9,7 +9,7 @@ buildscript { classpath 'com.palantir.javaformat:gradle-palantir-java-format:2.2.0' classpath 'com.palantir.gradle.consistentversions:gradle-consistent-versions:2.0.0' classpath 'com.gradle.publish:plugin-publish-plugin:0.15.0' - classpath 'com.palantir.baseline:gradle-baseline-java:4.13.0' + classpath 'com.palantir.baseline:gradle-baseline-java:4.17.0' classpath 'de.undercouch:gradle-download-task:4.1.2' classpath 'com.palantir.gradle.gitversion:gradle-git-version:0.12.3' classpath 'gradle.plugin.org.inferred:gradle-processors:3.3.0' From 4b9fc84899d1ee9bbcacf2af53aac524d994e227 Mon Sep 17 00:00:00 2001 From: Fabian Windheuser Date: Tue, 17 Aug 2021 13:05:01 +0200 Subject: [PATCH 2/3] Fix checkstyle --- .../gradle/dist/service/gc/GcProfile.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/gradle-sls-packaging/src/main/java/com/palantir/gradle/dist/service/gc/GcProfile.java b/gradle-sls-packaging/src/main/java/com/palantir/gradle/dist/service/gc/GcProfile.java index 84eb413ce..7b3481dbb 100644 --- a/gradle-sls-packaging/src/main/java/com/palantir/gradle/dist/service/gc/GcProfile.java +++ b/gradle-sls-packaging/src/main/java/com/palantir/gradle/dist/service/gc/GcProfile.java @@ -36,19 +36,19 @@ public interface GcProfile extends Serializable { List gcJvmOpts(JavaVersion javaVersion); - class Throughput implements GcProfile { + final class Throughput implements GcProfile { @Override - public final List gcJvmOpts(JavaVersion _javaVersion) { + public List gcJvmOpts(JavaVersion _javaVersion) { return ImmutableList.of("-XX:+UseParallelOldGC"); } } - class ResponseTime implements GcProfile { + final class ResponseTime implements GcProfile { private int newRatio = 2; private int initiatingOccupancyFraction = 68; @Override - public final List gcJvmOpts(JavaVersion javaVersion) { + public List gcJvmOpts(JavaVersion javaVersion) { // The CMS garbage collector was removed in Java 14: https://openjdk.java.net/jeps/363. Users are free to // use it up until this release. if (javaVersion.compareTo(JavaVersion.toVersion("14")) >= 0) { @@ -80,18 +80,18 @@ public final List gcJvmOpts(JavaVersion javaVersion) { "-XX:+IgnoreUnrecognizedVMOptions"); } - public final void initiatingOccupancyFraction(int occupancyFraction) { + public void initiatingOccupancyFraction(int occupancyFraction) { this.initiatingOccupancyFraction = occupancyFraction; } - public final void newRatio(int newerRatio) { + public void newRatio(int newerRatio) { this.newRatio = newerRatio; } } - class Hybrid implements GcProfile { + final class Hybrid implements GcProfile { @Override - public final List gcJvmOpts(JavaVersion _javaVersion) { + public List gcJvmOpts(JavaVersion _javaVersion) { return ImmutableList.of("-XX:+UseG1GC", "-XX:+UseNUMA"); } } @@ -100,7 +100,7 @@ public final List gcJvmOpts(JavaVersion _javaVersion) { * This GC profile does not apply any JVM flags which allows services to override GC settings without needing to * unset preconfigured flags. */ - class NoProfile implements GcProfile { + final class NoProfile implements GcProfile { @Override public List gcJvmOpts(JavaVersion _javaVersion) { return Collections.emptyList(); From 0cad9c8376f0b23466776e0b05a9871f16f1b1db Mon Sep 17 00:00:00 2001 From: Fabian Windheuser Date: Tue, 17 Aug 2021 13:12:02 +0200 Subject: [PATCH 3/3] Fix final --- .../gradle/dist/service/gc/GcProfile.java | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/gradle-sls-packaging/src/main/java/com/palantir/gradle/dist/service/gc/GcProfile.java b/gradle-sls-packaging/src/main/java/com/palantir/gradle/dist/service/gc/GcProfile.java index 7b3481dbb..cb9302025 100644 --- a/gradle-sls-packaging/src/main/java/com/palantir/gradle/dist/service/gc/GcProfile.java +++ b/gradle-sls-packaging/src/main/java/com/palantir/gradle/dist/service/gc/GcProfile.java @@ -36,19 +36,19 @@ public interface GcProfile extends Serializable { List gcJvmOpts(JavaVersion javaVersion); - final class Throughput implements GcProfile { + class Throughput implements GcProfile { @Override - public List gcJvmOpts(JavaVersion _javaVersion) { + public final List gcJvmOpts(JavaVersion _javaVersion) { return ImmutableList.of("-XX:+UseParallelOldGC"); } } - final class ResponseTime implements GcProfile { + class ResponseTime implements GcProfile { private int newRatio = 2; private int initiatingOccupancyFraction = 68; @Override - public List gcJvmOpts(JavaVersion javaVersion) { + public final List gcJvmOpts(JavaVersion javaVersion) { // The CMS garbage collector was removed in Java 14: https://openjdk.java.net/jeps/363. Users are free to // use it up until this release. if (javaVersion.compareTo(JavaVersion.toVersion("14")) >= 0) { @@ -80,18 +80,18 @@ public List gcJvmOpts(JavaVersion javaVersion) { "-XX:+IgnoreUnrecognizedVMOptions"); } - public void initiatingOccupancyFraction(int occupancyFraction) { + public final void initiatingOccupancyFraction(int occupancyFraction) { this.initiatingOccupancyFraction = occupancyFraction; } - public void newRatio(int newerRatio) { + public final void newRatio(int newerRatio) { this.newRatio = newerRatio; } } - final class Hybrid implements GcProfile { + class Hybrid implements GcProfile { @Override - public List gcJvmOpts(JavaVersion _javaVersion) { + public final List gcJvmOpts(JavaVersion _javaVersion) { return ImmutableList.of("-XX:+UseG1GC", "-XX:+UseNUMA"); } } @@ -100,9 +100,9 @@ public List gcJvmOpts(JavaVersion _javaVersion) { * This GC profile does not apply any JVM flags which allows services to override GC settings without needing to * unset preconfigured flags. */ - final class NoProfile implements GcProfile { + class NoProfile implements GcProfile { @Override - public List gcJvmOpts(JavaVersion _javaVersion) { + public final List gcJvmOpts(JavaVersion _javaVersion) { return Collections.emptyList(); } }