Skip to content

Commit a71abe3

Browse files
TBlueFTBlueF
committed
Add early null-checks to API-parameters
1 parent 866920b commit a71abe3

File tree

6 files changed

+24
-17
lines changed

6 files changed

+24
-17
lines changed

‎common/src/main/java/de/bluecolored/bluemap/common/api/AssetStorageImpl.java‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,12 @@
2727
import de.bluecolored.bluemap.api.AssetStorage;
2828
import de.bluecolored.bluemap.core.storage.MapStorage;
2929
import de.bluecolored.bluemap.core.storage.compression.CompressedInputStream;
30+
import lombok.NonNull;
3031

3132
import java.io.IOException;
3233
import java.io.InputStream;
3334
import java.io.OutputStream;
35+
import java.util.Objects;
3436
import java.util.Optional;
3537

3638
public class AssetStorageImpl implements AssetStorage {
@@ -44,29 +46,29 @@ public AssetStorageImpl(MapStorage storage, String mapId) {
4446
}
4547

4648
@Override
47-
public OutputStream writeAsset(String name) throws IOException {
49+
public OutputStream writeAsset(@NonNull String name) throws IOException {
4850
return storage.asset(name).write();
4951
}
5052

5153
@Override
52-
public Optional<InputStream> readAsset(String name) throws IOException {
54+
public Optional<InputStream> readAsset(@NonNull String name) throws IOException {
5355
CompressedInputStream in = storage.asset(name).read();
5456
if (in == null) return Optional.empty();
5557
return Optional.of(in.decompress());
5658
}
5759

5860
@Override
59-
public boolean assetExists(String name) throws IOException {
61+
public boolean assetExists(@NonNull String name) throws IOException {
6062
return storage.asset(name).exists();
6163
}
6264

6365
@Override
64-
public String getAssetUrl(String name) {
66+
public String getAssetUrl(@NonNull String name) {
6567
return "maps/" + mapId + "/assets/" + MapStorage.escapeAssetName(name);
6668
}
6769

6870
@Override
69-
public void deleteAsset(String name) throws IOException {
71+
public void deleteAsset(@NonNull String name) throws IOException {
7072
storage.asset(name).delete();
7173
}
7274

‎common/src/main/java/de/bluecolored/bluemap/common/api/BlueMapAPIImpl.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
import de.bluecolored.bluemap.core.logger.Logger;
3737
import de.bluecolored.bluemap.core.map.BmMap;
3838
import de.bluecolored.bluemap.core.world.World;
39+
import lombok.NonNull;
3940
import org.jetbrains.annotations.Nullable;
4041

4142
import java.util.Collection;
@@ -98,7 +99,7 @@ public Collection<BlueMapWorld> getWorlds() {
9899
}
99100

100101
@Override
101-
public Optional<BlueMapWorld> getWorld(Object world) {
102+
public Optional<BlueMapWorld> getWorld(@NonNull Object world) {
102103
return worldCache.get(world);
103104
}
104105

@@ -126,7 +127,7 @@ public Optional<BlueMapWorld> getWorldUncached(Object world) {
126127
}
127128

128129
@Override
129-
public Optional<BlueMapMap> getMap(String id) {
130+
public Optional<BlueMapMap> getMap(@NonNull String id) {
130131
return mapCache.get(id);
131132
}
132133

‎common/src/main/java/de/bluecolored/bluemap/common/api/BlueMapMapImpl.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
import de.bluecolored.bluemap.common.rendermanager.MapUpdateTask;
3535
import de.bluecolored.bluemap.common.rendermanager.WorldRegionRenderTask;
3636
import de.bluecolored.bluemap.core.map.BmMap;
37+
import lombok.NonNull;
3738
import org.jetbrains.annotations.Nullable;
3839

3940
import java.lang.ref.WeakReference;
@@ -91,7 +92,7 @@ public Vector2i getTileOffset() {
9192
}
9293

9394
@Override
94-
public void setTileFilter(Predicate<Vector2i> filter) {
95+
public void setTileFilter(@NonNull Predicate<Vector2i> filter) {
9596
unpack(map).setTileFilter(filter);
9697
}
9798

‎common/src/main/java/de/bluecolored/bluemap/common/api/PluginImpl.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
import de.bluecolored.bluemap.api.plugin.PlayerIconFactory;
2929
import de.bluecolored.bluemap.api.plugin.SkinProvider;
3030
import de.bluecolored.bluemap.common.plugin.Plugin;
31+
import lombok.NonNull;
3132

3233
public class PluginImpl implements de.bluecolored.bluemap.api.plugin.Plugin {
3334

@@ -43,7 +44,7 @@ public SkinProvider getSkinProvider() {
4344
}
4445

4546
@Override
46-
public void setSkinProvider(SkinProvider skinProvider) {
47+
public void setSkinProvider(@NonNull SkinProvider skinProvider) {
4748
plugin.getSkinUpdater().setSkinProvider(skinProvider);
4849
}
4950

‎common/src/main/java/de/bluecolored/bluemap/common/api/RenderManagerImpl.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
import de.bluecolored.bluemap.common.rendermanager.MapUpdatePreparationTask;
3333
import de.bluecolored.bluemap.common.rendermanager.MapUpdateTask;
3434
import de.bluecolored.bluemap.common.rendermanager.TileUpdateStrategy;
35+
import lombok.NonNull;
3536

3637
import java.util.Collection;
3738

@@ -48,20 +49,20 @@ public RenderManagerImpl(BlueMapAPIImpl api, Plugin plugin) {
4849
}
4950

5051
@Override
51-
public boolean scheduleMapUpdateTask(BlueMapMap map, boolean force) {
52+
public boolean scheduleMapUpdateTask(@NonNull BlueMapMap map, boolean force) {
5253
BlueMapMapImpl cmap = castMap(map);
5354
return renderManager.scheduleRenderTask(MapUpdatePreparationTask
5455
.updateMap(cmap.map(), TileUpdateStrategy.fixed(force), renderManager));
5556
}
5657

5758
@Override
58-
public boolean scheduleMapUpdateTask(BlueMapMap map, Collection<Vector2i> regions, boolean force) {
59+
public boolean scheduleMapUpdateTask(@NonNull BlueMapMap map, Collection<Vector2i> regions, boolean force) {
5960
BlueMapMapImpl cmap = castMap(map);
6061
return renderManager.scheduleRenderTask(new MapUpdateTask(cmap.map(), regions, TileUpdateStrategy.fixed(force)));
6162
}
6263

6364
@Override
64-
public boolean scheduleMapPurgeTask(BlueMapMap map) {
65+
public boolean scheduleMapPurgeTask(@NonNull BlueMapMap map) {
6566
BlueMapMapImpl cmap = castMap(map);
6667
return renderManager.scheduleRenderTask(new MapPurgeTask(cmap.map()));
6768
}

‎common/src/main/java/de/bluecolored/bluemap/common/api/WebAppImpl.java‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
import de.bluecolored.bluemap.common.plugin.Plugin;
3030
import de.bluecolored.bluemap.core.logger.Logger;
3131
import de.bluecolored.bluemap.core.util.FileHelper;
32+
import lombok.NonNull;
3233
import org.jetbrains.annotations.Nullable;
3334

3435
import javax.imageio.ImageIO;
@@ -63,7 +64,7 @@ public Path getWebRoot() {
6364
}
6465

6566
@Override
66-
public void setPlayerVisibility(UUID player, boolean visible) {
67+
public void setPlayerVisibility(@NonNull UUID player, boolean visible) {
6768
if (plugin == null) return; // fail silently: not supported on non-plugin platforms
6869

6970
if (visible) {
@@ -74,21 +75,21 @@ public void setPlayerVisibility(UUID player, boolean visible) {
7475
}
7576

7677
@Override
77-
public boolean getPlayerVisibility(UUID player) {
78+
public boolean getPlayerVisibility(@NonNull UUID player) {
7879
if (plugin == null) return false; // fail silently: not supported on non-plugin platforms
7980

8081
return !plugin.getPluginState().isPlayerHidden(player);
8182
}
8283

8384
@Override
84-
public synchronized void registerScript(String url) {
85+
public synchronized void registerScript(@NonNull String url) {
8586
Logger.global.logDebug("Registering script from API: " + url);
8687
blueMapService.getWebFilesManager().getScripts().add(url);
8788
scheduleUpdateWebAppSettings();
8889
}
8990

9091
@Override
91-
public synchronized void registerStyle(String url) {
92+
public synchronized void registerStyle(@NonNull String url) {
9293
Logger.global.logDebug("Registering style from API: " + url);
9394
blueMapService.getWebFilesManager().getStyles().add(url);
9495
scheduleUpdateWebAppSettings();
@@ -122,7 +123,7 @@ public void run() {
122123
@Override
123124
@Deprecated(forRemoval = true)
124125
@SuppressWarnings("removal")
125-
public String createImage(BufferedImage image, String path) throws IOException {
126+
public String createImage(@NonNull BufferedImage image, @NonNull String path) throws IOException {
126127
path = path.replaceAll("[^a-zA-Z0-9_.\\-/]", "_");
127128

128129
Path webRoot = getWebRoot().toAbsolutePath();

0 commit comments

Comments
 (0)