refactor: consolidate IMetaschemaData implementations into SimpleResourceLocation

- Change SimpleResourceLocation to implement IMetaschemaData instead of just
  IResourceLocation, enabling reuse for bound object metadata
- Remove duplicate private MetaschemaData inner classes from both
  MetaschemaJsonReader and MetaschemaXmlReader
- Update factory methods to return IMetaschemaData for consistency
- This avoids duplicate creation of location data during parsing

Author: david-waltermire

core/src/main/java/gov/nist/secauto/metaschema/core/model/SimpleResourceLocation.java

@@ -12,13 +12,16 @@
 import edu.umd.cs.findbugs.annotations.NonNull;
 
 /**
- * A simple implementation of {@link IResourceLocation} that stores location
+ * A simple implementation of {@link IMetaschemaData} that stores location
  * information from various parser sources.
+ * <p>
+ * This class can be used both for bound object metadata during parsing and for
+ * validation context in error messages.
  */
-public final class SimpleResourceLocation implements IResourceLocation {
+public final class SimpleResourceLocation implements IMetaschemaData {
   /** A constant representing an unknown location. */
   @NonNull
-  public static final IResourceLocation UNKNOWN = new SimpleResourceLocation(-1, -1, -1L, -1L);
+  public static final IMetaschemaData UNKNOWN = new SimpleResourceLocation(-1, -1, -1L, -1L);
 
   private final int line;
   private final int column;
@@ -52,7 +55,7 @@ public SimpleResourceLocation(int line, int column, long charOffset, long byteOf
    * @return a new resource location, or {@link #UNKNOWN} if the input is null
    */
   @NonNull
-  public static IResourceLocation fromXmlLocation(Location location) {
+  public static IMetaschemaData fromXmlLocation(Location location) {
     if (location == null) {
       return UNKNOWN;
     }
@@ -71,7 +74,7 @@ public static IResourceLocation fromXmlLocation(Location location) {
    * @return a new resource location, or {@link #UNKNOWN} if the input is null
    */
   @NonNull
-  public static IResourceLocation fromJsonLocation(JsonLocation location) {
+  public static IMetaschemaData fromJsonLocation(JsonLocation location) {
     if (location == null) {
       return UNKNOWN;
     }
@@ -92,7 +95,7 @@ public static IResourceLocation fromJsonLocation(JsonLocation location) {
    * @return a new resource location
    */
   @NonNull
-  public static IResourceLocation of(int line, int column) {
+  public static IMetaschemaData of(int line, int column) {
     return new SimpleResourceLocation(line, column, -1L, -1L);
   }
 

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

@@ -12,7 +12,6 @@
 import com.fasterxml.jackson.databind.node.ObjectNode;
 
 import gov.nist.secauto.metaschema.core.model.IBoundObject;
-import gov.nist.secauto.metaschema.core.model.IMetaschemaData;
 import gov.nist.secauto.metaschema.core.model.IResourceLocation;
 import gov.nist.secauto.metaschema.core.model.SimpleResourceLocation;
 import gov.nist.secauto.metaschema.core.model.util.JsonUtil;
@@ -496,7 +495,7 @@ private IBoundObject readComplexDefinitionObject(
     IBoundObject item = definition.newInstance(
         JsonLocation.NA.equals(location)
             ? null
-            : () -> new MetaschemaData(ObjectUtils.requireNonNull(location)));
+            : () -> SimpleResourceLocation.fromJsonLocation(ObjectUtils.requireNonNull(location)));
 
     try {
       // call pre-parse initialization hook
@@ -921,41 +920,6 @@ public ITEM readItem() throws IOException {
     }
   }
 
-  @SuppressWarnings("PMD.DataClass")
-  private static class MetaschemaData implements IMetaschemaData {
-    private final int line;
-    private final int column;
-    private final long charOffset;
-    private final long byteOffset;
-
-    public MetaschemaData(@NonNull JsonLocation location) {
-      this.line = location.getLineNr();
-      this.column = location.getColumnNr();
-      this.charOffset = location.getCharOffset();
-      this.byteOffset = location.getByteOffset();
-    }
-
-    @Override
-    public int getLine() {
-      return line;
-    }
-
-    @Override
-    public int getColumn() {
-      return column;
-    }
-
-    @Override
-    public long getCharOffset() {
-      return charOffset;
-    }
-
-    @Override
-    public long getByteOffset() {
-      return byteOffset;
-    }
-  }
-
   @FunctionalInterface
   private interface DefinitionBodyHandler<DEF extends IBoundDefinitionModelComplex> {
     void accept(

databind/src/main/java/gov/nist/secauto/metaschema/databind/io/xml/MetaschemaXmlReader.java

@@ -6,7 +6,6 @@
 package gov.nist.secauto.metaschema.databind.io.xml;
 
 import gov.nist.secauto.metaschema.core.model.IBoundObject;
-import gov.nist.secauto.metaschema.core.model.IMetaschemaData;
 import gov.nist.secauto.metaschema.core.model.IResourceLocation;
 import gov.nist.secauto.metaschema.core.model.SimpleResourceLocation;
 import gov.nist.secauto.metaschema.core.model.util.XmlEventUtil;
@@ -511,7 +510,8 @@ private <DEF extends IBoundDefinitionModelComplex> IBoundObject readDefinitionEl
         Location location = start.getLocation();
 
         // construct the item
-        IBoundObject item = definition.newInstance(location == null ? null : () -> new MetaschemaData(location));
+        IBoundObject item = definition.newInstance(
+            location == null ? null : () -> SimpleResourceLocation.fromXmlLocation(location));
 
         // call pre-parse initialization hook
         definition.callBeforeDeserialize(item, parent);
@@ -705,38 +705,6 @@ public IBoundObject readChoiceGroupItem(IBoundObject parent, IBoundInstanceModel
     }
   }
 
-  private static class MetaschemaData implements IMetaschemaData {
-    private final int line;
-    private final int column;
-    private final long charOffset;
-
-    public MetaschemaData(@NonNull Location location) {
-      this.line = location.getLineNumber();
-      this.column = location.getColumnNumber();
-      this.charOffset = location.getCharacterOffset();
-    }
-
-    @Override
-    public int getLine() {
-      return line;
-    }
-
-    @Override
-    public int getColumn() {
-      return column;
-    }
-
-    @Override
-    public long getCharOffset() {
-      return charOffset;
-    }
-
-    @Override
-    public long getByteOffset() {
-      return -1;
-    }
-  }
-
   @FunctionalInterface
   private interface DefinitionBodyHandler<DEF extends IBoundDefinitionModelComplex, ITEM> {
     void accept(