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 f7e9b9afb6 TODO-187: Remove dead ClassMeta.Category.BEAN constant and
adopt isBeanMap() at equivalent serializer sites
f7e9b9afb6 is described below
commit f7e9b9afb61a38f63500ed5a3aed6cdc8a1cb3be
Author: James Bognar <[email protected]>
AuthorDate: Tue Jul 14 20:41:25 2026 -0400
TODO-187: Remove dead ClassMeta.Category.BEAN constant and adopt
isBeanMap() at equivalent serializer sites
Category.BEAN was declared but never set (isBean() is computed separately
via
getBeanMeta() != null) and never read anywhere; its bit position is
explicitly
assigned (not ordinal-derived), so removal doesn't shift other bits.
Also swapped `o instanceof BeanMap` for the already-resolved
`sType.isBeanMap()`
at 13 serializer-session sites where sType is provably derived from o's
actual
runtime type (no delegate/wType indirection). Left ~13 other instanceof
BeanMap
sites unconverted where sType/cMeta reflects a declared/wrapped type rather
than
the object being tested (HTML/XML/RDF delegate paths, Hocon property/map
paths,
Parquet row dispatch, ObjectSearcher, MarkdownSerializerSession, and the
generic
MarshallingSession.toBeanMap utility).
Co-authored-by: Cursor <[email protected]>
---
.../src/main/java/org/apache/juneau/marshall/ClassMeta.java | 1 -
.../org/apache/juneau/marshall/bson/BsonSerializerSession.java | 6 +++---
.../org/apache/juneau/marshall/cbor/CborSerializerSession.java | 4 ++--
.../org/apache/juneau/marshall/hjson/HjsonSerializerSession.java | 4 ++--
.../org/apache/juneau/marshall/hocon/HoconSerializerSession.java | 4 ++--
.../org/apache/juneau/marshall/json/JsonSerializerSession.java | 4 ++--
.../apache/juneau/marshall/msgpack/MsgPackSerializerSession.java | 4 ++--
.../juneau/marshall/protobuf/ProtobufSerializerSession.java | 2 +-
.../juneau/marshall/prototext/PrototextSerializerSession.java | 8 ++++----
.../java/org/apache/juneau/marshall/uon/UonSerializerSession.java | 4 ++--
.../juneau/marshall/urlencoding/UrlEncodingSerializerSession.java | 4 ++--
.../org/apache/juneau/marshall/yaml/YamlSerializerSession.java | 4 ++--
12 files changed, 24 insertions(+), 25 deletions(-)
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/ClassMeta.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/ClassMeta.java
index 962a118df0..f483d42008 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/ClassMeta.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/ClassMeta.java
@@ -114,7 +114,6 @@ public final class ClassMeta<T> extends BeanInfo<T> {
LIST(17),
SET(18),
DELEGATE(19),
- BEAN(20),
ITERATOR(21),
ITERABLE(22),
STREAM(23),
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/bson/BsonSerializerSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/bson/BsonSerializerSession.java
index cf4896eb21..3bca6d4cb7 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/bson/BsonSerializerSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/bson/BsonSerializerSession.java
@@ -186,11 +186,11 @@ public class BsonSerializerSession extends
OutputStreamSerializerSession impleme
serializeBeanMap(child, toBeanMap(o),
getBeanTypeName(this, eType, aType, pMeta));
out.writeChildDocument(child);
} else if (sType.isMap()) {
- if (o instanceof BeanMap o2) {
+ if (sType.isBeanMap()) {
out.writeElement(DOCUMENT.value, name);
var child = out.createChild();
child.startDocument();
- serializeBeanMap(child, o2,
getBeanTypeName(this, eType, aType, pMeta));
+ serializeBeanMap(child, (BeanMap)o,
getBeanTypeName(this, eType, aType, pMeta));
out.writeChildDocument(child);
} else {
out.writeElement(DOCUMENT.value, name);
@@ -387,7 +387,7 @@ public class BsonSerializerSession extends
OutputStreamSerializerSession impleme
if (sType != null && sType.isBean()) {
pop();
serializeBeanMap(bsonOut, toBeanMap(o),
getBeanTypeName(this, eType, sType, null));
- } else if (sType != null && sType.isMap() && !(o instanceof
BeanMap)) {
+ } else if (sType != null && sType.isMap() &&
!sType.isBeanMap()) {
pop();
serializeMap(bsonOut, (Map)o, eType);
} else {
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/cbor/CborSerializerSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/cbor/CborSerializerSession.java
index 86c47f3c16..c3b25b5403 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/cbor/CborSerializerSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/cbor/CborSerializerSession.java
@@ -215,8 +215,8 @@ public class CborSerializerSession extends
OutputStreamSerializerSession impleme
else if (sType.isBean())
serializeBeanMap(out, toBeanMap(o), typeName);
else if (sType.isMap()) {
- if (o instanceof BeanMap o2)
- serializeBeanMap(out, o2, typeName);
+ if (sType.isBeanMap())
+ serializeBeanMap(out, (BeanMap)o, typeName);
else
serializeMap(out, (Map)o, eType);
} else if (sType.isCollection()) {
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/hjson/HjsonSerializerSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/hjson/HjsonSerializerSession.java
index 52b036d782..c64097ee44 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/hjson/HjsonSerializerSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/hjson/HjsonSerializerSession.java
@@ -254,8 +254,8 @@ public class HjsonSerializerSession extends
WriterSerializerSession implements R
} else if (sType.isBean()) {
serializeBeanMap(out, toBeanMap(o),
getBeanTypeName(this, eType, aType, pMeta), false);
} else if (sType.isMap()) {
- if (o instanceof BeanMap o2)
- serializeBeanMap(out, o2, getBeanTypeName(this,
eType, aType, pMeta), false);
+ if (sType.isBeanMap())
+ serializeBeanMap(out, (BeanMap) o,
getBeanTypeName(this, eType, aType, pMeta), false);
else
serializeMap(out, (Map) o, eType, false);
} else if (sType.isCollection()) {
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/hocon/HoconSerializerSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/hocon/HoconSerializerSession.java
index 3a4d3c8bc7..7c6f807716 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/hocon/HoconSerializerSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/hocon/HoconSerializerSession.java
@@ -283,8 +283,8 @@ public class HoconSerializerSession extends
WriterSerializerSession implements R
} else if (sType.isBean()) {
serializeBeanMap(hw, toBeanMap(o),
getBeanTypeName(this, eType, aType, pMeta), false);
} else if (sType.isMap()) {
- if (o instanceof BeanMap o2)
- serializeBeanMap(hw, o2, getBeanTypeName(this,
eType, aType, pMeta), false);
+ if (sType.isBeanMap())
+ serializeBeanMap(hw, (BeanMap) o,
getBeanTypeName(this, eType, aType, pMeta), false);
else
serializeMap(hw, (Map) o, eType, false);
} else if (sType.isCollection()) {
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/json/JsonSerializerSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/json/JsonSerializerSession.java
index 339f153f93..3d134e9744 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/json/JsonSerializerSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/json/JsonSerializerSession.java
@@ -410,8 +410,8 @@ public class JsonSerializerSession extends
WriterSerializerSession implements To
} else if (sType.isBean()) {
serializeBeanMap(out, toBeanMap(o), typeName);
} else if (sType.isMap()) {
- if (o instanceof BeanMap o2)
- serializeBeanMap(out, o2, typeName);
+ if (sType.isBeanMap())
+ serializeBeanMap(out, (BeanMap)o, typeName);
else
serializeMap(out, (Map)o, eType);
} else if (sType.isCollection()) {
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/msgpack/MsgPackSerializerSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/msgpack/MsgPackSerializerSession.java
index 3fafe6ec99..bf153a7217 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/msgpack/MsgPackSerializerSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/msgpack/MsgPackSerializerSession.java
@@ -277,8 +277,8 @@ public class MsgPackSerializerSession extends
OutputStreamSerializerSession impl
else if (sType.isBean())
serializeBeanMap(out, toBeanMap(o), typeName);
else if (sType.isMap()) {
- if (o instanceof BeanMap o2)
- serializeBeanMap(out, o2, typeName);
+ if (sType.isBeanMap())
+ serializeBeanMap(out, (BeanMap)o, typeName);
else
serializeMap(out, (Map)o, eType);
} else if (sType.isCollection()) {
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/protobuf/ProtobufSerializerSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/protobuf/ProtobufSerializerSession.java
index 3cb9c735dc..5e8a32764d 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/protobuf/ProtobufSerializerSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/protobuf/ProtobufSerializerSession.java
@@ -116,7 +116,7 @@ public class ProtobufSerializerSession extends
OutputStreamSerializerSession {
if (o == null)
return;
var cm = getClassMetaForObject(o);
- if (cm != null && (cm.isMap() && ! cm.isBean()) && ! (o
instanceof BeanMap))
+ if (cm != null && (cm.isMap() && ! cm.isBean()) && !
cm.isBeanMap())
throw new SerializeException("Protobuf binary
serialization requires a bean root type, not a raw Map.");
serializeBean(w, toBeanMap(o), getClassMetaForObject(o));
w.flush();
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/prototext/PrototextSerializerSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/prototext/PrototextSerializerSession.java
index 2fee0906ef..0a6bf9b3a5 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/prototext/PrototextSerializerSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/prototext/PrototextSerializerSession.java
@@ -218,15 +218,15 @@ public class PrototextSerializerSession extends
WriterSerializerSession implemen
if (nn(fieldName)) {
out.messageStart(fieldName,
ctx.useColonForMessages);
indent++;
- if (o instanceof BeanMap o2)
- serializeBeanMap(out, o2, typeName);
+ if (sType.isBeanMap())
+ serializeBeanMap(out, (BeanMap) o,
typeName);
else
serializeMap(out, (Map) o, sType);
indent--;
out.messageEnd(indent);
} else {
- if (o instanceof BeanMap o2)
- serializeBeanMap(out, o2, typeName);
+ if (sType.isBeanMap())
+ serializeBeanMap(out, (BeanMap) o,
typeName);
else
serializeMap(out, (Map) o, sType);
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/uon/UonSerializerSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/uon/UonSerializerSession.java
index 45ceff2d63..61f3c72a6a 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/uon/UonSerializerSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/uon/UonSerializerSession.java
@@ -431,8 +431,8 @@ public class UonSerializerSession extends
WriterSerializerSession implements Htt
else if (sType.isBean())
serializeBeanMap(out, toBeanMap(o), typeName);
else if (sType.isMap()) {
- if (o instanceof BeanMap o2)
- serializeBeanMap(out, o2, typeName);
+ if (sType.isBeanMap())
+ serializeBeanMap(out, (BeanMap)o, typeName);
else
serializeMap(out, (Map)o, eType);
} else if (sType.isCollection()) {
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/urlencoding/UrlEncodingSerializerSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/urlencoding/UrlEncodingSerializerSession.java
index c03c840055..a35f18706f 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/urlencoding/UrlEncodingSerializerSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/urlencoding/UrlEncodingSerializerSession.java
@@ -182,8 +182,8 @@ public class UrlEncodingSerializerSession extends
UonSerializerSession {
if (sType.isBean()) {
serializeBeanMap(out, toBeanMap(o), typeName);
} else if (sType.isMap()) {
- if (o instanceof BeanMap o2)
- serializeBeanMap(out, o2, typeName);
+ if (sType.isBeanMap())
+ serializeBeanMap(out, (BeanMap)o, typeName);
else
serializeMap(out, (Map)o, sType);
} else if (sType.isCollection() || sType.isArray()) {
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/yaml/YamlSerializerSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/yaml/YamlSerializerSession.java
index 4b8aa5989d..27a136eed5 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/yaml/YamlSerializerSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/yaml/YamlSerializerSession.java
@@ -219,8 +219,8 @@ public class YamlSerializerSession extends
WriterSerializerSession implements Re
} else if (sType.isBean()) {
serializeBeanMap(out, toBeanMap(o), typeName);
} else if (sType.isMap()) {
- if (o instanceof BeanMap o2)
- serializeBeanMap(out, o2, typeName);
+ if (sType.isBeanMap())
+ serializeBeanMap(out, (BeanMap)o, typeName);
else
serializeMap(out, (Map)o, eType);
} else if (sType.isCollection()) {
