This is an automated email from the ASF dual-hosted git repository.
jamesbognar pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/juneau.git
from fe62d501f8 chore: remove completed TODO-21 from TODO.md
new b66b76b180 refactor: extract @BeanType from @Marshalled and create
commons.bean package (Phase 1 of bean-layer split)
new 0cdbdd819c refactor: extract @BeanProp from @MarshalledProp; merge
@MarshalledCtor into @BeanCtor (Phase 2 of bean-layer split)
new fc54e2a5e5 refactor: extract @BeanConfig from @MarshalledConfig (Phase
3 of bean-layer split)
new 6dc9a18ab5 refactor: extract @BeanIgnore from @MarshalledIgnore for
bean-detection (Phase 4 of bean-layer split)
new 595f2273e6 refactor: move MarshallingInterceptor to
commons.bean.BeanInterceptor (Phase 5a of bean-layer split)
new bd1889c113 docs: simplify annotation links in marshall and rest
Javadocs
The 6 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../java/org/apache/juneau/bean/LinkString.java | 3 +-
.../org/apache/juneau/bean/html5/HtmlElement.java | 5 +-
.../juneau/bean/html5/HtmlElementContainer.java | 5 +-
.../apache/juneau/bean/html5/HtmlElementMixed.java | 5 +-
.../juneau/bean/html5/HtmlElementRawText.java | 5 +-
.../apache/juneau/bean/html5/HtmlElementText.java | 5 +-
.../java/org/apache/juneau/bean/html5/Pre.java | 3 +-
.../apache/juneau/bean/jsonschema/JsonSchema.java | 53 +-
.../org/apache/juneau/bean/mcp/JsonSchema.java | 3 +-
.../apache/juneau/bean/openapi3/HeaderInfo.java | 9 +-
.../org/apache/juneau/bean/openapi3/Items.java | 5 +-
.../org/apache/juneau/bean/openapi3/MediaType.java | 5 +-
.../juneau/bean/openapi3/OpenApiElement.java | 7 +-
.../apache/juneau/bean/openapi3/SchemaInfo.java | 5 +-
.../org/apache/juneau/bean/swagger/HeaderInfo.java | 5 +-
.../java/org/apache/juneau/bean/swagger/Items.java | 5 +-
.../org/apache/juneau/bean/swagger/SchemaInfo.java | 5 +-
.../apache/juneau/bean/swagger/SwaggerElement.java | 7 +-
.../commons/annotation/MarshalledIgnore.java | 58 --
.../juneau/commons/bean}/BasicPropertyNamer.java | 2 +-
.../apache/juneau/commons/bean/BeanConfig.java} | 360 +----------
.../BeanConfigAnnotation.java} | 22 +-
.../org/apache/juneau/commons/bean/BeanCtor.java} | 54 +-
.../juneau/commons/bean/BeanCtorAnnotation.java} | 44 +-
.../org/apache/juneau/commons/bean/BeanIgnore.java | 87 +++
.../juneau/commons/bean/BeanIgnoreAnnotation.java} | 48 +-
.../juneau/commons/bean/BeanInterceptor.java} | 20 +-
.../org/apache/juneau/commons/bean/BeanProp.java | 299 +++++++++
.../juneau/commons/bean/BeanPropAnnotation.java} | 140 ++--
.../org/apache/juneau/commons/bean/BeanType.java} | 254 +-------
.../juneau/commons/bean/BeanTypeAnnotation.java} | 260 ++------
.../apache/juneau/commons/bean}/PropertyNamer.java | 6 +-
.../juneau/commons/bean}/PropertyNamerDLC.java | 2 +-
.../juneau/commons/bean}/PropertyNamerDUCS.java | 2 +-
.../juneau/commons/bean}/PropertyNamerULC.java | 2 +-
.../apache/juneau/commons/bean}/package-info.java | 11 +-
.../juneau/commons/function/BeanFactory.java | 5 +-
.../juneau/commons/function/ListBeanChannel.java | 2 +-
.../juneau/commons/function/package-info.java | 12 +-
.../apache/juneau/commons/http/MediaRanges.java | 4 +-
.../org/apache/juneau/commons/http/MediaType.java | 4 +-
.../apache/juneau/commons/http/StringRange.java | 4 +-
.../apache/juneau/commons/http/StringRanges.java | 4 +-
.../juneau/commons/inject/BeanInstantiator.java | 2 +-
.../java/org/apache/juneau/jena/RdfParser.java | 6 +-
.../java/org/apache/juneau/jena/RdfSerializer.java | 6 +-
.../java/org/apache/juneau/AnnotationWorkList.java | 7 +
.../src/main/java/org/apache/juneau/BeanMap.java | 5 +-
.../src/main/java/org/apache/juneau/BeanMeta.java | 157 ++---
.../java/org/apache/juneau/BeanPropertyMeta.java | 69 +-
.../src/main/java/org/apache/juneau/ClassMeta.java | 11 +-
.../src/main/java/org/apache/juneau/Context.java | 16 +-
.../java/org/apache/juneau/MarshalledFilter.java | 83 ++-
.../java/org/apache/juneau/MarshallingContext.java | 91 +--
.../org/apache/juneau/MarshallingContextable.java | 39 +-
.../java/org/apache/juneau/MarshallingSession.java | 1 +
.../apache/juneau/MarshallingTraverseContext.java | 6 +-
.../main/java/org/apache/juneau/UriContext.java | 3 +-
...igAnnotation.java => BeanConfigAnnotation.java} | 46 +-
.../{UriApply.java => BeanCtorApply.java} | 27 +-
...nnotation.java => BeanCtorApplyAnnotation.java} | 55 +-
.../{SchemaApply.java => BeanIgnoreApply.java} | 24 +-
...otation.java => BeanIgnoreApplyAnnotation.java} | 55 +-
.../{UriApply.java => BeanPropApply.java} | 25 +-
...nnotation.java => BeanPropApplyAnnotation.java} | 55 +-
.../{MarshalledApply.java => BeanTypeApply.java} | 22 +-
...nnotation.java => BeanTypeApplyAnnotation.java} | 55 +-
.../org/apache/juneau/annotation/Marshalled.java | 322 +--------
.../juneau/annotation/MarshalledAnnotation.java | 282 +-------
.../apache/juneau/annotation/MarshalledConfig.java | 719 +--------------------
.../annotation/MarshalledConfigAnnotation.java | 28 -
.../juneau/annotation/MarshalledCtorApply.java | 96 ---
.../annotation/MarshalledCtorApplyAnnotation.java | 225 -------
.../apache/juneau/annotation/MarshalledIgnore.java | 59 +-
.../annotation/MarshalledIgnoreAnnotation.java | 21 +-
.../apache/juneau/annotation/MarshalledProp.java | 386 +----------
.../annotation/MarshalledPropAnnotation.java | 161 +----
.../java/org/apache/juneau/annotation/Name.java | 3 +-
.../main/java/org/apache/juneau/csv/CsvParser.java | 6 +-
.../java/org/apache/juneau/csv/CsvSerializer.java | 6 +-
.../org/apache/juneau/html/HtmlDocSerializer.java | 6 +-
.../java/org/apache/juneau/html/HtmlParser.java | 6 +-
.../juneau/html/HtmlSchemaDocSerializer.java | 6 +-
.../apache/juneau/html/HtmlSchemaSerializer.java | 6 +-
.../org/apache/juneau/html/HtmlSerializer.java | 6 +-
.../juneau/html/HtmlStrippedDocSerializer.java | 6 +-
.../java/org/apache/juneau/json/JsonParser.java | 6 +-
.../apache/juneau/json/JsonSchemaSerializer.java | 6 +-
.../org/apache/juneau/json/JsonSerializer.java | 6 +-
.../java/org/apache/juneau/json5/Json5Parser.java | 6 +-
.../org/apache/juneau/json5/Json5Serializer.java | 6 +-
.../juneau/jsonschema/JsonSchemaGenerator.java | 6 +-
.../org/apache/juneau/markdown/MarkdownParser.java | 6 +-
.../apache/juneau/markdown/MarkdownSerializer.java | 6 +-
.../org/apache/juneau/msgpack/MsgPackParser.java | 6 +-
.../apache/juneau/msgpack/MsgPackSerializer.java | 6 +-
.../java/org/apache/juneau/oapi/OpenApiParser.java | 6 +-
.../org/apache/juneau/oapi/OpenApiSerializer.java | 6 +-
.../apache/juneau/parser/InputStreamParser.java | 6 +-
.../main/java/org/apache/juneau/parser/Parser.java | 6 +-
.../org/apache/juneau/parser/ReaderParser.java | 6 +-
.../apache/juneau/plaintext/PlainTextParser.java | 6 +-
.../juneau/plaintext/PlainTextSerializer.java | 6 +-
.../juneau/serializer/OutputStreamSerializer.java | 6 +-
.../org/apache/juneau/serializer/Serializer.java | 6 +-
.../apache/juneau/serializer/WriterSerializer.java | 6 +-
.../org/apache/juneau/soap/SoapXmlSerializer.java | 6 +-
.../java/org/apache/juneau/swap/AutoListSwap.java | 13 +-
.../java/org/apache/juneau/swap/AutoMapSwap.java | 13 +-
.../org/apache/juneau/swap/AutoNumberSwap.java | 13 +-
.../org/apache/juneau/swap/AutoObjectSwap.java | 13 +-
.../java/org/apache/juneau/swap/SurrogateSwap.java | 3 +-
.../main/java/org/apache/juneau/uon/UonParser.java | 6 +-
.../java/org/apache/juneau/uon/UonSerializer.java | 6 +-
.../juneau/urlencoding/UrlEncodingParser.java | 6 +-
.../juneau/urlencoding/UrlEncodingSerializer.java | 6 +-
.../main/java/org/apache/juneau/xml/XmlParser.java | 6 +-
.../java/org/apache/juneau/xml/XmlSerializer.java | 6 +-
.../java/org/apache/juneau/xml/annotation/Xml.java | 3 +-
.../java/org/apache/juneau/yaml/YamlParser.java | 6 +-
.../org/apache/juneau/yaml/YamlSerializer.java | 6 +-
.../examples/core/html/HtmlComplexExample.java | 2 +-
.../examples/core/html/HtmlSimpleExample.java | 2 +-
.../examples/core/json/JsonComplexExample.java | 2 +-
.../examples/core/json/JsonSimpleExample.java | 2 +-
.../juneau/examples/core/oapi/OapiExample.java | 2 +-
.../org/apache/juneau/examples/core/pojo/Pojo.java | 3 +-
.../juneau/examples/core/pojo/PojoComplex.java | 3 +-
.../juneau/examples/core/uon/UonExample.java | 2 +-
.../examples/core/xml/XmlComplexExample.java | 2 +-
.../juneau/examples/core/xml/XmlSimpleExample.java | 2 +-
.../juneau/examples/rest/RequestEchoResource.java | 7 +-
.../juneau/examples/rest/UtilityBeansResource.java | 3 +-
.../microservice/resources/DirectoryResource.java | 3 +-
.../microservice/resources/LogsResource.java | 3 +-
.../org/apache/juneau/rest/client/RestClient.java | 6 +-
.../org/apache/juneau/rest/client/RestRequest.java | 1 +
.../org/apache/juneau/http/annotation/Header.java | 2 +-
.../apache/juneau/http/entity/BasicHttpEntity.java | 4 +-
.../apache/juneau/http/resource/BasicResource.java | 4 +-
.../apache/juneau/rest/mock/MockRestClient.java | 6 +-
.../java/org/apache/juneau/rest/RestContext.java | 10 +-
.../org/apache/juneau/rest/annotation/RestGet.java | 5 +-
.../apache/juneau/rest/annotation/RestInit.java | 6 +-
.../org/apache/juneau/rest/annotation/RestOp.java | 7 +-
.../apache/juneau/rest/annotation/RestPatch.java | 7 +-
.../apache/juneau/rest/beans/BeanDescription.java | 3 +-
.../juneau/rest/beans/ResourceDescription.java | 3 +-
.../apache/juneau/rest/config/DefaultConfig.java | 3 +-
.../apache/juneau/rest/stats/RestContextStats.java | 3 +-
.../apache/juneau/AnnotationInheritance_Test.java | 23 +-
.../java/org/apache/juneau/Annotations_Test.java | 9 +-
.../java/org/apache/juneau/BasicBeans_Test.java | 5 +-
.../java/org/apache/juneau/BeanMapErrors_Test.java | 27 +-
.../test/java/org/apache/juneau/BeanMap_Test.java | 81 +--
.../java/org/apache/juneau/BeanStreaming_Test.java | 3 +-
.../apache/juneau/DynaBean_ComboRoundTripTest.java | 19 +-
.../org/apache/juneau/MarshalledConfig_Test.java | 17 +-
.../java/org/apache/juneau/PropertyNamerTest.java | 1 +
.../juneau/ReadWriteOnlyProperties_Test.java | 29 +-
.../src/test/java/org/apache/juneau/TestUtils.java | 8 +-
.../src/test/java/org/apache/juneau/a/A1.java | 12 +-
.../juneau/a/rttests/Generics_RoundTripTest.java | 3 +-
.../a/rttests/ReadOnlyBeans_RoundTripTest.java | 5 +-
.../juneau/a/rttests/Records_RoundTripTest.java | 9 +-
.../juneau/a/rttests/RoundTripBeanMaps_Test.java | 21 +-
.../a/rttests/RoundTripBeansWithBuilders_Test.java | 13 +-
...on_Test.java => BeanConfigAnnotation_Test.java} | 97 +--
...tion_Test.java => BeanCtorAnnotation_Test.java} | 19 +-
...on_Test.java => BeanIgnoreAnnotation_Test.java} | 27 +-
...halledIgnore_Test.java => BeanIgnore_Test.java} | 103 ++-
.../BeanPropAnnotation_Test.java} | 59 +-
...Test.java => BeanProp_StarPlainField_Test.java} | 15 +-
.../annotation/MarshalledAnnotation_Test.java | 105 ++-
.../MarshalledConfigAnnotation_Test.java | 99 +--
.../MarshalledIgnoreAnnotation_Test.java | 2 +-
.../juneau/annotation/MarshalledIgnore_Test.java | 94 +--
.../annotation/MarshalledPropAnnotation_Test.java | 42 +-
.../apache/juneau/annotation/Marshalled_Test.java | 53 +-
.../java/org/apache/juneau/csv/CsvParser_Test.java | 5 +-
.../org/apache/juneau/html/BasicHtml_Test.java | 15 +-
.../juneau/html/HtmlSchemaSerializer_Test.java | 5 +-
.../java/org/apache/juneau/html/Html_Test.java | 3 +-
.../org/apache/juneau/ini/IniRoundTrip_Test.java | 7 +-
.../org/apache/juneau/jena/RdfParser_Test.java | 3 +-
.../org/apache/juneau/jena/RdfSerializer_Test.java | 3 +-
.../org/apache/juneau/jsonl/JsonlParser_Test.java | 3 +-
.../apache/juneau/jsonl/JsonlRoundTrip_Test.java | 7 +-
.../java/org/apache/juneau/jsonl/Jsonl_Test.java | 3 +-
.../juneau/markdown/MarkdownParser_Test.java | 5 +-
.../apache/juneau/objecttools/ObjectRest_Test.java | 6 +-
.../annotation/RestOp_MarshalledConfig_Test.java | 39 +-
.../RestClient_Config_MarshallingContext_Test.java | 3 +-
.../apache/juneau/transform/AutoListSwapTest.java | 17 +-
.../apache/juneau/transform/AutoMapSwapTest.java | 17 +-
.../juneau/transform/AutoNumberSwapTest.java | 17 +-
.../juneau/transform/AutoObjectSwapTest.java | 17 +-
.../transforms/Builder_ComboRoundTripTest.java | 3 +-
.../juneau/transforms/MarshalledFilter_Test.java | 13 +-
.../urlencoding/UrlEncodingSerializer_Test.java | 9 +-
.../java/org/apache/juneau/xml/BasicXml_Test.java | 18 +-
.../java/org/apache/juneau/xml/CommonXml_Test.java | 3 +-
.../org/apache/juneau/xml/XmlCollapsed_Test.java | 5 +-
.../apache/juneau/xml/XmlIgnoreComments_Test.java | 9 +-
.../test/java/org/apache/juneau/xml/Xml_Test.java | 20 +-
.../test/java/org/apache/juneau/xml/xml1b/T7.java | 13 +-
scripts/check-fluent-setter-overrides.py | 6 +-
todo/TODO-5-bean-runtime-types-to-commons.md | 178 +++++
todo/TODO.md | 2 +
209 files changed, 2184 insertions(+), 4672 deletions(-)
delete mode 100644
juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/annotation/MarshalledIgnore.java
rename juneau-core/{juneau-marshall/src/main/java/org/apache/juneau =>
juneau-commons/src/main/java/org/apache/juneau/commons/bean}/BasicPropertyNamer.java
(97%)
copy
juneau-core/{juneau-marshall/src/main/java/org/apache/juneau/annotation/MarshalledConfig.java
=>
juneau-commons/src/main/java/org/apache/juneau/commons/bean/BeanConfig.java}
(59%)
copy
juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/{logging/LogRecordListener.java
=> bean/BeanConfigAnnotation.java} (57%)
rename
juneau-core/{juneau-marshall/src/main/java/org/apache/juneau/annotation/MarshalledCtor.java
=> juneau-commons/src/main/java/org/apache/juneau/commons/bean/BeanCtor.java}
(61%)
rename
juneau-core/{juneau-marshall/src/main/java/org/apache/juneau/annotation/MarshalledCtorAnnotation.java
=>
juneau-commons/src/main/java/org/apache/juneau/commons/bean/BeanCtorAnnotation.java}
(70%)
create mode 100644
juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/bean/BeanIgnore.java
copy
juneau-core/{juneau-marshall/src/main/java/org/apache/juneau/annotation/MarshalledIgnoreAnnotation.java
=>
juneau-commons/src/main/java/org/apache/juneau/commons/bean/BeanIgnoreAnnotation.java}
(68%)
rename
juneau-core/{juneau-marshall/src/main/java/org/apache/juneau/swap/MarshallingInterceptor.java
=>
juneau-commons/src/main/java/org/apache/juneau/commons/bean/BeanInterceptor.java}
(85%)
create mode 100644
juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/bean/BeanProp.java
copy
juneau-core/{juneau-marshall/src/main/java/org/apache/juneau/annotation/MarshalledPropAnnotation.java
=>
juneau-commons/src/main/java/org/apache/juneau/commons/bean/BeanPropAnnotation.java}
(60%)
copy
juneau-core/{juneau-marshall/src/main/java/org/apache/juneau/annotation/Marshalled.java
=> juneau-commons/src/main/java/org/apache/juneau/commons/bean/BeanType.java}
(51%)
copy
juneau-core/{juneau-marshall/src/main/java/org/apache/juneau/annotation/MarshalledAnnotation.java
=>
juneau-commons/src/main/java/org/apache/juneau/commons/bean/BeanTypeAnnotation.java}
(54%)
rename juneau-core/{juneau-marshall/src/main/java/org/apache/juneau =>
juneau-commons/src/main/java/org/apache/juneau/commons/bean}/PropertyNamer.java
(88%)
rename juneau-core/{juneau-marshall/src/main/java/org/apache/juneau =>
juneau-commons/src/main/java/org/apache/juneau/commons/bean}/PropertyNamerDLC.java
(98%)
rename juneau-core/{juneau-marshall/src/main/java/org/apache/juneau =>
juneau-commons/src/main/java/org/apache/juneau/commons/bean}/PropertyNamerDUCS.java
(98%)
rename juneau-core/{juneau-marshall/src/main/java/org/apache/juneau =>
juneau-commons/src/main/java/org/apache/juneau/commons/bean}/PropertyNamerULC.java
(98%)
copy {juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5
=>
juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/bean}/package-info.java
(69%)
copy
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/{MarshalledConfigAnnotation.java
=> BeanConfigAnnotation.java} (68%)
copy
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/{UriApply.java
=> BeanCtorApply.java} (77%)
copy
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/{UriApplyAnnotation.java
=> BeanCtorApplyAnnotation.java} (74%)
copy
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/{SchemaApply.java
=> BeanIgnoreApply.java} (78%)
copy
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/{MarshalledApplyAnnotation.java
=> BeanIgnoreApplyAnnotation.java} (75%)
copy
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/{UriApply.java
=> BeanPropApply.java} (79%)
copy
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/{UriApplyAnnotation.java
=> BeanPropApplyAnnotation.java} (74%)
copy
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/{MarshalledApply.java
=> BeanTypeApply.java} (80%)
copy
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/{UriApplyAnnotation.java
=> BeanTypeApplyAnnotation.java} (74%)
delete mode 100644
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/MarshalledCtorApply.java
delete mode 100644
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/MarshalledCtorApplyAnnotation.java
copy
juneau-utest/src/test/java/org/apache/juneau/annotation/{MarshalledConfigAnnotation_Test.java
=> BeanConfigAnnotation_Test.java} (67%)
rename
juneau-utest/src/test/java/org/apache/juneau/annotation/{MarshalledCtorAnnotation_Test.java
=> BeanCtorAnnotation_Test.java} (88%)
copy
juneau-utest/src/test/java/org/apache/juneau/annotation/{MarshalledIgnoreAnnotation_Test.java
=> BeanIgnoreAnnotation_Test.java} (82%)
copy
juneau-utest/src/test/java/org/apache/juneau/annotation/{MarshalledIgnore_Test.java
=> BeanIgnore_Test.java} (72%)
copy
juneau-utest/src/test/java/org/apache/juneau/{rest/annotation/RestDestroyAnnotation_Test.java
=> annotation/BeanPropAnnotation_Test.java} (65%)
rename
juneau-utest/src/test/java/org/apache/juneau/annotation/{MarshalledProp_StarPlainField_Test.java
=> BeanProp_StarPlainField_Test.java} (87%)
create mode 100644 todo/TODO-5-bean-runtime-types-to-commons.md
