Cleaned up some PMD and compile warnings.

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

@@ -58,7 +58,7 @@ public void registerFunction(@NonNull IFunction function) {
     registerFunctionByName(function);
   }
 
-  protected void registerFunctionByQName(@NonNull IFunction function) {
+  private void registerFunctionByQName(@NonNull IFunction function) {
     QName qname = function.getQName();
     IFunction duplicate;
     synchronized (this) {
@@ -75,7 +75,7 @@ protected void registerFunctionByQName(@NonNull IFunction function) {
     }
   }
 
-  protected void registerFunctionByName(@NonNull IFunction function) {
+  private void registerFunctionByName(@NonNull IFunction function) {
     String name = function.getName();
     synchronized (this) {
       NamedFunctionSet functions = libraryByName.get(name);

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

@@ -59,6 +59,12 @@ public Level getHighestSeverity() {
     return highestLevel;
   }
 
+  /**
+   * Add a finding to the collection of findings maintained by this instance.
+   *
+   * @param finding
+   *          the finding to add
+   */
   protected void addFinding(@NonNull ConstraintValidationFinding finding) {
     findings.add(finding);
 

databind/src/main/java/gov/nist/secauto/metaschema/databind/io/json/MetaschemaJsonWriter.java

@@ -117,6 +117,7 @@ public void writeItemFieldValue(Object parentItem, IBoundFieldValue fieldValue)
         item = fieldValue.getDefaultValue();
       }
     } else if (item.equals(fieldValue.getResolvedDefaultValue())) {
+      // same as default
       item = null;
     }
 

databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/ModelUtil.java

@@ -100,9 +100,9 @@ public static <A extends Annotation> A getAnnotation(
   @Nullable
   public static String resolveNoneOrDefault(@Nullable String value, @Nullable String defaultValue) {
     String retval;
-    if (value == null || ModelUtil.DEFAULT_STRING_VALUE.equals(value)) {
+    if (value == null || DEFAULT_STRING_VALUE.equals(value)) {
       retval = defaultValue;
-    } else if (ModelUtil.NO_STRING_VALUE.equals(value)) {
+    } else if (NO_STRING_VALUE.equals(value)) {
       retval = null; // NOPMD - intentional
     } else {
       retval = value;
@@ -136,10 +136,10 @@ public static String resolveNamespace(String annotationValue) {
    */
   private static String resolveNamespace(String value, boolean allowNone) {
     String retval;
-    if (value == null || ModelUtil.DEFAULT_STRING_VALUE.equals(value)) {
+    if (value == null || DEFAULT_STRING_VALUE.equals(value)) {
       // get namespace from the metaschema
       retval = null;
-    } else if (allowNone && ModelUtil.NO_STRING_VALUE.equals(value)) {
+    } else if (allowNone && NO_STRING_VALUE.equals(value)) {
       retval = ""; // NOPMD - intentional
     } else {
       retval = value;
@@ -157,7 +157,7 @@ private static String resolveNamespace(String value, boolean allowNone) {
    */
   @Nullable
   public static String resolveNoneOrValue(@NonNull String value) {
-    return ModelUtil.NO_STRING_VALUE.equals(value) ? null : value;
+    return NO_STRING_VALUE.equals(value) ? null : value;
   }
 
   /**
@@ -202,7 +202,7 @@ public static IDataTypeAdapter<?> getDataTypeAdapter(
   @Nullable
   public static Object resolveDefaultValue(@NonNull String defaultValue, IDataTypeAdapter<?> adapter) {
     Object retval = null;
-    if (!ModelUtil.NULL_VALUE.equals(defaultValue)) {
+    if (!NULL_VALUE.equals(defaultValue)) {
       retval = adapter.parse(defaultValue);
     }
     return retval;
@@ -215,14 +215,14 @@ public static Integer resolveNullOrInteger(int value) {
   public static Object resolveNullOrValue(
       @NonNull String defaultValue,
       @NonNull IDataTypeAdapter<?> javaTypeAdapter) {
-    return ModelUtil.NULL_VALUE.equals(defaultValue)
+    return NULL_VALUE.equals(defaultValue)
         ? null
         : javaTypeAdapter.parse(defaultValue);
   }
 
   @NonNull
   public static IGroupAs groupAs(@NonNull GroupAs groupAs) {
-    return ModelUtil.NULL_VALUE.equals(groupAs.name())
+    return NULL_VALUE.equals(groupAs.name())
         ? IGroupAs.SINGLETON_GROUP_AS
         : new DefaultGroupAs(groupAs);
   }

databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/DefinitionAssembly.java

@@ -84,17 +84,13 @@ public DefinitionAssembly(
 
     String rootLocalName = ModelUtil.resolveNoneOrDefault(getAnnotation().rootName(), null);
     this.xmlRootQName = ObjectUtils.notNull(Lazy.lazy(() -> {
-      QName retval;
-      if (rootLocalName == null) {
-        retval = null;
-      } else {
+      QName retval = null;
+      if (rootLocalName != null) {
         String namespace = ModelUtil.resolveOptionalNamespace(getAnnotation().rootNamespace());
         if (namespace == null) {
           namespace = getContainingModule().getXmlNamespace().toASCIIString();
         }
-        retval = new QName(
-            namespace,
-            rootLocalName);
+        retval = new QName(namespace, rootLocalName);
       }
       return retval;
     }));

databind/src/test/java/gov/nist/secauto/metaschema/databind/codegen/GenerationTest.java

@@ -26,6 +26,7 @@
 
 package gov.nist.secauto.metaschema.databind.codegen;
 
+import static org.junit.jupiter.api.Assertions.assertAll;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 import gov.nist.secauto.metaschema.core.model.MetaschemaException;
@@ -50,7 +51,8 @@ void testOscalBindingModuleLoader() throws MetaschemaException, IOException {
     IBindingModule module = loader.load(ObjectUtils.notNull(URI.create(
         "https://raw.githubusercontent.com/usnistgov/OSCAL/main/src/metaschema/oscal_complete_metaschema.xml")));
     IBindingContext context = IBindingContext.instance().registerModule(module, Paths.get("target/oscal-classes"));
-
-    assertNotNull(module);
+    assertAll(
+        () -> assertNotNull(module),
+        () -> assertNotNull(context));
   }
 }