Skip to content

Commit da133a0

Browse files
Excavator: Remove calls to deprecated APIs
1 parent 352b2db commit da133a0

File tree

5 files changed

+2
-11
lines changed

5 files changed

+2
-11
lines changed

gradle-baseline-java/src/main/java/com/palantir/baseline/plugins/BaselineFormat.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,6 @@ public void apply(Project project) {
101101
}
102102

103103
private static void configureBuildGradleFormatter(Project project, SpotlessExtension spotlessExtension) {
104-
@SuppressWarnings("for-rollout:deprecation")
105104
Path buildDir = project.getRootProject().getBuildDir().toPath();
106105
Path configFile = buildDir.resolve("baseline-format").resolve("greclipse.properties");
107106

gradle-baseline-java/src/main/java/com/palantir/baseline/plugins/BaselineScala.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,25 +64,21 @@ private void configureIdeaPlugin(IdeaModel ideaModel, SourceSet mainSourceSet) {
6464
// configure target jvm mode
6565
String targetJvmVersion = "-target:" + SCALA_TARGET_VERSION;
6666
Node rootNode = xmlProvider.asNode();
67-
@SuppressWarnings("for-rollout:deprecation")
6867
Node scalaCompilerConf = (Node) rootNode.getAt(new QName("component")).stream()
6968
.filter(o -> ((Node) o).attributes().get("name").equals("ScalaCompilerConfiguration"))
7069
.findFirst()
7170
.orElseGet(() ->
7271
rootNode.appendNode("component", ImmutableMap.of("name", "ScalaCompilerConfiguration")));
7372
// configure scala compilation order
74-
@SuppressWarnings("for-rollout:deprecation")
7573
Node compilerOrder = (Node) scalaCompilerConf.getAt(new QName("option")).stream()
7674
.filter(o -> ((Node) o).attributes().get("name").equals("compileOrder"))
7775
.findFirst()
7876
.orElseGet(() -> scalaCompilerConf.appendNode("option"));
7977
compilerOrder.attributes().put("name", "compileOrder");
8078
compilerOrder.attributes().put("value", compilerMode);
81-
@SuppressWarnings("for-rollout:deprecation")
8279
Node parametersNode = (Node) scalaCompilerConf.getAt(new QName("parameters")).stream()
8380
.findFirst()
8481
.orElseGet(() -> scalaCompilerConf.appendNode("parameters"));
85-
@SuppressWarnings("for-rollout:deprecation")
8682
Node parameter = (Node) parametersNode.getAt(new QName("parameter")).stream()
8783
.filter(o -> ((Node) o).attributes().get("value").equals(targetJvmVersion))
8884
.findFirst()

gradle-baseline-java/src/main/java/com/palantir/baseline/plugins/XmlUtils.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ static void createOrUpdateXmlFile(File configurationFile, Consumer<Node> configu
4848
configurationFile, configure, () -> new Node(null, "project", ImmutableMap.of("version", "4")));
4949
}
5050

51-
@SuppressWarnings("for-rollout:deprecation")
5251
static void createOrUpdateXmlFile(
5352
File configurationFile, Consumer<Node> configure, Supplier<Node> defaultRootNode) {
5453
Node rootNode;
@@ -68,7 +67,6 @@ static void createOrUpdateXmlFile(
6867

6968
try (BufferedWriter writer = Files.newWriter(configurationFile, StandardCharsets.UTF_8);
7069
PrintWriter printWriter = new PrintWriter(writer)) {
71-
@SuppressWarnings("for-rollout:deprecation")
7270
XmlNodePrinter nodePrinter = new XmlNodePrinter(printWriter);
7371
nodePrinter.setPreserveWhitespace(true);
7472
nodePrinter.print(rootNode);

gradle-baseline-java/src/main/java/com/palantir/baseline/tasks/CheckClassUniquenessLockTask.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ private String clashingJarHeader(Set<ClassUniquenessArtifactIdentifier> clashing
175175
.collect(Collectors.joining(", ", "[", "]"));
176176
}
177177

178-
@SuppressWarnings({"for-rollout:IllegalMethodCalledDuringTaskExecution", "for-rollout:deprecation"})
178+
@SuppressWarnings("for-rollout:IllegalMethodCalledDuringTaskExecution")
179179
private void ensureLockfileContains(String expected) {
180180
if (shouldFix.get()) {
181181
GFileUtils.writeFile(expected, lockFile);
@@ -192,7 +192,6 @@ private void ensureLockfileContains(String expected) {
192192
"./gradlew checkClassUniqueness --fix");
193193
}
194194

195-
@SuppressWarnings("for-rollout:deprecation")
196195
String onDisk = GFileUtils.readFile(lockFile);
197196
if (!onDisk.equals(expected)) {
198197
List<String> onDiskLines = Splitter.on('\n').splitToList(onDisk);
@@ -221,7 +220,7 @@ private void ensureLockfileContains(String expected) {
221220
}
222221
}
223222

224-
@SuppressWarnings({"for-rollout:IllegalMethodCalledDuringTaskExecution", "for-rollout:deprecation"})
223+
@SuppressWarnings("for-rollout:IllegalMethodCalledDuringTaskExecution")
225224
private void ensureLockfileDoesNotExist() {
226225
if (lockFile.exists()) {
227226
if (shouldFix.get()) {

gradle-baseline-java/src/main/java/com/palantir/baseline/util/GitUtils.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ public final class GitUtils {
2727

2828
public static Optional<String> maybeGitHubUri() {
2929
try {
30-
@SuppressWarnings("for-rollout:deprecation")
3130
String gitConfigContents = GFileUtils.readFile(new File(".git/config"));
3231
Matcher matcher = GIT_ORIGIN.matcher(gitConfigContents);
3332
if (matcher.find()) {

0 commit comments

Comments
 (0)