Simplification

Author: acoburn

acp/src/main/java/com/inrupt/client/acp/AccessControlResource.java

@@ -29,6 +29,8 @@
 import com.inrupt.rdf.wrapping.commons.WrapperIRI;
 
 import java.net.URI;
+import java.util.List;
+import java.util.Map;
 import java.util.Set;
 import java.util.UUID;
 import java.util.function.Consumer;
@@ -54,6 +56,17 @@ public class AccessControlResource extends RDFSource {
 
     public static final URI SOLID_ACCESS_GRANT = URI.create("http://www.w3.org/ns/solid/vc#SolidAccessGrant");
 
+    private static final Map<URI, IRI> EXPANSION_MAPPINGS = Map.of(
+                ACP.accessControl, asIRI(ACP.AccessControl),
+                ACP.memberAccessControl, asIRI(ACP.AccessControl),
+                ACP.apply, asIRI(ACP.Policy),
+                ACP.allOf, asIRI(ACP.Matcher),
+                ACP.anyOf, asIRI(ACP.Matcher),
+                ACP.noneOf, asIRI(ACP.Matcher));
+
+    private static final List<URI> EXPANSION_PROPERTIES = List.of(ACP.accessControl, ACP.memberAccessControl,
+            ACP.apply, ACP.allOf, ACP.anyOf, ACP.noneOf);
+
     /**
      * Definitions for different matcher types, for use with {@link #find}.
      */
@@ -127,23 +140,13 @@ public Set<AccessControl> memberAccessControl() {
     public AccessControlResource expand(final SolidSyncClient client) {
         // Copy the data from the existing ACR into a new dataset
         final var dataset = rdf.createDataset();
-        final var matcherType = asIRI(ACP.Matcher);
-        final var accessControlType = asIRI(ACP.AccessControl);
         stream().forEach(dataset::add);
 
         try (final var cache = rdf.createDataset()) {
-            expandType(dataset, cache, asIRI(ACP.accessControl), accessControlType,
-                    uri -> populateCache(client, uri, cache));
-            expandType(dataset, cache, asIRI(ACP.memberAccessControl), accessControlType,
-                    uri -> populateCache(client, uri, cache));
-            expandType(dataset, cache, asIRI(ACP.apply), asIRI(ACP.Policy),
-                    uri -> populateCache(client, uri, cache));
-            expandType(dataset, cache, asIRI(ACP.allOf), matcherType,
-                    uri -> populateCache(client, uri, cache));
-            expandType(dataset, cache, asIRI(ACP.anyOf), matcherType,
-                    uri -> populateCache(client, uri, cache));
-            expandType(dataset, cache, asIRI(ACP.noneOf), matcherType,
+            for (final var property : EXPANSION_PROPERTIES) {
+                expandType(dataset, cache, asIRI(property), EXPANSION_MAPPINGS.get(property),
                     uri -> populateCache(client, uri, cache));
+            }
         } catch (final Exception ex) {
             LOGGER.atDebug().setMessage("Unable to close dataset: {}").addArgument(ex::getMessage).log();
         }
@@ -162,21 +165,11 @@ public AccessControlResource expand(final SolidClient client) {
         final var dataset = rdf.createDataset();
         stream().forEach(dataset::add);
 
-        final var matcherType = asIRI(ACP.Matcher);
-        final var accessControlType = asIRI(ACP.AccessControl);
         try (final var cache = rdf.createDataset()) {
-            expandType(dataset, cache, asIRI(ACP.accessControl), accessControlType,
-                    uri -> populateCacheAsync(client, uri, cache));
-            expandType(dataset, cache, asIRI(ACP.memberAccessControl), accessControlType,
-                    uri -> populateCacheAsync(client, uri, cache));
-            expandType(dataset, cache, asIRI(ACP.apply), asIRI(ACP.Policy),
-                    uri -> populateCacheAsync(client, uri, cache));
-            expandType(dataset, cache, asIRI(ACP.allOf), matcherType,
-                    uri -> populateCacheAsync(client, uri, cache));
-            expandType(dataset, cache, asIRI(ACP.anyOf), matcherType,
-                    uri -> populateCacheAsync(client, uri, cache));
-            expandType(dataset, cache, asIRI(ACP.noneOf), matcherType,
-                    uri -> populateCacheAsync(client, uri, cache));
+            for (final var property : EXPANSION_PROPERTIES) {
+                expandType(dataset, cache, asIRI(property), EXPANSION_MAPPINGS.get(property),
+                        uri -> populateCacheAsync(client, uri, cache));
+            }
         } catch (final Exception ex) {
             LOGGER.atDebug().setMessage("Unable to close dataset: {}").addArgument(ex::getMessage).log();
         }