502647092/TabooLib
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove NotNull

Browse Source
This commit is contained in:
坏黑 2019-07-06 18:53:49 +08:00
parent 6364f38d03
commit 23612b8ee7
3 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/scala/io/izzel/taboolib/module/db/local/Local.java
View File

@ -1,7 +1,6 @@
package io.izzel.taboolib.module.db.local; package io.izzel.taboolib.module.db.local;
import com.google.common.collect.Maps; import com.google.common.collect.Maps;
import com.sun.istack.internal.NotNull;
import io.izzel.taboolib.module.inject.TSchedule; import io.izzel.taboolib.module.inject.TSchedule;
import io.izzel.taboolib.util.Ref; import io.izzel.taboolib.util.Ref;
@ -29,12 +28,10 @@ public class Local {
Optional.ofNullable(plugins.remove(name)).ifPresent(LocalPlugin::clearFiles); Optional.ofNullable(plugins.remove(name)).ifPresent(LocalPlugin::clearFiles);
} }
@NotNull
public static LocalPlugin get(String name) { public static LocalPlugin get(String name) {
return plugins.computeIfAbsent(name, LocalPlugin::new); return plugins.computeIfAbsent(name, LocalPlugin::new);
} }
@NotNull
public static LocalPlugin get() { public static LocalPlugin get() {
Class<?> callerClass = Ref.getCallerClass(3).orElse(null); Class<?> callerClass = Ref.getCallerClass(3).orElse(null);
return get(callerClass == null ? "TabooLib" : Ref.getCallerPlugin(callerClass).getName()); return get(callerClass == null ? "TabooLib" : Ref.getCallerPlugin(callerClass).getName());

2
src/main/scala/io/izzel/taboolib/module/db/local/LocalPlayer.java
View File

@ -1,7 +1,6 @@
package io.izzel.taboolib.module.db.local; package io.izzel.taboolib.module.db.local;
import com.google.common.collect.Maps; import com.google.common.collect.Maps;
import com.sun.istack.internal.NotNull;
import io.izzel.taboolib.TabooLib; import io.izzel.taboolib.TabooLib;
import io.izzel.taboolib.TabooLibAPI; import io.izzel.taboolib.TabooLibAPI;
import io.izzel.taboolib.module.inject.TSchedule; import io.izzel.taboolib.module.inject.TSchedule;
@ -24,7 +23,6 @@ public class LocalPlayer {
private static Map<String, FileConfiguration> files = Maps.newConcurrentMap(); private static Map<String, FileConfiguration> files = Maps.newConcurrentMap();
@NotNull
public static FileConfiguration get(OfflinePlayer player) { public static FileConfiguration get(OfflinePlayer player) {
return TabooLibAPI.isOriginLoaded() ? PlayerDataManager.getPlayerData(player) : files.computeIfAbsent(toName(player), n -> Files.load(toFile(n))); return TabooLibAPI.isOriginLoaded() ? PlayerDataManager.getPlayerData(player) : files.computeIfAbsent(toName(player), n -> Files.load(toFile(n)));
} }

6
src/main/scala/io/izzel/taboolib/module/db/local/LocalPlugin.java
View File

@ -1,12 +1,10 @@
package io.izzel.taboolib.module.db.local; package io.izzel.taboolib.module.db.local;
import com.google.common.collect.Maps; import com.google.common.collect.Maps;
import com.sun.istack.internal.NotNull;
import io.izzel.taboolib.util.Files; import io.izzel.taboolib.util.Files;
import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.configuration.file.FileConfiguration;
import org.bukkit.configuration.file.YamlConfiguration; import org.bukkit.configuration.file.YamlConfiguration;
import javax.annotation.Nullable;
import java.io.File; import java.io.File;
import java.util.Map; import java.util.Map;
@ -23,24 +21,20 @@ public class LocalPlugin {
this.name = name; this.name = name;
} }
@NotNull
public FileConfiguration get(String name) { public FileConfiguration get(String name) {
return files.computeIfAbsent(fixName(name), n -> Files.load(toFile(n))); return files.computeIfAbsent(fixName(name), n -> Files.load(toFile(n)));
} }
@NotNull
public FileConfiguration getFile(String name) { public FileConfiguration getFile(String name) {
return files.getOrDefault(fixName(name), new YamlConfiguration()); return files.getOrDefault(fixName(name), new YamlConfiguration());
} }
@NotNull
public FileConfiguration addFile(String name) { public FileConfiguration addFile(String name) {
FileConfiguration file = Files.load(toFile(name)); FileConfiguration file = Files.load(toFile(name));
files.put(fixName(name), file); files.put(fixName(name), file);
return file; return file;
} }
@Nullable
public FileConfiguration clearFile(String name) { public FileConfiguration clearFile(String name) {
return files.remove(fixName(name)); return files.remove(fixName(name));
} }