Adapts to changes in microbean-bean 0.0.17 (#5)

Signed-off-by: Laird Nelson <[email protected]>

Author: ljnelson

pom.xml

@@ -125,7 +125,7 @@
       <dependency>
         <groupId>org.junit</groupId>
         <artifactId>junit-bom</artifactId>
-        <version>5.11.4</version>
+        <version>5.12.2</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
@@ -134,7 +134,7 @@
       <dependency>
         <groupId>org.jboss.weld</groupId>
         <artifactId>weld-core-bom</artifactId>
-        <version>6.0.0.Final</version>
+        <version>6.0.2.Final</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
@@ -150,7 +150,7 @@
       <dependency>
         <groupId>org.microbean</groupId>
         <artifactId>microbean-bean</artifactId>
-        <version>0.0.16</version>
+        <version>0.0.17</version>
       </dependency>
 
       <dependency>
@@ -184,6 +184,12 @@
 
     <!-- Test-scoped dependencies. -->
 
+    <dependency>
+      <groupId>org.jboss.weld.se</groupId>
+      <artifactId>weld-se-core</artifactId>
+      <scope>test</scope>
+    </dependency>
+
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-api</artifactId>
@@ -213,7 +219,7 @@
           <artifactId>maven-checkstyle-plugin</artifactId>
           <version>3.6.0</version>
           <configuration>
-                        <checkstyleRules>
+            <checkstyleRules>
               <module name="Checker">
                 <module name="BeforeExecutionExclusionFileFilter">
                   <property name="fileNamePattern" value="module\-info\.java$" />
@@ -438,14 +444,7 @@
         </plugin>
         <plugin>
           <artifactId>maven-surefire-plugin</artifactId>
-          <version>3.5.2</version>
-          <dependencies>
-            <dependency>
-              <groupId>org.apache.maven.surefire</groupId>
-              <artifactId>surefire-junit-platform</artifactId>
-              <version>3.5.2</version>
-            </dependency>
-          </dependencies>
+          <version>3.5.3</version>
         </plugin>
         <plugin>
           <artifactId>maven-toolchains-plugin</artifactId>
@@ -454,7 +453,7 @@
         <plugin>
           <groupId>com.github.spotbugs</groupId>
           <artifactId>spotbugs-maven-plugin</artifactId>
-          <version>4.9.2.0</version>
+          <version>4.9.3.0</version>
         </plugin>
         <plugin>
           <groupId>org.codehaus.mojo</groupId>
@@ -464,7 +463,7 @@
         <plugin>
           <groupId>io.smallrye</groupId>
           <artifactId>jandex-maven-plugin</artifactId>
-          <version>3.2.7</version>
+          <version>3.3.0</version>
         </plugin>
         <plugin>
           <groupId>org.sonatype.plugins</groupId>

src/main/java/org/microbean/reference/AbstractClientProxier.java

@@ -29,8 +29,8 @@
 import javax.lang.model.element.TypeElement;
 
 import org.microbean.bean.BeanTypeList;
+import org.microbean.bean.Creation;
 import org.microbean.bean.Id;
-import org.microbean.bean.Request;
 
 import org.microbean.construct.Domain;
 
@@ -148,7 +148,7 @@ protected ClassLoader classLoader(final TypeElement e) {
    *
    * @param <R> the type of the contextual reference
    *
-   * @param r the {@link Request} necessitating this invocation; must not be {@code null}
+   * @param id an {@link Id} qualifying the contextual instance that will be proxied; must not be {@code null}
    *
    * @param instanceSupplier a {@link Supplier} of contextual instances of type {@code R}; must not be {@code null}
    *
@@ -157,7 +157,7 @@ protected ClassLoader classLoader(final TypeElement e) {
    * @exception NullPointerException if any argument is {@code null}, or if the {@link #instantiate(ProxySpecification,
    * Supplier)} method, invoked as part of the implementation of this method, returns {@code null}
    *
-   * @exception IllegalArgumentException if the supplied {@link Request} is not proxiable for any reason
+   * @exception IllegalArgumentException if the supplied {@link Id} is not proxiable for any reason
    *
    * @exception ReferenceException if the {@link #instantiate(ProxySpecification, Supplier)} method throws a checked
    * {@link Exception}
@@ -169,12 +169,7 @@ protected ClassLoader classLoader(final TypeElement e) {
   // By the time we get here, proxying is absolutely called for. (If we can't return an R, something went wrong, it's
   // not that the inputs were unsuitable.)
   @Override // ClientProxier
-  public final <R> R clientProxy(final Request<R> r, final Supplier<? extends R> instanceSupplier) {
-    return this.clientProxy(r.beanReduction().bean().id(), instanceSupplier);
-  }
-
-  // Called only by #clientProxy(Request, Supplier).
-  private final <R> R clientProxy(final Id id, final Supplier<? extends R> instanceSupplier) {
+  public final <R> R clientProxy(final Id id, final Supplier<? extends R> instanceSupplier) {
     return this.clientProxy(id.types(), id.attributes(), instanceSupplier);
   }
 
@@ -314,7 +309,7 @@ protected T generate(final ProxySpecification ps) throws Throwable {
   }
 
   /**
-   * Called indirectly by the {@link #clientProxy(Request, Supplier)} method when a new {@link ClientProxy
+   * Called indirectly by the {@link #clientProxy(Id, Supplier)} method when a new {@link ClientProxy
    * ClientProxy&lt;R&gt;} instance needs to be created, creates a new instance of a {@link ClientProxy
    * ClientProxy&lt;R&gt;} that proxies contextual instances supplied by the supplied {@code instanceSupplier}, and
    * returns it.

src/main/java/org/microbean/reference/ClientProxier.java

@@ -15,14 +15,14 @@
 
 import java.util.function.Supplier;
 
-import org.microbean.bean.Request;
+import org.microbean.bean.Id;
 
 /**
- * A supplier of {@link ClientProxy} instances.
+ * A source of {@link ClientProxy} instances.
  *
  * @author <a href="https://about.me/lairdnelson" target="_top">Laird Nelson</a>
  *
- * @see #clientProxy(Request, Supplier)
+ * @see #clientProxy(Id, Supplier)
  */
 @FunctionalInterface
 public interface ClientProxier {
@@ -35,7 +35,7 @@ public interface ClientProxier {
    *
    * @param <R> the type of the contextual reference
    *
-   * @param r the {@link Request} necessitating this invocation; must not be {@code null}
+   * @param id an {@link Id} qualifying the contextual instance that will be proxied; must not be {@code null}
    *
    * @param instanceSupplier a {@link Supplier} of contextual instances of the appropriate type; must not be {@code null}
    *
@@ -45,6 +45,6 @@ public interface ClientProxier {
    *
    * @see ClientProxy
    */
-  public <R> R clientProxy(final Request<R> r, final Supplier<? extends R> instanceSupplier);
+  public <R> R clientProxy(final Id id, final Supplier<? extends R> instanceSupplier);
 
 }

src/main/java/org/microbean/reference/ClientProxier.java.bak

@@ -0,0 +1,48 @@
+/* -*- mode: Java; c-basic-offset: 2; indent-tabs-mode: nil; coding: utf-8-unix -*-
+ *
+ * Copyright © 2023–2025 microBean™.
+ *
+ * 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 org.microbean.reference;
+
+import java.util.function.Supplier;
+
+/**
+ * A supplier of {@link ClientProxy} instances.
+ *
+ * @author <a href="https://about.me/lairdnelson" target="_top">Laird Nelson</a>
+ *
+ * @see #clientProxy(Request, Supplier)
+ */
+@FunctionalInterface
+public interface ClientProxier {
+
+  /**
+   * Returns a <dfn>contextual reference</dfn> which is also a {@link ClientProxy}, given a
+   * {@link Supplier} of <dfn>contextual instances</dfn> of the appropriate type.
+   *
+   * <p>Implementations of this method may return {@code null}.</p>
+   *
+   * @param <R> the type of the contextual reference
+   *
+   * @param r the {@link Request} necessitating this invocation; must not be {@code null}
+   *
+   * @param instanceSupplier a {@link Supplier} of contextual instances of the appropriate type; must not be {@code null}
+   *
+   * @return a contextual reference, which may be {@code null}
+   *
+   * @exception NullPointerException if any argument is {@code null}
+   *
+   * @see ClientProxy
+   */
+  public <R> R clientProxy(final Request<R> r, final Supplier<? extends R> instanceSupplier);
+
+}

src/main/java/org/microbean/reference/DefaultRequest.java renamed to src/main/java/org/microbean/reference/DefaultRequest.java.bak

@@ -196,7 +196,7 @@ public <J> DefaultRequest<J> child(final BeanReduction<J> beanReduction) {
     return child;
   }
 
-  @Override // AutoCloseableRegistry, Instances (AutoCloseable), Request (AutoCloseable)
+  @Override // AutoCloseableRegistry
   public void close() {
     this.acr.close();
     this.instances.close();