Skip to content

Commit 71edfef

Browse files
committed
Start making use of Java 17 apis
1 parent e6046c2 commit 71edfef

File tree

7 files changed

+19
-41
lines changed

7 files changed

+19
-41
lines changed

src/main/java/fr/catcore/modremapperapi/utils/CollectionUtils.java

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,26 +2,16 @@
22

33
import java.util.*;
44
import java.util.function.Function;
5+
import java.util.stream.Collectors;
56

67
@Deprecated
78
public class CollectionUtils {
89

910
public static <T> Collection<T> transformList(Collection<T> collection, Function<T, T> function) {
10-
List<T> list = new ArrayList<>();
11-
for (T t : collection) {
12-
list.add(function.apply(t));
13-
}
14-
15-
return list;
11+
return collection.stream().map(function).collect(Collectors.toList());
1612
}
1713

1814
public static <K, T> Map<K, T> transformMapValues(Map<K, T> ktMap, Function<T, T> function) {
19-
Map<K, T> map = new HashMap<>();
20-
21-
for (Map.Entry<K, T> entry : ktMap.entrySet()) {
22-
map.put(entry.getKey(), function.apply(entry.getValue()));
23-
}
24-
25-
return map;
15+
return ktMap.entrySet().stream().collect(Collectors.toMap(Map.Entry::getKey, e -> function.apply(e.getValue())));
2616
}
2717
}

src/main/java/fr/catcore/modremapperapi/utils/FileUtils.java

Lines changed: 11 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
import java.io.*;
66
import java.net.URISyntaxException;
7+
import java.nio.file.Files;
78
import java.nio.file.Path;
8-
import java.util.ArrayList;
99
import java.util.Collection;
1010
import java.util.List;
1111

@@ -14,39 +14,27 @@ public class FileUtils {
1414
@Deprecated
1515
public static void writeTextFile(Collection<String> lines, File file) {
1616
file.getParentFile().mkdirs();
17+
1718
try {
18-
FileWriter fileWriter = new FileWriter(file);
19-
BufferedWriter bufferedWriter = new BufferedWriter(fileWriter);
20-
for (String line : lines) {
21-
bufferedWriter.append(line);
22-
bufferedWriter.append("\n");
23-
}
24-
bufferedWriter.close();
25-
fileWriter.close();
19+
Files.writeString(file.toPath(), String.join("\n", lines));
2620
} catch (IOException e) {
2721
e.printStackTrace();
2822
}
2923
}
3024

3125
@Deprecated
32-
public static List<String> readTextSource(String path) {
33-
List<String> result = new ArrayList<>();
26+
public static List<String> readTextSource(String path) {
3427
try {
35-
InputStream stream = FabricLauncherBase.class.getClassLoader().getResourceAsStream(path);
36-
InputStreamReader streamReader = new InputStreamReader(stream);
37-
BufferedReader bufferedWriter = new BufferedReader(streamReader);
38-
String line = bufferedWriter.readLine();
39-
while (line != null) {
40-
result.add(line);
41-
line = bufferedWriter.readLine();
28+
var url = FabricLauncherBase.class.getClassLoader().getResource(path);
29+
30+
if (url != null) {
31+
return Files.readAllLines(Path.of(url.toURI()));
4232
}
43-
bufferedWriter.close();
44-
streamReader.close();
45-
stream.close();
46-
} catch (IOException e) {
33+
} catch (IOException | URISyntaxException e) {
4734
e.printStackTrace();
4835
}
49-
return result;
36+
37+
return List.of();
5038
}
5139

5240
@Deprecated

src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/context/ModDiscoverer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public ModDiscoverer(ModDiscovererConfig config) {
3030
public List<ModCandidate> collect() {
3131
originalDirectory = FabricLoader.getInstance().getGameDir().resolve(config.getFolderName());
3232

33-
if (!Files.isDirectory(originalDirectory)) return new ArrayList<>();
33+
if (!Files.isDirectory(originalDirectory)) return List.of();
3434

3535
List<ModCandidate> candidates = new ArrayList<>();
3636

src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/context/ModRemmaperV2Context.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ public void afterRemap() {
9494

9595
@Override
9696
public List<ModRemapper> discoverMods(boolean remapClassEdits) {
97-
List<ModRemapper> collected = new ArrayList<>();
97+
var collected = new ArrayList<ModRemapper>();
9898
List<ModCandidate> candidates = new ArrayList<>();
9999
Map<ModDiscovererConfig, ModDiscoverer> config2Discoverer = new HashMap<>();
100100

src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/defaults/DefaultMappingsConfig.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public Supplier<String> getExtraMappings() {
2222

2323
@Override
2424
public Map<String, String> getRenamingMap() {
25-
return new HashMap<>();
25+
return Map.of();
2626
}
2727

2828
@Override

src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/mappings/MappingTreeHelper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public static MemoryMappingTree mergeIntoNew(MappingTree left, MappingTree right
4242

4343
result.visitHeader();
4444

45-
List<String> dstNamespaces = new ArrayList<>(left.getDstNamespaces());
45+
var dstNamespaces = new ArrayList<>(left.getDstNamespaces());
4646

4747
for (String dstNamespace : right.getDstNamespaces()) {
4848
if (!dstNamespaces.contains(dstNamespace)) {

src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/utils/FileUtils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ public static List<String> listPathContent(Path path) throws IOException {
146146
@ApiStatus.Internal
147147
public static void emptyDir(Path dir) {
148148
try {
149-
Files.walkFileTree(dir, new FileVisitor<Path>() {
149+
Files.walkFileTree(dir, new FileVisitor<>() {
150150
@Override
151151
public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) {
152152
return FileVisitResult.CONTINUE;

0 commit comments

Comments
 (0)