Incorporate PR suggestions

Author: atextor

core/sds-aspect-meta-model-java/src/main/java/io/openmanufacturing/sds/metamodel/loader/DefaultPropertyWrapper.java

@@ -114,12 +114,13 @@ public boolean equals( final Object o ) {
       return optional == that.optional &&
             notInPayload == that.notInPayload &&
             isAbstract == that.isAbstract &&
+            Objects.equals( extends_, that.extends_ ) &&
             Objects.equals( characteristic, that.characteristic ) &&
             Objects.equals( exampleValue, that.exampleValue );
    }
 
    @Override
    public int hashCode() {
-      return Objects.hash( super.hashCode(), exampleValue, optional, notInPayload, isAbstract );
+      return Objects.hash( super.hashCode(), exampleValue, optional, notInPayload, isAbstract, extends_ );
    }
 }

core/sds-aspect-meta-model-java/src/main/java/io/openmanufacturing/sds/metamodel/loader/MetaModelBaseAttributes.java

@@ -196,29 +196,6 @@ private static Optional<String> getName( final Resource modelElement, final BAMM
       return extendsStatement.flatMap( statement -> getName( statement.getObject().asResource(), bamm ) );
    }
 
-   /**
-    * Returns a model element's name: If it's a named resource, the name is part of its URN; otherwise
-    * (e.g., [ bamm:extends :foo ; ... ]) go up the inheritance tree recursively.
-    *
-    * @param modelElement the model element to retrieve the name for
-    * @param bamm the meta model vocabulary
-    * @return the element's local name
-    */
-   private static Optional<String> getNameFromInheritanceTree( final Resource modelElement, final BAMM bamm ) {
-      if ( !modelElement.isAnon() ) {
-         return Optional.of( AspectModelUrn.fromUrn( modelElement.getURI() ).getName() );
-      }
-
-      final Statement propertyStatement = modelElement.getProperty( bamm.property() );
-      if ( propertyStatement != null ) {
-         return getNameFromInheritanceTree( propertyStatement.getObject().asResource(), bamm );
-      }
-
-      final Optional<Statement> extendsStatement = Streams.stream(
-            modelElement.getModel().listStatements( modelElement, bamm._extends(), (RDFNode) null ) ).findAny();
-      return extendsStatement.flatMap( statement -> getNameFromInheritanceTree( statement.getObject().asResource(), bamm ) );
-   }
-
    private static String getSyntheticName( final Resource modelElement, final Model model, final BAMM bamm ) {
       Resource parentModelElement = model.listStatements( null, null, modelElement ).next().getSubject();
       while ( parentModelElement.isAnon() ) {

core/sds-aspect-model-java-generator/src/test-shared/java/io/openmanufacturing/sds/test/shared/compiler/JavaCompiler.java

@@ -85,16 +85,9 @@ public void report( final Diagnostic<? extends FileObject> diagnostic ) {
       };
 
       final List<String> compilerOptions = List.of( "-classpath", System.getProperty( "java.class.path" ) );
-      compiler.getTask( null, manager, diagnosticListener, compilerOptions, null, compilerInput ).
-
-            call();
-
-      return loadOrder.stream()
-                  .
-
-            collect( Collectors.toMap( Function.identity(), qualifiedName ->
-
-                  defineAndLoad( qualifiedName, manager ) ) );
+      compiler.getTask( null, manager, diagnosticListener, compilerOptions, null, compilerInput ).call();
+      return loadOrder.stream().collect( Collectors.toMap( Function.identity(), qualifiedName ->
+            defineAndLoad( qualifiedName, manager ) ) );
    }
 
    @SuppressWarnings( "unchecked" )