Upstream/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-12-02 13:33:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update SQLManager to new API

Browse Source
This commit is contained in:
Hannes Greule 2020-02-18 19:20:41 +01:00
parent 9adaa4ae79
commit 132e63e2fb
2 changed files with 62 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/SQLManager.java
View File

@ -4,6 +4,8 @@ import com.github.intellectualsites.plotsquared.configuration.ConfigurationSecti
import com.github.intellectualsites.plotsquared.plot.PlotSquared; import com.github.intellectualsites.plotsquared.plot.PlotSquared;
import com.github.intellectualsites.plotsquared.plot.config.Settings; import com.github.intellectualsites.plotsquared.plot.config.Settings;
import com.github.intellectualsites.plotsquared.plot.config.Storage; import com.github.intellectualsites.plotsquared.plot.config.Storage;
import com.github.intellectualsites.plotsquared.plot.flags.FlagContainer;
import com.github.intellectualsites.plotsquared.plot.flags.GlobalFlagContainer;
import com.github.intellectualsites.plotsquared.plot.flags.PlotFlag; import com.github.intellectualsites.plotsquared.plot.flags.PlotFlag;
import com.github.intellectualsites.plotsquared.plot.object.BlockLoc; import com.github.intellectualsites.plotsquared.plot.object.BlockLoc;
import com.github.intellectualsites.plotsquared.plot.object.Plot; import com.github.intellectualsites.plotsquared.plot.object.Plot;
@ -546,7 +548,7 @@ import java.util.concurrent.atomic.AtomicInteger;
for (Plot plot : myList) { for (Plot plot : myList) {
plotMap.put(plot.getId(), plot); plotMap.put(plot.getId(), plot);
} }
ArrayList<SettingsPair> settings = new ArrayList<>(); ArrayList<LegacySettings> settings = new ArrayList<>();
final ArrayList<UUIDPair> helpers = new ArrayList<>(); final ArrayList<UUIDPair> helpers = new ArrayList<>();
final ArrayList<UUIDPair> trusted = new ArrayList<>(); final ArrayList<UUIDPair> trusted = new ArrayList<>();
final ArrayList<UUIDPair> denied = new ArrayList<>(); final ArrayList<UUIDPair> denied = new ArrayList<>();
@ -562,7 +564,8 @@ import java.util.concurrent.atomic.AtomicInteger;
PlotId plotId = new PlotId(x, y); PlotId plotId = new PlotId(x, y);
Plot plot = plotMap.get(plotId); Plot plot = plotMap.get(plotId);
if (plot != null) { if (plot != null) {
settings.add(new SettingsPair(id, plot.getSettings())); settings.add(new LegacySettings(id, plot.getSettings(),
new FlagContainer(plot.getArea().getFlagContainer())));
for (UUID uuid : plot.getDenied()) { for (UUID uuid : plot.getDenied()) {
denied.add(new UUIDPair(id, uuid)); denied.add(new UUIDPair(id, uuid));
} }
@ -828,8 +831,8 @@ import java.util.concurrent.atomic.AtomicInteger;
} }
} }
public void createSettings(final ArrayList<SettingsPair> myList, final Runnable whenDone) { public void createSettings(final ArrayList<LegacySettings> myList, final Runnable whenDone) {
final StmtMod<SettingsPair> mod = new StmtMod<SettingsPair>() { final StmtMod<LegacySettings> mod = new StmtMod<LegacySettings>() {
@Override public String getCreateMySQL(int size) { @Override public String getCreateMySQL(int size) {
return getCreateMySQL(size, "INSERT INTO `" + SQLManager.this.prefix return getCreateMySQL(size, "INSERT INTO `" + SQLManager.this.prefix
+ "plot_settings`(`plot_plot_id`,`biome`,`rain`,`custom_time`,`time`,`deny_entry`,`alias`,`flags`,`merged`," + "plot_settings`(`plot_plot_id`,`biome`,`rain`,`custom_time`,`time`,`deny_entry`,`alias`,`flags`,`merged`,"
@ -848,7 +851,7 @@ import java.util.concurrent.atomic.AtomicInteger;
+ "plot_settings`(`plot_plot_id`) VALUES(?)"; + "plot_settings`(`plot_plot_id`) VALUES(?)";
} }
@Override public void setMySQL(PreparedStatement statement, int i, SettingsPair pair) @Override public void setMySQL(PreparedStatement statement, int i, LegacySettings pair)
throws SQLException { throws SQLException {
statement.setInt(i * 10 + 1, pair.id); // id statement.setInt(i * 10 + 1, pair.id); // id
statement.setNull(i * 10 + 2, 4); // biome statement.setNull(i * 10 + 2, 4); // biome
@ -863,12 +866,12 @@ import java.util.concurrent.atomic.AtomicInteger;
} }
StringBuilder flag_string = new StringBuilder(); StringBuilder flag_string = new StringBuilder();
int k = 0; int k = 0;
for (Entry<Flag<?>, ?> flag : pair.settings.flags.entrySet()) { for (PlotFlag<?, ?> flag : pair.flagContainer.getFlagMap().values()) {
if (k != 0) { if (k != 0) {
flag_string.append(','); flag_string.append(',');
} }
flag_string.append(flag.getKey().getName()).append(':').append( flag_string.append(flag.getName()).append(':').append(
flag.getKey().valueToString(flag.getValue()).replaceAll(":", "¯") flag.getValue().toString().replaceAll(":", "¯")
.replaceAll(",", "´")); .replaceAll(",", "´"));
k++; k++;
} }
@ -886,7 +889,7 @@ import java.util.concurrent.atomic.AtomicInteger;
statement.setString(i * 10 + 10, position); statement.setString(i * 10 + 10, position);
} }
@Override public void setSQLite(PreparedStatement stmt, int i, SettingsPair pair) @Override public void setSQLite(PreparedStatement stmt, int i, LegacySettings pair)
throws SQLException { throws SQLException {
stmt.setInt(i * 10 + 1, pair.id); // id stmt.setInt(i * 10 + 1, pair.id); // id
stmt.setNull(i * 10 + 2, 4); // biome stmt.setNull(i * 10 + 2, 4); // biome
@ -901,12 +904,12 @@ import java.util.concurrent.atomic.AtomicInteger;
} }
StringBuilder flag_string = new StringBuilder(); StringBuilder flag_string = new StringBuilder();
int k = 0; int k = 0;
for (Entry<Flag<?>, ?> flag : pair.settings.flags.entrySet()) { for (PlotFlag<?, ?> flag : pair.flagContainer.getFlagMap().values()) {
if (k != 0) { if (k != 0) {
flag_string.append(','); flag_string.append(',');
} }
flag_string.append(flag.getKey().getName()).append(':').append( flag_string.append(flag.getName()).append(':').append(
flag.getKey().valueToString(flag.getValue()).replaceAll(":", "¯") flag.getValue().toString().replaceAll(":", "¯")
.replaceAll(",", "´")); .replaceAll(",", "´"));
k++; k++;
} }
@ -927,7 +930,7 @@ import java.util.concurrent.atomic.AtomicInteger;
stmt.setString(i * 10 + 10, position); stmt.setString(i * 10 + 10, position);
} }
@Override public void setSQL(PreparedStatement stmt, SettingsPair pair) @Override public void setSQL(PreparedStatement stmt, LegacySettings pair)
throws SQLException { throws SQLException {
stmt.setInt(1, pair.id); stmt.setInt(1, pair.id);
} }
@ -1853,18 +1856,21 @@ import java.util.concurrent.atomic.AtomicInteger;
if (myflags == null || myflags.isEmpty()) { if (myflags == null || myflags.isEmpty()) {
flags_string = new String[] {}; flags_string = new String[] {};
} else { } else {
flags_string = myflags.split(","); flags_string = myflags.split(","); // splits flags
} }
HashMap<Flag<?>, Object> flags = new HashMap<>(); HashSet<PlotFlag<?, ?>> flags = new HashSet<>();
boolean exception = false; boolean exception = false;
for (String element : flags_string) { for (String element : flags_string) {
if (element.contains(":")) { if (element.contains(":")) {
String[] split = element.split(":"); String[] split = element.split(":"); // splits flag:value
try { try {
String flag_str = String flag_str =
split[1].replaceAll("¯", ":").replaceAll("\u00B4", ","); split[1].replaceAll("¯", ":").replaceAll("\u00B4", ",");
Flag<?> flag = FlagManager.getOrCreateFlag(split[0]); PlotFlag<?, ?> flag = GlobalFlagContainer.getInstance().getFlagFromString(split[0]);
flags.put(flag, flag.parseValue(flag_str)); if (flag == null) {
PlotSquared.debug("Flag not found and therefore ignored: " + split[0]);
}
flags.add(flag.parse(flag_str));
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
exception = true; exception = true;
@ -1874,8 +1880,10 @@ import java.util.concurrent.atomic.AtomicInteger;
element.replaceAll("\u00AF", ":").replaceAll("\u00B4", ","); element.replaceAll("\u00AF", ":").replaceAll("\u00B4", ",");
if (StringMan if (StringMan
.isAlpha(element.replaceAll("_", "").replaceAll("-", ""))) { .isAlpha(element.replaceAll("_", "").replaceAll("-", ""))) {
Flag flag = FlagManager.getOrCreateFlag(element); PlotFlag<?, ?> flag = GlobalFlagContainer.getInstance().getFlagFromString(element);
flags.put(flag, flag.parseValue("")); if (flag == null) {
PlotSquared.debug("Flag not found and therefore ignored: " + element);
}
} else { } else {
PlotSquared.debug("INVALID FLAG: " + element); PlotSquared.debug("INVALID FLAG: " + element);
} }
@ -1887,7 +1895,10 @@ import java.util.concurrent.atomic.AtomicInteger;
PlotSquared.debug("&c" + myflags); PlotSquared.debug("&c" + myflags);
this.setFlags(plot, flags); this.setFlags(plot, flags);
} }
plot.getSettings().flags = flags; // TODO throws NPE because PlotArea isn't set yet
FlagContainer container = new FlagContainer(plot.getArea().getFlagContainer());
container.addAll(flags);
plot.setFlagContainer(container);
} else if (Settings.Enabled_Components.DATABASE_PURGER) { } else if (Settings.Enabled_Components.DATABASE_PURGER) {
toDelete.add(id); toDelete.add(id);
} else { } else {
@ -1992,7 +2003,8 @@ import java.util.concurrent.atomic.AtomicInteger;
} }
@Override public void setFlags(final Plot plot, Collection<PlotFlag<?, ?>> flags) { @Override public void setFlags(final Plot plot, Collection<PlotFlag<?, ?>> flags) {
final String flag_string = FlagManager.toString(flags); // TODO use something new instead
final String flag_string = toString(flags);
addPlotTask(plot, new UniqueStatement("setFlags") { addPlotTask(plot, new UniqueStatement("setFlags") {
@Override public void set(PreparedStatement statement) throws SQLException { @Override public void set(PreparedStatement statement) throws SQLException {
statement.setString(1, flag_string); statement.setString(1, flag_string);
@ -2966,12 +2978,12 @@ import java.util.concurrent.atomic.AtomicInteger;
PlotSquared.debug(" - Correcting merge for: " + plot); PlotSquared.debug(" - Correcting merge for: " + plot);
setMerged(dataPlot, plot.getMerged()); setMerged(dataPlot, plot.getMerged());
} }
HashMap<Flag<?>, Object> pf = plot.getFlags(); Set<PlotFlag<?, ?>> pf = plot.getFlags();
HashMap<Flag<?>, Object> df = dataPlot.getFlags(); Set<PlotFlag<?, ?>> df = dataPlot.getFlags();
if (!pf.isEmpty() && !df.isEmpty()) { if (!pf.isEmpty() && !df.isEmpty()) {
if (pf.size() != df.size() || !StringMan if (pf.size() != df.size() || !StringMan
.isEqual(StringMan.joinOrdered(pf.values(), ","), .isEqual(StringMan.joinOrdered(pf, ","),
StringMan.joinOrdered(df.values(), ","))) { StringMan.joinOrdered(df, ","))) {
PlotSquared.debug(" - Correcting flags for: " + plot); PlotSquared.debug(" - Correcting flags for: " + plot);
setFlags(plot, pf); setFlags(plot, pf);
} }
@ -3104,6 +3116,20 @@ import java.util.concurrent.atomic.AtomicInteger;
public abstract void set(PreparedStatement statement) throws SQLException; public abstract void set(PreparedStatement statement) throws SQLException;
} }
public static String toString(Collection<PlotFlag<?, ?>> flags) {
StringBuilder flag_string = new StringBuilder();
int i = 0;
for (PlotFlag<?, ?> flag : flags) {
if (i != 0) {
flag_string.append(',');
}
flag_string.append(flag.getName()).append(':')
.append(flag.getValue().toString().replaceAll(":", "¯").replaceAll(",", "´"));
i++;
}
return flag_string.toString();
}
private class UUIDPair { private class UUIDPair {
@ -3117,14 +3143,16 @@ import java.util.concurrent.atomic.AtomicInteger;
} }
private class SettingsPair { private static class LegacySettings {
public final int id; public final int id;
public final PlotSettings settings; public final PlotSettings settings;
public final FlagContainer flagContainer;
public SettingsPair(int id, PlotSettings settings) { public LegacySettings(int id, PlotSettings settings, FlagContainer flagContainer) {
this.id = id; this.id = id;
this.settings = settings; this.settings = settings;
this.flagContainer = flagContainer;
} }
} }
} }

2
Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java
View File

@ -224,6 +224,7 @@ public class Plot {
this.settings.setMerged(merged); this.settings.setMerged(merged);
this.timestamp = timestamp; this.timestamp = timestamp;
this.temp = temp; this.temp = temp;
if (area != null) {
this.flagContainer = new FlagContainer(area.getFlagContainer()); this.flagContainer = new FlagContainer(area.getFlagContainer());
if (flags != null) { if (flags != null) {
for (PlotFlag<?, ?> flag : flags) { for (PlotFlag<?, ?> flag : flags) {
@ -231,6 +232,7 @@ public class Plot {
} }
} }
} }
}
/** /**
* Gets a plot from a string e.g. [area];[id] * Gets a plot from a string e.g. [area];[id]