JCL-340: Pluralize method names, where appropriate

Author: acoburn

solid/src/main/java/com/inrupt/client/solid/Metadata.java

@@ -33,7 +33,7 @@
 public class Metadata {
 
     private final URI storage;
-    private final Set<URI> type = new HashSet<>();
+    private final Set<URI> types = new HashSet<>();
     private final Map<String, Set<String>> wacAllow = new HashMap<>();
     private final Set<String> allowedMethods = new HashSet<>();
     private final Set<String> allowedPatchSyntaxes = new HashSet<>();
@@ -57,9 +57,23 @@ public Optional<URI> 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<URI> getType() {
-        return type;
+        return getTypes();
+    }
+
+    /**
+     * The Solid Resource types.
+     *
+     * <p>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<URI> getTypes() {
+        return types;
     }
 
     /**
@@ -258,7 +272,7 @@ public Builder contentType(final String type) {
         public Metadata build() {
             final Metadata metadata = new Metadata(builderStorage, 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);

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://storage.example/")),
                     resource.getMetadata().getStorage());
             assertTrue(resource.getMetadata().getWacAllow().get("user")
@@ -114,6 +115,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), resource.getMetadata().getStorage());
         }
     }