chore(java): H3a final verification + minor cleanup (unused imports, stale test names)

- Remove dead `import com.metaobjects.loader.MetaDataLoader` from MetaField,
  MetaValidator, and MetaView; add explicit `import com.metaobjects.MetaRoot`
  where needed and replace FQCN uses with the short name.
- Rename stale `com.metaobjects.loader.simple` test classes to reflect reality:
  SimpleLoaderTestBase → MetaDataLoaderTestBase (com.metaobjects.loader),
  SimpleLoaderTest → MetaDataLoaderUriTest (com.metaobjects.loader),
  VehicleMetadataTest moved to com.metaobjects.loader.
- Update GeneratorTestBase (codegen-base) to import MetaDataLoaderTestBase.
- All 276 metadata tests pass; codegen-base retains exactly 8 pre-existing
  XSD schema failures (SchemaValidationTest, SimpleSchemaValidationTest,
  WorkingSchemaValidationTest) — zero new failures.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

Author: dmealing

java/codegen-base/src/test/java/com/metaobjects/generator/GeneratorTestBase.java

@@ -1,11 +1,11 @@
 package com.metaobjects.generator;
 
-import com.metaobjects.loader.simple.SimpleLoaderTestBase;
+import com.metaobjects.loader.MetaDataLoaderTestBase;
 
 /**
  * Base class for generator tests.
- * H3a Task 5: delegates to SimpleLoaderTestBase which now uses MetaDataLoader.
+ * H3a Task 6: updated to extend MetaDataLoaderTestBase (renamed from SimpleLoaderTestBase).
  */
