(juneau) branch master updated: Clean up juneau-rest-server

[jamesbognar]

This is an automated email from the ASF dual-hosted git repository.

jamesbognar pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/juneau.git


The following commit(s) were added to refs/heads/master by this push:
     new 54dcf5572b Clean up juneau-rest-server
54dcf5572b is described below

commit 54dcf5572bd3ed4568305baba16db723e7df148a
Author: James Bognar <james.bog...@salesforce.com>
AuthorDate: Mon Jan 5 12:44:21 2026 -0500

    Clean up juneau-rest-server
---
 .../main/java/org/apache/juneau/cp/BasicBeanStore.java  | 17 +++++++----------
 .../test/java/org/apache/juneau/cp/BeanStore_Test.java  | 13 ++++++-------
 2 files changed, 13 insertions(+), 17 deletions(-)

diff --git 
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/BasicBeanStore.java
 
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/BasicBeanStore.java
index 1dae0428d4..5529c10799 100644
--- 
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/BasicBeanStore.java
+++ 
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/BasicBeanStore.java
@@ -276,6 +276,9 @@ public class BasicBeanStore {
                lock = threadSafe ? new SimpleReadWriteLock() : 
SimpleReadWriteLock.NO_OP;
                entries = threadSafe ? new ConcurrentLinkedDeque<>() : new 
LinkedList<>();
                unnamedEntries = threadSafe ? new ConcurrentHashMap<>() : map();
+               var e = createEntry(BasicBeanStore.class, ()->this, null);
+               entries.addFirst(e);
+               unnamedEntries.put(BasicBeanStore.class, e);
        }
 
        BasicBeanStore() {
@@ -468,16 +471,10 @@ public class BasicBeanStore {
                for (var i = 0; i < executable.getParameterCount(); i++) {
                        var pi = executable.getParameter(i);
                        var pt = pi.getParameterType();
-                       if (i == 0 && outer.isPresent() && 
pt.isInstance(outer.get())) {
-                               o[i] = outer.get();
-                       } else if (pt.is(BasicBeanStore.class)) {
-                               o[i] = this;
-                       } else {
-                               var beanQualifier = pi.getResolvedQualifier();
-                               var ptc = pt.unwrap(Optional.class).inner();
-                               var o2 = beanQualifier == null ? getBean(ptc) : 
getBean(ptc, beanQualifier);
-                               o[i] = pt.is(Optional.class) ? o2 : 
o2.orElse(null);
-                       }
+                       var beanQualifier = pi.getResolvedQualifier();
+                       var ptc = pt.unwrap(Optional.class).inner();
+                       var o2 = beanQualifier == null ? getBean(ptc) : 
getBean(ptc, beanQualifier);
+                       o[i] = pt.is(Optional.class) ? o2 : o2.orElse(null);
                }
                return o;
        }
diff --git 
a/juneau-utest/src/test/java/org/apache/juneau/cp/BeanStore_Test.java 
b/juneau-utest/src/test/java/org/apache/juneau/cp/BeanStore_Test.java
index c262868229..43d8089985 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/cp/BeanStore_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/cp/BeanStore_Test.java
@@ -30,7 +30,6 @@ import org.apache.juneau.*;
 import org.apache.juneau.annotation.*;
 import org.apache.juneau.annotation.Named;
 import org.apache.juneau.commons.reflect.*;
-import org.apache.juneau.commons.utils.*;
 import org.junit.jupiter.api.*;
 
 class BeanStore_Test extends TestBase {
@@ -269,9 +268,9 @@ class BeanStore_Test extends TestBase {
 
                var outer = new B1(null, null, null);
 
-               var b1p = BasicBeanStore.create().outer(outer).build();
+               var b1p = 
BasicBeanStore.create().outer(outer).build().addBean(B1.class, outer);
                var b1c = 
BasicBeanStore.create().outer(outer).parent(b1p).build();
-               var b2p = 
BasicBeanStore.create().outer(outer).threadSafe().build();
+               var b2p = 
BasicBeanStore.create().outer(outer).threadSafe().build().addBean(B1.class, 
outer);
                var b2c = 
BasicBeanStore.create().outer(outer).parent(b1p).threadSafe().build();
 
                var ci = ClassInfo.of(B1.class);
@@ -403,10 +402,10 @@ class BeanStore_Test extends TestBase {
                Predicate<Object> pA1a = x -> x==a1a;
                Predicate<Object> pA2a = x -> ((Optional<?>)x).get()==a2a;
 
-               var b1p = BasicBeanStore.create().outer(this).build();
-               var b1c = 
BasicBeanStore.create().outer(this).parent(b1p).build();
-               var b2p = 
BasicBeanStore.create().outer(this).threadSafe().build();
-               var b2c = 
BasicBeanStore.create().outer(this).parent(b1p).threadSafe().build();
+               var b1p = 
BasicBeanStore.create().build().addBean(BeanStore_Test.class, this);
+               var b1c = BasicBeanStore.create().parent(b1p).build();
+               var b2p = 
BasicBeanStore.create().threadSafe().build().addBean(BeanStore_Test.class, 
this);
+               var b2c = 
BasicBeanStore.create().parent(b1p).threadSafe().build();
 
                var ci = ClassInfo.of(B2.class);
                var c1 = ci.getPublicConstructor(x -> 
x.hasParameterTypes(BeanStore_Test.class, A1.class, Optional.class, 
BasicBeanStore.class)).get();