You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by sk...@apache.org on 2014/01/23 17:21:46 UTC
[3/5] git commit: [OLINGO-117] TDD implementation
[OLINGO-117] TDD implementation
Project: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/commit/38539fe2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/tree/38539fe2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/diff/38539fe2
Branch: refs/heads/olingo-117
Commit: 38539fe228a7f0651d1fee7667000c0faf1fa634
Parents: 2de6df2
Author: Stephan Klevenz <sk...@apache.org>
Authored: Tue Jan 21 12:25:48 2014 +0100
Committer: Stephan Klevenz <sk...@apache.org>
Committed: Thu Jan 23 17:21:31 2014 +0100
----------------------------------------------------------------------
.../odata2/core/ep/consumer/XmlFeedConsumer.java | 14 ++++++++++++++
.../odata2/core/ep/consumer/XmlFeedConsumerTest.java | 4 ++++
2 files changed, 18 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/38539fe2/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/XmlFeedConsumer.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/XmlFeedConsumer.java b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/XmlFeedConsumer.java
index a20f2f2..b5902f4 100644
--- a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/XmlFeedConsumer.java
+++ b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/XmlFeedConsumer.java
@@ -34,6 +34,7 @@ import org.apache.olingo.odata2.api.ep.entry.EntryMetadata;
import org.apache.olingo.odata2.api.ep.entry.ODataEntry;
import org.apache.olingo.odata2.api.ep.feed.ODataFeed;
import org.apache.olingo.odata2.core.ep.aggregator.EntityInfoAggregator;
+import org.apache.olingo.odata2.core.ep.entry.EntryMetadataImpl;
import org.apache.olingo.odata2.core.ep.feed.FeedMetadataImpl;
import org.apache.olingo.odata2.core.ep.feed.ODataFeedImpl;
import org.apache.olingo.odata2.core.ep.util.FormatXml;
@@ -110,6 +111,19 @@ public class XmlFeedConsumer {
if (FormatXml.ATOM_ENTRY.equals(reader.getLocalName())) {
ODataEntry entry = xec.readEntry(reader, eia, entryReadProperties);
results.add(entry);
+ } else if (FormatXml.ATOM_TOMBSTONE_DELETED_ENTRY.equals(reader.getLocalName())) {
+ EntryMetadataImpl deletedEntryMetadata = new EntryMetadataImpl();
+
+ String uri = reader.getAttributeValue(FormatXml.ATOM_TOMBSTONE_NAMESPACE, FormatXml.ATOM_TOMBSTONE_REF);
+ String date = reader.getAttributeValue(FormatXml.ATOM_TOMBSTONE_NAMESPACE, FormatXml.ATOM_TOMBSTONE_WHEN);
+ String id = uri;
+
+ reader.nextTag();
+
+ deletedEntryMetadata.setUri(uri);
+ deletedEntryMetadata.setId(id);
+
+ deletedEntries.add(deletedEntryMetadata);
} else if (FormatXml.M_COUNT.equals(reader.getLocalName())) {
reader.require(XMLStreamConstants.START_ELEMENT, Edm.NAMESPACE_M_2007_08, FormatXml.M_COUNT);
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/38539fe2/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/XmlFeedConsumerTest.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/XmlFeedConsumerTest.java b/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/XmlFeedConsumerTest.java
index b2c6267..a05c377 100644
--- a/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/XmlFeedConsumerTest.java
+++ b/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/XmlFeedConsumerTest.java
@@ -152,5 +152,9 @@ public class XmlFeedConsumerTest extends AbstractXmlConsumerTest {
assertTrue(feed.isDeltaFeed());
assertNotNull(feed.getDeletedEntries());
+ assertNotNull(feed.getEntries());
+
+ assertEquals(1, feed.getEntries().size());
+ assertEquals(1, feed.getDeletedEntries().size());
}
}