diff --git a/solid/src/main/java/com/inrupt/client/solid/Metadata.java b/solid/src/main/java/com/inrupt/client/solid/Metadata.java index c24c82f134c..13145b55162 100644 --- a/solid/src/main/java/com/inrupt/client/solid/Metadata.java +++ b/solid/src/main/java/com/inrupt/client/solid/Metadata.java @@ -34,7 +34,7 @@ public class Metadata { private final URI acl; private final URI storage; - private final Set type = new HashSet<>(); + private final Set types = new HashSet<>(); private final Map> wacAllow = new HashMap<>(); private final Set allowedMethods = new HashSet<>(); private final Set allowedPatchSyntaxes = new HashSet<>(); @@ -58,9 +58,23 @@ public Optional getStorage() { * {@code rdf:type} data explicitly set on a resource. * * @return the type values for a resource + * @deprecated as of Beta3, please use the {@link #getTypes} method */ + @Deprecated public Set getType() { - return type; + return getTypes(); + } + + /** + * The Solid Resource types. + * + *

This data typically comes from HTTP Link headers and may be different than + * {@code rdf:type} data explicitly set on a resource. + * + * @return the type values for a resource + */ + public Set getTypes() { + return types; } /** @@ -294,7 +308,7 @@ public Builder contentType(final String type) { public Metadata build() { final Metadata metadata = new Metadata(builderStorage, builderAcl, builderContentType); metadata.wacAllow.putAll(builderWacAllow); - metadata.type.addAll(builderType); + metadata.types.addAll(builderType); metadata.allowedMethods.addAll(builderAllowedMethods); metadata.allowedPatchSyntaxes.addAll(builderAllowedPatchSyntaxes); metadata.allowedPostSyntaxes.addAll(builderAllowedPostSyntaxes); diff --git a/solid/src/test/java/com/inrupt/client/solid/SolidRDFSourceTest.java b/solid/src/test/java/com/inrupt/client/solid/SolidRDFSourceTest.java index b40b875e5ee..f037c88e62d 100644 --- a/solid/src/test/java/com/inrupt/client/solid/SolidRDFSourceTest.java +++ b/solid/src/test/java/com/inrupt/client/solid/SolidRDFSourceTest.java @@ -76,6 +76,7 @@ void testGetOfSolidRDFSource() throws IOException, InterruptedException { try (final SolidRDFSource resource = response.body()) { assertEquals(uri, resource.getIdentifier()); assertTrue(resource.getMetadata().getType().contains(LDP.BasicContainer)); + assertTrue(resource.getMetadata().getTypes().contains(LDP.BasicContainer)); assertEquals(Optional.of(URI.create("http://acl.example/solid/")), resource.getMetadata().getAcl()); assertEquals(Optional.of(URI.create("http://storage.example/")), @@ -116,6 +117,7 @@ void testCheckRootOfSolidRDFSource() throws IOException, InterruptedException { try (final SolidRDFSource resource = response.body()) { assertEquals(uri, resource.getIdentifier()); assertTrue(resource.getMetadata().getType().contains(LDP.BasicContainer)); + assertTrue(resource.getMetadata().getTypes().contains(LDP.BasicContainer)); assertEquals(Optional.of(URI.create("http://acl.example/")), resource.getMetadata().getAcl()); assertEquals(Optional.of(uri), resource.getMetadata().getStorage());