You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by mi...@apache.org on 2015/11/22 18:46:26 UTC
[3/3] olingo-odata2 git commit: [OLINGO-822] Merge branch
'OLINGO-822_WritePropertiesForExpandContext'
[OLINGO-822] Merge branch 'OLINGO-822_WritePropertiesForExpandContext'
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata2/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata2/commit/843fba14
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata2/tree/843fba14
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata2/diff/843fba14
Branch: refs/heads/master
Commit: 843fba1449b367d5eef6fa69f4606bbd7232a9d9
Parents: 352a82c 21dfed3
Author: mibo <mi...@mirb.de>
Authored: Sun Nov 22 18:40:04 2015 +0100
Committer: mibo <mi...@mirb.de>
Committed: Sun Nov 22 18:40:04 2015 +0100
----------------------------------------------------------------------
.../api/ep/callback/WriteCallbackContext.java | 21 ++++
.../ep/producer/AtomEntryEntityProducer.java | 12 +-
.../ep/producer/JsonEntryEntityProducer.java | 1 +
.../producer/JsonEntryEntityProducerTest.java | 122 +++++++++++++++++--
.../odata2/core/ep/producer/MyCallback.java | 13 +-
.../core/ep/producer/XmlExpandProducerTest.java | 59 ++++++++-
6 files changed, 208 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/843fba14/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/JsonEntryEntityProducerTest.java
----------------------------------------------------------------------
diff --cc odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/JsonEntryEntityProducerTest.java
index c06f9b5,2b86d06..519ba0d
--- a/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/JsonEntryEntityProducerTest.java
+++ b/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/JsonEntryEntityProducerTest.java
@@@ -30,23 -30,10 +30,17 @@@ import java.io.IOException
import java.io.InputStream;
import java.io.InputStreamReader;
import java.net.URI;
- import java.util.ArrayList;
- import java.util.Arrays;
- import java.util.Calendar;
- import java.util.HashMap;
- import java.util.List;
- import java.util.Map;
- import java.util.TimeZone;
+ import java.util.*;
import org.apache.olingo.odata2.api.ODataCallback;
-import org.apache.olingo.odata2.api.edm.*;
+import org.apache.olingo.odata2.api.edm.Edm;
+import org.apache.olingo.odata2.api.edm.EdmEntitySet;
+import org.apache.olingo.odata2.api.edm.EdmEntityType;
+import org.apache.olingo.odata2.api.edm.EdmFacets;
+import org.apache.olingo.odata2.api.edm.EdmMapping;
+import org.apache.olingo.odata2.api.edm.EdmProperty;
+import org.apache.olingo.odata2.api.edm.EdmSimpleTypeException;
+import org.apache.olingo.odata2.api.edm.EdmTyped;
import org.apache.olingo.odata2.api.ep.EntityProviderException;
import org.apache.olingo.odata2.api.ep.EntityProviderWriteProperties;
import org.apache.olingo.odata2.api.ep.callback.OnWriteEntryContent;