Adds more test coverage

Signed-off-by: Patrick Reinhart <patrick@reini.net>

Author: reinhapa

src/main/java/org/xmldb/api/base/ResourceType.java

@@ -53,8 +53,22 @@ private ResourceType(String name) {
     this.name = name;
   }
 
+  /**
+   * Returns the old style resource type name from XML:DB API version 1.0 constant.
+   * 
+   * @return the classic type name
+   */
+  public String typeName() {
+    return name;
+  }
+
+  /**
+   * Returns the old style resource type name from XML:DB API version 1.0 constant.
+   * 
+   * @return the classic type name
+   */
   @Override
   public String toString() {
-    return name;
+    return typeName();
   }
 }

src/main/java/org/xmldb/api/security/AclEntry.java

@@ -45,6 +45,7 @@
 
 import java.util.Collections;
 import java.util.EnumSet;
+import java.util.Objects;
 import java.util.Set;
 
 /**
@@ -89,11 +90,10 @@ public static final class Builder {
 
     private Builder(AclEntryType type, UserPrincipal principal, Set<AclEntryPermission> permissions,
         Set<AclEntryFlag> flags) {
-      assert permissions != null && flags != null;
       this.type = type;
       this.principal = principal;
-      this.permissions = permissions;
-      this.flags = flags;
+      this.permissions = Objects.requireNonNull(permissions);
+      this.flags = Objects.requireNonNull(flags);
     }
 
     /**
@@ -119,9 +119,7 @@ public AclEntry build() {
      * @return this builder
      */
     public Builder setType(AclEntryType type) {
-      if (type == null)
-        throw new NullPointerException();
-      this.type = type;
+      this.type = Objects.requireNonNull(type);
       return this;
     }
 
