Upstream
/
WorldGuard
mirror of https://github.com/EngineHub/WorldGuard.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

store custom domains thread safe, improve api usability

This commit is contained in:
Joo200 2023-08-20 11:06:36 +02:00
parent 02a8fd4c17
commit 0a9eb447d6
4 changed files with 38 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
worldguard-core/src/main/java/com/sk89q/worldguard/domains/DefaultDomain.java
View File

@ -36,12 +36,12 @@ import javax.annotation.Nullable;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.Collections; import java.util.Collections;
import java.util.HashSet;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import java.util.UUID; import java.util.UUID;
import java.util.concurrent.ConcurrentHashMap;
import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkNotNull;
@ -53,7 +53,7 @@ public class DefaultDomain implements Domain, ChangeTracked {
private PlayerDomain playerDomain = new PlayerDomain(); private PlayerDomain playerDomain = new PlayerDomain();
private GroupDomain groupDomain = new GroupDomain(); private GroupDomain groupDomain = new GroupDomain();
private Set<CustomDomain> customDomains = new HashSet<>(); private final Map<String, CustomDomain> customDomains = new ConcurrentHashMap<>();
private boolean customDomainsChanged = false; private boolean customDomainsChanged = false;
/** /**
@ -70,7 +70,7 @@ public class DefaultDomain implements Domain, ChangeTracked {
public DefaultDomain(DefaultDomain existing) { public DefaultDomain(DefaultDomain existing) {
setPlayerDomain(existing.getPlayerDomain()); setPlayerDomain(existing.getPlayerDomain());
setGroupDomain(existing.getGroupDomain()); setGroupDomain(existing.getGroupDomain());
setCustomDomains(existing.getCustomDomains()); setCustomDomains(existing.customDomains);
} }
/** /**
@ -118,9 +118,8 @@ public class DefaultDomain implements Domain, ChangeTracked {
*/ */
public void addCustomDomain(CustomDomain customDomain) { public void addCustomDomain(CustomDomain customDomain) {
checkNotNull(customDomain); checkNotNull(customDomain);
removeCustomDomain(customDomain.getName()); this.customDomains.put(customDomain.getName(), customDomain);
this.customDomains.add(customDomain); this.customDomainsChanged = true;
customDomainsChanged = true;
} }
/** /**
@ -130,8 +129,8 @@ public class DefaultDomain implements Domain, ChangeTracked {
*/ */
public void removeCustomDomain(String name) { public void removeCustomDomain(String name) {
checkNotNull(name); checkNotNull(name);
if (this.customDomains.removeIf(d -> d.getName().equalsIgnoreCase(name))) { if (this.customDomains.remove(name) != null) {
customDomainsChanged = true; this.customDomainsChanged = true;
} }
} }
@ -142,8 +141,8 @@ public class DefaultDomain implements Domain, ChangeTracked {
*/ */
public void removeCustomDomain(CustomDomain customDomain) { public void removeCustomDomain(CustomDomain customDomain) {
checkNotNull(customDomain); checkNotNull(customDomain);
if (this.customDomains.remove(customDomain)) { if (this.customDomains.remove(customDomain.getName()) != null) {
customDomainsChanged = true; this.customDomainsChanged = true;
} }
} }
@ -152,10 +151,11 @@ public class DefaultDomain implements Domain, ChangeTracked {
* *
* @param customDomains the domains * @param customDomains the domains
*/ */
public void setCustomDomains(Collection<CustomDomain> customDomains) { public void setCustomDomains(Map<String, CustomDomain> customDomains) {
checkNotNull(customDomains); checkNotNull(customDomains);
this.customDomains = new HashSet<>(customDomains); this.customDomains.clear();
customDomainsChanged = true; this.customDomains.putAll(customDomains);
this.customDomainsChanged = true;
} }
/** /**
@ -163,8 +163,18 @@ public class DefaultDomain implements Domain, ChangeTracked {
* *
* @return a unmodifiable copy of the domains * @return a unmodifiable copy of the domains
*/ */
public Set<CustomDomain> getCustomDomains() { public Collection<CustomDomain> getCustomDomains() {
return Collections.unmodifiableSet(this.customDomains); return Collections.unmodifiableCollection(this.customDomains.values());
}
/**
* Get the api domain specified by its name
*
* @param name the name of the domain
* @return the custom domain
*/
public @Nullable CustomDomain getCustomDomain(String name) {
return this.customDomains.get(name);
} }
/** /**
@ -311,12 +321,12 @@ public class DefaultDomain implements Domain, ChangeTracked {
@Override @Override
public boolean contains(LocalPlayer player) { public boolean contains(LocalPlayer player) {
return playerDomain.contains(player) || groupDomain.contains(player) || customDomains.stream().anyMatch(d -> d.contains(player)); return playerDomain.contains(player) || groupDomain.contains(player) || customDomains.values().stream().anyMatch(d -> d.contains(player));
} }
@Override @Override
public boolean contains(UUID uniqueId) { public boolean contains(UUID uniqueId) {
return playerDomain.contains(uniqueId) || customDomains.stream().anyMatch(d -> d.contains(uniqueId)); return playerDomain.contains(uniqueId) || customDomains.values().stream().anyMatch(d -> d.contains(uniqueId));
} }
@Override @Override
@ -384,7 +394,7 @@ public class DefaultDomain implements Domain, ChangeTracked {
public String toCustomDomainsString() { public String toCustomDomainsString() {
List<String> output = new ArrayList<>(); List<String> output = new ArrayList<>();
for (CustomDomain customDomain : customDomains) { for (CustomDomain customDomain : customDomains.values()) {
output.add(customDomain.getName() + ":" + customDomain.toString()); output.add(customDomain.getName() + ":" + customDomain.toString());
} }
output.sort(String.CASE_INSENSITIVE_ORDER); output.sort(String.CASE_INSENSITIVE_ORDER);
@ -513,7 +523,7 @@ public class DefaultDomain implements Domain, ChangeTracked {
private Component toCustomDomainsComponent() { private Component toCustomDomainsComponent() {
final TextComponent.Builder builder = TextComponent.builder(""); final TextComponent.Builder builder = TextComponent.builder("");
for (Iterator<CustomDomain> it = customDomains.iterator(); it.hasNext(); ) { for (Iterator<CustomDomain> it = customDomains.values().iterator(); it.hasNext(); ) {
CustomDomain domain = it.next(); CustomDomain domain = it.next();
builder.append(TextComponent.of(domain.getName() + ":", TextColor.LIGHT_PURPLE)) builder.append(TextComponent.of(domain.getName() + ":", TextColor.LIGHT_PURPLE))
.append(TextComponent.of(domain.toString(), TextColor.GOLD)); .append(TextComponent.of(domain.toString(), TextColor.GOLD));
@ -528,7 +538,7 @@ public class DefaultDomain implements Domain, ChangeTracked {
@Override @Override
public boolean isDirty() { public boolean isDirty() {
return playerDomain.isDirty() || groupDomain.isDirty() || return playerDomain.isDirty() || groupDomain.isDirty() ||
customDomainsChanged || customDomains.stream().anyMatch(ChangeTracked::isDirty); customDomainsChanged || customDomains.values().stream().anyMatch(ChangeTracked::isDirty);
} }
@Override @Override
@ -536,7 +546,7 @@ public class DefaultDomain implements Domain, ChangeTracked {
playerDomain.setDirty(dirty); playerDomain.setDirty(dirty);
groupDomain.setDirty(dirty); groupDomain.setDirty(dirty);
customDomainsChanged = dirty; customDomainsChanged = dirty;
customDomains.forEach(d -> d.setDirty(dirty)); customDomains.values().forEach(d -> d.setDirty(dirty));
} }
@Override @Override

2
worldguard-core/src/main/java/com/sk89q/worldguard/domains/registry/DomainRegistry.java
View File

@ -83,7 +83,7 @@ public interface DomainRegistry extends Iterable<DomainFactory<?>> {
* @param createUnknown Whether "just in time" domains should be created for unknown domains * @param createUnknown Whether "just in time" domains should be created for unknown domains
* @return The unmarshalled domain list * @return The unmarshalled domain list
*/ */
List<CustomDomain> unmarshal(Map<String, Object> rawValues, boolean createUnknown); Map<String, CustomDomain> unmarshal(Map<String, Object> rawValues, boolean createUnknown);
/** /**
* Get the number of registered domains. * Get the number of registered domains.

11
worldguard-core/src/main/java/com/sk89q/worldguard/domains/registry/SimpleDomainRegistry.java
View File

@ -25,9 +25,8 @@ import com.google.common.collect.Maps;
import com.sk89q.worldguard.domains.CustomDomain; import com.sk89q.worldguard.domains.CustomDomain;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import java.util.ArrayList; import java.util.HashMap;
import java.util.Iterator; import java.util.Iterator;
import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.concurrent.ConcurrentMap; import java.util.concurrent.ConcurrentMap;
import java.util.logging.Level; import java.util.logging.Level;
@ -139,20 +138,20 @@ public class SimpleDomainRegistry implements DomainRegistry {
return null; return null;
} }
public List<CustomDomain> unmarshal(Map<String, Object> rawValues, boolean createUnknown) { public Map<String, CustomDomain> unmarshal(Map<String, Object> rawValues, boolean createUnknown) {
checkNotNull(rawValues, "rawValues"); checkNotNull(rawValues, "rawValues");
List<CustomDomain> domainList = new ArrayList<>(); Map<String, CustomDomain> domains = new HashMap<>();
for (Map.Entry<String, Object> entry : rawValues.entrySet()) { for (Map.Entry<String, Object> entry : rawValues.entrySet()) {
try { try {
CustomDomain domain = getOrCreate(entry.getKey(), entry.getValue(), createUnknown); CustomDomain domain = getOrCreate(entry.getKey(), entry.getValue(), createUnknown);
domainList.add(domain); domains.put(domain.getName(), domain);
} catch (Throwable e) { } catch (Throwable e) {
log.log(Level.WARNING, "Failed to unmarshal domain for " + entry.getKey(), e); log.log(Level.WARNING, "Failed to unmarshal domain for " + entry.getKey(), e);
} }
} }
return domainList; return domains;
} }
@Override @Override

2
worldguard-core/src/main/java/com/sk89q/worldguard/protection/managers/storage/file/YamlRegionFile.java
View File

@ -289,7 +289,7 @@ public class YamlRegionFile implements RegionDatabase {
YAMLNode apiDomains = node.getNode("custom"); YAMLNode apiDomains = node.getNode("custom");
if (apiDomains != null) { if (apiDomains != null) {
List<CustomDomain> parsedDomains = WorldGuard.getInstance().getDomainRegistry().unmarshal(apiDomains.getMap(), true); Map<String, CustomDomain> parsedDomains = WorldGuard.getInstance().getDomainRegistry().unmarshal(apiDomains.getMap(), true);
domain.setCustomDomains(parsedDomains); domain.setCustomDomains(parsedDomains);
} }