You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2014/12/02 00:59:13 UTC
[12/13] isis git commit: Merge remote-tracking branch
'martin-g/jackson-2.x-update'
Merge remote-tracking branch 'martin-g/jackson-2.x-update'
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/d5201213
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/d5201213
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/d5201213
Branch: refs/heads/master
Commit: d5201213fdb29b4b29509774917b579b830352ac
Parents: e5a2ade 24320d8
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Mon Dec 1 23:36:09 2014 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Mon Dec 1 23:36:09 2014 +0000
----------------------------------------------------------------------
.../MethodPrefixBasedFacetFactoryAbstract.java | 2 -
.../exploration/ExplorationFacetAbstract.java | 1 -
.../ActionInteractionFacetAbstract.java | 2 +-
.../prototype/PrototypeFacetAbstract.java | 1 -
core/pom.xml | 10 +--
core/viewer-restfulobjects-applib/pom.xml | 8 +--
.../applib/JsonRepresentation.java | 74 ++++++++++----------
.../applib/LinkRepresentation.java | 14 ++--
.../applib/client/RepresentationWalker.java | 4 +-
.../applib/client/RestfulResponse.java | 4 +-
.../AbstractObjectMemberRepresentation.java | 2 +-
.../ActionResultRepresentation.java | 2 +-
.../DomainObjectMemberRepresentation.java | 2 +-
.../DomainObjectRepresentation.java | 2 +-
.../domainobjects/DomainRepresentation.java | 2 +-
.../domainobjects/ListRepresentation.java | 2 +-
.../ObjectActionRepresentation.java | 2 +-
.../ObjectCollectionRepresentation.java | 3 +-
.../ObjectPropertyRepresentation.java | 2 +-
.../ScalarValueRepresentation.java | 2 +-
.../AbstractTypeMemberRepresentation.java | 2 +-
.../ActionDescriptionRepresentation.java | 2 +-
...ctionParameterDescriptionRepresentation.java | 2 +-
.../CollectionDescriptionRepresentation.java | 2 +-
.../domaintypes/DomainTypeRepresentation.java | 2 +-
.../PropertyDescriptionRepresentation.java | 2 +-
.../TypeActionResultRepresentation.java | 2 +-
.../domaintypes/TypeListRepresentation.java | 2 +-
.../applib/errors/ErrorRepresentation.java | 2 +-
.../applib/homepage/HomePageRepresentation.java | 2 +-
.../applib/user/UserRepresentation.java | 2 +-
.../restfulobjects/applib/util/JsonMapper.java | 52 ++++++++++----
.../applib/util/JsonNodeUtils.java | 7 +-
.../applib/util/UrlEncodingUtils.java | 2 +-
.../applib/version/VersionRepresentation.java | 2 +-
.../restfulobjects/applib/JsonFixture.java | 6 +-
...entationTest_arrayGet_arraySetElementAt.java | 16 ++---
.../JsonRepresentationTest_arrayIterator.java | 15 ++--
.../JsonRepresentationTest_asInputStream.java | 4 +-
.../applib/JsonRepresentationTest_getArray.java | 12 ++--
.../JsonRepresentationTest_getBigDecimal.java | 39 +++++------
.../JsonRepresentationTest_getBigInteger.java | 24 +++----
.../JsonRepresentationTest_getBoolean.java | 14 ++--
.../JsonRepresentationTest_getDouble.java | 14 ++--
.../applib/JsonRepresentationTest_getInt.java | 23 +++---
.../JsonRepresentationTest_getLink_isLink.java | 16 ++---
.../applib/JsonRepresentationTest_getLong.java | 23 +++---
.../JsonRepresentationTest_getNull_isNull.java | 8 +--
...sonRepresentationTest_getRepresentation.java | 29 ++++----
...onRepresentationTest_getString_isString.java | 14 ++--
...epresentationTest_isArray_isMap_isValue.java | 17 ++---
.../applib/JsonRepresentationTest_mapHas.java | 13 ++--
.../JsonRepresentationTest_mapIterable.java | 15 ++--
.../JsonRepresentationTest_newObject.java | 11 ++-
.../applib/JsonRepresentationTest_putXxx.java | 10 +--
.../applib/JsonRepresentationTest_size.java | 12 ++--
...nObjectRepresentationTest_getCollection.java | 4 +-
...ObjectRepresentationTest_getCollections.java | 4 +-
...nObjectRepresentationTest_getProperties.java | 4 +-
...ainObjectRepresentationTest_getProperty.java | 4 +-
.../AbstractObjectMemberReprRenderer.java | 5 +-
.../domainobjects/ActionResultReprRenderer.java | 5 +-
.../domainobjects/JsonValueEncoder.java | 2 +-
.../domainobjects/ObjectActionReprRenderer.java | 4 +-
.../ObjectPropertyReprRenderer.java | 4 +-
.../domaintypes/DomainTypeReprRenderer.java | 5 +-
.../rendering/util/JsonWriterUtil.java | 6 --
.../restfulobjects/rendering/util/Util.java | 4 +-
.../JsonValueEncoderTest_asAdapter.java | 8 ++-
.../isis/viewer/restfulobjects/tck/Util.java | 18 +++--
...enDisabledMembers_thenRepresentation_ok.java | 4 +-
...ivenHasIcon_thenRepresentation_ok_TOFIX.java | 19 ++---
...ivenHiddenMembers_thenRepresentation_ok.java | 4 +-
...venViewModel_thenRepresentation_ok_TODO.java | 23 +++---
...henArgsValid_thenMultiplePropertyUpdate.java | 4 +-
...sPlus_thenStringPropertyUpdated_ok_TODO.java | 6 +-
..._whenArgValid_thenJdkPropertyUpdated_ok.java | 6 +-
...lid_thenJodaTimePropertyUpdated_ok_TODO.java | 12 ++--
...rgValid_thenPrimitivePropertyUpdated_ok.java | 6 +-
.../action/Get_whenDoesntExistOid_then_404.java | 16 +----
...dempotent_thenResponseCode_205_bad_TODO.java | 19 ++---
...empotent_thenResponseCode_205_bad_TOFIX.java | 19 ++---
.../Get_givenActionSemanticsOfSafe_ok.java | 10 +--
.../Get_givenDisabled_thenResponseCode_203.java | 18 ++---
...enMandatorySimpleArg_whenArgMissing_bad.java | 8 +--
...MandatorySimpleArg_whenArgNullValue_bad.java | 8 +--
...givenNoArgRequired_whenNoArgProvided_ok.java | 24 +++----
...t_givenOptionalArg_whenNoArgProvided_ok.java | 24 +++----
...rgIsHrefAndLinksToNonExistentEntity_bad.java | 4 +-
.../Get_givenRefArg_whenArgProvided_ok.java | 28 ++++----
...larArgInteger_whenArgMalformed_bad_TODO.java | 10 +--
...ivenScalarArgInteger_whenArgProvided_ok.java | 10 +--
...rg_whenArgMalformedMissingValueNode_bad.java | 17 ++---
.../Get_givenScalarArg_whenArgSurplus_bad.java | 19 ++---
...lidationRuleForAllArgs_whenArgFails_bad.java | 26 +++----
...dationRuleForSingleArg_whenArgFails_bad.java | 28 ++++----
...ype_andContentLength_andRespCode_200_ok.java | 24 +++----
...Null_thenRepr_andRespHeaders_and_200_ok.java | 19 ++---
...whenObject_isNull_thenRepresentation_ok.java | 17 ++---
...SemanticsOfIdempotent_then_205_bad_TODO.java | 19 ++---
...ctionSemanticsOfSafe_then_205_bad_TOFIX.java | 19 ++---
...anticsOfNotIdempotent_then_405_bad_TODO.java | 19 ++---
...ActionSemanticsOfSafe_then_405_bad_TODO.java | 19 ++---
..._whenDoesntExistId_thenResponseCode_404.java | 16 +----
.../Get_whenQueryArg_xRoFollowLinks_ok.java | 8 +--
.../Get_whenQueryArg_xRoFollowLinks_ok.java | 25 +++----
106 files changed, 522 insertions(+), 673 deletions(-)
----------------------------------------------------------------------