zhdev/bukman
1
0
Fork 0
Code Issues Pull requests Releases 1 Activity

Merge pull request #41 from FrankHeijden/fix/closeable-results

Browse source 
Make sure all instances are CloseablePluginResults
This commit is contained in:
Frank van der Heijden 2021-12-20 19:12:11 +01:00 • committed by GitHub
commit bc197fb075
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Common/src/main/java/net/frankheijden/serverutils/common/entities/results/CloseablePluginResults.java
View file

@ -2,16 +2,24 @@ package net.frankheijden.serverutils.common.entities.results;
import java.io.Closeable;
import java.io.IOException;
import java.util.Collections;
import java.util.List;
public class CloseablePluginResults<T> extends PluginResults<T> implements Closeable {
@Override
public CloseablePluginResults<T> addResult(PluginResult<T> pluginResult) {
if (!(pluginResult instanceof CloseablePluginResult)) {
throw new IllegalArgumentException("Not an instance of CloseablePluginResult: " + pluginResult);
if (pluginResult instanceof CloseablePluginResult) {
results.add(pluginResult);
} else {
results.add(new CloseablePluginResult<>(
pluginResult.getPluginId(),
pluginResult.getPlugin(),
pluginResult.getResult(),
Collections.emptyList(),
pluginResult.getPlaceholders()
));
}
results.add(pluginResult);
return this;
}
@ -28,10 +36,8 @@ public class CloseablePluginResults<T> extends PluginResults<T> implements Close
}
@Override
protected CloseablePluginResults<T> addResult(String pluginId, T plugin, Result result, String... placeholders
) {
super.addResult(pluginId, plugin, result, placeholders);
return this;
protected CloseablePluginResults<T> addResult(String pluginId, T plugin, Result result, String... placeholders) {
return addResult(new CloseablePluginResult<>(pluginId, plugin, result, Collections.emptyList(), placeholders));
}
public CloseablePluginResults<T> addResult(