You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by an...@apache.org on 2019/06/27 02:13:41 UTC
[sling-whiteboard] 01/01: Merge branch 'master' into
feature/sling-cpconverter-maven-plugin
This is an automated email from the ASF dual-hosted git repository.
andysch pushed a commit to branch feature/sling-cpconverter-maven-plugin
in repository https://gitbox.apache.org/repos/asf/sling-whiteboard.git
commit 13aa43b3ff688528f0754c7e9cc633e3efc2f8fc
Merge: 21be47c 0c10119
Author: Andreas Schaefer <sc...@iMac.local>
AuthorDate: Wed Jun 26 19:12:06 2019 -0700
Merge branch 'master' into feature/sling-cpconverter-maven-plugin
.../models/persist/annotations/ChildType.java | 31 -
.../persist/annotations/DirectDescendants.java | 38 --
.../sling/models/persist/annotations/Ignore.java | 37 --
.../models/persist/annotations/ResourceType.java | 31 -
.../models/persist/impl/util/AssertUtils.java | 50 --
.../persist/bean/BeanWithAnnotatedPathField.java | 26 -
.../persist/bean/BeanWithAnnotatedPathGetter.java | 30 -
.../models/persist/bean/BeanWithPathField.java | 23 -
.../models/persist/bean/BeanWithPathGetter.java | 21 -
{SlingJCRPersist => SlingModelPersist}/pom.xml | 359 +++++------
.../src/main/assembly/felix.xml | 0
.../injectors/MapOfChildResourcesInjector.java | 244 ++++----
.../sling/models/persistor/ModelPersistor.java | 60 +-
.../models/persistor/annotations/ChildType.java | 30 +
.../persistor/annotations/DirectDescendants.java | 36 ++
.../sling/models/persistor/annotations/Ignore.java | 35 ++
.../models/persistor/annotations/ResourceType.java | 30 +
.../models/persistor/impl/ModelPersistorImpl.java | 593 +++++++++---------
.../models/persistor}/impl/ResourceTypeKey.java | 130 ++--
.../persistor}/impl/util/ReflectionUtils.java | 606 +++++++++----------
.../injectors/BeanWithDirectMappedChildren.java | 108 ++--
.../models/injectors/BeanWithMappedChildren.java | 104 ++--
.../injectors/MapOfChildResourcesInjectorTest.java | 206 ++++---
.../sling/models/persist/ModelPersistTest.java | 668 +++++++++++----------
.../persist/bean/BeanWithAnnotatedPathField.java | 38 ++
.../persist/bean/BeanWithAnnotatedPathGetter.java | 42 ++
.../models/persist/bean/BeanWithMappedNames.java | 312 +++++-----
.../models/persist/bean/BeanWithPathField.java | 35 ++
.../models/persist/bean/BeanWithPathGetter.java | 34 ++
.../sling/models/persist/bean/ComplexBean.java | 181 +++---
.../sling/models/persist/bean/MappedChildren.java | 101 ++--
.../models/persist/impl/ResourceTypeKeyTest.java | 118 ++--
feature-diff/pom.xml | 25 +-
runtime2feature/pom.xml | 25 +-
34 files changed, 2263 insertions(+), 2144 deletions(-)