chore: uptake mereology across the project (#50)

Author: deer

codemodel-foundation/src/main/java/build/codemodel/foundation/descriptor/AbstractTraitable.java

@@ -29,6 +29,8 @@
 import build.base.marshalling.Unmarshal;
 import build.codemodel.foundation.CodeModel;
 
+import java.util.Collection;
+import java.util.Collections;
 import java.util.Iterator;
 import java.util.Objects;
 import java.util.Optional;
@@ -120,9 +122,18 @@ protected void destructor(final Marshaller marshaller,
 
     @Override
     public <T> Iterator<T> iterator(final Class<T> type) {
-        return hasTraits()
+        final var traitIterator = hasTraits()
             ? getDelegate().iterator(type)
-            : Iterators.empty();
+            : Iterators.<T>empty();
+        final var otherIterator = otherParts().stream()
+            .filter(type::isInstance)
+            .map(type::cast)
+            .iterator();
+        return Iterators.concat(type, traitIterator, otherIterator);
+    }
+
+    public Collection<?> otherParts() {
+        return Collections.emptySet();
     }
 
     @Override

codemodel-foundation/src/main/java/build/codemodel/foundation/descriptor/CallableDescriptor.java

@@ -20,9 +20,8 @@
  * #L%
  */
 
-import build.base.foundation.stream.Streams;
+import build.base.mereology.Composite;
 import build.codemodel.foundation.CodeModel;
-import build.codemodel.foundation.Dependent;
 import build.codemodel.foundation.naming.CallableName;
 import build.codemodel.foundation.usage.TypeUsage;
 
@@ -39,7 +38,7 @@
  * @since Jan-2024
  */
 public interface CallableDescriptor
-    extends Trait, Dependent, Traitable {
+    extends Trait, Composite, Traitable {
 
     /**
      * Obtains the {@link TypeDescriptor} in which the {@link CallableDescriptor} is defined.
@@ -108,14 +107,4 @@ default Stream<TypeUsage> throwables() {
             : Stream.empty();
     }
 
-    @Override
-    default Stream<TypeUsage> dependencies() {
-        return Streams.concat(
-            Stream.of(returnType()),
-            formalParameters()
-                .map(FormalParameterDescriptor::type),
-            throwables(),
-            traits(Dependent.class)
-                .flatMap(Dependent::dependencies));
-    }
 }

codemodel-foundation/src/main/java/build/codemodel/foundation/descriptor/ThrowableDescriptor.java

@@ -28,10 +28,11 @@
 import build.base.marshalling.Out;
 import build.base.marshalling.Unmarshal;
 import build.codemodel.foundation.CodeModel;
-import build.codemodel.foundation.Dependent;
 import build.codemodel.foundation.usage.TypeUsage;
 
 import java.lang.invoke.MethodHandles;
+import java.util.Collection;
+import java.util.List;
 import java.util.Objects;
 import java.util.stream.Stream;
 
@@ -45,7 +46,7 @@
  */
 public class ThrowableDescriptor
     extends AbstractTraitable
-    implements Trait, Dependent {
+    implements Trait {
 
     /**
      * The <i>Throwable</i> {@link TypeUsage}.
@@ -108,8 +109,8 @@ public TypeUsage throwable() {
     }
 
     @Override
-    public Stream<TypeUsage> dependencies() {
-        return Stream.of(throwable());
+    public Collection<?> otherParts() {
+        return List.of(throwable());
     }
 
     @Override

codemodel-foundation/src/main/java/build/codemodel/foundation/descriptor/TypeDescriptor.java

@@ -20,12 +20,10 @@
  * #L%
  */
 
-import build.codemodel.foundation.Dependent;
+import build.base.mereology.Composite;
 import build.codemodel.foundation.naming.TypeName;
 import build.codemodel.foundation.usage.TypeUsage;
 
-import java.util.stream.Stream;
-
 /**
  * Provides type information concerning the <i>definition</i> of a type.
  *
@@ -35,19 +33,12 @@
  * @since Jan-2024
  */
 public interface TypeDescriptor
-    extends Dependent, Traitable {
+    extends Composite, Traitable {
 
     /**
      * The {@link TypeName} for the <i>Type</i>.
      *
      * @return the {@link TypeName}
      */
     TypeName typeName();
-
-    @Override
-    default Stream<TypeUsage> dependencies() {
-        return traits(Dependent.class)
-            .flatMap(Dependent::dependencies)
-            .distinct();
-    }
 }

codemodel-foundation/src/main/java/build/codemodel/foundation/usage/AnnotationTypeUsage.java

@@ -30,7 +30,6 @@
 import build.base.marshalling.Out;
 import build.base.marshalling.Unmarshal;
 import build.codemodel.foundation.CodeModel;
-import build.codemodel.foundation.Dependent;
 import build.codemodel.foundation.descriptor.Trait;
 import build.codemodel.foundation.descriptor.Traitable;
 import build.codemodel.foundation.naming.TypeName;
@@ -49,7 +48,7 @@
  */
 public class AnnotationTypeUsage
     extends AbstractNamedTypeUsage
-    implements Trait, Dependent, Comparable<AnnotationTypeUsage> {
+    implements Trait, Comparable<AnnotationTypeUsage> {
 
     /**
      * The {@link AnnotationValue}s.
@@ -124,12 +123,6 @@ public Stream<AnnotationValue> values() {
         return this.values.stream();
     }
 
-    @Override
-    public Stream<TypeUsage> dependencies() {
-        return traits(Dependent.class)
-            .flatMap(Dependent::dependencies);
-    }
-
     @Override
     public boolean equals(final Object object) {
         if (this == object) {

codemodel-foundation/src/main/java/build/codemodel/foundation/usage/ArrayTypeUsage.java

@@ -21,7 +21,6 @@
  */
 
 import build.base.foundation.Lazy;
-import build.base.foundation.stream.Streams;
 import build.base.marshalling.Bound;
 import build.base.marshalling.Marshal;
 import build.base.marshalling.Marshalled;
@@ -30,11 +29,12 @@
 import build.base.marshalling.Out;
 import build.base.marshalling.Unmarshal;
 import build.codemodel.foundation.CodeModel;
-import build.codemodel.foundation.Dependent;
 import build.codemodel.foundation.descriptor.Trait;
 import build.codemodel.foundation.descriptor.Traitable;
 
 import java.lang.invoke.MethodHandles;
+import java.util.Collection;
+import java.util.List;
 import java.util.Objects;
 import java.util.stream.Stream;
 
@@ -110,11 +110,8 @@ public TypeUsage type() {
     }
 
     @Override
-    public Stream<TypeUsage> dependencies() {
-        return Streams.concat(
-            Stream.of(type()),
-            traits(Dependent.class)
-                .flatMap(Dependent::dependencies));
+    public Collection<?> otherParts() {
+        return List.of(type());
     }
 
     @Override

codemodel-foundation/src/main/java/build/codemodel/foundation/usage/GenericTypeUsage.java

@@ -30,13 +30,13 @@
 import build.base.marshalling.Out;
 import build.base.marshalling.Unmarshal;
 import build.codemodel.foundation.CodeModel;
-import build.codemodel.foundation.Dependent;
 import build.codemodel.foundation.descriptor.Trait;
 import build.codemodel.foundation.descriptor.Traitable;
 import build.codemodel.foundation.naming.TypeName;
 
 import java.lang.invoke.MethodHandles;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.stream.Collectors;
@@ -207,11 +207,8 @@ public static GenericTypeUsage of(final CodeModel codeModel,
     }
 
     @Override
-    public Stream<TypeUsage> dependencies() {
-        return Streams.concat(
-            parameters(),
-            traits(Dependent.class)
-                .flatMap(Dependent::dependencies));
+    public Collection<?> otherParts() {
+        return parameters().collect(Collectors.toList());
     }
 
     static {

codemodel-foundation/src/main/java/build/codemodel/foundation/usage/IntersectionTypeUsage.java

@@ -30,13 +30,13 @@
 import build.base.marshalling.Out;
 import build.base.marshalling.Unmarshal;
 import build.codemodel.foundation.CodeModel;
-import build.codemodel.foundation.Dependent;
 import build.codemodel.foundation.descriptor.Trait;
 import build.codemodel.foundation.descriptor.Traitable;
 import build.codemodel.foundation.descriptor.TypeDescriptor;
 
 import java.lang.invoke.MethodHandles;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -119,11 +119,8 @@ public Stream<TypeUsage> types() {
     }
 
     @Override
-    public Stream<TypeUsage> dependencies() {
-        return Streams.concat(
-            types(),
-            traits(Dependent.class)
-                .flatMap(Dependent::dependencies));
+    public Collection<?> otherParts() {
+        return types().collect(Collectors.toList());
     }
 
     @Override

codemodel-foundation/src/main/java/build/codemodel/foundation/usage/SpecificTypeUsage.java

@@ -28,7 +28,6 @@
 import build.base.marshalling.Out;
 import build.base.marshalling.Unmarshal;
 import build.codemodel.foundation.CodeModel;
-import build.codemodel.foundation.Dependent;
 import build.codemodel.foundation.descriptor.Trait;
 import build.codemodel.foundation.naming.TypeName;
 
@@ -97,13 +96,6 @@ public boolean equals(final Object object) {
             && super.equals(other);
     }
 
-    @Override
-    public Stream<TypeUsage> dependencies() {
-        // the direct dependencies are those of the annotations
-        return traits(Dependent.class)
-            .flatMap(Dependent::dependencies);
-    }
-
     /**
      * Creates a {@link SpecificTypeUsage}.
      *

codemodel-foundation/src/main/java/build/codemodel/foundation/usage/TypeUsage.java

@@ -20,12 +20,11 @@
  * #L%
  */
 
+import build.base.mereology.Composite;
 import build.codemodel.foundation.CodeModel;
-import build.codemodel.foundation.Dependent;
 import build.codemodel.foundation.descriptor.Traitable;
 import build.codemodel.foundation.descriptor.TypeDescriptor;
 
-import java.util.LinkedHashSet;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.stream.Collector;
@@ -39,7 +38,7 @@
  * @since Jan-2024
  */
 public interface TypeUsage
-    extends Dependent, Traitable {
+    extends Composite, Traitable {
 
     /**
      * Attempts to obtain an {@link Optional} representation of or the first part of the {@link TypeUsage} assignable
@@ -60,26 +59,11 @@ default <T> Optional<T> as(final Class<T> requiredClass) {
      * of the {@link TypeUsage}s on which this {@link TypeUsage} directly and indirectly depends.
      *
      * @param visitor the {@link TypeUsageVisitor}
-     * @see #dependencies()
      */
     default void visit(final TypeUsageVisitor visitor) {
         if (Objects.nonNull(visitor)) {
-            final var pending = new LinkedHashSet<TypeUsage>();
-            final var visited = new LinkedHashSet<TypeUsage>();
-            pending.add(this);
-
-            while (!pending.isEmpty()) {
-                final var next = pending.removeFirst();
-
-                if (!visited.contains(next)) {
-                    visitor.visit(next);
-                    visited.add(next);
-
-                    next.dependencies()
-                        .filter(typeUsage -> !visited.contains(typeUsage) && !pending.contains(typeUsage))
-                        .forEach(pending::add);
-                }
-            }
+            visitor.visit(this);
+            composition(TypeUsage.class).forEach(visitor::visit);
         }
     }
 
@@ -97,7 +81,8 @@ default <A, R> R collect(final Collector<? super TypeUsage, A, R> collector) {
         Objects.requireNonNull(collector, "The Collector must not be null");
 
         final var accumulator = collector.supplier().get();
-        visit(typeUsage -> collector.accumulator().accept(accumulator, typeUsage));
+        collector.accumulator().accept(accumulator, this);
+        composition(TypeUsage.class).forEach(u -> collector.accumulator().accept(accumulator, u));
         return collector.finisher().apply(accumulator);
     }
 }