[brooklyn-server] branch master updated (a591a4d -> 39dc74b)

[iu...@apache.org]

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

iuliana pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git.


    from a591a4d  Merge pull request #1118 from ahgittin/custom-catalog-format-rebind
     new 2ca7672  DSL input omitted from serialization if not set
     new 7cc6e06  failing test for DSL serialization/deserialiation edge cases
     new 1a8f899  brooklyn dsl object serialization - JsonIgnore getImmediately, and no-arg constructor
     new c1d9517  tidy notes on DSL deferred supplier
     new fbd1fc1  make literal return a deferred supplier
     new 5e8c04f  refactor tests to new class
     new cf0ba84  add support for Brooklyn DSL within the jackson serialization / deserialization code
     new 84811af  improve wrapped value support for guava and deserialization with types
     new 39dc74b  Merge pull request #1119 from ahgittin/dsl-serialiation-and-deserialization

The 12641 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:
 .../spi/dsl/BrooklynDslDeferredSupplier.java       |  22 ++--
 .../brooklyn/spi/dsl/DslDeferredFunctionCall.java  |   3 +-
 .../brooklyn/camp/brooklyn/spi/dsl/DslUtils.java   |  25 ++--
 .../spi/dsl/methods/BrooklynDslCommon.java         |  63 +++++++--
 .../brooklyn/spi/dsl/methods/DslComponent.java     |  36 ++++--
 .../camp/brooklyn/CustomTypeConfigYamlTest.java    |  11 +-
 .../camp/brooklyn/spi/dsl/DslParseTest.java        |  12 +-
 .../brooklyn/spi/dsl/DslSerializationTest.java     | 142 +++++++++++++++++++++
 .../camp/brooklyn/spi/dsl/TagsYamlTest.java        |   2 +-
 .../brooklyn/spi/dsl/methods/DslTestObjects.java   |   5 +-
 .../core/resolve/jackson/BeanWithTypeUtils.java    |   2 +-
 .../jackson/BrooklynJacksonSerializationUtils.java |  66 ++++++----
 .../JacksonBetterDelegatingDeserializer.java       | 139 ++++++++++++++++++++
 .../core/resolve/jackson/WrappedValue.java         |  35 ++++-
 .../jackson/WrappedValuesSerialization.java        |  14 +-
 .../core/task/InterruptingImmediateSupplier.java   |   3 +-
 .../brooklyn/core/entity/EntityConfigTest.java     |   3 +-
 .../resolve/jackson/LoggingSerializationTest.java  |   2 +-
 .../brooklyn/util/core/task/ValueResolverTest.java |   7 +-
 .../rest/resources/AdjunctResourceTest.java        |  12 +-
 20 files changed, 514 insertions(+), 90 deletions(-)
 create mode 100644 camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/spi/dsl/DslSerializationTest.java
 create mode 100644 core/src/main/java/org/apache/brooklyn/core/resolve/jackson/JacksonBetterDelegatingDeserializer.java