-public class GeneratorTestBase extends SimpleLoaderTestBase {
+public class GeneratorTestBase extends MetaDataLoaderTestBase {
 
 }

java/metadata/src/main/java/com/metaobjects/field/MetaField.java

@@ -12,7 +12,6 @@
 import com.metaobjects.attr.StringAttribute;
 import com.metaobjects.constraint.PlacementConstraint;
 import com.metaobjects.constraint.RegexConstraint;
-import com.metaobjects.loader.MetaDataLoader;
 import com.metaobjects.util.DataConverter;
 import com.metaobjects.validator.MetaValidator;
 import com.metaobjects.validator.MetaValidatorNotFoundException;
@@ -190,7 +189,7 @@ public MetaField(String subtype, String name, DataTypes dataType) {
      * @return The declaring MetaClass
      */
     public MetaObject getDeclaringObject() {
-        if ( getParent() instanceof com.metaobjects.MetaRoot) return null;
+        if ( getParent() instanceof MetaRoot) return null;
         if ( getParent() instanceof MetaObject ) return (MetaObject) getParent();
         throw new InvalidMetaDataException(this, "MetaFields can only be attached to MetaObjects " +
                 "or the metadata root as abstracts");

java/metadata/src/main/java/com/metaobjects/validator/MetaValidator.java

@@ -9,11 +9,11 @@
 import com.metaobjects.InvalidMetaDataException;
 import com.metaobjects.MetaData;
 import com.metaobjects.MetaDataNotFoundException;
+import com.metaobjects.MetaRoot;
 import com.metaobjects.attr.BooleanAttribute;
 import com.metaobjects.attr.MetaAttribute;
 import com.metaobjects.attr.StringAttribute;
 import com.metaobjects.field.MetaField;
-import com.metaobjects.loader.MetaDataLoader;
 import com.metaobjects.util.MetaDataUtil;
 import com.metaobjects.object.MetaObject;
 import com.metaobjects.registry.MetaDataRegistry;
@@ -80,10 +80,10 @@ public MetaValidator(String subtype, String name) {
      * Gets the declaring meta field.<br>
      * NOTE: This may not be the MetaField from which the view
      * was retrieved, so be careful!
-     * @return the MetaField that declares this validator, or null if attached to MetaDataLoader
+     * @return the MetaField that declares this validator, or null if attached to the metadata root
      */
     public MetaField getDeclaringMetaField() {
-        if ( getParent() instanceof com.metaobjects.MetaRoot) return null;
+        if ( getParent() instanceof MetaRoot) return null;
         if ( getParent() instanceof MetaField ) return (MetaField) getParent();
         throw new InvalidMetaDataException(this, "MetaValidators can only be attached to MetaFields " +
                 "or the metadata root as abstracts");

java/metadata/src/main/java/com/metaobjects/view/MetaView.java

@@ -4,8 +4,8 @@
 import com.metaobjects.MetaData;
 import com.metaobjects.MetaDataException;
 import com.metaobjects.MetaDataNotFoundException;
+import com.metaobjects.MetaRoot;
 import com.metaobjects.field.MetaField;
-import com.metaobjects.loader.MetaDataLoader;
 import com.metaobjects.util.MetaDataUtil;
 import com.metaobjects.object.MetaObject;
 import com.metaobjects.registry.MetaDataRegistry;
@@ -73,7 +73,7 @@ public MetaView(String type, String subtype, String name) {
     //  return addChild(attr);
     //}
     public MetaField getDeclaringMetaField() {
-        if (getParent() instanceof com.metaobjects.MetaRoot) return null;
+        if (getParent() instanceof MetaRoot) return null;
         if (getParent() instanceof MetaField) return (MetaField) getParent();
         throw new InvalidMetaDataException(this, "MetaViews can only be attached to MetaFields " +
                 "or the metadata root as abstracts");

…/loader/simple/SimpleLoaderTestBase.java …jects/loader/MetaDataLoaderTestBase.javajava/metadata/src/test/java/com/metaobjects/loader/simple/SimpleLoaderTestBase.java renamed to java/metadata/src/test/java/com/metaobjects/loader/MetaDataLoaderTestBase.java java/metadata/src/test/java/com/metaobjects/loader/simple/SimpleLoaderTestBase.java renamed to java/metadata/src/test/java/com/metaobjects/loader/MetaDataLoaderTestBase.java

@@ -8,9 +8,8 @@
  * Contributors:
  *    Doug Mealing LLC - initial API and implementation and/or initial documentation
  */
-package com.metaobjects.loader.simple;
+package com.metaobjects.loader;
 
-import com.metaobjects.loader.MetaDataLoader;
 import com.metaobjects.registry.SharedRegistryTestBase;
 import java.net.URI;
 import java.util.List;
@@ -19,12 +18,13 @@
  * Base class for loader tests that uses the shared registry approach
  * to prevent registry conflicts between tests.
  *
- * <p>H3a Task 5: SimpleLoader has been removed; this class now delegates to
- * {@link MetaDataLoader} via {@link SharedRegistryTestBase#createTestLoader}.</p>
+ * <p>H3a Task 6: renamed from {@code SimpleLoaderTestBase} (package
+ * {@code com.metaobjects.loader.simple}) to reflect that the class now
+ * delegates to {@link MetaDataLoader}, not the removed {@code SimpleLoader}.</p>
  *
  * @author dmealing
  */
-public class SimpleLoaderTestBase extends SharedRegistryTestBase {
+public class MetaDataLoaderTestBase extends SharedRegistryTestBase {
 
     /**
      * Initialize a loader with specific sources while using the shared registry.

…ects/loader/simple/SimpleLoaderTest.java …bjects/loader/MetaDataLoaderUriTest.javajava/metadata/src/test/java/com/metaobjects/loader/simple/SimpleLoaderTest.java renamed to java/metadata/src/test/java/com/metaobjects/loader/MetaDataLoaderUriTest.java java/metadata/src/test/java/com/metaobjects/loader/simple/SimpleLoaderTest.java renamed to java/metadata/src/test/java/com/metaobjects/loader/MetaDataLoaderUriTest.java

@@ -1,6 +1,5 @@
-package com.metaobjects.loader.simple;
+package com.metaobjects.loader;
 
-import com.metaobjects.loader.MetaDataLoader;
 import com.metaobjects.loader.uri.URIHelper;
 import org.junit.Test;
 
@@ -10,9 +9,13 @@
 import static org.junit.Assert.assertNotNull;
 
 /**
- * Loader tests — H3a Task 5: retargeted from SimpleLoader to MetaDataLoader.
+ * Loader URI-based tests — exercises {@link MetaDataLoader} with classpath resource URIs.
+ *
+ * <p>H3a Task 6: renamed from {@code SimpleLoaderTest} (package
+ * {@code com.metaobjects.loader.simple}) to reflect that the class now
+ * exercises {@link MetaDataLoader}, not the removed {@code SimpleLoader}.</p>
  */
-public class SimpleLoaderTest extends SimpleLoaderTestBase {
+public class MetaDataLoaderUriTest extends MetaDataLoaderTestBase {
 
     @Test
     public void testLoadSimpleTypes() throws URISyntaxException {

…s/loader/simple/VehicleMetadataTest.java …aobjects/loader/VehicleMetadataTest.javajava/metadata/src/test/java/com/metaobjects/loader/simple/VehicleMetadataTest.java renamed to java/metadata/src/test/java/com/metaobjects/loader/VehicleMetadataTest.java java/metadata/src/test/java/com/metaobjects/loader/simple/VehicleMetadataTest.java renamed to java/metadata/src/test/java/com/metaobjects/loader/VehicleMetadataTest.java

@@ -1,6 +1,5 @@
-package com.metaobjects.loader.simple;
+package com.metaobjects.loader;
 
-import com.metaobjects.loader.MetaDataLoader;
 import com.metaobjects.loader.uri.URIHelper;
 import org.junit.Test;
 import org.slf4j.Logger;
@@ -13,134 +12,137 @@
 /**
  * Basic test suite for vehicle metadata parsing with new inline attribute support
  * and array-only format. Focus on verifying the parsing works correctly.
+ *
+ * <p>H3a Task 6: moved from package {@code com.metaobjects.loader.simple} to
+ * {@code com.metaobjects.loader}; base class updated to {@link MetaDataLoaderTestBase}.</p>
  */
-public class VehicleMetadataTest extends SimpleLoaderTestBase {
-    
+public class VehicleMetadataTest extends MetaDataLoaderTestBase {
+
     private static final Logger log = LoggerFactory.getLogger(VehicleMetadataTest.class);
-    
-    @Test  
+
+    @Test
     public void testBasicCommonMetadataLoading() throws Exception {
         log.debug("Testing basic common metadata loading");
-        
+
         // Simple test to verify the parser works at all
         MetaDataLoader loader = initLoader(Arrays.asList(
             URIHelper.toURI("model:resource:com/metaobjects/loader/simple/acme-common-metadata.json")
         ));
-        
+
         assertNotNull("Loader should be created", loader);
         assertTrue("Should load some children", loader.getChildren().size() > 0);
-        
-        log.debug("✅ Basic common metadata loading successful - {} children loaded", loader.getChildren().size());
+
+        log.debug("Basic common metadata loading successful - {} children loaded", loader.getChildren().size());
     }
-    
-    @Test  
+
+    @Test
     public void testBasicVehicleMetadataLoading() throws Exception {
         log.debug("Testing basic vehicle metadata loading");
-        
+
         // Load common first, then vehicle
         MetaDataLoader loader = initLoader(Arrays.asList(
             URIHelper.toURI("model:resource:com/metaobjects/loader/simple/acme-common-metadata.json"),
             URIHelper.toURI("model:resource:com/metaobjects/loader/simple/acme-vehicle-metadata.json")
         ));
-        
+
         assertNotNull("Loader should be created", loader);
         assertTrue("Should load some children", loader.getChildren().size() > 0);
-        
-        log.debug("✅ Basic vehicle metadata loading successful - {} children loaded", loader.getChildren().size());
+
+        log.debug("Basic vehicle metadata loading successful - {} children loaded", loader.getChildren().size());
     }
-    
-    @Test  
+
+    @Test
     public void testCompleteMetadataLoading() throws Exception {
         log.debug("Testing complete metadata loading with overlay");
-        
+
         // Load all three files
         MetaDataLoader loader = initLoader(Arrays.asList(
             URIHelper.toURI("model:resource:com/metaobjects/loader/simple/acme-common-metadata.json"),
             URIHelper.toURI("model:resource:com/metaobjects/loader/simple/acme-vehicle-metadata.json"),
             URIHelper.toURI("model:resource:com/metaobjects/loader/simple/acme-vehicle-overlay-metadata.json")
         ));
-        
+
         assertNotNull("Loader should be created", loader);
         assertTrue("Should load some children", loader.getChildren().size() > 0);
-        
+
         // Try to find some basic objects by name to verify structure
         try {
             assertNotNull("Should find garage object", loader.getMetaObjectByName("acme::garage::Garage"));
-            log.debug("✅ Found Garage object");
+            log.debug("Found Garage object");
         } catch (Exception e) {
             log.warn("Could not find Garage object: {}", e.getMessage());
         }
-        
+
         try {
             assertNotNull("Should find vehicle object", loader.getMetaObjectByName("acme::vehicle::Vehicle"));
-            log.debug("✅ Found Vehicle object");
+            log.debug("Found Vehicle object");
         } catch (Exception e) {
             log.warn("Could not find Vehicle object: {}", e.getMessage());
         }
-        
+
         try {
             assertNotNull("Should find car object", loader.getMetaObjectByName("acme::vehicle::car::Car"));
-            log.debug("✅ Found Car object");
+            log.debug("Found Car object");
         } catch (Exception e) {
             log.warn("Could not find Car object: {}", e.getMessage());
         }
-        
+
         try {
             assertNotNull("Should find porsche object", loader.getMetaObjectByName("acme::vehicle::car::luxury::Porsche"));
-            log.debug("✅ Found Porsche object");
+            log.debug("Found Porsche object");
         } catch (Exception e) {
             log.warn("Could not find Porsche object: {}", e.getMessage());
         }
-        
-        log.debug("✅ Complete metadata loading successful - {} total children loaded", loader.getChildren().size());
+
+        log.debug("Complete metadata loading successful - {} total children loaded", loader.getChildren().size());
     }
-    
+
     @Test
     public void testArrayOnlyFormat() throws Exception {
         log.debug("Testing array-only format (no 'children' key required)");
-        
+
         // The metadata files use [...] directly instead of "children": [...]
         // If they load successfully, the array-only format is working
         MetaDataLoader loader = initLoader(Arrays.asList(
             URIHelper.toURI("model:resource:com/metaobjects/loader/simple/acme-common-metadata.json")
         ));
-        
+
         assertNotNull("Array-only format should parse successfully", loader);
         assertTrue("Should load children using array-only format", loader.getChildren().size() > 0);
-        
-        log.debug("✅ Array-only format test successful");
+
+        log.debug("Array-only format test successful");
     }
-    
+
     @Test
     public void testInlineAttributeFormat() throws Exception {
         log.debug("Testing inline attribute format (@attribute: 'value')");
-        
+
         // The metadata files use @attribute: "value" inline format
         // Need to load common metadata first for cross-file references to work
         MetaDataLoader loader = initLoader(Arrays.asList(
             URIHelper.toURI("model:resource:com/metaobjects/loader/simple/acme-common-metadata.json"),
             URIHelper.toURI("model:resource:com/metaobjects/loader/simple/acme-vehicle-metadata.json")
         ));
-        
+
         assertNotNull("Inline attribute format should parse successfully", loader);
         assertTrue("Should load children with inline attributes", loader.getChildren().size() > 0);
-        
-        log.debug("✅ Inline attribute format test successful");
+
+        log.debug("Inline attribute format test successful");
     }
-    
-    @Test  
+
+    @Test
     public void testMinimalCrossFileReference() throws Exception {
         log.debug("Testing minimal cross-file reference");
-        
+
         // Load common first, then concrete
         MetaDataLoader loader = initLoader(Arrays.asList(
             URIHelper.toURI("model:resource:com/metaobjects/loader/simple/test-common.json"),
             URIHelper.toURI("model:resource:com/metaobjects/loader/simple/test-concrete.json")
         ));
-        
+
         assertNotNull("Loader should be created", loader);
         assertTrue("Should load some children", loader.getChildren().size() > 0);
-        
-        log.debug("✅ Minimal cross-file reference successful - {} children loaded", loader.getChildren().size());
+
+        log.debug("Minimal cross-file reference successful - {} children loaded", loader.getChildren().size());
     }
-}
+}