Merge branch 'master' into OLINGO-231_PocForAndroid
Conflicts:
odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/XmlEntityConsumer.java
odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/XmlPropertyConsumerTest.java
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata2/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata2/commit/28333eff
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata2/tree/28333eff
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata2/diff/28333eff
Branch: refs/heads/OLINGO-231_PocForAndroid
Commit: 28333efff58a8bab0f2f0198eb3dd37ec41fb93c
Parents: 3f1de10 1ac8e7d
Author: Michael Bolz <[email protected]>
Authored: Tue Apr 29 13:57:53 2014 +0200
Committer: Michael Bolz <[email protected]>
Committed: Tue Apr 29 13:57:53 2014 +0200
----------------------------------------------------------------------
.../processor/core/util/ClassHelper.java | 53 ++--
.../processor/core/util/ClassHelperTest.java | 21 +-
.../api/exception/ODataJPARuntimeException.java | 1 -
.../processor/core/access/data/JPAEntity.java | 2 +-
.../core/access/data/JPAEntityParser.java | 4 +-
.../core/access/model/JPAEdmNameBuilder.java | 6 +-
.../core/access/model/JPATypeConvertor.java | 4 +-
.../processor/core/model/JPAEdmProperty.java | 9 +-
.../JPAEntityParserTestForStaticMethods.java | 2 +-
.../access/model/JPAEdmNameBuilderTest.java | 4 +-
.../core/mock/ODataJPAServiceFactoryMock.java | 6 +-
.../core/mock/OnJPAWriteContentMock.java | 4 +-
.../processor/core/mock/data/JPATypeMock.java | 12 +-
.../ref/converter/BlobToByteConverter.java | 4 +-
.../jpa/processor/ref/model/Material.java | 2 +-
.../odata2/jpa/processor/ref/model/NoteKey.java | 14 +-
.../ref/extension/OnDBWriteContent.java | 4 +-
.../api/ep/EntityProviderReadProperties.java | 19 +-
.../api/ep/EntityProviderWriteProperties.java | 27 +-
.../olingo/odata2/core/ODataRequestHandler.java | 9 +-
.../odata2/core/batch/BatchRequestParser.java | 102 ++++---
.../odata2/core/batch/BatchRequestWriter.java | 24 +-
.../odata2/core/batch/BatchResponseParser.java | 11 +-
.../core/ep/consumer/JsonEntryConsumer.java | 19 +-
.../core/ep/consumer/JsonFeedConsumer.java | 3 +-
.../core/ep/consumer/JsonPropertyConsumer.java | 33 ++-
.../core/ep/consumer/XmlEntityConsumer.java | 7 +-
.../core/ep/consumer/XmlEntryConsumer.java | 22 +-
.../core/ep/consumer/XmlPropertyConsumer.java | 32 ++-
.../ep/producer/AtomEntryEntityProducer.java | 36 ++-
.../ep/producer/JsonEntryEntityProducer.java | 21 +-
.../odata2/core/ContentNegotiatorTest.java | 8 +
.../core/batch/BatchRequestParserTest.java | 2 +
.../odata2/core/batch/BatchRequestTest.java | 285 +++++++++++++++++++
.../core/batch/BatchRequestWriterTest.java | 22 +-
.../core/batch/BatchResponseParserTest.java | 1 -
.../odata2/core/batch/BatchResponseTest.java | 141 +++++++++
.../ep/ODataEntityProviderPropertiesTest.java | 9 +
.../consumer/JsonEntryDeepInsertEntryTest.java | 16 ++
.../ep/consumer/JsonPropertyConsumerTest.java | 53 +++-
.../ep/consumer/XmlPropertyConsumerTest.java | 103 +++++--
.../core/ep/producer/AtomEntryProducerTest.java | 30 ++
.../producer/JsonEntryEntityProducerTest.java | 24 ++
.../resources/JsonInlineRoomWithInlineNull.json | 44 +++
.../src/test/resources/batchResponse.batch | 2 -
.../odata2/fit/basic/ServiceResolutionTest.java | 18 ++
.../odata2/fit/ref/EntryJsonChangeTest.java | 30 +-
.../odata2/fit/ref/FunctionImportXmlTest.java | 68 ++++-
.../odata2/testutil/helper/StringHelper.java | 99 ++++++-
49 files changed, 1223 insertions(+), 249 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/28333eff/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/XmlEntityConsumer.java
----------------------------------------------------------------------
diff --cc
odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/XmlEntityConsumer.java
index 13d8805,5d73862..85068bf
---
a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/XmlEntityConsumer.java
+++
b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/XmlEntityConsumer.java
@@@ -113,10 -114,9 +113,11 @@@ public class XmlEntityConsumer
XmlPropertyConsumer xec = new XmlPropertyConsumer();
try {
- reader = XmlHelper.createStreamReader(content);
- return xec.readProperty(reader, edmProperty,
properties.getMergeSemantic(), properties.getTypeMappings(),
- properties);
+ reader = XmlStreamFactory.createStreamReader(content);
- Map<String, Object> result =
- xec.readProperty(reader, edmProperty,
properties.getMergeSemantic(), properties.getTypeMappings());
- return result;
++ return xec.readProperty(reader, edmProperty,
++ properties.getMergeSemantic(),
++ properties.getTypeMappings(),
++ properties);
} catch (EntityProviderException e) {
cachedException = e;
throw cachedException;
http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/28333eff/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/XmlEntryConsumer.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/28333eff/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/XmlPropertyConsumer.java
----------------------------------------------------------------------
diff --cc
odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/XmlPropertyConsumer.java
index 02bdb0f,3887333..db51a79
---
a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/XmlPropertyConsumer.java
+++
b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/XmlPropertyConsumer.java
@@@ -34,12 -39,9 +35,12 @@@ import org.apache.olingo.odata2.core.ep
import org.apache.olingo.odata2.core.ep.aggregator.EntityPropertyInfo;
import org.apache.olingo.odata2.core.ep.aggregator.EntityTypeMapping;
import org.apache.olingo.odata2.core.ep.util.FormatXml;
+import org.apache.olingo.odata2.api.xml.XMLStreamConstants;
+import org.apache.olingo.odata2.api.xml.XMLStreamException;
+import org.apache.olingo.odata2.api.xml.XMLStreamReader;
/**
- *
+ * XML property consumer.
*/
public class XmlPropertyConsumer {
http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/28333eff/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/AtomEntryEntityProducer.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/28333eff/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/XmlPropertyConsumerTest.java
----------------------------------------------------------------------
diff --cc
odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/XmlPropertyConsumerTest.java
index 0bf231a,c33b4ea..edd931c
---
a/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/XmlPropertyConsumerTest.java
+++
b/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/XmlPropertyConsumerTest.java
@@@ -36,7 -39,7 +37,8 @@@ import org.apache.olingo.odata2.api.edm
import org.apache.olingo.odata2.api.edm.EdmSimpleTypeException;
import org.apache.olingo.odata2.api.edm.EdmSimpleTypeKind;
import org.apache.olingo.odata2.api.ep.EntityProviderException;
+import org.apache.olingo.odata2.api.xml.XMLStreamReader;
+ import org.apache.olingo.odata2.api.ep.EntityProviderReadProperties;
import org.apache.olingo.odata2.testutil.mock.MockFacade;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/28333eff/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/AtomEntryProducerTest.java
----------------------------------------------------------------------
