ewr

Author: kaspernielsen

modules/packed/src/main/java/app/packed/bean/BeanAttachmentConfiguration.java

@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2008 Kasper Nielsen.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package app.packed.bean;
+
+import app.packed.operation.OperationConfiguration;
+import app.packed.operation.OperationHandle;
+
+/**
+ *
+ */
+public class BeanAttachmentConfiguration<T> extends OperationConfiguration {
+
+    /**
+     * @param handle
+     */
+    public BeanAttachmentConfiguration(OperationHandle<?> handle) {
+        super(handle);
+    }
+
+}

modules/packed/src/main/java/app/packed/bean/BeanAttachmentMirror.java

@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) 2008 Kasper Nielsen.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package app.packed.bean;
+
+/**
+ *
+ */
+public class BeanAttachmentMirror {
+
+}

modules/packed/src/main/java/app/packed/component/guest/FromAttachment.java renamed to modules/packed/src/main/java/app/packed/bean/FromBeanAttachment.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package app.packed.component.guest;
+package app.packed.bean;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -32,4 +32,4 @@
 @Target({ ElementType.FIELD, ElementType.PARAMETER, ElementType.TYPE_USE })
 @Retention(RetentionPolicy.RUNTIME)
 @OnAnnotatedVariable(extension = BaseExtension.class)
-public @interface FromAttachment {}
+public @interface FromBeanAttachment {}

modules/packed/src/main/java/app/packed/bean/scanning/BeanIntrospector.java

@@ -29,6 +29,7 @@
 import java.util.function.Consumer;
 import java.util.function.Supplier;
 
+import app.packed.bean.BeanAttachmentConfiguration;
 import app.packed.bean.BeanBuildLocal.Accessor;
 import app.packed.bean.BeanHandle;
 import app.packed.bean.BeanInstallationException;
@@ -79,6 +80,14 @@ BeanSetup bean() {
         return requireNonNull(introspector().scanner.bean);
     }
 
+    public final <T> BeanAttachmentConfiguration<T> attachToBean(Op<T> op) {
+        throw new UnsupportedOperationException();
+    }
+
+    public final <T> BeanAttachmentConfiguration<T> attachToBeanIfAbsent(Op<T> op) {
+        throw new UnsupportedOperationException();
+    }
+
     /** {@return an annotation reader for the bean class.} */
     public final AnnotationList beanAnnotations() {
         return new PackedAnnotationList(beanClass().getAnnotations());

modules/packed/src/main/java/internal/app/packed/lifecycle/lifetime/ContainerLifetimeSetup.java

@@ -22,17 +22,15 @@
 import java.util.List;
 import java.util.Set;
 
-import app.packed.bean.BeanKind;
-import app.packed.bean.BeanSourceKind;
 import app.packed.extension.ExtensionContext;
 import app.packed.lifetime.ContainerLifetimeMirror;
 import app.packed.util.Nullable;
 import internal.app.packed.bean.BeanSetup;
 import internal.app.packed.container.ContainerSetup;
 import internal.app.packed.container.PackedContainerInstaller;
 import internal.app.packed.lifecycle.BeanLifecycleOperationHandle;
-import internal.app.packed.lifecycle.BeanLifecycleOperationHandle.LifecycleOperationInitializeHandle;
 import internal.app.packed.lifecycle.BeanLifecycleOperationHandle.LifecycleOnStartHandle;
+import internal.app.packed.lifecycle.BeanLifecycleOperationHandle.LifecycleOperationInitializeHandle;
 import internal.app.packed.lifecycle.BeanLifecycleOperationHandle.LifecycleOperationStopHandle;
 import internal.app.packed.lifecycle.lifetime.entrypoint.EntryPointManager;
 import internal.app.packed.lifecycle.lifetime.runtime.PackedExtensionContext;
@@ -67,7 +65,6 @@ public final class ContainerLifetimeSetup extends AbstractTreeNode<ContainerLife
 
     public final List<LifecycleOperationInitializeHandle> initializationPre = new ArrayList<>();
 
-
     // Er ikke noedvendigvis fra et entrypoint, kan ogsaa vaere en completer
     public final Class<?> resultType;
 
@@ -82,6 +79,8 @@ public final class ContainerLifetimeSetup extends AbstractTreeNode<ContainerLife
 
     public final List<LifecycleOperationStopHandle> stoppersPre = new ArrayList<>();
 
+    private final LifetimeStoreSetup store = new LifetimeStoreSetup();
+
     /**
      * @param origin
      * @param parent
@@ -93,16 +92,13 @@ public ContainerLifetimeSetup(PackedContainerInstaller<?> installer, ContainerSe
         this.resultType = installer.template.resultType();
 
         if (newContainer.isApplicationRoot()) {
-            reserve(ManagedLifetime.class);
+            store.addOther(ManagedLifetime.class);
         }
     }
 
     public int addBean(BeanSetup bean) {
         beans.add(bean);
-        if (bean.beanKind == BeanKind.CONTAINER && bean.beanSourceKind != BeanSourceKind.INSTANCE) {
-            return reserve(bean.beanClass);
-        }
-        return -1;
+        return store.addBean(bean);
     }
 
     public void initialize(ExtensionContext pool) {
@@ -130,7 +126,7 @@ public ContainerLifetimeMirror mirror() {
     }
 
     public ExtensionContext newRuntimePool() {
-        return PackedExtensionContext.create(size);
+        return store.newRuntimePool();
     }
 
     public void orderDependencies() {
@@ -176,15 +172,6 @@ private void orderDependenciesBeans0(BeanSetup bean) {
         return treeParent;
     }
 
-    /**
-     * Reserves room for a single object.
-     *
-     * @return the index to store the object in at runtime
-     */
-    private int reserve(Class<?> cls) {
-        return size++;
-    }
-
     /** {@inheritDoc} */
     @Override
     public Class<?> resultType() {

modules/packed/src/main/java/internal/app/packed/lifecycle/lifetime/LifetimeStoreSetup.java

@@ -29,15 +29,20 @@
  */
 public final class LifetimeStoreSetup {
 
-    final ArrayList<BeanSetup> entries = new ArrayList<>();
+    final ArrayList<Object> entries = new ArrayList<>();
 
     public int addBean(BeanSetup bean) {
         if (bean.beanKind == BeanKind.CONTAINER && bean.beanSourceKind != BeanSourceKind.INSTANCE) {
             entries.add(bean);
+            return entries.size()-1;
         }
         return -1;
     }
 
+    public void addOther(Class<?> other) {
+        entries.add(other);
+    }
+
     public ExtensionContext newRuntimePool() {
         return PackedExtensionContext.create(entries.size());
     }