From 699a9409f276c527c1ec7736b08551c51512de57 Mon Sep 17 00:00:00 2001 From: svc-excavator-bot Date: Wed, 4 Sep 2019 12:53:13 +0000 Subject: [PATCH] Excavator: Upgrades Baseline to the latest version --- .../baseline/errorprone/PreferSafeLoggableExceptions.java | 3 ++- .../baseline/refaster/BaselineRefasterCompiler.java | 7 +++---- build.gradle | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/baseline-error-prone/src/main/java/com/palantir/baseline/errorprone/PreferSafeLoggableExceptions.java b/baseline-error-prone/src/main/java/com/palantir/baseline/errorprone/PreferSafeLoggableExceptions.java index 3e29f42665..53a7aaa02e 100644 --- a/baseline-error-prone/src/main/java/com/palantir/baseline/errorprone/PreferSafeLoggableExceptions.java +++ b/baseline-error-prone/src/main/java/com/palantir/baseline/errorprone/PreferSafeLoggableExceptions.java @@ -27,6 +27,7 @@ import com.google.errorprone.matchers.Matcher; import com.google.errorprone.matchers.Matchers; import com.google.errorprone.util.ASTHelpers; +import com.palantir.logsafe.exceptions.SafeIllegalStateException; import com.sun.source.tree.ExpressionTree; import com.sun.source.tree.NewClassTree; import java.io.IOException; @@ -98,6 +99,6 @@ public Description matchNewClass(NewClassTree tree, VisitorState state) { .build()) .build()) .findAny() - .orElseThrow(() -> new IllegalStateException("Expected to match a known replaceable exception type")); + .orElseThrow(() -> new SafeIllegalStateException("Expected to match a known replaceable exception type")); } } diff --git a/baseline-refaster-javac-plugin/src/main/java/com/palantir/baseline/refaster/BaselineRefasterCompiler.java b/baseline-refaster-javac-plugin/src/main/java/com/palantir/baseline/refaster/BaselineRefasterCompiler.java index 4254054046..54dca47080 100644 --- a/baseline-refaster-javac-plugin/src/main/java/com/palantir/baseline/refaster/BaselineRefasterCompiler.java +++ b/baseline-refaster-javac-plugin/src/main/java/com/palantir/baseline/refaster/BaselineRefasterCompiler.java @@ -17,7 +17,6 @@ package com.palantir.baseline.refaster; import com.google.auto.service.AutoService; -import com.google.common.base.Preconditions; import com.sun.source.util.JavacTask; import com.sun.source.util.Plugin; import com.sun.tools.javac.api.BasicJavacTask; @@ -40,11 +39,11 @@ public String getName() { public void init(JavacTask task, String... args) { List listArgs = Arrays.asList(args); int outIndex = listArgs.indexOf("--out"); - Preconditions.checkArgument(outIndex != -1, "No --out specified"); - Preconditions.checkArgument(listArgs.size() > outIndex, "No value passed for --out"); + com.palantir.logsafe.Preconditions.checkArgument(outIndex != -1, "No --out specified"); + com.palantir.logsafe.Preconditions.checkArgument(listArgs.size() > outIndex, "No value passed for --out"); String path = listArgs.get(outIndex + 1); - Preconditions.checkArgument(task instanceof BasicJavacTask, "JavacTask not instance of BasicJavacTask"); + com.palantir.logsafe.Preconditions.checkArgument(task instanceof BasicJavacTask, "JavacTask not instance of BasicJavacTask"); task.addTaskListener(new BaselineRefasterCompilerAnalyzer( ((BasicJavacTask) task).getContext(), FileSystems.getDefault().getPath(path))); } diff --git a/build.gradle b/build.gradle index 32f1b429fa..9acf715b59 100644 --- a/build.gradle +++ b/build.gradle @@ -10,7 +10,7 @@ buildscript { classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4' classpath 'com.netflix.nebula:nebula-publishing-plugin:13.2.0' classpath 'com.netflix.nebula:gradle-info-plugin:5.0.3' - classpath 'com.palantir.baseline:gradle-baseline-java:1.17.2' + classpath 'com.palantir.baseline:gradle-baseline-java:1.19.0' } }