Skip to content

Commit 317b2ac

Browse files
committed
Remove the long-deprecated and completely unused Set<String> mavenCoordinates field from JarState.
1 parent decbd1b commit 317b2ac

File tree

2 files changed

+4
-21
lines changed

2 files changed

+4
-21
lines changed

lib-extra/src/main/java/com/diffplug/spotless/extra/EclipseBasedStepBuilder.java

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2016-2021 DiffPlug
2+
* Copyright 2016-2023 DiffPlug
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -24,7 +24,6 @@
2424
import java.util.ArrayList;
2525
import java.util.List;
2626
import java.util.Objects;
27-
import java.util.Optional;
2827
import java.util.Properties;
2928

3029
import com.diffplug.common.base.Errors;
@@ -187,12 +186,6 @@ public Properties getPreferences() {
187186
return preferences.getProperties();
188187
}
189188

190-
/** Returns first coordinate from sorted set that starts with a given prefix.*/
191-
public Optional<String> getMavenCoordinate(String prefix) {
192-
return jarState.getMavenCoordinates().stream()
193-
.filter(coordinate -> coordinate.startsWith(prefix)).findFirst();
194-
}
195-
196189
/**
197190
* Load class based on the given configuration of JAR provider and Maven coordinates.
198191
* Different class loader instances are provided in the following scenarios:

lib/src/main/java/com/diffplug/spotless/JarState.java

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
import java.util.NoSuchElementException;
2626
import java.util.Objects;
2727
import java.util.Set;
28-
import java.util.TreeSet;
2928
import java.util.stream.Collectors;
3029

3130
/**
@@ -39,12 +38,9 @@
3938
public final class JarState implements Serializable {
4039
private static final long serialVersionUID = 1L;
4140

42-
@Deprecated
43-
private final Set<String> mavenCoordinates;
4441
private final FileSignature fileSignature;
4542

46-
private JarState(Collection<String> mavenCoordinates, FileSignature fileSignature) {
47-
this.mavenCoordinates = new TreeSet<>(mavenCoordinates);
43+
private JarState(FileSignature fileSignature) {
4844
this.fileSignature = fileSignature;
4945
}
5046

@@ -71,13 +67,13 @@ private static JarState provisionWithTransitives(boolean withTransitives, Collec
7167
throw new NoSuchElementException("Resolved to an empty result: " + mavenCoordinates.stream().collect(Collectors.joining(", ")));
7268
}
7369
FileSignature fileSignature = FileSignature.signAsSet(jars);
74-
return new JarState(mavenCoordinates, fileSignature);
70+
return new JarState(fileSignature);
7571
}
7672

7773
/** Wraps the given collection of a files as a JarState, maintaining the order in the Collection. */
7874
public static JarState preserveOrder(Collection<File> jars) throws IOException {
7975
FileSignature fileSignature = FileSignature.signAsList(jars);
80-
return new JarState(Collections.emptySet(), fileSignature);
76+
return new JarState(fileSignature);
8177
}
8278

8379
URL[] jarUrls() {
@@ -107,10 +103,4 @@ public ClassLoader getClassLoader() {
107103
public ClassLoader getClassLoader(Serializable key) {
108104
return SpotlessCache.instance().classloader(key, this);
109105
}
110-
111-
/** Returns unmodifiable view on sorted Maven coordinates */
112-
@Deprecated
113-
public Set<String> getMavenCoordinates() {
114-
return Collections.unmodifiableSet(mavenCoordinates);
115-
}
116106
}

0 commit comments

Comments
 (0)