Code reformatting. Added a type method to IConstraint implementations…

… to provide a human-readable name for the constraint to improve error messages.

core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnDocumentUri.java

@@ -17,7 +17,6 @@
 import gov.nist.secauto.metaschema.core.metapath.item.node.INodeItem;
 import gov.nist.secauto.metaschema.core.util.ObjectUtils;
 
-import java.net.URI;
 import java.util.List;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
@@ -106,7 +105,6 @@ private static ISequence<IAnyUriItem> executeOneArg(@NonNull IFunction function,
    */
   @Nullable
   public static IAnyUriItem fnDocumentUri(@NonNull IDocumentNodeItem document) {
-    URI documentUri = document.getDocumentUri();
-    return documentUri == null ? null : IAnyUriItem.valueOf(documentUri);
+    return IAnyUriItem.valueOf(document.getDocumentUri());
   }
 }

core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/IDocumentNodeItem.java

@@ -6,6 +6,8 @@
 import gov.nist.secauto.metaschema.core.metapath.type.IItemType;
 import gov.nist.secauto.metaschema.core.metapath.type.IKindTest;
 
+import java.net.URI;
+
 import edu.umd.cs.findbugs.annotations.NonNull;
 
 /**
@@ -44,6 +46,10 @@ default IDocumentNodeItem getNodeItem() {
     return this;
   }
 
+  @Override
+  @NonNull
+  URI getDocumentUri();
+
   /**
    * Get the node item for the document root element.
    *

core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/IFieldNodeItem.java

@@ -64,7 +64,7 @@ default URI getBaseUri() {
 
   @Override
   default @NonNull
-      String format(@NonNull IPathFormatter formatter) {
+  String format(@NonNull IPathFormatter formatter) {
     return formatter.formatField(this);
   }
 

core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/IFlagNodeItem.java

@@ -100,7 +100,7 @@ default IFlagNodeItem getFlagByName(@NonNull IEnhancedQName name) {
   @SuppressWarnings("null")
   @Override
   default @NonNull
-      Stream<? extends IFlagNodeItem> flags() {
+  Stream<? extends IFlagNodeItem> flags() {
     // a flag does not have flags
     return Stream.empty();
   }
@@ -112,7 +112,7 @@ Stream<? extends IFlagNodeItem> flags() {
   @SuppressWarnings("null")
   @Override
   default @NonNull
-      Collection<? extends List<? extends IModelNodeItem<?, ?>>> getModelItems() {
+  Collection<? extends List<? extends IModelNodeItem<?, ?>>> getModelItems() {
     // a flag does not have model items
     return Collections.emptyList();
   }
@@ -141,7 +141,7 @@ Stream<? extends IFlagNodeItem> flags() {
 
   @Override
   default @NonNull
-      String format(@NonNull IPathFormatter formatter) {
+  String format(@NonNull IPathFormatter formatter) {
     return formatter.formatFlag(this);
   }
 

core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/DefaultConstraintValidator.java

@@ -386,7 +386,7 @@ private static String toErrorMessage(
       @NonNull Throwable ex) {
     StringBuilder builder = new StringBuilder(128);
     builder.append("A ")
-        .append(constraint.getClass().getName())
+        .append(constraint.getType().getName())
         .append(" constraint");
 
     String id = constraint.getId();
@@ -402,7 +402,7 @@ private static String toErrorMessage(
 
     builder.append(", matching the item at path '")
         .append(item.getMetapath())
-        .append("', resulted in an unexpected error. The error was: ")
+        .append("', resulted in an unexpected error. ")
         .append(ex.getLocalizedMessage());
     return ObjectUtils.notNull(builder.toString());
   }

core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/IAllowedValuesConstraint.java

@@ -47,6 +47,11 @@ enum Extensible {
     NONE;
   }
 
+  @Override
+  default Type getType() {
+    return Type.ALLOWED_VALUES;
+  }
+
   /**
    * Get the collection allowed values associated with this constraint.
    *

core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/ICardinalityConstraint.java

@@ -17,6 +17,11 @@
  * elements with a minimum and/or maximum occurrence.
  */
 public interface ICardinalityConstraint extends IConfigurableMessageConstraint {
+  @Override
+  default Type getType() {
+    return Type.CARDINALITY;
+  }
+
   /**
    * Retrieve the required minimum occurrence of the target instance. If
    * specified, this value must be less than or equal to the value of

core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/IConstraint.java

@@ -23,6 +23,31 @@
  * flag. Provides a common interface for all constraint definitions.
  */
 public interface IConstraint extends IAttributable, IDescribable {
+  /**
+   * The type of constraint.
+   */
+  enum Type {
+    ALLOWED_VALUES("allowed-values"),
+    CARDINALITY("cardinality"),
+    EXPECT("expect"),
+    INDEX("index"),
+    UNIQUE("unique"),
+    INDEX_HAS_KEY("index-has-key"),
+    MATCHES("matches");
+
+    @NonNull
+    private final String name;
+
+    Type(@NonNull String name) {
+      this.name = name;
+    }
+
+    @NonNull
+    public String getName() {
+      return name;
+    }
+  }
+
   /**
    * The degree to which a constraint violation is significant.
    * <p>
@@ -91,6 +116,14 @@ static String getConstraintIdentity(@NonNull IConstraint constraint) {
     return ObjectUtils.notNull(identity);
   }
 
+  /**
+   * Get the constraint type.
+   *
+   * @return the constraint type
+   */
+  @NonNull
+  Type getType();
+
   /**
    * Retrieve the unique identifier for the constraint.
    *

core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/IExpectConstraint.java

@@ -17,6 +17,11 @@
  * A custom message can be used to indicate what a test failure signifies.
  */
 public interface IExpectConstraint extends IConfigurableMessageConstraint {
+  @Override
+  default Type getType() {
+    return Type.EXPECT;
+  }
+
   /**
    * Get the test to use to validate selected nodes.
    *

core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/IIndexConstraint.java

@@ -18,6 +18,11 @@
  * data objects using the {@link IIndexHasKeyConstraint}.
  */
 public interface IIndexConstraint extends IKeyConstraint {
+  @Override
+  default Type getType() {
+    return Type.INDEX;
+  }
+
   /**
    * Get the name of the index, which is used to refer to the index by an
    * {@link IIndexHasKeyConstraint}.

core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/IIndexHasKeyConstraint.java

@@ -16,6 +16,11 @@
  * {@link IIndexConstraint}.
  */
 public interface IIndexHasKeyConstraint extends IKeyConstraint {
+  @Override
+  default Type getType() {
+    return Type.INDEX_HAS_KEY;
+  }
+
   /**
    * The name of the index used to verify cross references.
    *

core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/IMatchesConstraint.java

@@ -19,6 +19,11 @@
  * and/or conform to an identified data type.
  */
 public interface IMatchesConstraint extends IConfigurableMessageConstraint {
+  @Override
+  default Type getType() {
+    return Type.MATCHES;
+  }
+
   /**
    * Get the expected pattern.
    *

core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/IUniqueConstraint.java

@@ -18,6 +18,10 @@
  * generated, but this constraint type does not persist a named index.
  */
 public interface IUniqueConstraint extends IKeyConstraint {
+  @Override
+  default Type getType() {
+    return Type.UNIQUE;
+  }
 
   @Override
   default <T, R> R accept(IConstraintVisitor<T, R> visitor, T state) {

core/src/main/java/gov/nist/secauto/metaschema/core/util/UriUtils.java

@@ -72,10 +72,11 @@ public static URI toUri(@NonNull String location, @NonNull URI baseUri) throws U
    * @throws URISyntaxException
    *           if any of the URIs are malformed
    */
+  @NonNull
   public static URI relativize(URI base, URI other, boolean prepend) throws URISyntaxException {
     URI normBase = Objects.requireNonNull(base).normalize();
     URI normOther = Objects.requireNonNull(other).normalize();
-    URI retval = normBase.relativize(normOther);
+    URI retval = ObjectUtils.notNull(normBase.relativize(normOther));
 
     if (prepend && !normBase.isOpaque() && !retval.isOpaque() && hasSameSchemeAndAuthority(normBase, retval)) {
       // the URIs are not opaque and they share the same scheme and authority
@@ -85,7 +86,6 @@ public static URI relativize(URI base, URI other, boolean prepend) throws URISyn
 
       retval = new URI(null, null, newPath, normOther.getQuery(), normOther.getFragment());
     }
-
     return retval;
   }