Cleanup DomainRegistry

Author: Joo200

worldguard-core/src/main/java/com/sk89q/worldguard/commands/region/MemberCommands.java

@@ -26,7 +26,6 @@
 import com.sk89q.worldedit.command.util.AsyncCommandBuilder;
 import com.sk89q.worldedit.extension.platform.Actor;
 import com.sk89q.worldedit.util.formatting.component.ErrorFormat;
-import com.sk89q.worldedit.util.formatting.component.SubtleFormat;
 import com.sk89q.worldedit.util.formatting.text.Component;
 import com.sk89q.worldedit.util.formatting.text.TextComponent;
 import com.sk89q.worldedit.util.formatting.text.event.ClickEvent;
@@ -35,11 +34,9 @@
 import com.sk89q.worldedit.world.World;
 import com.sk89q.worldguard.LocalPlayer;
 import com.sk89q.worldguard.WorldGuard;
-import com.sk89q.worldguard.domains.CustomDomain;
 import com.sk89q.worldguard.domains.DefaultDomain;
 import com.sk89q.worldguard.domains.registry.DomainFactory;
 import com.sk89q.worldguard.domains.registry.DomainRegistry;
-import com.sk89q.worldguard.domains.registry.InvalidDomainFormat;
 import com.sk89q.worldguard.internal.permission.RegionPermissionModel;
 import com.sk89q.worldguard.protection.managers.RegionManager;
 import com.sk89q.worldguard.protection.regions.ProtectedRegion;

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

@@ -62,6 +62,12 @@ public interface DomainRegistry extends Iterable<DomainFactory<?>> {
     @Nullable
     DomainFactory<?> get(String name);
 
+    /**
+     * Try to get a domain by its name
+     */
+    @Nullable
+    CustomDomain createDomain(String name);
+
     /**
      * Get all domains keyed by the registered name
      *

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

@@ -100,31 +100,37 @@ public DomainFactory<?> get(String name) {
         return domains.get(name.toLowerCase());
     }
 
+    @Nullable
+    @Override
+    public CustomDomain createDomain(String name) {
+        DomainFactory<?> factory = get(name);
+        if (factory == null) return null;
+        return factory.create(name);
+    }
+
     @Override
     public Map<String, DomainFactory<?>> getAll() {
         return ImmutableMap.copyOf(domains);
     }
 
     private CustomDomain getOrCreate(String name, Object value, boolean createUnknown) {
-        DomainFactory<? extends CustomDomain> domainFactory = get(name);
+        CustomDomain customDomain = createDomain(name);
 
-        if (domainFactory != null) {
-            CustomDomain customDomain = domainFactory.create(name);
-            if (customDomain != null) customDomain.unmarshal(value);
+        if (customDomain != null) {
+            customDomain.unmarshal(value);
             return customDomain;
         }
 
         synchronized (lock) {
-            domainFactory = get(name); // Load again because the previous load was not synchronized
-            if (domainFactory != null) {
-                CustomDomain customDomain = domainFactory.create(name);
-                if (customDomain != null) customDomain.unmarshal(value);
+            customDomain = createDomain(name); // Load again because the previous load was not synchronized
+            if (customDomain != null) {
+                customDomain.unmarshal(value);
                 return customDomain;
             }
             if (createUnknown) {
                 DomainFactory<UnknownDomain> unknownFactory = forceRegister(name, UnknownDomain.FACTORY);
                 if (unknownFactory != null) {
-                    CustomDomain customDomain = unknownFactory.create(name);
+                    customDomain = unknownFactory.create(name);
                     if (customDomain != null) customDomain.unmarshal(value);
                     return customDomain;
                 }

worldguard-core/src/main/java/com/sk89q/worldguard/protection/util/DomainInputResolver.java

@@ -135,11 +135,10 @@ public DefaultDomain call() throws UnresolvedNamesException, InvalidDomainFormat
                 domain.addGroup(groupMatcher.group(1));
             } else if (customMatcher.matches()) {
                 String domainName = customMatcher.group(1);
-                DomainFactory<?> domainFactory = WorldGuard.getInstance().getDomainRegistry().get(domainName);
-                if (domainFactory == null) {
+                CustomDomain customDomain = WorldGuard.getInstance().getDomainRegistry().createDomain(domainName);
+                if (customDomain == null) {
                     throw new InvalidDomainFormat("No domain named '" + domainName + "' found.");
                 }
-                CustomDomain customDomain = domainFactory.create(domainName);
                 customDomain.parseInput(CustomDomainContext.create()
                     .setSender(actor).setInput(customMatcher.group(2)).setObject("region", region).build());
             } else {