From 23612b8ee76e43d7133f995e90aa3da9ddb9f91f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=9D=8F=E9=BB=91?= Date: Sat, 6 Jul 2019 18:53:49 +0800 Subject: [PATCH] Remove NotNull --- src/main/scala/io/izzel/taboolib/module/db/local/Local.java | 3 --- .../io/izzel/taboolib/module/db/local/LocalPlayer.java | 2 -- .../io/izzel/taboolib/module/db/local/LocalPlugin.java | 6 ------ 3 files changed, 11 deletions(-) diff --git a/src/main/scala/io/izzel/taboolib/module/db/local/Local.java b/src/main/scala/io/izzel/taboolib/module/db/local/Local.java index b8f2a74..472dc77 100644 --- a/src/main/scala/io/izzel/taboolib/module/db/local/Local.java +++ b/src/main/scala/io/izzel/taboolib/module/db/local/Local.java @@ -1,7 +1,6 @@ package io.izzel.taboolib.module.db.local; import com.google.common.collect.Maps; -import com.sun.istack.internal.NotNull; import io.izzel.taboolib.module.inject.TSchedule; import io.izzel.taboolib.util.Ref; @@ -29,12 +28,10 @@ public class Local { Optional.ofNullable(plugins.remove(name)).ifPresent(LocalPlugin::clearFiles); } - @NotNull public static LocalPlugin get(String name) { return plugins.computeIfAbsent(name, LocalPlugin::new); } - @NotNull public static LocalPlugin get() { Class callerClass = Ref.getCallerClass(3).orElse(null); return get(callerClass == null ? "TabooLib" : Ref.getCallerPlugin(callerClass).getName()); diff --git a/src/main/scala/io/izzel/taboolib/module/db/local/LocalPlayer.java b/src/main/scala/io/izzel/taboolib/module/db/local/LocalPlayer.java index e18a3f9..50489d7 100644 --- a/src/main/scala/io/izzel/taboolib/module/db/local/LocalPlayer.java +++ b/src/main/scala/io/izzel/taboolib/module/db/local/LocalPlayer.java @@ -1,7 +1,6 @@ package io.izzel.taboolib.module.db.local; import com.google.common.collect.Maps; -import com.sun.istack.internal.NotNull; import io.izzel.taboolib.TabooLib; import io.izzel.taboolib.TabooLibAPI; import io.izzel.taboolib.module.inject.TSchedule; @@ -24,7 +23,6 @@ public class LocalPlayer { private static Map files = Maps.newConcurrentMap(); - @NotNull public static FileConfiguration get(OfflinePlayer player) { return TabooLibAPI.isOriginLoaded() ? PlayerDataManager.getPlayerData(player) : files.computeIfAbsent(toName(player), n -> Files.load(toFile(n))); } diff --git a/src/main/scala/io/izzel/taboolib/module/db/local/LocalPlugin.java b/src/main/scala/io/izzel/taboolib/module/db/local/LocalPlugin.java index 1fa2639..283470f 100644 --- a/src/main/scala/io/izzel/taboolib/module/db/local/LocalPlugin.java +++ b/src/main/scala/io/izzel/taboolib/module/db/local/LocalPlugin.java @@ -1,12 +1,10 @@ package io.izzel.taboolib.module.db.local; import com.google.common.collect.Maps; -import com.sun.istack.internal.NotNull; import io.izzel.taboolib.util.Files; import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.configuration.file.YamlConfiguration; -import javax.annotation.Nullable; import java.io.File; import java.util.Map; @@ -23,24 +21,20 @@ public class LocalPlugin { this.name = name; } - @NotNull public FileConfiguration get(String name) { return files.computeIfAbsent(fixName(name), n -> Files.load(toFile(n))); } - @NotNull public FileConfiguration getFile(String name) { return files.getOrDefault(fixName(name), new YamlConfiguration()); } - @NotNull public FileConfiguration addFile(String name) { FileConfiguration file = Files.load(toFile(name)); files.put(fixName(name), file); return file; } - @Nullable public FileConfiguration clearFile(String name) { return files.remove(fixName(name)); }