[midPoint-git] midPoint branch parser updated. v2.3devel-1166-g93079d5
Katka Valalikova
git at evolveum.com
Mon Feb 10 11:03:49 CET 2014
Project "midPoint" branch parser has been updated
via 93079d50d97f878e693ad53efab89f20cfcba40d (commit) v2.3devel-1166-g93079d5
via 35a65711498b96511d4d727f44e173160ff34e24 (commit) v2.3devel-1165-g35a6571
via 8f5a2f445fc4d8759f2edded5ca5d743d5ede61d (commit) v2.3devel-1164-g8f5a2f4
via b0ea3a4418bf56c1cb116f3cf63bb68631f65b1e (commit) v2.3devel-1163-gb0ea3a4
via faf4563273a24f81d024726efcda12f447c13ac9 (commit) v2.3devel-1087-gfaf4563
from 259fc81b9340532adf157b0493d64be1c24a84ac (commit) v2.3devel-1161-g259fc81
- Log -----------------------------------------------------------------
commit 93079d50d97f878e693ad53efab89f20cfcba40d
Author: katkav <k.valalikova at evolveum.com>
Date: Mon Feb 10 10:56:55 2014 +0100
small refactoring for yaml and json parsing..
commit 35a65711498b96511d4d727f44e173160ff34e24
Author: katkav <k.valalikova at evolveum.com>
Date: Sun Feb 9 22:18:10 2014 +0100
build fix..
commit 8f5a2f445fc4d8759f2edded5ca5d743d5ede61d
Author: katkav <k.valalikova at evolveum.com>
Date: Sun Feb 9 21:18:57 2014 +0100
json / yaml <-> xnode <-> prism improvements..implemented support for schemaXnode..
commit b0ea3a4418bf56c1cb116f3cf63bb68631f65b1e
Merge: faf4563 259fc81
Author: katkav <k.valalikova at evolveum.com>
Date: Sat Feb 8 18:23:48 2014 +0100
Merge branch 'parser' of git.evolveum.com:/srv/git/projects/midpoint into parser
commit faf4563273a24f81d024726efcda12f447c13ac9
Author: katkav <k.valalikova at evolveum.com>
Date: Fri Feb 7 16:31:44 2014 +0100
yaml + json parsing improvement (addig support for yaml type tags)..
-----------------------------------------------------------------------
(Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full)
Summary of changes:
.../midpoint/prism/json/AbstractParser.java | 132 +++--
.../midpoint/prism/json/DOMDeserializer.java | 86 ----
.../midpoint/prism/json/DOMSerializer.java | 134 ------
.../prism/json/JaxbElementDeserializer.java | 216 ---------
.../midpoint/prism/json/JaxbElementSerializer.java | 73 ---
.../midpoint/prism/json/PolyStringSerializer.java | 24 -
.../midpoint/prism/json/PrismJasonProcessor.java | 17 +-
.../midpoint/prism/json/PrismJsonSerializer.java | 440 -----------------
.../midpoint/prism/json/QNameSerializer.java | 24 -
.../midpoint/prism/parser/AbstractParser.java | 503 ++++++++++++++++++++
.../evolveum/midpoint/prism/parser/JsonParser.java | 124 +++++
.../evolveum/midpoint/prism/parser/YamlParser.java | 255 +++-------
.../prism/parser/json/DomElementSerializer.java | 22 +
.../{ => parser}/json/ItemPathDeserializer.java | 2 +-
.../{ => parser}/json/ItemPathSerializer.java | 10 +-
.../prism/{ => parser}/json/JsonValueParser.java | 33 +-
.../prism/parser/json/PolyStringDeserializer.java | 27 ++
.../prism/parser/json/PolyStringSerializer.java | 41 ++
.../prism/{ => parser}/json/QNameDeserializer.java | 14 +-
.../prism/parser/json/QNameSerializer.java | 48 ++
.../json/XmlGregorialCalendarSerializer.java | 21 +
.../prism/parser/yaml/MidpoinYAMLGenerator.java | 52 ++
.../prism/parser/yaml/MidpointYAMLFactory.java | 44 ++
.../prism/parser/yaml/MidpointYAMLParser.java | 51 ++
.../midpoint/prism/parser/AbstractParserTest.java | 44 +-
.../midpoint/prism/parser/TestDomParser.java | 1 -
.../midpoint/prism/parser/TestJsonParser.java | 5 +-
.../midpoint/prism/parser/TestYamlParser.java | 2 -
.../test/resources/common/json/resource-rum.json | 13 +
.../src/test/resources/common/json/user-jack.json | 147 +++---
.../test/resources/common/yaml/resource-rum.yaml | 10 +
.../src/test/resources/common/yaml/user-jack.yaml | 55 +--
32 files changed, 1300 insertions(+), 1370 deletions(-)
delete mode 100644 infra/prism/src/main/java/com/evolveum/midpoint/prism/json/DOMDeserializer.java
delete mode 100644 infra/prism/src/main/java/com/evolveum/midpoint/prism/json/DOMSerializer.java
delete mode 100644 infra/prism/src/main/java/com/evolveum/midpoint/prism/json/JaxbElementDeserializer.java
delete mode 100644 infra/prism/src/main/java/com/evolveum/midpoint/prism/json/JaxbElementSerializer.java
delete mode 100644 infra/prism/src/main/java/com/evolveum/midpoint/prism/json/PolyStringSerializer.java
delete mode 100644 infra/prism/src/main/java/com/evolveum/midpoint/prism/json/PrismJsonSerializer.java
delete mode 100644 infra/prism/src/main/java/com/evolveum/midpoint/prism/json/QNameSerializer.java
create mode 100644 infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/AbstractParser.java
create mode 100644 infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/JsonParser.java
create mode 100644 infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/json/DomElementSerializer.java
rename infra/prism/src/main/java/com/evolveum/midpoint/prism/{ => parser}/json/ItemPathDeserializer.java (96%)
rename infra/prism/src/main/java/com/evolveum/midpoint/prism/{ => parser}/json/ItemPathSerializer.java (65%)
rename infra/prism/src/main/java/com/evolveum/midpoint/prism/{ => parser}/json/JsonValueParser.java (55%)
create mode 100644 infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/json/PolyStringDeserializer.java
create mode 100644 infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/json/PolyStringSerializer.java
rename infra/prism/src/main/java/com/evolveum/midpoint/prism/{ => parser}/json/QNameDeserializer.java (88%)
create mode 100644 infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/json/QNameSerializer.java
create mode 100644 infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/json/XmlGregorialCalendarSerializer.java
create mode 100644 infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/yaml/MidpoinYAMLGenerator.java
create mode 100644 infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/yaml/MidpointYAMLFactory.java
create mode 100644 infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/yaml/MidpointYAMLParser.java
create mode 100644 infra/prism/src/test/resources/common/json/resource-rum.json
create mode 100644 infra/prism/src/test/resources/common/yaml/resource-rum.yaml
hooks/post-receive
--
midPoint
More information about the midPoint-svn
mailing list