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 bfefd3fb3d Clean up juneau-rest-server
bfefd3fb3d is described below
commit bfefd3fb3d331bab36c741754f8a47c800cfa83e
Author: James Bognar <[email protected]>
AuthorDate: Mon Jan 5 14:49:08 2026 -0500
Clean up juneau-rest-server
---
.../juneau/commons/reflect/TypeVariables.java | 2 --
.../apache/juneau/commons/reflect/Visibility.java | 1 -
.../org/apache/juneau/commons/utils/Utils.java | 1 -
.../java/org/apache/juneau/cp/BasicBeanStore.java | 31 +++-------------------
.../apache/juneau/cp/BeanCreateMethodFinder.java | 16 ++++++++++-
.../java/org/apache/juneau/cp/BeanCreator.java | 20 +++++++++++---
.../juneau/rest/springboot/SpringBeanStore.java | 4 +--
.../java/org/apache/juneau/rest/RestContext.java | 7 +++--
.../java/org/apache/juneau/rest/RestOpContext.java | 31 +++++++++++-----------
.../java/org/apache/juneau/rest/RestSession.java | 2 +-
.../juneau/rest/httppart/RequestContent.java | 1 -
.../java/org/apache/juneau/cp/BeanStore_Test.java | 10 +++----
12 files changed, 60 insertions(+), 66 deletions(-)
diff --git
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/reflect/TypeVariables.java
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/reflect/TypeVariables.java
index 4711f4e97b..9c761c2326 100644
---
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/reflect/TypeVariables.java
+++
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/reflect/TypeVariables.java
@@ -19,8 +19,6 @@ package org.apache.juneau.commons.reflect;
import java.lang.reflect.*;
import java.util.*;
-import org.apache.juneau.commons.utils.*;
-
/**
* Encapsulates type variable implementations for a class hierarchy.
*
diff --git
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/reflect/Visibility.java
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/reflect/Visibility.java
index 0027a3ecde..61047d5a20 100644
---
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/reflect/Visibility.java
+++
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/reflect/Visibility.java
@@ -19,7 +19,6 @@ package org.apache.juneau.commons.reflect;
import static org.apache.juneau.commons.utils.AssertionUtils.*;
import static org.apache.juneau.commons.utils.ClassUtils.*;
-import java.beans.beancontext.*;
import java.lang.reflect.*;
/**
diff --git
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/utils/Utils.java
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/utils/Utils.java
index 28d3bed782..1fa5a3df69 100644
---
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/utils/Utils.java
+++
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/utils/Utils.java
@@ -21,7 +21,6 @@ import static org.apache.juneau.commons.utils.StringUtils.*;
import static org.apache.juneau.commons.utils.ThrowableUtils.*;
import java.lang.reflect.*;
import java.nio.charset.*;
-import java.text.*;
import java.util.*;
import java.util.concurrent.atomic.*;
import java.util.function.*;
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 82631798e7..2b5149eb1f 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
@@ -89,7 +89,6 @@ public class BasicBeanStore {
BasicBeanStore parent;
boolean readOnly, threadSafe;
- Object outer;
Class<? extends BasicBeanStore> type;
BasicBeanStore impl;
@@ -144,19 +143,6 @@ public class BasicBeanStore {
return this;
}
- /**
- * Specifies the outer bean context.
- *
- * <p>
- * The outer context bean to use when calling constructors on
inner classes.
- *
- * @param value The outer bean context. Can be <jk>null</jk>.
- * @return This object.
- */
- public Builder outer(Object value) {
- outer = value;
- return this;
- }
/**
* Specifies the parent bean store.
@@ -244,22 +230,10 @@ public class BasicBeanStore {
return create().parent(parent).build();
}
- /**
- * Static creator.
- *
- * @param parent Parent bean store. Can be <jk>null</jk> if this is
the root resource.
- * @param outer The outer bean used when instantiating inner classes.
Can be <jk>null</jk>.
- * @return A new {@link BasicBeanStore} object.
- */
- public static BasicBeanStore of(BasicBeanStore parent, Object outer) {
- return create().parent(parent).outer(outer).build();
- }
-
private final Deque<Entry<?>> entries;
private final Map<Class<?>,Entry<?>> unnamedEntries;
final Optional<BasicBeanStore> parent;
- final Optional<Object> outer;
final boolean readOnly, threadSafe;
final SimpleReadWriteLock lock;
@@ -270,7 +244,6 @@ public class BasicBeanStore {
*/
protected BasicBeanStore(Builder builder) {
parent = opt(builder.parent);
- outer = opt(builder.outer);
readOnly = builder.readOnly;
threadSafe = builder.threadSafe;
lock = threadSafe ? new SimpleReadWriteLock() :
SimpleReadWriteLock.NO_OP;
@@ -438,6 +411,7 @@ public class BasicBeanStore {
* Given an executable, returns a list of types that are missing from
this factory.
*
* @param executable The constructor or method to get the params for.
+ * @param outer The outer object to use when instantiating inner
classes. Can be <jk>null</jk>.
* @return A comma-delimited list of types that are missing from this
factory, or <jk>null</jk> if none are missing.
*/
public String getMissingParams(ExecutableInfo executable, Object outer)
{
@@ -464,6 +438,7 @@ public class BasicBeanStore {
* Returns the corresponding beans in this factory for the specified
param types.
*
* @param executable The constructor or method to get the params for.
+ * @param outer The outer object to use when instantiating inner
classes. Can be <jk>null</jk>.
* @return The corresponding beans in this factory for the specified
param types.
*/
public Object[] getParams(ExecutableInfo executable, Object outer) {
@@ -487,6 +462,7 @@ public class BasicBeanStore {
* Given the list of param types, returns <jk>true</jk> if this factory
has all the parameters for the specified executable.
*
* @param executable The constructor or method to get the params for.
+ * @param outer The outer object to use when instantiating inner
classes. Can be <jk>null</jk>.
* @return A comma-delimited list of types that are missing from this
factory.
*/
public boolean hasAllParams(ExecutableInfo executable, Object outer) {
@@ -531,7 +507,6 @@ public class BasicBeanStore {
return filteredBeanPropertyMap()
.a("entries",
entries.stream().map(Entry::properties).collect(toList()))
.a("identity", id(this))
- .a("outer", id(outer.orElse(null)))
.a("parent",
parent.map(BasicBeanStore::properties).orElse(null))
.ai(readOnly, "readOnly", readOnly)
.ai(threadSafe, "threadSafe", threadSafe);
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/BeanCreateMethodFinder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/BeanCreateMethodFinder.java
index 9d39147e01..8450297ab3 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/BeanCreateMethodFinder.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/BeanCreateMethodFinder.java
@@ -89,6 +89,13 @@ public class BeanCreateMethodFinder<T> {
private MethodInfo method;
private Object[] args;
+ /**
+ * Constructor.
+ *
+ * @param beanType The bean type to find creation methods for.
+ * @param resourceClass The resource class to search for creation
methods.
+ * @param beanStore The bean store to use for parameter resolution.
+ */
public BeanCreateMethodFinder(Class<T> beanType, Class<?>
resourceClass, BasicBeanStore beanStore) {
this.beanType = assertArgNotNull("beanType", beanType);
this.resource = null;
@@ -96,11 +103,18 @@ public class BeanCreateMethodFinder<T> {
this.beanStore = BasicBeanStore.of(beanStore);
}
+ /**
+ * Constructor.
+ *
+ * @param beanType The bean type to find creation methods for.
+ * @param resource The resource object to search for creation methods.
+ * @param beanStore The bean store to use for parameter resolution.
+ */
public BeanCreateMethodFinder(Class<T> beanType, Object resource,
BasicBeanStore beanStore) {
this.beanType = assertArgNotNull("beanType", beanType);
this.resource = assertArgNotNull("resource", resource);
this.resourceClass = resource.getClass();
- this.beanStore = BasicBeanStore.of(beanStore, resource);
+ this.beanStore = BasicBeanStore.of(beanStore);
}
/**
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/BeanCreator.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/BeanCreator.java
index f367df6c79..411e0573ef 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/BeanCreator.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/BeanCreator.java
@@ -146,11 +146,19 @@ public class BeanCreator<T> {
* @return A new creator.
*/
public static <T> BeanCreator<T> of(Class<T> beanType) {
- return new BeanCreator(beanType, BasicBeanStore.INSTANCE);
+ return new BeanCreator<>(beanType, BasicBeanStore.INSTANCE);
}
+ /**
+ * Creates a new bean creator.
+ *
+ * @param <T> The bean type to create.
+ * @param beanType The bean type to create.
+ * @param beanStore The bean store to use for parameter resolution.
+ * @return A new creator.
+ */
public static <T> BeanCreator<T> of(Class<T> beanType, BasicBeanStore
beanStore) {
- return new BeanCreator(beanType, beanStore);
+ return new BeanCreator<>(beanType, beanStore);
}
private final BasicBeanStore store;
@@ -169,9 +177,15 @@ public class BeanCreator<T> {
*/
protected BeanCreator(Class<T> type, BasicBeanStore store) {
this.type = info(type);
- this.store = BasicBeanStore.of(store, store.outer.orElse(null));
+ this.store = BasicBeanStore.of(store);
}
+ /**
+ * Specifies the outer object to use when instantiating inner classes.
+ *
+ * @param outer The outer object. Can be <jk>null</jk>.
+ * @return This object.
+ */
public BeanCreator<T> outer(Object outer) {
this.outer = outer;
return this;
diff --git
a/juneau-rest/juneau-rest-server-springboot/src/main/java/org/apache/juneau/rest/springboot/SpringBeanStore.java
b/juneau-rest/juneau-rest-server-springboot/src/main/java/org/apache/juneau/rest/springboot/SpringBeanStore.java
index beefd062a5..28a40ab395 100644
---
a/juneau-rest/juneau-rest-server-springboot/src/main/java/org/apache/juneau/rest/springboot/SpringBeanStore.java
+++
b/juneau-rest/juneau-rest-server-springboot/src/main/java/org/apache/juneau/rest/springboot/SpringBeanStore.java
@@ -19,8 +19,6 @@ package org.apache.juneau.rest.springboot;
import static org.apache.juneau.commons.utils.Utils.*;
import java.util.*;
-import java.util.stream.*;
-
import org.apache.juneau.cp.*;
import org.springframework.context.*;
@@ -43,7 +41,7 @@ public class SpringBeanStore extends BasicBeanStore {
* @param resource The REST object. Can be <jk>null</jk>.
*/
public SpringBeanStore(Optional<ApplicationContext> appContext,
Optional<BasicBeanStore> parent, Object resource) {
- super(create().parent(parent.orElse(null)).outer(resource));
+ super(create().parent(parent.orElse(null)));
this.appContext = appContext;
}
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java
index 2475a39919..d4de60fd64 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java
@@ -1776,7 +1776,7 @@ public class RestContext extends Context {
if (rootBeanStore == null) {
rootBeanStore = beanStore;
- beanStore = BasicBeanStore.of(rootBeanStore,
r.get());
+ beanStore = BasicBeanStore.of(rootBeanStore);
}
var bs = beanStore;
@@ -3867,7 +3867,6 @@ public class RestContext extends Context {
BasicBeanStore
.create()
.parent(rootBeanStore())
- .outer(resource.get())
);
// @formatter:on
@@ -4635,7 +4634,7 @@ public class RestContext extends Context {
RestOpContext.Builder rocb =
RestOpContext.create(mi.inner(),
restContext).beanStore(beanStore).type(opContextClass);
- beanStore =
BasicBeanStore.of(beanStore,
resource.get()).addBean(RestOpContext.Builder.class, rocb);
+ beanStore =
BasicBeanStore.of(beanStore).addBean(RestOpContext.Builder.class, rocb);
for (var m : initMap.values()) {
if (!
beanStore.hasAllParams(m, resource.get())) {
throw
servletException("Could not call @RestInit method {0}.{1}. Could not find
prerequisites: {2}.", cns(m.getDeclaringClass()), m.getSignature(),
@@ -5970,7 +5969,7 @@ public class RestContext extends Context {
var params = mi.getParameters();
var ra = new RestOpArg[params.size()];
- beanStore = BasicBeanStore.of(beanStore, getResource());
+ beanStore = BasicBeanStore.of(beanStore);
for (var i = 0; i < params.size(); i++) {
var pi = params.get(i);
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOpContext.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOpContext.java
index 77fe6bd40a..1a51d77bac 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOpContext.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOpContext.java
@@ -126,7 +126,7 @@ public class RestOpContext extends Context implements
Comparable<RestOpContext>
this.parent = context.builder;
this.restMethod = method;
- this.beanStore =
BasicBeanStore.of(context.getBeanStore(),
context.builder.resource().get()).addBean(java.lang.reflect.Method.class,
method);
+ this.beanStore =
BasicBeanStore.of(context.getBeanStore()).addBean(java.lang.reflect.Method.class,
method);
var ap =
context.getBeanContext().getAnnotationProvider();
var mi = MethodInfo.of(context.getResourceClass(),
method);
@@ -1419,7 +1419,7 @@ public class RestOpContext extends Context implements
Comparable<RestOpContext>
// Replace with bean from:
@RestInject(methodScope="foo") public [static] BeanContext xxx(<args>)
// @formatter:off
- var bs = BasicBeanStore.of(beanStore,
resource).addBean(BeanContext.Builder.class, v.get());
+ var bs =
BasicBeanStore.of(beanStore).addBean(BeanContext.Builder.class, v.get());
new BeanCreateMethodFinder<>(BeanContext.class,
resource, bs)
.find(this::matches)
.run(x -> v.get().impl(x));
@@ -1539,7 +1539,7 @@ public class RestOpContext extends Context implements
Comparable<RestOpContext>
// Replace with bean from:
@RestInject(name="defaultRequestAttributes",methodScope="foo") public [static]
NamedAttributeMap xxx(<args>)
// @formatter:off
- var bs = BasicBeanStore.of(beanStore,
resource).addBean(NamedAttributeMap.class, v.get());
+ var bs =
BasicBeanStore.of(beanStore).addBean(NamedAttributeMap.class, v.get());
new BeanCreateMethodFinder<>(NamedAttributeMap.class,
resource, bs)
.find(x -> matches(x,
"defaultRequestAttributes"))
.run(x -> v.set(x));
@@ -1565,7 +1565,7 @@ public class RestOpContext extends Context implements
Comparable<RestOpContext>
// Replace with bean from:
@RestInject(name="defaultRequestFormData",methodScope="foo") public [static]
PartList xxx(<args>)
// @formatter:off
- var bs = BasicBeanStore.of(beanStore,
resource).addBean(PartList.class, v.get());
+ var bs =
BasicBeanStore.of(beanStore).addBean(PartList.class, v.get());
new BeanCreateMethodFinder<>(PartList.class, resource,
bs)
.find(x -> matches(x, "defaultRequestFormData"))
.run(x -> v.set(x));
@@ -1591,7 +1591,7 @@ public class RestOpContext extends Context implements
Comparable<RestOpContext>
// Replace with bean from:
@RestInject(name="defaultRequestHeaders",methodScope="foo") public [static]
HeaderList xxx(<args>)
// @formatter:off
- var bs = BasicBeanStore.of(beanStore,
resource).addBean(HeaderList.class, v.get());
+ var bs =
BasicBeanStore.of(beanStore).addBean(HeaderList.class, v.get());
new BeanCreateMethodFinder<>(HeaderList.class,
resource, bs)
.find(x -> matches(x, "defaultRequestHeaders"))
.run(x -> v.set(x));
@@ -1617,7 +1617,7 @@ public class RestOpContext extends Context implements
Comparable<RestOpContext>
// Replace with bean from:
@RestInject(name="defaultRequestQueryData",methodScope="foo") public [static]
PartList xxx(<args>)
// @formatter:off
- var bs = BasicBeanStore.of(beanStore,
resource).addBean(PartList.class, v.get());
+ var bs =
BasicBeanStore.of(beanStore).addBean(PartList.class, v.get());
new BeanCreateMethodFinder<>(PartList.class, resource,
bs)
.find(x -> matches(x,
"defaultRequestQueryData"))
.run(x -> v.set(x));
@@ -1643,7 +1643,7 @@ public class RestOpContext extends Context implements
Comparable<RestOpContext>
// Replace with bean from:
@RestInject(name="defaultResponseHeaders",methodScope="foo") public [static]
HeaderList xxx(<args>)
// @formatter:off
- var bs = BasicBeanStore.of(beanStore,
resource).addBean(HeaderList.class, v.get());
+ var bs =
BasicBeanStore.of(beanStore).addBean(HeaderList.class, v.get());
new BeanCreateMethodFinder<>(HeaderList.class,
resource, bs)
.find(x -> matches(x, "defaultResponseHeaders"))
.run(x -> v.set(x));
@@ -1670,7 +1670,7 @@ public class RestOpContext extends Context implements
Comparable<RestOpContext>
// Replace with bean from:
@RestInject(methodScope="foo") public [static] EncoderSet xxx(<args>)
// @formatter:off
- var bs = BasicBeanStore.of(beanStore,
resource).addBean(EncoderSet.Builder.class, v.get());
+ var bs =
BasicBeanStore.of(beanStore).addBean(EncoderSet.Builder.class, v.get());
new BeanCreateMethodFinder<>(EncoderSet.class,
resource, bs)
.find(this::matches)
.run(x -> v.get().impl(x));
@@ -1749,7 +1749,7 @@ public class RestOpContext extends Context implements
Comparable<RestOpContext>
// Replace with bean from:
@RestInject(methodScope="foo") public [static] JsonSchemaGenerator xxx(<args>)
// @formatter:off
- var bs = BasicBeanStore.of(beanStore,
resource).addBean(JsonSchemaGenerator.Builder.class, v.get());
+ var bs =
BasicBeanStore.of(beanStore).addBean(JsonSchemaGenerator.Builder.class,
v.get());
new BeanCreateMethodFinder<>(JsonSchemaGenerator.class,
resource, bs)
.find(this::matches)
.run(x -> v.get().impl(x));
@@ -1854,7 +1854,7 @@ public class RestOpContext extends Context implements
Comparable<RestOpContext>
// Replace with bean from:
@RestInject(methodScope="foo") public [static] ParserSet xxx(<args>)
// @formatter:off
- var bs = BasicBeanStore.of(beanStore,
resource).addBean(ParserSet.Builder.class, v.get());
+ var bs =
BasicBeanStore.of(beanStore).addBean(ParserSet.Builder.class, v.get());
new BeanCreateMethodFinder<>(ParserSet.class, resource,
bs)
.find(this::matches)
.run(x -> v.get().impl(x));
@@ -1881,7 +1881,7 @@ public class RestOpContext extends Context implements
Comparable<RestOpContext>
// Replace with bean from:
@RestInject(methodScope="foo") public [static] HttpPartParser xxx(<args>)
// @formatter:off
- var bs = BasicBeanStore.of(beanStore,
resource).addBean(HttpPartParser.Creator.class, v.get());
+ var bs =
BasicBeanStore.of(beanStore).addBean(HttpPartParser.Creator.class, v.get());
new BeanCreateMethodFinder<>(HttpPartParser.class,
resource, bs)
.find(this::matches)
.run(x -> v.get().impl(x));
@@ -1908,7 +1908,7 @@ public class RestOpContext extends Context implements
Comparable<RestOpContext>
// Replace with bean from:
@RestInject(methodScope="foo") public [static] HttpPartSerializer xxx(<args>)
// @formatter:off
- var bs = BasicBeanStore.of(beanStore,
resource).addBean(HttpPartSerializer.Creator.class, v.get());
+ var bs =
BasicBeanStore.of(beanStore).addBean(HttpPartSerializer.Creator.class, v.get());
new BeanCreateMethodFinder<>(HttpPartSerializer.class,
resource, bs)
.find(this::matches)
.run(x -> v.get().impl(x));
@@ -1935,7 +1935,7 @@ public class RestOpContext extends Context implements
Comparable<RestOpContext>
// Replace with bean from:
@RestInject(methodScope="foo") public [static] SerializerSet xxx(<args>)
// @formatter:off
- var bs = BasicBeanStore.of(beanStore,
resource).addBean(SerializerSet.Builder.class, v.get());
+ var bs =
BasicBeanStore.of(beanStore).addBean(SerializerSet.Builder.class, v.get());
new BeanCreateMethodFinder<>(SerializerSet.class,
resource, bs)
.find(this::matches)
.run(x -> v.get().impl(x));
@@ -2167,10 +2167,9 @@ public class RestOpContext extends Context implements
Comparable<RestOpContext>
debug =
DebugEnablement.create(context.getBeanStore()).enable(builder.debug,
"*").build();
mi = MethodInfo.of(method).accessible();
- var r = context.getResource();
- // @formatter:off
- var bs = BasicBeanStore.of(context.getRootBeanStore(), r)
+ // @formatter:off
+ var bs = BasicBeanStore.of(context.getRootBeanStore())
.addBean(RestOpContext.class, this)
.addBean(Method.class, method)
.addBean(AnnotationWorkList.class,
builder.getApplied());
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestSession.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestSession.java
index c62b0d82e2..77500e6add 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestSession.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestSession.java
@@ -223,7 +223,7 @@ public class RestSession extends ContextSession {
super(builder);
context = builder.ctx;
resource = builder.resource;
- beanStore = BasicBeanStore.of(context.getBeanStore(),
resource).addBean(RestContext.class, context);
+ beanStore =
BasicBeanStore.of(context.getBeanStore()).addBean(RestContext.class, context);
logger = beanStore.add(CallLogger.class, builder.logger);
pathInfoUndecoded = builder.pathInfoUndecoded;
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestContent.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestContent.java
index 193b65bede..8bbe3b3e2f 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestContent.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestContent.java
@@ -552,7 +552,6 @@ public class RequestContent {
.apply(ReaderParser.Builder.class, x ->
x.streamCharset(req.getCharset()))
.schema(schema)
.debug(req.isDebug() ? true : null)
- .outer(req.getContext().getResource())
.build();
// @formatter:on
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 9e7d8846bd..9cd00271a0 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
@@ -268,10 +268,10 @@ class BeanStore_Test extends TestBase {
var outer = new B1(null, null, null);
- 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().addBean(B1.class,
outer);
- var b2c =
BasicBeanStore.create().outer(outer).parent(b1p).threadSafe().build();
+ var b1p = BasicBeanStore.create().build().addBean(B1.class,
outer);
+ var b1c = BasicBeanStore.create().parent(b1p).build();
+ var b2p =
BasicBeanStore.create().threadSafe().build().addBean(B1.class, outer);
+ var b2c =
BasicBeanStore.create().parent(b1p).threadSafe().build();
var ci = ClassInfo.of(B1.class);
var c1 = ci.getPublicConstructor(x ->
x.hasParameterTypes(A1.class, Optional.class, BasicBeanStore.class)).get();
@@ -535,7 +535,7 @@ class BeanStore_Test extends TestBase {
public class D1b {}
@Test void d01_createBean_basic() {
- var bs = BasicBeanStore.create().outer(new
BeanStore_Test()).build();
+ var bs = BasicBeanStore.create().build();
assertNotNull(BeanCreator.of(D1a.class, bs).outer(this).run());
assertNotNull(BeanCreator.of(D1b.class, bs).outer(this).run());
assertThrows(IllegalArgumentException.class, () ->
BeanCreator.of(null, bs).outer(this).run());