@@ -132,18 +130,14 @@ public Builder setType(AclEntryType type) {
      * @return this builder
      */
     public Builder setPrincipal(UserPrincipal principal) {
-      if (principal == null)
-        throw new NullPointerException();
-      this.principal = principal;
+      this.principal = Objects.requireNonNull(principal);
       return this;
     }
 
     // check set only contains elements of the given type
     private static void checkSet(Set<?> set, Class<?> type) {
       for (Object e : set) {
-        if (e == null) {
-          throw new NullPointerException();
-        } else if (!type.isInstance(e)) {
+        if (!type.isInstance(e)) {
           throw new IllegalArgumentException(
               e.getClass().getName() + " is not an instance of " + type.getName());
         }
@@ -210,7 +204,6 @@ public Builder setFlags(Set<AclEntryFlag> flags) {
         flags = EnumSet.copyOf(flags);
         checkSet(flags, AclEntryFlag.class);
       }
-
       this.flags = flags;
       return this;
     }
@@ -332,6 +325,6 @@ public int hashCode() {
    */
   @Override
   public String toString() {
-    return format("%s(%s)", super.toString(), principal);
+    return format("%s(%s)", getClass().getName(), principal);
   }
 }

src/main/java/org/xmldb/api/security/AclEntryFlag.java

@@ -45,4 +45,28 @@
  * @since 2.0
  */
 public enum AclEntryFlag {
+  /**
+   * Can be placed on a collection and indicates that the ACL entry should be added to each new
+   * resource created.
+   */
+  RESOURCE_INHERIT,
+
+  /**
+   * Can be placed on a collection and indicates that the ACL entry should be added to each new
+   * collection created.
+   */
+  COLLECTION_INHERIT,
+
+  /**
+   * Can be placed on a collection to indicate that the ACL entry should not be placed on the newly
+   * created collection which is inheritable by sub collections of the created collection.
+   */
+  NO_PROPAGATE_INHERIT,
+
+  /**
+   * Can be placed on a collection but does not apply to the collection, only to newly created
+   * resources/collections as specified by the {@link #RESOURCE_INHERIT} and
+   * {@link #COLLECTION_INHERIT} flags.
+   */
+  INHERIT_ONLY;
 }

src/main/java/org/xmldb/api/security/AclEntryPermission.java

@@ -39,6 +39,22 @@
  */
 package org.xmldb.api.security;
 
+/**
+ * A typesafe enumeration of the access entry permission types.
+ *
+ * @since 2.0
+ */
 public enum AclEntryPermission {
-  READ, WRITE, EXECUTE;
+  /**
+   * Permission to read the data of the collection / resource.
+   */
+  READ,
+  /**
+   * Permission to modify the collection / resource data.
+   */
+  WRITE,
+  /**
+   * Permission to list a execute a resource.
+   */
+  EXECUTE;
 }

src/test/java/org/xmldb/api/base/ResourceTypeTest.java

@@ -53,7 +53,9 @@ void testValidValues() {
 
   @Test
   void testToString() {
+    assertThat(BINARY_RESOURCE.typeName()).isEqualTo("BinaryResource");
     assertThat(BINARY_RESOURCE).hasToString("BinaryResource");
+    assertThat(XML_RESOURCE.typeName()).isEqualTo("XMLResource");
     assertThat(XML_RESOURCE).hasToString("XMLResource");
   }
 }

src/test/java/org/xmldb/api/security/AclEntryFlagTest.java

@@ -0,0 +1,56 @@
+/*
+ * The XML:DB Initiative Software License, Version 1.0
+ *
+ * Copyright (c) 2000-2022 The XML:DB Initiative. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are permitted
+ * provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice, this list of conditions
+ * and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice, this list of
+ * conditions and the following disclaimer in the documentation and/or other materials provided with
+ * the distribution.
+ *
+ * 3. The end-user documentation included with the redistribution, if any, must include the
+ * following acknowledgment: "This product includes software developed by the XML:DB Initiative
+ * (http://www.xmldb.org/)." Alternately, this acknowledgment may appear in the software itself, if
+ * and wherever such third-party acknowledgments normally appear.
+ *
+ * 4. The name "XML:DB Initiative" must not be used to endorse or promote products derived from this
+ * software without prior written permission. For written permission, please contact info@xmldb.org.
+ *
+ * 5. Products derived from this software may not be called "XML:DB", nor may "XML:DB" appear in
+ * their name, without prior written permission of the XML:DB Initiative.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * =================================================================================================
+ * This software consists of voluntary contributions made by many individuals on behalf of the
+ * XML:DB Initiative. For more information on the XML:DB Initiative, please see
+ * <https://github.com/xmldb-org/>
+ */
+package org.xmldb.api.security;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.xmldb.api.security.AclEntryFlag.COLLECTION_INHERIT;
+import static org.xmldb.api.security.AclEntryFlag.INHERIT_ONLY;
+import static org.xmldb.api.security.AclEntryFlag.NO_PROPAGATE_INHERIT;
+import static org.xmldb.api.security.AclEntryFlag.RESOURCE_INHERIT;
+
+import org.junit.jupiter.api.Test;
+
+class AclEntryFlagTest {
+  @Test
+  void testValidValues() {
+    assertThat(AclEntryFlag.values()).containsExactly(RESOURCE_INHERIT, COLLECTION_INHERIT,
+        NO_PROPAGATE_INHERIT, INHERIT_ONLY);
+  }
+}

src/test/java/org/xmldb/api/security/AclEntryPermissionTest.java

@@ -0,0 +1,54 @@
+/*
+ * The XML:DB Initiative Software License, Version 1.0
+ *
+ * Copyright (c) 2000-2022 The XML:DB Initiative. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are permitted
+ * provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice, this list of conditions
+ * and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice, this list of
+ * conditions and the following disclaimer in the documentation and/or other materials provided with
+ * the distribution.
+ *
+ * 3. The end-user documentation included with the redistribution, if any, must include the
+ * following acknowledgment: "This product includes software developed by the XML:DB Initiative
+ * (http://www.xmldb.org/)." Alternately, this acknowledgment may appear in the software itself, if
+ * and wherever such third-party acknowledgments normally appear.
+ *
+ * 4. The name "XML:DB Initiative" must not be used to endorse or promote products derived from this
+ * software without prior written permission. For written permission, please contact info@xmldb.org.
+ *
+ * 5. Products derived from this software may not be called "XML:DB", nor may "XML:DB" appear in
+ * their name, without prior written permission of the XML:DB Initiative.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * =================================================================================================
+ * This software consists of voluntary contributions made by many individuals on behalf of the
+ * XML:DB Initiative. For more information on the XML:DB Initiative, please see
+ * <https://github.com/xmldb-org/>
+ */
+package org.xmldb.api.security;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.xmldb.api.security.AclEntryPermission.EXECUTE;
+import static org.xmldb.api.security.AclEntryPermission.READ;
+import static org.xmldb.api.security.AclEntryPermission.WRITE;
+
+import org.junit.jupiter.api.Test;
+
+class AclEntryPermissionTest {
+  @Test
+  void testValidValues() {
+    assertThat(AclEntryPermission.values()).containsExactly(READ, WRITE, EXECUTE);
+  }
+}