Updates

Author: kaspernielsen

modules/packed/src/main/java/app/packed/component/OverviewMirror.java

@@ -54,6 +54,11 @@ protected OverviewMirror(OverviewHandle<E> overviewHandle) {
         this.handle = (PackedOverviewHandle<E>) requireNonNull(overviewHandle);
     }
 
+    /** {@return the backing handle for this overview mirror} */
+    protected final OverviewHandle<E> handle() {
+        return handle;
+    }
+
     /**
      * {@return a stream of all operations within this overview's scope that were installed by extension {@code E}}
      * <p>

modules/packed/src/main/java/app/packed/container/ContainerMirror.java

@@ -3,12 +3,9 @@
 import static java.util.Objects.requireNonNull;
 
 import java.util.List;
-import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Stream;
 
-import org.jspecify.annotations.Nullable;
-
 import app.packed.application.ApplicationMirror;
 import app.packed.assembly.AssemblyMirror;
 import app.packed.bean.BeanMirror;
@@ -19,18 +16,12 @@
 import app.packed.component.ComponentRealm;
 import app.packed.extension.BaseExtension;
 import app.packed.extension.Extension;
-import app.packed.extension.ExtensionMirror;
 import app.packed.namespace.NamespaceMirror;
 import app.packed.operation.OperationMirror;
 import app.packed.util.TreeView;
 import internal.app.packed.bean.introspection.IntrospectorOnAutoService;
-import internal.app.packed.container.ContainerSetup;
-import internal.app.packed.extension.ExtensionClassModel;
-import internal.app.packed.extension.ExtensionSetup;
 import internal.app.packed.extension.base.BaseExtensionBeanIntrospector;
 import internal.app.packed.util.PackedTreeView;
-import internal.app.packed.util.types.ClassUtil;
-import internal.app.packed.util.types.TypeVariableExtractor;
 
 /**
  * A mirror of a container.
@@ -43,19 +34,6 @@
 @AutoServiceInheritable(introspector = ContainerMirrorBeanIntrospector.class)
 public non-sealed class ContainerMirror implements ComponentMirror, ContainerBuildLocal.Accessor {
 
-    /** Extract the (extension class) type variable from ExtensionMirror. */
-    private final static ClassValue<Class<? extends Extension<?>>> EXTENSION_TYPES = new ClassValue<>() {
-
-        /** A type variable extractor. */
-        private static final TypeVariableExtractor EXTRACTOR = TypeVariableExtractor.of(ExtensionMirror.class);
-
-        /** {@inheritDoc} */
-        @Override
-        protected Class<? extends Extension<?>> computeValue(Class<?> type) {
-            return ExtensionClassModel.extractE(EXTRACTOR, type);
-        }
-    };
-
     /** The container we are mirroring. */
     final ContainerHandle<?> handle;
 
@@ -132,21 +110,6 @@ public final Set<Class<? extends Extension<?>>> extensionTypes() {
         return handle.container.extensionTypes();
     }
 
-    /**
-     * <p>
-     * If you know for certain that extension is used in the container you can use {@link #use(Class)} instead.
-     *
-     * @param <T>
-     *            the type of mirror
-     * @param mirrorType
-     *            the mirror type
-     * @return a mirror of the specified type, or empty if the extension the mirror represents is not used in the container
-     */
-    public final <T extends ExtensionMirror<?>> Optional<T> findExtension(Class<T> mirrorType) {
-        ClassUtil.checkProperSubclass(ExtensionMirror.class, mirrorType, "mirrorType");
-        return Optional.ofNullable(newMirrorOrNull(handle.container, mirrorType));
-    }
-
     /** {@inheritDoc} */
     @Override
     public final int hashCode() {
@@ -208,32 +171,6 @@ public final List<WireletMirror> wirelets() {
         throw new UnsupportedOperationException();
     }
 
-    /**
-     * Creates a new mirror if an. Otherwise returns {@code null}
-     *
-     * @param container
-     *            the container to test for presence extension may be present
-     * @param mirrorClass
-     *            the type of mirror to return
-     * @return a mirror of the specified type or null if no extension of the matching type was used in the container
-     */
-    @Nullable
-    static <T extends ExtensionMirror<?>> T newMirrorOrNull(ContainerSetup container, Class<T> mirrorClass) {
-        // Extract <E> from ExtensionMirror<E extends Extension>
-        Class<? extends Extension<?>> extensionType = EXTENSION_TYPES.get(mirrorClass);
-
-        ExtensionMirror<?> mirror = null;
-
-        // See if the extension is in use.
-        ExtensionSetup extension = container.extensions.get(extensionType);
-        if (extension != null) {
-            // Call Extension#newExtensionMirror
-            mirror = extension.newExtensionMirror(mirrorClass);
-            requireNonNull(mirror);
-            // Should take an ExtensionHandle
-        }
-        return mirrorClass.cast(mirror);
-    }
 }
 
 final class ContainerMirrorBeanIntrospector extends BaseExtensionBeanIntrospector {

modules/packed/src/main/java/app/packed/extension/BaseExtension.java

@@ -287,12 +287,6 @@ private BeanInstaller newBeanBuilderSelf(BeanKind lifetime) {
         return PackedBeanInstaller.newInstaller(lifetime, extension, extension);
     }
 
-    /** {@return a mirror for this extension.} */
-    @Override
-    protected BaseExtensionMirror newExtensionMirror() {
-        return new BaseExtensionMirror(handle());
-    }
-
     /** {@inheritDoc} */
     @Override
     protected BaseExtensionPoint newExtensionPoint(ExtensionPointHandle usesite) {

modules/packed/src/main/java/app/packed/extension/BaseExtensionMirror.java

@@ -97,11 +97,6 @@ public PackedExtensionPointHandle get_ExtensionPoint_PackedExtensionPointHandle(
                 return extensionPoint.handle;
             }
 
-            @Override
-            public ExtensionMirror<?> invoke_Extension_NewExtensionMirror(Extension<?> extension) {
-                return extension.newExtensionMirror();
-            }
-
             @Override
             public ExtensionPoint<?> invoke_Extension_NewExtensionPoint(Extension<?> extension, ExtensionPointHandle usesite) {
                 return extension.newExtensionPoint(usesite);
@@ -276,20 +271,6 @@ protected final E lifetimeRoot() {
         return (E) s.instance();
     }
 
-    /**
-     * This method can be overridden to provide a customized {@link ExtensionMirror mirror} for the extension. For example,
-     * {@link BaseExtension} overrides this method to provide an instance of {@link BaseExtensionMirror}.
-     * <p>
-     * This method should never return null.
-     *
-     * @return a customized mirror for the extension
-     * @throws InternalExtensionException
-     *             if the extension defines an extension mirror but does not override this method.
-     */
-    protected ExtensionMirror<E> newExtensionMirror() {
-        throw new InternalExtensionException("This method must be overridden by " + extension.extensionType);
-    }
-
     /**
      * Returns a new extension point for the extension
      * <p>