svn commit: r1033904 - /websites/production/olingo/content/

[chrisam]

Author: chrisam
Date: Mon Aug 13 14:27:51 2018
New Revision: 1033904

Log:
Publish website

Added:
websites/production/olingo/content/
  - copied from r1033903, websites/staging/olingo/trunk/content/

svn commit: r1837958 - /olingo/site/trunk/content/doc/odata2/release.mdtext

[chrisam]

Author: chrisam
Date: Mon Aug 13 14:16:35 2018
New Revision: 1837958

URL: http://svn.apache.org/viewvc?rev=1837958=rev
Log:
Update v2 release docu to exclude md5

Modified:
olingo/site/trunk/content/doc/odata2/release.mdtext

Modified: olingo/site/trunk/content/doc/odata2/release.mdtext
URL: 
http://svn.apache.org/viewvc/olingo/site/trunk/content/doc/odata2/release.mdtext?rev=1837958=1837957=1837958=diff
==
--- olingo/site/trunk/content/doc/odata2/release.mdtext (original)
+++ olingo/site/trunk/content/doc/odata2/release.mdtext Mon Aug 13 14:16:35 2018
@@ -137,13 +137,13 @@ configured in the parent pom of the proj
 The Maven module `odata2-dist` is responsible to package convenience 
distribution zip files
 using the assembly plugin. The distributions are created with a release build 
`mvn clean install -Papache-release -Dgpg.passphrase="yourPassphraseHere"`
 
-# MD5 and SHA for distribution packages
+# SHA for distribution packages
 
-MD5 and SHA files are created manually for distribution packages:
+SHA files are created manually for distribution packages:
 
-openssl md5 < ${filename}.zip > ${filename}.zip.md5
 gpg --print-md SHA512 ${filename}.zip > ${filename}.zip.sha512
 
+DO NOT generate md5 files.
 
 # Release Tag
 

svn commit: r1837955 - in /olingo/site/trunk/content/javadoc/odata4: ./ org/ org/apache/ org/apache/olingo/ org/apache/olingo/client/ org/apache/olingo/client/api/ org/apache/olingo/client/api/class-u

[chrisam]

Author: chrisam
Date: Mon Aug 13 14:10:03 2018
New Revision: 1837955

URL: http://svn.apache.org/viewvc?rev=1837955=rev
Log:
Add new javadoc


[This commit notification would consist of 316 parts, 
which exceeds the limit of 50 ones, so it was shortened to the summary.]

svn commit: r1837953 - /olingo/site/trunk/content/javadoc/odata4/

[chrisam]

Author: chrisam
Date: Mon Aug 13 14:03:24 2018
New Revision: 1837953

URL: http://svn.apache.org/viewvc?rev=1837953=rev
Log:
Delete old javadoc

Removed:
olingo/site/trunk/content/javadoc/odata4/

svn commit: r1837952 - /olingo/site/trunk/content/doc/odata4/download.mdtext

[chrisam]

Author: chrisam
Date: Mon Aug 13 14:01:25 2018
New Revision: 1837952

URL: http://svn.apache.org/viewvc?rev=1837952=rev
Log:
Update download page v4

Modified:
olingo/site/trunk/content/doc/odata4/download.mdtext

Modified: olingo/site/trunk/content/doc/odata4/download.mdtext
URL: 
http://svn.apache.org/viewvc/olingo/site/trunk/content/doc/odata4/download.mdtext?rev=1837952=1837951=1837952=diff
==
--- olingo/site/trunk/content/doc/odata4/download.mdtext (original)
+++ olingo/site/trunk/content/doc/odata4/download.mdtext Mon Aug 13 14:01:25 
2018
@@ -21,26 +21,26 @@ Notice:Licensed to the Apache Softwa
 Apache Olingo OData4 is a collection of Java libraries for
 implementing [OData V4][1] protocol clients or servers.
 
-### Release 4.4.0 (2017-09-01)
+### Release 4.5.0 (2018-08-13)
 
 [Full download page][2] and [release notes][3].
 
-The Apache *Olingo OData 4 4.4.0* release is the fourth stable release for the 
*OData V4* specifications.
+The Apache *Olingo OData 4 4.5.0* release is the fith stable release for the 
*OData V4* specifications.
 
 ### Commodity Packages
 
 Package | zip | Description
 --- | --- | -
-Olingo OData Sources
|[Download](http://www.apache.org/dyn/closer.lua/olingo/odata4/4.4.0/Olingo-OData-4.4.0-source-release.zip)
 
([md5](https://dist.apache.org/repos/dist/release/olingo/odata4/4.4.0/Olingo-OData-4.4.0-source-release.zip.md5),
 
[sha512](https://dist.apache.org/repos/dist/release/olingo/odata4/4.4.0/Olingo-OData-4.4.0-source-release.zip.sha512),
 
[pgp](https://dist.apache.org/repos/dist/release/olingo/odata4/4.4.0/Olingo-OData-4.4.0-source-release.zip.asc))
 | Complete source code.
-Olingo OData Docs   | 
[Download](http://www.apache.org/dyn/closer.lua/olingo/odata4/4.4.0/Olingo-OData-JavaDoc-4.4.0-javadoc.zip)
 
([md5](https://dist.apache.org/repos/dist/release/olingo/odata4/4.4.0/Olingo-OData-JavaDoc-4.4.0-javadoc.zip.md5),
 
[sha512](https://dist.apache.org/repos/dist/release/olingo/odata4/4.4.0/Olingo-OData-JavaDoc-4.4.0-javadoc.zip.sha512),
 
[pgp](https://dist.apache.org/repos/dist/release/olingo/odata4/4.4.0/Olingo-OData-JavaDoc-4.4.0-javadoc.zip.asc))
 | Documentation and JavaDoc.
-Olingo OData Server for Java| 
[Download](http://www.apache.org/dyn/closer.lua/olingo/odata4/4.4.0/Olingo-OData-Server-for-Java-4.4.0-lib.zip)
 
([md5](https://dist.apache.org/repos/dist/release/olingo/odata4/4.4.0/Olingo-OData-Server-for-Java-4.4.0-lib.zip.md5),
 
[sha512](https://dist.apache.org/repos/dist/release/olingo/odata4/4.4.0/Olingo-OData-Server-for-Java-4.4.0-lib.zip.sha512),
 
[pgp](https://dist.apache.org/repos/dist/release/olingo/odata4/4.4.0/Olingo-OData-Server-for-Java-4.4.0-lib.zip.asc))
 | All you need to implement an OData V4 Java server.
-Olingo OData Server Extension for Java| 
[Download](http://www.apache.org/dyn/closer.lua/olingo/odata4/4.4.0/Olingo-OData-Server-Extension-for-Java-4.4.0-lib.zip)
 
([md5](https://dist.apache.org/repos/dist/release/olingo/odata4/4.4.0/Olingo-OData-Server-Extension-for-Java-4.4.0-lib.zip.md5),
 
[sha512](https://dist.apache.org/repos/dist/release/olingo/odata4/4.4.0/Olingo-OData-Server-Extension-for-Java-4.4.0-lib.zip.sha512),
 
[pgp](https://dist.apache.org/repos/dist/release/olingo/odata4/4.4.0/Olingo-OData-Server-Extension-for-Java-4.4.0-lib.zip.asc))
 | Convenience API to implement an OData V4 Java server.
-Olingo OData Client for Java  | 
[Download](http://www.apache.org/dyn/closer.lua/olingo/odata4/4.4.0/Olingo-OData-Client-for-Java-4.4.0-lib.zip)
 
([md5](https://dist.apache.org/repos/dist/release/olingo/odata4/4.4.0/Olingo-OData-Client-for-Java-4.4.0-lib.zip.md5),
 
[sha512](https://dist.apache.org/repos/dist/release/olingo/odata4/4.4.0/Olingo-OData-Client-for-Java-4.4.0-lib.zip.sha512),
 
[pgp](https://dist.apache.org/repos/dist/release/olingo/odata4/4.4.0/Olingo-OData-Client-for-Java-4.4.0-lib.zip.asc))
 | All you need to implement an OData V4 Java client.
-Olingo OData Client for Android | 
[Download](http://www.apache.org/dyn/closer.lua/olingo/odata4/4.4.0/Olingo-OData-Client-for-Android-4.4.0-lib.zip)
 
([md5](https://dist.apache.org/repos/dist/release/olingo/odata4/4.4.0/Olingo-OData-Client-for-Android-4.4.0-lib.zip.md5),
 
[sha512](https://dist.apache.org/repos/dist/release/olingo/odata4/4.4.0/Olingo-OData-Client-for-Android-4.4.0-lib.zip.sha512),
 
[pgp](https://dist.apache.org/repos/dist/release/olingo/odata4/4.4.0/Olingo-OData-Client-for-Android-4.4.0-lib.zip.asc))
 | All you need to implement an OData V4 Android client.
+Olingo OData Sources
|[Download](http://www.apache.org/dyn/closer.lua/olingo/odata4/4.5.0/Olingo-OData-4.5.0-source-release.zip)
 
([md5](https://dist.apache.org/repos/dist/release/olingo/odata4/4.5.0/Olingo-OData-4.5.0-source-release.zip.md5),
 
[sha512](https://dist.apache.org/repos/dist/release/olingo/odata4/4.5.0/Olingo-OData-4.5.0-source

svn commit: r28692 - /release/olingo/odata4/4.5.0/

[chrisam]

Author: chrisam
Date: Mon Aug 13 13:58:16 2018
New Revision: 28692

Log:
add new 4.5.0 release

Added:
release/olingo/odata4/4.5.0/
release/olingo/odata4/4.5.0/Olingo-OData-4.5.0-source-release.zip   (with 
props)
release/olingo/odata4/4.5.0/Olingo-OData-4.5.0-source-release.zip.asc
release/olingo/odata4/4.5.0/Olingo-OData-4.5.0-source-release.zip.sha512
release/olingo/odata4/4.5.0/Olingo-OData-Client-for-Android-4.5.0-lib.zip   
(with props)

release/olingo/odata4/4.5.0/Olingo-OData-Client-for-Android-4.5.0-lib.zip.asc

release/olingo/odata4/4.5.0/Olingo-OData-Client-for-Android-4.5.0-lib.zip.sha512
release/olingo/odata4/4.5.0/Olingo-OData-Client-for-Java-4.5.0-lib.zip   
(with props)
release/olingo/odata4/4.5.0/Olingo-OData-Client-for-Java-4.5.0-lib.zip.asc

release/olingo/odata4/4.5.0/Olingo-OData-Client-for-Java-4.5.0-lib.zip.sha512
release/olingo/odata4/4.5.0/Olingo-OData-JavaDoc-4.5.0-javadoc.zip   (with 
props)
release/olingo/odata4/4.5.0/Olingo-OData-JavaDoc-4.5.0-javadoc.zip.asc
release/olingo/odata4/4.5.0/Olingo-OData-JavaDoc-4.5.0-javadoc.zip.sha512

release/olingo/odata4/4.5.0/Olingo-OData-Server-Extension-for-Java-4.5.0-lib.zip
   (with props)

release/olingo/odata4/4.5.0/Olingo-OData-Server-Extension-for-Java-4.5.0-lib.zip.asc

release/olingo/odata4/4.5.0/Olingo-OData-Server-Extension-for-Java-4.5.0-lib.zip.sha512
release/olingo/odata4/4.5.0/Olingo-OData-Server-for-Java-4.5.0-lib.zip   
(with props)
release/olingo/odata4/4.5.0/Olingo-OData-Server-for-Java-4.5.0-lib.zip.asc

release/olingo/odata4/4.5.0/Olingo-OData-Server-for-Java-4.5.0-lib.zip.sha512

Added: release/olingo/odata4/4.5.0/Olingo-OData-4.5.0-source-release.zip
==
Binary file - no diff available.

Propchange: release/olingo/odata4/4.5.0/Olingo-OData-4.5.0-source-release.zip
--
svn:mime-type = application/octet-stream

Added: release/olingo/odata4/4.5.0/Olingo-OData-4.5.0-source-release.zip.asc
==
--- release/olingo/odata4/4.5.0/Olingo-OData-4.5.0-source-release.zip.asc 
(added)
+++ release/olingo/odata4/4.5.0/Olingo-OData-4.5.0-source-release.zip.asc Mon 
Aug 13 13:58:16 2018
@@ -0,0 +1,17 @@
+-BEGIN PGP SIGNATURE-
+Version: GnuPG v1
+
+iQIcBAABCgAGBQJbcYlwAAoJEEgk951HXZUi/O0P/2dUMXVaWkO4aDAZMe3fQ/IE
+/GTXX548hNBKwXpk94R1Nu0E7QUiUCP3vkCmtZUbjhGOcr3j1aRQEAnX2cmKa/D8
+e0iCAAoB+VvPTuywAc3p1NHQiqOXkB0lSLMU6pIeFiv5nLQVu1H2gHXLk5V1ct4C
+Vlo3g2N29uB/83kt7LjoLJlcVCS/cKZLymh+vVK1PQt9s+POBtfwzosbd3ehehlj
+Pcnts56fosdyDUddIKKzEyqlKLyq+F3O8o/ouTrm2AEAJQW+0Y5qau4zY3O33CGr
+DeRvlRM9BKU4H5IumrnDVZf0Amb5bFUEsp8DaY8Od8V/IWoj5nI1PmvnWikN7A2g
+H50G4j73ZFYKht3x1LMwCpaVAz2IWwWE8nK7XoLwXEXeEBmibqERmvj9jfY4LaLG
+k+l5As+HSy8OzUGjqFotEwe43uihwl+SBQdyRVZk2AkWVM1lgtMcFqBYAB0Hihuv
+MCQT/fR7LiZsv6ffXnIqk7oIm7781i6NhajgALS5hdOvLuLKdMRvNYFFLJw2fTj7
+guxxMnVorqMVOhUejv+geWJXPc9JHY2BY60yzZnletiBAkSeLQ2MYucCIK8i1Mx0
+NyTu3x7jpcuJs+Mto73IhhAyYuTpyK09Z3uEaDcmh1rEDw+dfNaBVj+r/lT+Ft2e
+hqaHnzJTwYeebQnXATiP
+=WLt7
+-END PGP SIGNATURE-

Added: release/olingo/odata4/4.5.0/Olingo-OData-4.5.0-source-release.zip.sha512
==
--- release/olingo/odata4/4.5.0/Olingo-OData-4.5.0-source-release.zip.sha512 
(added)
+++ release/olingo/odata4/4.5.0/Olingo-OData-4.5.0-source-release.zip.sha512 
Mon Aug 13 13:58:16 2018
@@ -0,0 +1,3 @@
+./target/Olingo-OData-4.5.0-source-release.zip: 
+78712452 AA50673E EF924146 DEE02493 2AEDDD1D 86A240A5 BDF89A9E B6AAD79F 
6E09AE54
+ EEFA9595 F4B60D58 D3854D76 670E2850 F7AC578A 28D335C2 44A399C1

Added: release/olingo/odata4/4.5.0/Olingo-OData-Client-for-Android-4.5.0-lib.zip
==
Binary file - no diff available.

Propchange: 
release/olingo/odata4/4.5.0/Olingo-OData-Client-for-Android-4.5.0-lib.zip
--
svn:mime-type = application/octet-stream

Added: 
release/olingo/odata4/4.5.0/Olingo-OData-Client-for-Android-4.5.0-lib.zip.asc
==
--- 
release/olingo/odata4/4.5.0/Olingo-OData-Client-for-Android-4.5.0-lib.zip.asc 
(added)
+++ 
release/olingo/odata4/4.5.0/Olingo-OData-Client-for-Android-4.5.0-lib.zip.asc 
Mon Aug 13 13:58:16 2018
@@ -0,0 +1,17 @@
+-BEGIN PGP SIGNATURE-
+Version: GnuPG v1
+
+iQIcBAABCgAGBQJbcYpCAAoJEEgk951HXZUihX4P/1LzIfdkWLoZKoc5UQOG1BuW
+xZb/U9LKge6GGNPoDx3kBAhGQqpQ2f9+DjvIjcnEWBsHuv5q4W74WPaqbtIhAFiI
+mg85xAHAKi94qQsJuav6KPVSIkVDllTH6WArtbBPQGkAbJbyw2jx+ijyJ4hByFUM
+8DvqjC42IETRaTpz+pI1Doo5MHI/2+VDSI3VmFdN/uUBKFUwvvnL35nkfDHxhKJ5
+SsQASuVucQVgg/QY2639lFK6sD+6NgHIJTcNMem3IRnTzOaZ8zXOAGpXbX1pXmSX

svn commit: r1837951 - /olingo/site/trunk/content/doc/odata4/release.mdtext

[chrisam]

Author: chrisam
Date: Mon Aug 13 13:58:26 2018
New Revision: 1837951

URL: http://svn.apache.org/viewvc?rev=1837951=rev
Log:
Adjust release documentation to exclude md5

Modified:
olingo/site/trunk/content/doc/odata4/release.mdtext

Modified: olingo/site/trunk/content/doc/odata4/release.mdtext
URL: 
http://svn.apache.org/viewvc/olingo/site/trunk/content/doc/odata4/release.mdtext?rev=1837951=1837950=1837951=diff
==
--- olingo/site/trunk/content/doc/odata4/release.mdtext (original)
+++ olingo/site/trunk/content/doc/odata4/release.mdtext Mon Aug 13 13:58:26 2018
@@ -128,13 +128,13 @@ configured in the parent pom of the proj
 The Maven module `odata-dist` (in project sub-folder `dist`) is responsible to 
package convenience distribution zip files
 using the assembly plugin. The distributions are created with a release build 
`mvn clean install -Papache-release -Dgpg.passphrase="yourPassphraseHere"`
 
-# MD5 and SHA for distribution packages
+# SHA for distribution packages
 
-MD5 and SHA files are created manually for distribution packages:
+SHA files are created manually for distribution packages:
 
-openssl md5 < ${filename}.zip > ${filename}.zip.md5
 gpg --print-md SHA512 ${filename}.zip > ${filename}.zip.sha512
 
+DO NOT create md5 files
 
 # Release Tag
 

svn commit: r28691 - /release/olingo/odata4/4.3.0/

[chrisam]

Author: chrisam
Date: Mon Aug 13 13:56:14 2018
New Revision: 28691

Log:
remove old version

Removed:
release/olingo/odata4/4.3.0/

[3/3] olingo-odata4 git commit: [OLINGO-1284] Set next 4.6.0-SNAPSHOT development version

[chrisam]

[OLINGO-1284] Set next 4.6.0-SNAPSHOT development version


Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/0f393065
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/0f393065
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/0f393065

Branch: refs/heads/master
Commit: 0f39306541a04b0fd92903c18b4c9a3b9970bd7f
Parents: 7290f7e
Author: Christian Amend 
Authored: Mon Aug 13 15:26:45 2018 +0200
Committer: Christian Amend 
Committed: Mon Aug 13 15:26:45 2018 +0200

--
 dist/android-lib/pom.xml | 2 +-
 dist/client-lib/pom.xml  | 2 +-
 dist/javadoc/pom.xml | 2 +-
 dist/pom.xml | 2 +-
 dist/server-lib-ext/pom.xml  | 2 +-
 dist/server-lib/pom.xml  | 2 +-
 ext/client-android/pom.xml   | 2 +-
 ext/client-proxy/pom.xml | 2 +-
 ext/karaf/karaf-features/pom.xml | 2 +-
 ext/karaf/karaf-fit/pom.xml  | 2 +-
 .../org/apache/olingo/osgi/itests/server/CarServiceTest.java | 2 +-
 ext/karaf/pom.xml| 2 +-
 ext/pojogen-maven-plugin/pom.xml | 2 +-
 ext/pom.xml  | 2 +-
 fit/pom.xml  | 2 +-
 lib/client-api/pom.xml   | 2 +-
 lib/client-core/pom.xml  | 2 +-
 lib/commons-api/pom.xml  | 2 +-
 lib/commons-core/pom.xml | 2 +-
 lib/pom.xml  | 2 +-
 lib/server-api/pom.xml   | 2 +-
 lib/server-core-ext/pom.xml  | 2 +-
 lib/server-core/pom.xml  | 2 +-
 lib/server-tecsvc/pom.xml| 2 +-
 lib/server-test/pom.xml  | 2 +-
 pom.xml  | 2 +-
 samples/client/pom.xml   | 2 +-
 samples/osgi/server/pom.xml  | 2 +-
 samples/pom.xml  | 2 +-
 samples/server/pom.xml   | 2 +-
 samples/tutorials/p0_all/pom.xml | 4 ++--
 samples/tutorials/p10_media/pom.xml  | 4 ++--
 samples/tutorials/p11_batch/pom.xml  | 4 ++--
 samples/tutorials/p12_deep_insert/pom.xml| 4 ++--
 samples/tutorials/p12_deep_insert_preparation/pom.xml| 4 ++--
 samples/tutorials/p1_read/pom.xml| 4 ++--
 samples/tutorials/p2_readep/pom.xml  | 4 ++--
 samples/tutorials/p3_write/pom.xml   | 4 ++--
 samples/tutorials/p4_navigation/pom.xml  | 4 ++--
 samples/tutorials/p5_queryoptions-tcs/pom.xml| 4 ++--
 samples/tutorials/p6_queryoptions-es/pom.xml | 4 ++--
 samples/tutorials/p7_queryoptions-o/pom.xml  | 4 ++--
 samples/tutorials/p8_queryoptions-f/pom.xml  | 4 ++--
 samples/tutorials/p9_action/pom.xml  | 4 ++--
 samples/tutorials/p9_action_preparation/pom.xml  | 4 ++--
 samples/tutorials/pe_streaming/pom.xml   | 4 ++--
 samples/tutorials/pom.xml| 2 +-
 47 files changed, 63 insertions(+), 63 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/0f393065/dist/android-lib/pom.xml
--
diff --git a/dist/android-lib/pom.xml b/dist/android-lib/pom.xml
index 12cc7ee..8499469 100644
--- a/dist/android-lib/pom.xml
+++ b/dist/android-lib/pom.xml
@@ -31,7 +31,7 @@
   
 org.apache.olingo
 odata-dist
-4.5.0
+4.6.0-SNAPSHOT
 ..
   
 

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/0f393065/dist/client-lib/pom.xml
--
diff --git a/dist/client-lib/pom.xml b/dist/client-lib/pom.xml
index a0d1327..c118eca 100644
--- a/dist/client-lib/pom.xml
+++ b/dist/client-lib/pom.xml
@@ -31,7 +31,7 

[1/3] olingo-odata4 git commit: [OLINGO-1284] Set 4.5.0-RC01 version

[chrisam]

Repository: olingo-odata4
Updated Branches:
  refs/heads/master c7664d4cb -> 0f3930654


[OLINGO-1284] Set 4.5.0-RC01 version


Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/cde4f072
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/cde4f072
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/cde4f072

Branch: refs/heads/master
Commit: cde4f0723fa4825c09374dae50366b1bdf1d4143
Parents: c7664d4
Author: Christian Amend 
Authored: Mon Aug 6 14:28:45 2018 +0200
Committer: Christian Amend 
Committed: Mon Aug 6 14:28:45 2018 +0200

--
 dist/android-lib/pom.xml | 2 +-
 dist/client-lib/pom.xml  | 2 +-
 dist/javadoc/pom.xml | 2 +-
 dist/pom.xml | 2 +-
 dist/server-lib-ext/pom.xml  | 2 +-
 dist/server-lib/pom.xml  | 2 +-
 ext/client-android/pom.xml   | 2 +-
 ext/client-proxy/pom.xml | 2 +-
 ext/karaf/karaf-features/pom.xml | 2 +-
 ext/karaf/karaf-fit/pom.xml  | 2 +-
 .../org/apache/olingo/osgi/itests/server/CarServiceTest.java | 2 +-
 ext/karaf/pom.xml| 2 +-
 ext/pojogen-maven-plugin/pom.xml | 2 +-
 ext/pom.xml  | 2 +-
 fit/pom.xml  | 2 +-
 lib/client-api/pom.xml   | 2 +-
 lib/client-core/pom.xml  | 2 +-
 lib/commons-api/pom.xml  | 2 +-
 lib/commons-core/pom.xml | 2 +-
 lib/pom.xml  | 2 +-
 lib/server-api/pom.xml   | 2 +-
 lib/server-core-ext/pom.xml  | 2 +-
 lib/server-core/pom.xml  | 2 +-
 lib/server-tecsvc/pom.xml| 2 +-
 lib/server-test/pom.xml  | 2 +-
 pom.xml  | 2 +-
 samples/client/pom.xml   | 2 +-
 samples/osgi/server/pom.xml  | 2 +-
 samples/pom.xml  | 2 +-
 samples/server/pom.xml   | 2 +-
 samples/tutorials/p0_all/pom.xml | 4 ++--
 samples/tutorials/p10_media/pom.xml  | 4 ++--
 samples/tutorials/p11_batch/pom.xml  | 4 ++--
 samples/tutorials/p12_deep_insert/pom.xml| 4 ++--
 samples/tutorials/p12_deep_insert_preparation/pom.xml| 4 ++--
 samples/tutorials/p1_read/pom.xml| 4 ++--
 samples/tutorials/p2_readep/pom.xml  | 4 ++--
 samples/tutorials/p3_write/pom.xml   | 4 ++--
 samples/tutorials/p4_navigation/pom.xml  | 4 ++--
 samples/tutorials/p5_queryoptions-tcs/pom.xml| 4 ++--
 samples/tutorials/p6_queryoptions-es/pom.xml | 4 ++--
 samples/tutorials/p7_queryoptions-o/pom.xml  | 4 ++--
 samples/tutorials/p8_queryoptions-f/pom.xml  | 4 ++--
 samples/tutorials/p9_action/pom.xml  | 4 ++--
 samples/tutorials/p9_action_preparation/pom.xml  | 4 ++--
 samples/tutorials/pe_streaming/pom.xml   | 4 ++--
 samples/tutorials/pom.xml| 2 +-
 47 files changed, 63 insertions(+), 63 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/cde4f072/dist/android-lib/pom.xml
--
diff --git a/dist/android-lib/pom.xml b/dist/android-lib/pom.xml
index b338172..a228964 100644
--- a/dist/android-lib/pom.xml
+++ b/dist/android-lib/pom.xml
@@ -31,7 +31,7 @@
   
 org.apache.olingo
 odata-dist
-4.5.0-SNAPSHOT
+4.5.0-RC01
 ..
   
 

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/cde4f072/dist/client-lib/pom.xml
--
diff --git a/dist/client-lib/pom.xml b/dist/client-lib/pom.xml
index 8bb7f98..4f7bfaa 100644
--- 

[2/3] olingo-odata4 git commit: [OLINGO-1284] Set 4.5.0 release version

[chrisam]

[OLINGO-1284] Set 4.5.0 release version


Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/7290f7ea
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/7290f7ea
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/7290f7ea

Branch: refs/heads/master
Commit: 7290f7ea4dc6e4096ec85c47f6012dcc24458e5c
Parents: cde4f07
Author: Christian Amend 
Authored: Mon Aug 13 15:25:07 2018 +0200
Committer: Christian Amend 
Committed: Mon Aug 13 15:25:07 2018 +0200

--
 dist/android-lib/pom.xml | 2 +-
 dist/client-lib/pom.xml  | 2 +-
 dist/javadoc/pom.xml | 2 +-
 dist/pom.xml | 2 +-
 dist/server-lib-ext/pom.xml  | 2 +-
 dist/server-lib/pom.xml  | 2 +-
 ext/client-android/pom.xml   | 2 +-
 ext/client-proxy/pom.xml | 2 +-
 ext/karaf/karaf-features/pom.xml | 2 +-
 ext/karaf/karaf-fit/pom.xml  | 2 +-
 .../org/apache/olingo/osgi/itests/server/CarServiceTest.java | 2 +-
 ext/karaf/pom.xml| 2 +-
 ext/pojogen-maven-plugin/pom.xml | 2 +-
 ext/pom.xml  | 2 +-
 fit/pom.xml  | 2 +-
 lib/client-api/pom.xml   | 2 +-
 lib/client-core/pom.xml  | 2 +-
 lib/commons-api/pom.xml  | 2 +-
 lib/commons-core/pom.xml | 2 +-
 lib/pom.xml  | 2 +-
 lib/server-api/pom.xml   | 2 +-
 lib/server-core-ext/pom.xml  | 2 +-
 lib/server-core/pom.xml  | 2 +-
 lib/server-tecsvc/pom.xml| 2 +-
 lib/server-test/pom.xml  | 2 +-
 pom.xml  | 2 +-
 samples/client/pom.xml   | 2 +-
 samples/osgi/server/pom.xml  | 2 +-
 samples/pom.xml  | 2 +-
 samples/server/pom.xml   | 2 +-
 samples/tutorials/p0_all/pom.xml | 4 ++--
 samples/tutorials/p10_media/pom.xml  | 4 ++--
 samples/tutorials/p11_batch/pom.xml  | 4 ++--
 samples/tutorials/p12_deep_insert/pom.xml| 4 ++--
 samples/tutorials/p12_deep_insert_preparation/pom.xml| 4 ++--
 samples/tutorials/p1_read/pom.xml| 4 ++--
 samples/tutorials/p2_readep/pom.xml  | 4 ++--
 samples/tutorials/p3_write/pom.xml   | 4 ++--
 samples/tutorials/p4_navigation/pom.xml  | 4 ++--
 samples/tutorials/p5_queryoptions-tcs/pom.xml| 4 ++--
 samples/tutorials/p6_queryoptions-es/pom.xml | 4 ++--
 samples/tutorials/p7_queryoptions-o/pom.xml  | 4 ++--
 samples/tutorials/p8_queryoptions-f/pom.xml  | 4 ++--
 samples/tutorials/p9_action/pom.xml  | 4 ++--
 samples/tutorials/p9_action_preparation/pom.xml  | 4 ++--
 samples/tutorials/pe_streaming/pom.xml   | 4 ++--
 samples/tutorials/pom.xml| 2 +-
 47 files changed, 63 insertions(+), 63 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/7290f7ea/dist/android-lib/pom.xml
--
diff --git a/dist/android-lib/pom.xml b/dist/android-lib/pom.xml
index a228964..12cc7ee 100644
--- a/dist/android-lib/pom.xml
+++ b/dist/android-lib/pom.xml
@@ -31,7 +31,7 @@
   
 org.apache.olingo
 odata-dist
-4.5.0-RC01
+4.5.0
 ..
   
 

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/7290f7ea/dist/client-lib/pom.xml
--
diff --git a/dist/client-lib/pom.xml b/dist/client-lib/pom.xml
index 4f7bfaa..a0d1327 100644
--- a/dist/client-lib/pom.xml
+++ b/dist/client-lib/pom.xml
@@ -31,7 +31,7 @@
   
 

olingo-odata4 git commit: [OLINGO-1284] Set 4.5.0-RC01 version

[chrisam]

Repository: olingo-odata4
Updated Branches:
  refs/heads/release45 [created] cde4f0723


[OLINGO-1284] Set 4.5.0-RC01 version


Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/cde4f072
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/cde4f072
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/cde4f072

Branch: refs/heads/release45
Commit: cde4f0723fa4825c09374dae50366b1bdf1d4143
Parents: c7664d4
Author: Christian Amend 
Authored: Mon Aug 6 14:28:45 2018 +0200
Committer: Christian Amend 
Committed: Mon Aug 6 14:28:45 2018 +0200

--
 dist/android-lib/pom.xml | 2 +-
 dist/client-lib/pom.xml  | 2 +-
 dist/javadoc/pom.xml | 2 +-
 dist/pom.xml | 2 +-
 dist/server-lib-ext/pom.xml  | 2 +-
 dist/server-lib/pom.xml  | 2 +-
 ext/client-android/pom.xml   | 2 +-
 ext/client-proxy/pom.xml | 2 +-
 ext/karaf/karaf-features/pom.xml | 2 +-
 ext/karaf/karaf-fit/pom.xml  | 2 +-
 .../org/apache/olingo/osgi/itests/server/CarServiceTest.java | 2 +-
 ext/karaf/pom.xml| 2 +-
 ext/pojogen-maven-plugin/pom.xml | 2 +-
 ext/pom.xml  | 2 +-
 fit/pom.xml  | 2 +-
 lib/client-api/pom.xml   | 2 +-
 lib/client-core/pom.xml  | 2 +-
 lib/commons-api/pom.xml  | 2 +-
 lib/commons-core/pom.xml | 2 +-
 lib/pom.xml  | 2 +-
 lib/server-api/pom.xml   | 2 +-
 lib/server-core-ext/pom.xml  | 2 +-
 lib/server-core/pom.xml  | 2 +-
 lib/server-tecsvc/pom.xml| 2 +-
 lib/server-test/pom.xml  | 2 +-
 pom.xml  | 2 +-
 samples/client/pom.xml   | 2 +-
 samples/osgi/server/pom.xml  | 2 +-
 samples/pom.xml  | 2 +-
 samples/server/pom.xml   | 2 +-
 samples/tutorials/p0_all/pom.xml | 4 ++--
 samples/tutorials/p10_media/pom.xml  | 4 ++--
 samples/tutorials/p11_batch/pom.xml  | 4 ++--
 samples/tutorials/p12_deep_insert/pom.xml| 4 ++--
 samples/tutorials/p12_deep_insert_preparation/pom.xml| 4 ++--
 samples/tutorials/p1_read/pom.xml| 4 ++--
 samples/tutorials/p2_readep/pom.xml  | 4 ++--
 samples/tutorials/p3_write/pom.xml   | 4 ++--
 samples/tutorials/p4_navigation/pom.xml  | 4 ++--
 samples/tutorials/p5_queryoptions-tcs/pom.xml| 4 ++--
 samples/tutorials/p6_queryoptions-es/pom.xml | 4 ++--
 samples/tutorials/p7_queryoptions-o/pom.xml  | 4 ++--
 samples/tutorials/p8_queryoptions-f/pom.xml  | 4 ++--
 samples/tutorials/p9_action/pom.xml  | 4 ++--
 samples/tutorials/p9_action_preparation/pom.xml  | 4 ++--
 samples/tutorials/pe_streaming/pom.xml   | 4 ++--
 samples/tutorials/pom.xml| 2 +-
 47 files changed, 63 insertions(+), 63 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/cde4f072/dist/android-lib/pom.xml
--
diff --git a/dist/android-lib/pom.xml b/dist/android-lib/pom.xml
index b338172..a228964 100644
--- a/dist/android-lib/pom.xml
+++ b/dist/android-lib/pom.xml
@@ -31,7 +31,7 @@
   
 org.apache.olingo
 odata-dist
-4.5.0-SNAPSHOT
+4.5.0-RC01
 ..
   
 

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/cde4f072/dist/client-lib/pom.xml
--
diff --git a/dist/client-lib/pom.xml b/dist/client-lib/pom.xml
index 8bb7f98..4f7bfaa 100644

svn commit: r1021854 - /websites/production/olingo/content/

[chrisam]

Author: chrisam
Date: Thu Dec  7 12:05:53 2017
New Revision: 1021854

Log:
publish new download page

Added:
websites/production/olingo/content/
  - copied from r1021853, websites/staging/olingo/trunk/content/

svn commit: r1817359 - /olingo/site/trunk/content/doc/odata2/download.mdtext

[chrisam]

Author: chrisam
Date: Thu Dec  7 11:32:12 2017
New Revision: 1817359

URL: http://svn.apache.org/viewvc?rev=1817359=rev
Log:
Update download page

Modified:
olingo/site/trunk/content/doc/odata2/download.mdtext

Modified: olingo/site/trunk/content/doc/odata2/download.mdtext
URL: 
http://svn.apache.org/viewvc/olingo/site/trunk/content/doc/odata2/download.mdtext?rev=1817359=1817358=1817359=diff
==
--- olingo/site/trunk/content/doc/odata2/download.mdtext (original)
+++ olingo/site/trunk/content/doc/odata2/download.mdtext Thu Dec  7 11:32:12 
2017
@@ -21,11 +21,11 @@ Notice:Licensed to the Apache Softwa
 Apache Olingo OData2 is a collection of Java libraries for
 implementing [OData V2][1] protocol clients or servers.
 
-### Release 2.0.9 (2017-07-08)
+### Release 2.0.10 (2017-12-07)
 
 [Full download page][2], [release notes][3]
 
-The Apache Olingo OData2 2.0.9 release is a patch release.
+The Apache Olingo OData2 2.0.10 release is a patch release.
 
 ### Commodity Packages
 
@@ -36,10 +36,10 @@ The *Core Library* is developed for the
 
 Package | zip | Description
 --- | --- | -
-Olingo OData2 Library| 
[Download](http://www.apache.org/dyn/closer.lua/olingo/odata2/2.0.9/olingo-odata2-dist-lib-2.0.9-lib.zip)
 
([md5](https://dist.apache.org/repos/dist/release/olingo/odata2/2.0.9/olingo-odata2-dist-lib-2.0.9-lib.zip.md5),
 
[sha512](https://dist.apache.org/repos/dist/release/olingo/odata2/2.0.9/olingo-odata2-dist-lib-2.0.9-lib.zip.sha512),
 
[pgp](https://dist.apache.org/repos/dist/release/olingo/odata2/2.0.9/olingo-odata2-dist-lib-2.0.9-lib.zip.asc))
 | All you need to implement an OData V2 client or server.
-Olingo OData2 Sources| 
[Download](http://www.apache.org/dyn/closer.lua/olingo/odata2/2.0.9/olingo-odata2-parent-2.0.9-source-release.zip)
 
([md5](https://dist.apache.org/repos/dist/release/olingo/odata2/2.0.9/olingo-odata2-parent-2.0.9-source-release.zip.md5),
 
[sha512](https://dist.apache.org/repos/dist/release/olingo/odata2/2.0.9/olingo-odata2-parent-2.0.9-source-release.zip.sha512),
 
[pgp](https://dist.apache.org/repos/dist/release/olingo/odata2/2.0.9/olingo-odata2-parent-2.0.9-source-release.zip.asc))
 | Olingo OData2 source code.
-Olingo OData2 Docs   | 
[Download](http://www.apache.org/dyn/closer.lua/olingo/odata2/2.0.9/olingo-odata2-dist-javadoc-2.0.9-javadoc.zip)
 
([md5](https://dist.apache.org/repos/dist/release/olingo/odata2/2.0.9/olingo-odata2-dist-javadoc-2.0.9-javadoc.zip.md5),
 
[sha512](https://dist.apache.org/repos/dist/release/olingo/odata2/2.0.9/olingo-odata2-dist-javadoc-2.0.9-javadoc.zip.sha512),
 
[pgp](https://dist.apache.org/repos/dist/release/olingo/odata2/2.0.9/olingo-odata2-dist-javadoc-2.0.9-javadoc.zip.asc))
 | Documentation and JavaDoc.
-Olingo OData2 Reference Scenario | 
[Download](http://www.apache.org/dyn/closer.lua/olingo/odata2/2.0.9/olingo-odata2-dist-ref-2.0.9-ref.zip)
 
([md5](https://dist.apache.org/repos/dist/release/olingo/odata2/2.0.9/olingo-odata2-dist-ref-2.0.9-ref.zip.md5),
 
[sha512](https://dist.apache.org/repos/dist/release/olingo/odata2/2.0.9/olingo-odata2-dist-ref-2.0.9-ref.zip.sha512),
 
[pgp](https://dist.apache.org/repos/dist/release/olingo/odata2/2.0.9/olingo-odata2-dist-ref-2.0.9-ref.zip.asc))
 | Deployable WAR files with reference scenario services using http://cxf.apache.org;>Apache CXF.
+Olingo OData2 Library| 
[Download](http://www.apache.org/dyn/closer.lua/olingo/odata2/2.0.10/olingo-odata2-dist-lib-2.0.10-lib.zip)
 
([md5](https://dist.apache.org/repos/dist/release/olingo/odata2/2.0.10/olingo-odata2-dist-lib-2.0.10-lib.zip.md5),
 
[sha512](https://dist.apache.org/repos/dist/release/olingo/odata2/2.0.10/olingo-odata2-dist-lib-2.0.10-lib.zip.sha512),
 
[pgp](https://dist.apache.org/repos/dist/release/olingo/odata2/2.0.10/olingo-odata2-dist-lib-2.0.10-lib.zip.asc))
 | All you need to implement an OData V2 client or server.
+Olingo OData2 Sources| 
[Download](http://www.apache.org/dyn/closer.lua/olingo/odata2/2.0.10/olingo-odata2-parent-2.0.10-source-release.zip)
 
([md5](https://dist.apache.org/repos/dist/release/olingo/odata2/2.0.10/olingo-odata2-parent-2.0.10-source-release.zip.md5),
 
[sha512](https://dist.apache.org/repos/dist/release/olingo/odata2/2.0.10/olingo-odata2-parent-2.0.10-source-release.zip.sha512),
 
[pgp](https://dist.apache.org/repos/dist/release/olingo/odata2/2.0.10/olingo-odata2-parent-2.0.10-source-release.zip.asc))
 | Olingo OData2 source code.
+Olingo OData2 Docs   | 
[Download](http://www.apache.org/dyn/closer.lua/olingo/odata2/2.0.10/olingo-odata2-dist-javadoc-2.0.10-javadoc.zip)
 
([md5](https://dist.apache.org/repos/dist/release/olingo/odata2/2.0.10/olingo-odata2-dist-javadoc-2.0.10-javadoc.zip.md5),
 
[sha512](https://dist.apache.org/repos/dist/release/olingo/odata2/2.0.10/olingo-odata2-dist-javadoc-2.0.10-javadoc.zip.sha512),
 
[pgp](ht

svn commit: r1817356 - in /olingo/site/trunk/content/javadoc/odata2: ./ org/ org/apache/ org/apache/olingo/ org/apache/olingo/odata2/ org/apache/olingo/odata2/annotation/ org/apache/olingo/odata2/anno

[chrisam]

Author: chrisam
Date: Thu Dec  7 11:25:43 2017
New Revision: 1817356

URL: http://svn.apache.org/viewvc?rev=1817356=rev
Log:
Add new 2.0.10 Javadoc


[This commit notification would consist of 226 parts, 
which exceeds the limit of 50 ones, so it was shortened to the summary.]

svn commit: r1817354 - /olingo/site/trunk/content/javadoc/odata2/

[chrisam]

Author: chrisam
Date: Thu Dec  7 11:19:08 2017
New Revision: 1817354

URL: http://svn.apache.org/viewvc?rev=1817354=rev
Log:
Delete old javadoc

Removed:
olingo/site/trunk/content/javadoc/odata2/

svn commit: r23413 - /release/olingo/odata2/2.0.10/

[chrisam]

Author: chrisam
Date: Wed Dec  6 13:56:34 2017
New Revision: 23413

Log:
add new 2.0.10 release

Added:
release/olingo/odata2/2.0.10/
release/olingo/odata2/2.0.10/olingo-odata2-dist-janos-2.0.10-janos.zip   
(with props)
release/olingo/odata2/2.0.10/olingo-odata2-dist-janos-2.0.10-janos.zip.asc
release/olingo/odata2/2.0.10/olingo-odata2-dist-janos-2.0.10-janos.zip.md5

release/olingo/odata2/2.0.10/olingo-odata2-dist-janos-2.0.10-janos.zip.sha512
release/olingo/odata2/2.0.10/olingo-odata2-dist-javadoc-2.0.10-javadoc.zip  
 (with props)

release/olingo/odata2/2.0.10/olingo-odata2-dist-javadoc-2.0.10-javadoc.zip.asc

release/olingo/odata2/2.0.10/olingo-odata2-dist-javadoc-2.0.10-javadoc.zip.md5

release/olingo/odata2/2.0.10/olingo-odata2-dist-javadoc-2.0.10-javadoc.zip.sha512
release/olingo/odata2/2.0.10/olingo-odata2-dist-jpa-2.0.10-jpa.zip   (with 
props)
release/olingo/odata2/2.0.10/olingo-odata2-dist-jpa-2.0.10-jpa.zip.asc
release/olingo/odata2/2.0.10/olingo-odata2-dist-jpa-2.0.10-jpa.zip.md5
release/olingo/odata2/2.0.10/olingo-odata2-dist-jpa-2.0.10-jpa.zip.sha512
release/olingo/odata2/2.0.10/olingo-odata2-dist-lib-2.0.10-lib.zip   (with 
props)
release/olingo/odata2/2.0.10/olingo-odata2-dist-lib-2.0.10-lib.zip.asc
release/olingo/odata2/2.0.10/olingo-odata2-dist-lib-2.0.10-lib.zip.md5
release/olingo/odata2/2.0.10/olingo-odata2-dist-lib-2.0.10-lib.zip.sha512
release/olingo/odata2/2.0.10/olingo-odata2-dist-ref-2.0.10-ref.zip   (with 
props)
release/olingo/odata2/2.0.10/olingo-odata2-dist-ref-2.0.10-ref.zip.asc
release/olingo/odata2/2.0.10/olingo-odata2-dist-ref-2.0.10-ref.zip.md5
release/olingo/odata2/2.0.10/olingo-odata2-dist-ref-2.0.10-ref.zip.sha512
release/olingo/odata2/2.0.10/olingo-odata2-parent-2.0.10-source-release.zip 
  (with props)

release/olingo/odata2/2.0.10/olingo-odata2-parent-2.0.10-source-release.zip.asc

release/olingo/odata2/2.0.10/olingo-odata2-parent-2.0.10-source-release.zip.md5

release/olingo/odata2/2.0.10/olingo-odata2-parent-2.0.10-source-release.zip.sha512
release/olingo/odata2/2.0.10/olingo-odata2-spring-2.0.10-source-release.zip 
  (with props)

release/olingo/odata2/2.0.10/olingo-odata2-spring-2.0.10-source-release.zip.asc

release/olingo/odata2/2.0.10/olingo-odata2-spring-2.0.10-source-release.zip.md5

release/olingo/odata2/2.0.10/olingo-odata2-spring-2.0.10-source-release.zip.sha512

Added: release/olingo/odata2/2.0.10/olingo-odata2-dist-janos-2.0.10-janos.zip
==
Binary file - no diff available.

Propchange: 
release/olingo/odata2/2.0.10/olingo-odata2-dist-janos-2.0.10-janos.zip
--
svn:mime-type = application/octet-stream

Added: 
release/olingo/odata2/2.0.10/olingo-odata2-dist-janos-2.0.10-janos.zip.asc
==
--- release/olingo/odata2/2.0.10/olingo-odata2-dist-janos-2.0.10-janos.zip.asc 
(added)
+++ release/olingo/odata2/2.0.10/olingo-odata2-dist-janos-2.0.10-janos.zip.asc 
Wed Dec  6 13:56:34 2017
@@ -0,0 +1,17 @@
+-BEGIN PGP SIGNATURE-
+Version: GnuPG v1
+
+iQIcBAABCgAGBQJaJ/ONAAoJEEgk951HXZUiFjsP/R10XqJEwrjvTBC/ZHHh/pO5
+rE+gBB4MzdoNVtBnWCc2wnMaPYTOIqY9I79LdPaZJcBtuwvCFJzkLHNpP3At1yNb
+wZngHaLLgbLPvP0ld2kcWFXp2dUTB7FBLfo2XRWupSWlK3RGBXuj+SmRxBvOtT2g
+rwzPrzEbSzBGifW7bYGtLz+QNdbre5Qbbpr/sNpehbM1H7hJn93uJG1qem7kB1Dx
+2O2IXqO6t0+LDr8mpC6bWQi6b9Eg/5dbNnBh74/Yo8qtIFu8txaQIR7indWEoUz0
+nkVsSsE6wOQ4TgCZSkmz0rXQ2a34Xvo788xvCw+/A8h3RJQoJuDn9XU4V4v6pcFr
+9hWWzNiG2ceusjRduqTCjMAwwQ2LbX7OQ+FGWZBl6yMzx7WOLuRIfA9xVs2Wclec
+WMuurSF7nUs3cQkTMHPSy7woi4Qn4qMQw8iIM7pnoZ/X+hFgj5ZwAcW2O4uXEseU
+a1yxPNnvJMS+oY7Ilc9MmIcZFPY2vi3UH1L+DzBMhFaaL8fo5c11+PmqQOIbU6iA
+Y+N4vQKNTzbJhBXOnDw7VVdSpZiDe15xQHTe10M58Al7fGjlo9FM6T0spUo5yLOP
+Koc6NQ3t7JbjeRuW4+d9QF5V9bRFQwDY1ckYaRSwfiy/14UQMlH+trirsl3wzoCJ
+CRAVEdm2lfM0SywAXvAc
+=8hE0
+-END PGP SIGNATURE-

Added: 
release/olingo/odata2/2.0.10/olingo-odata2-dist-janos-2.0.10-janos.zip.md5
==
--- release/olingo/odata2/2.0.10/olingo-odata2-dist-janos-2.0.10-janos.zip.md5 
(added)
+++ release/olingo/odata2/2.0.10/olingo-odata2-dist-janos-2.0.10-janos.zip.md5 
Wed Dec  6 13:56:34 2017
@@ -0,0 +1 @@
+(stdin)= 8e8300664938b10831231c5257e5e69c

Added: 
release/olingo/odata2/2.0.10/olingo-odata2-dist-janos-2.0.10-janos.zip.sha512
==
--- 
release/olingo/odata2/2.0.10/olingo-odata2-dist-janos-2.0.10-janos.zip.sha512 
(added)
+++ 
release/olingo/odata2/2.0.10/olingo-odata2-dist-janos-2.0.10-janos.zip.sha512 
Wed Dec  6 13:56:34 2017
@@ -0,0 +1,3 @@
+./odata2-dist/janos/target/olingo-odata2-dist-janos-2.0.10-janos.zip: 
+7D6642E8 6B93A1DE 7E9817DC AFEE3922 3565A012

svn commit: r23412 - /release/olingo/odata2/2.0.8/

[chrisam]

Author: chrisam
Date: Wed Dec  6 13:52:46 2017
New Revision: 23412

Log:
Delete old 2.0.8 release

Removed:
release/olingo/odata2/2.0.8/

[1/2] olingo-odata2 git commit: [OLINGO-1210] Set version to 2.0.10

[chrisam]

Repository: olingo-odata2
Updated Branches:
  refs/heads/master 67a93e77a -> 18d677b5c


[OLINGO-1210] Set version to 2.0.10


Project: http://git-wip-us.apache.org/repos/asf/olingo-odata2/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata2/commit/70bc93de
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata2/tree/70bc93de
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata2/diff/70bc93de

Branch: refs/heads/master
Commit: 70bc93de97f7d988b591aae1b760af47bfbfde6c
Parents: 67a93e7
Author: Christian Amend 
Authored: Wed Dec 6 14:15:39 2017 +0100
Committer: Christian Amend 
Committed: Wed Dec 6 14:15:39 2017 +0100

--
 odata2-annotation-processor/annotation-processor-api/pom.xml | 2 +-
 odata2-annotation-processor/annotation-processor-core/pom.xml| 2 +-
 odata2-annotation-processor/annotation-processor-ref/pom.xml | 2 +-
 odata2-annotation-processor/annotation-processor-web/pom.xml | 2 +-
 odata2-annotation-processor/pom.xml  | 2 +-
 odata2-dist/janos/pom.xml| 2 +-
 odata2-dist/javadoc/pom.xml  | 2 +-
 odata2-dist/jpa/pom.xml  | 2 +-
 odata2-dist/lib/pom.xml  | 2 +-
 odata2-dist/pom.xml  | 2 +-
 odata2-dist/ref/pom.xml  | 2 +-
 odata2-jpa-processor/jpa-api/pom.xml | 2 +-
 odata2-jpa-processor/jpa-core/pom.xml| 2 +-
 odata2-jpa-processor/jpa-ref/pom.xml | 2 +-
 odata2-jpa-processor/jpa-web/pom.xml | 2 +-
 odata2-jpa-processor/pom.xml | 2 +-
 odata2-lib/odata-annotation/pom.xml  | 2 +-
 odata2-lib/odata-api/pom.xml | 2 +-
 odata2-lib/odata-core/pom.xml| 2 +-
 odata2-lib/odata-fit/pom.xml | 2 +-
 odata2-lib/odata-ref/pom.xml | 2 +-
 odata2-lib/odata-testutil/pom.xml| 2 +-
 odata2-lib/odata-web/pom.xml | 2 +-
 odata2-lib/pom.xml   | 2 +-
 odata2-sample/cars-annotation-archetype/pom.xml  | 4 ++--
 .../src/main/resources/archetype-resources/pom.xml   | 2 +-
 odata2-sample/cars-jpa-archetype/pom.xml | 2 +-
 .../src/main/resources/archetype-resources/pom.xml   | 2 +-
 odata2-sample/cars-service-archetype/pom.xml | 4 ++--
 .../src/main/resources/archetype-resources/pom.xml   | 2 +-
 odata2-sample/pom.xml| 2 +-
 odata2-spring/pom.xml| 2 +-
 pom.xml  | 2 +-
 33 files changed, 35 insertions(+), 35 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/70bc93de/odata2-annotation-processor/annotation-processor-api/pom.xml
--
diff --git a/odata2-annotation-processor/annotation-processor-api/pom.xml 
b/odata2-annotation-processor/annotation-processor-api/pom.xml
index 26fec80..eeb7c3c 100644
--- a/odata2-annotation-processor/annotation-processor-api/pom.xml
+++ b/odata2-annotation-processor/annotation-processor-api/pom.xml
@@ -25,7 +25,7 @@
   
 org.apache.olingo
 olingo-odata2-annotation-processor
-2.0.10-RC01
+2.0.10
 ..
   
 

http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/70bc93de/odata2-annotation-processor/annotation-processor-core/pom.xml
--
diff --git a/odata2-annotation-processor/annotation-processor-core/pom.xml 
b/odata2-annotation-processor/annotation-processor-core/pom.xml
index 43faa32..fbabaa4 100644
--- a/odata2-annotation-processor/annotation-processor-core/pom.xml
+++ b/odata2-annotation-processor/annotation-processor-core/pom.xml
@@ -20,7 +20,7 @@
   
 org.apache.olingo
 olingo-odata2-annotation-processor
-2.0.10-RC01
+2.0.10
 ..
   
 

http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/70bc93de/odata2-annotation-processor/annotation-processor-ref/pom.xml
--
diff --git a/odata2-annotation-processor/annotation-processor-ref/pom.xml 
b/odata2-annotation-processor/annotation-processor-ref/pom.xml
index b382d25..34a2194 100644
--- 

[2/2] olingo-odata2 git commit: [OLINGO-1210] Set version to 2.0.11-SNAPSHOT

[chrisam]

[OLINGO-1210] Set version to 2.0.11-SNAPSHOT


Project: http://git-wip-us.apache.org/repos/asf/olingo-odata2/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata2/commit/18d677b5
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata2/tree/18d677b5
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata2/diff/18d677b5

Branch: refs/heads/master
Commit: 18d677b5c6b1bc787b1fdae21fadead904971fbc
Parents: 70bc93d
Author: Christian Amend 
Authored: Wed Dec 6 14:47:32 2017 +0100
Committer: Christian Amend 
Committed: Wed Dec 6 14:47:32 2017 +0100

--
 odata2-annotation-processor/annotation-processor-api/pom.xml | 2 +-
 odata2-annotation-processor/annotation-processor-core/pom.xml| 2 +-
 odata2-annotation-processor/annotation-processor-ref/pom.xml | 2 +-
 odata2-annotation-processor/annotation-processor-web/pom.xml | 2 +-
 odata2-annotation-processor/pom.xml  | 2 +-
 odata2-dist/janos/pom.xml| 2 +-
 odata2-dist/javadoc/pom.xml  | 2 +-
 odata2-dist/jpa/pom.xml  | 2 +-
 odata2-dist/lib/pom.xml  | 2 +-
 odata2-dist/pom.xml  | 2 +-
 odata2-dist/ref/pom.xml  | 2 +-
 odata2-jpa-processor/jpa-api/pom.xml | 2 +-
 odata2-jpa-processor/jpa-core/pom.xml| 2 +-
 odata2-jpa-processor/jpa-ref/pom.xml | 2 +-
 odata2-jpa-processor/jpa-web/pom.xml | 2 +-
 odata2-jpa-processor/pom.xml | 2 +-
 odata2-lib/odata-annotation/pom.xml  | 2 +-
 odata2-lib/odata-api/pom.xml | 2 +-
 odata2-lib/odata-core/pom.xml| 2 +-
 odata2-lib/odata-fit/pom.xml | 2 +-
 odata2-lib/odata-ref/pom.xml | 2 +-
 odata2-lib/odata-testutil/pom.xml| 2 +-
 odata2-lib/odata-web/pom.xml | 2 +-
 odata2-lib/pom.xml   | 2 +-
 odata2-sample/cars-annotation-archetype/pom.xml  | 4 ++--
 .../src/main/resources/archetype-resources/pom.xml   | 2 +-
 odata2-sample/cars-jpa-archetype/pom.xml | 2 +-
 .../src/main/resources/archetype-resources/pom.xml   | 2 +-
 odata2-sample/cars-service-archetype/pom.xml | 4 ++--
 .../src/main/resources/archetype-resources/pom.xml   | 2 +-
 odata2-sample/pom.xml| 2 +-
 odata2-spring/pom.xml| 2 +-
 pom.xml  | 2 +-
 33 files changed, 35 insertions(+), 35 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/18d677b5/odata2-annotation-processor/annotation-processor-api/pom.xml
--
diff --git a/odata2-annotation-processor/annotation-processor-api/pom.xml 
b/odata2-annotation-processor/annotation-processor-api/pom.xml
index eeb7c3c..c900fea 100644
--- a/odata2-annotation-processor/annotation-processor-api/pom.xml
+++ b/odata2-annotation-processor/annotation-processor-api/pom.xml
@@ -25,7 +25,7 @@
   
 org.apache.olingo
 olingo-odata2-annotation-processor
-2.0.10
+2.0.11-SNAPSHOT
 ..
   
 

http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/18d677b5/odata2-annotation-processor/annotation-processor-core/pom.xml
--
diff --git a/odata2-annotation-processor/annotation-processor-core/pom.xml 
b/odata2-annotation-processor/annotation-processor-core/pom.xml
index fbabaa4..751be87 100644
--- a/odata2-annotation-processor/annotation-processor-core/pom.xml
+++ b/odata2-annotation-processor/annotation-processor-core/pom.xml
@@ -20,7 +20,7 @@
   
 org.apache.olingo
 olingo-odata2-annotation-processor
-2.0.10
+2.0.11-SNAPSHOT
 ..
   
 

http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/18d677b5/odata2-annotation-processor/annotation-processor-ref/pom.xml
--
diff --git a/odata2-annotation-processor/annotation-processor-ref/pom.xml 
b/odata2-annotation-processor/annotation-processor-ref/pom.xml
index 34a2194..0e57437 100644
--- a/odata2-annotation-processor/annotation-processor-ref/pom.xml
+++ b/odata2-annotation-processor/annotation-processor-ref/pom.xml

[olingo-odata2] Git Push Summary

[chrisam]

Repository: olingo-odata2
Updated Tags:  refs/tags/2.0.10-RC01 [created] 67a93e77a

olingo-odata2 git commit: [OLINGO-1210] Set version to 2.0.10-RC01

[chrisam]

Repository: olingo-odata2
Updated Branches:
  refs/heads/master c04abbad1 -> 67a93e77a


[OLINGO-1210] Set version to 2.0.10-RC01


Project: http://git-wip-us.apache.org/repos/asf/olingo-odata2/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata2/commit/67a93e77
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata2/tree/67a93e77
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata2/diff/67a93e77

Branch: refs/heads/master
Commit: 67a93e77a016f04333d4d6e4bb92adbc4a00ac40
Parents: c04abba
Author: Christian Amend 
Authored: Thu Nov 30 15:09:07 2017 +0100
Committer: Christian Amend 
Committed: Thu Nov 30 15:09:07 2017 +0100

--
 odata2-annotation-processor/annotation-processor-api/pom.xml | 2 +-
 odata2-annotation-processor/annotation-processor-core/pom.xml| 2 +-
 odata2-annotation-processor/annotation-processor-ref/pom.xml | 2 +-
 odata2-annotation-processor/annotation-processor-web/pom.xml | 2 +-
 odata2-annotation-processor/pom.xml  | 2 +-
 odata2-dist/janos/pom.xml| 2 +-
 odata2-dist/janos/src/main/resources/NOTICE  | 2 +-
 odata2-dist/javadoc/pom.xml  | 2 +-
 odata2-dist/jpa/pom.xml  | 2 +-
 odata2-dist/jpa/src/main/resources/NOTICE| 2 +-
 odata2-dist/lib/pom.xml  | 2 +-
 odata2-dist/lib/src/main/resources/NOTICE| 2 +-
 odata2-dist/pom.xml  | 2 +-
 odata2-dist/ref/pom.xml  | 2 +-
 odata2-dist/ref/src/main/resources/NOTICE| 2 +-
 odata2-jpa-processor/jpa-api/pom.xml | 2 +-
 odata2-jpa-processor/jpa-core/pom.xml| 2 +-
 odata2-jpa-processor/jpa-ref/pom.xml | 2 +-
 odata2-jpa-processor/jpa-web/pom.xml | 2 +-
 odata2-jpa-processor/pom.xml | 2 +-
 odata2-lib/odata-annotation/pom.xml  | 2 +-
 odata2-lib/odata-api/pom.xml | 2 +-
 odata2-lib/odata-core/pom.xml| 2 +-
 odata2-lib/odata-fit/pom.xml | 2 +-
 odata2-lib/odata-ref/pom.xml | 2 +-
 odata2-lib/odata-testutil/pom.xml| 2 +-
 odata2-lib/odata-web/pom.xml | 2 +-
 odata2-lib/pom.xml   | 2 +-
 odata2-sample/cars-annotation-archetype/pom.xml  | 4 ++--
 .../src/main/resources/archetype-resources/pom.xml   | 2 +-
 odata2-sample/cars-jpa-archetype/pom.xml | 2 +-
 .../src/main/resources/archetype-resources/pom.xml   | 2 +-
 odata2-sample/cars-service-archetype/pom.xml | 4 ++--
 .../src/main/resources/archetype-resources/pom.xml   | 2 +-
 odata2-sample/pom.xml| 2 +-
 odata2-spring/pom.xml| 2 +-
 pom.xml  | 2 +-
 37 files changed, 39 insertions(+), 39 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/67a93e77/odata2-annotation-processor/annotation-processor-api/pom.xml
--
diff --git a/odata2-annotation-processor/annotation-processor-api/pom.xml 
b/odata2-annotation-processor/annotation-processor-api/pom.xml
index 7e6fd4e..26fec80 100644
--- a/odata2-annotation-processor/annotation-processor-api/pom.xml
+++ b/odata2-annotation-processor/annotation-processor-api/pom.xml
@@ -25,7 +25,7 @@
   
 org.apache.olingo
 olingo-odata2-annotation-processor
-2.0.10-SNAPSHOT
+2.0.10-RC01
 ..
   
 

http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/67a93e77/odata2-annotation-processor/annotation-processor-core/pom.xml
--
diff --git a/odata2-annotation-processor/annotation-processor-core/pom.xml 
b/odata2-annotation-processor/annotation-processor-core/pom.xml
index dc99d85..43faa32 100644
--- a/odata2-annotation-processor/annotation-processor-core/pom.xml
+++ b/odata2-annotation-processor/annotation-processor-core/pom.xml
@@ -20,7 +20,7 @@
   
 org.apache.olingo
 olingo-odata2-annotation-processor
-2.0.10-SNAPSHOT
+2.0.10-RC01
 ..
   
 

[2/2] olingo-odata4 git commit: [OLINGO-1166] Add test case for enum metadata issue

[chrisam]

[OLINGO-1166] Add test case for enum metadata issue

Signed-off-by: Christian Amend 


Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/b5ff4783
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/b5ff4783
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/b5ff4783

Branch: refs/heads/master
Commit: b5ff47837fffb8a3a0836c5a8d6959ec4ee7ed0d
Parents: 16afaa6
Author: Tom van Wietmarschen 
Authored: Tue Aug 22 14:39:58 2017 +0200
Committer: Christian Amend 
Committed: Fri Sep 8 14:57:23 2017 +0200

--
 .../xml/MetadataDocumentXmlSerializerTest.java  | 62 
 1 file changed, 62 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/b5ff4783/lib/server-core/src/test/java/org/apache/olingo/server/core/serializer/xml/MetadataDocumentXmlSerializerTest.java
--
diff --git 
a/lib/server-core/src/test/java/org/apache/olingo/server/core/serializer/xml/MetadataDocumentXmlSerializerTest.java
 
b/lib/server-core/src/test/java/org/apache/olingo/server/core/serializer/xml/MetadataDocumentXmlSerializerTest.java
index d92d6ac..449253f 100644
--- 
a/lib/server-core/src/test/java/org/apache/olingo/server/core/serializer/xml/MetadataDocumentXmlSerializerTest.java
+++ 
b/lib/server-core/src/test/java/org/apache/olingo/server/core/serializer/xml/MetadataDocumentXmlSerializerTest.java
@@ -34,12 +34,17 @@ import java.util.List;
 
 import org.apache.commons.io.IOUtils;
 import org.apache.olingo.commons.api.edm.Edm;
+import org.apache.olingo.commons.api.edm.EdmAnnotation;
 import org.apache.olingo.commons.api.edm.EdmComplexType;
+import org.apache.olingo.commons.api.edm.EdmEnumType;
+import org.apache.olingo.commons.api.edm.EdmMember;
 import org.apache.olingo.commons.api.edm.EdmPrimitiveType;
 import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind;
 import org.apache.olingo.commons.api.edm.EdmProperty;
 import org.apache.olingo.commons.api.edm.EdmSchema;
 import org.apache.olingo.commons.api.edm.FullQualifiedName;
+import org.apache.olingo.commons.api.edm.annotation.EdmConstantExpression;
+import 
org.apache.olingo.commons.api.edm.annotation.EdmExpression.EdmExpressionType;
 import org.apache.olingo.commons.api.edm.provider.CsdlAction;
 import org.apache.olingo.commons.api.edm.provider.CsdlActionImport;
 import org.apache.olingo.commons.api.edm.provider.CsdlAliasInfo;
@@ -139,6 +144,63 @@ public class MetadataDocumentXmlSerializerTest {
 + "",
 IOUtils.toString(metadata));
   }
+  
+  /** Test if annotations on EnumType Members are added as children of the 
Member element
+   *  in compliance with OData v4.0, part 3: CSDL, section 14.3
+   */
+  @Test
+  public void testAnnotationsNestedInEnumMembers() throws Exception {
+// Create mock schema
+EdmSchema schema = mock(EdmSchema.class);
+when(schema.getNamespace()).thenReturn("MyNamespace");
+Edm edm = mock(Edm.class);
+when(edm.getSchemas()).thenReturn(Arrays.asList(schema));
+
+// create mock metadata
+ServiceMetadata serviceMetadata = mock(ServiceMetadata.class);
+when(serviceMetadata.getEdm()).thenReturn(edm);
+
+// add mock enums to schema
+EdmEnumType enumType = mock(EdmEnumType.class);
+when(schema.getEnumTypes()).thenReturn(Arrays.asList(enumType));
+when(enumType.getName()).thenReturn("MyEnum");
+EdmPrimitiveType int32Type = 
OData.newInstance().createPrimitiveTypeInstance(EdmPrimitiveTypeKind.Int32);
+when(enumType.getUnderlyingType()).thenReturn(int32Type);
+
+// mock enum member values
+
when(enumType.getMemberNames()).thenReturn(Collections.singletonList("MyMember"));
+EdmMember member = mock(EdmMember.class);
+when(enumType.getMember("MyMember")).thenReturn(member);
+when(member.getName()).thenReturn("MyMember");
+when(member.getValue()).thenReturn("0");
+
+EdmAnnotation annotation = mock(EdmAnnotation.class);
+
when(member.getAnnotations()).thenReturn(Collections.singletonList(annotation));
+when(annotation.getQualifier()).thenReturn("Core.Description");
+EdmConstantExpression expression = mock(EdmConstantExpression.class);
+when(expression.isConstant()).thenReturn(true);
+when(expression.asConstant()).thenReturn(expression);
+when(expression.getExpressionType()).thenReturn(EdmExpressionType.String);
+when(expression.getExpressionName()).thenReturn("String");
+when(expression.getValueAsString()).thenReturn("MyDescription");
+when(annotation.getExpression()).thenReturn(expression);
+
+InputStream metadata = 
serializer.metadataDocument(serviceMetadata).getContent();
+

[1/2] olingo-odata4 git commit: [OLINGO-1166] Fix serialization of annotations for enum members in the CSDL

[chrisam]

Repository: olingo-odata4
Updated Branches:
  refs/heads/master 0a2ebd795 -> b5ff47837


[OLINGO-1166] Fix serialization of annotations for enum members in the CSDL

Signed-off-by: Christian Amend 


Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/16afaa6f
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/16afaa6f
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/16afaa6f

Branch: refs/heads/master
Commit: 16afaa6f68e5787400d71035b35f06ba650e2b88
Parents: 0a2ebd7
Author: Tom van Wietmarschen 
Authored: Thu Aug 17 13:11:24 2017 +0200
Committer: Christian Amend 
Committed: Fri Sep 8 14:56:59 2017 +0200

--
 .../server/core/serializer/xml/MetadataDocumentXmlSerializer.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/16afaa6f/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/xml/MetadataDocumentXmlSerializer.java
--
diff --git 
a/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/xml/MetadataDocumentXmlSerializer.java
 
b/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/xml/MetadataDocumentXmlSerializer.java
index fe0fb54..a5ae088 100644
--- 
a/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/xml/MetadataDocumentXmlSerializer.java
+++ 
b/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/xml/MetadataDocumentXmlSerializer.java
@@ -934,7 +934,7 @@ public class MetadataDocumentXmlSerializer {
   writer.writeAttribute(XML_UNDERLYING_TYPE, 
getFullQualifiedName(enumType.getUnderlyingType(), false));
 
   for (String memberName : enumType.getMemberNames()) {
-writer.writeEmptyElement(XML_MEMBER);
+writer.writeStartElement(XML_MEMBER);
 writer.writeAttribute(XML_NAME, memberName);
 
 EdmMember member = enumType.getMember(memberName);
@@ -943,6 +943,7 @@ public class MetadataDocumentXmlSerializer {
 }
 
 appendAnnotations(writer, member);
+writer.writeEndElement();
   }
 
   writer.writeEndElement();

[1/2] olingo-odata4 git commit: [OLINGO-1152] Fix IllegalArgumentException when enum property is null.

[chrisam]

Repository: olingo-odata4
Updated Branches:
  refs/heads/master 4cae638ff -> 0a2ebd795


[OLINGO-1152] Fix IllegalArgumentException when enum property is null.

Signed-off-by: Christian Amend 


Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/6b34920a
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/6b34920a
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/6b34920a

Branch: refs/heads/master
Commit: 6b34920a5b0e465875ceebddc8a85fec086b8160
Parents: 4cae638
Author: Tom van Wietmarschen 
Authored: Thu Jul 20 16:49:26 2017 +0200
Committer: Christian Amend 
Committed: Fri Sep 8 14:50:58 2017 +0200

--
 .../olingo/client/core/serialization/JsonDeserializer.java   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/6b34920a/lib/client-core/src/main/java/org/apache/olingo/client/core/serialization/JsonDeserializer.java
--
diff --git 
a/lib/client-core/src/main/java/org/apache/olingo/client/core/serialization/JsonDeserializer.java
 
b/lib/client-core/src/main/java/org/apache/olingo/client/core/serialization/JsonDeserializer.java
index ec896bb..b2cfd49 100644
--- 
a/lib/client-core/src/main/java/org/apache/olingo/client/core/serialization/JsonDeserializer.java
+++ 
b/lib/client-core/src/main/java/org/apache/olingo/client/core/serialization/JsonDeserializer.java
@@ -385,7 +385,9 @@ public class JsonDeserializer implements ODataDeserializer {
   break;
 
 case ENUM:
-  valuable.setValue(ValueType.ENUM, node.asText());
+  if(!node.isNull()) {
+ valuable.setValue(ValueType.ENUM, node.asText());
+  }
   break;
 
 case PRIMITIVE:

[2/2] olingo-odata4 git commit: [OLINGO-1152] Test case for null enum values

[chrisam]

[OLINGO-1152] Test case for null enum values

Signed-off-by: Christian Amend 


Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/0a2ebd79
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/0a2ebd79
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/0a2ebd79

Branch: refs/heads/master
Commit: 0a2ebd7953c95eded80c0d050a33c2c036cfa014
Parents: 6b34920
Author: Tom van Wietmarschen 
Authored: Tue Aug 22 15:08:20 2017 +0200
Committer: Christian Amend 
Committed: Fri Sep 8 14:51:40 2017 +0200

--
 .../java/org/apache/olingo/client/core/JSONTest.java | 15 +++
 .../org/apache/olingo/client/core/olingo1152.json|  6 ++
 2 files changed, 21 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/0a2ebd79/lib/client-core/src/test/java/org/apache/olingo/client/core/JSONTest.java
--
diff --git 
a/lib/client-core/src/test/java/org/apache/olingo/client/core/JSONTest.java 
b/lib/client-core/src/test/java/org/apache/olingo/client/core/JSONTest.java
index caef339..646c562 100644
--- a/lib/client-core/src/test/java/org/apache/olingo/client/core/JSONTest.java
+++ b/lib/client-core/src/test/java/org/apache/olingo/client/core/JSONTest.java
@@ -36,6 +36,7 @@ import org.apache.olingo.client.api.data.ResWrap;
 import org.apache.olingo.client.api.domain.ClientCollectionValue;
 import org.apache.olingo.client.api.domain.ClientComplexValue;
 import org.apache.olingo.client.api.domain.ClientEntity;
+import org.apache.olingo.client.api.domain.ClientProperty;
 import org.apache.olingo.client.api.domain.ClientValue;
 import org.apache.olingo.client.core.serialization.JsonDeserializer;
 import org.apache.olingo.commons.api.Constants;
@@ -482,4 +483,18 @@ public class JSONTest extends AbstractTest {
   i++;
 }
   }
+  
+  @Test
+  public void issueOLINGO1152() throws Exception {
+InputStream inputStream = getClass().getResourceAsStream(
+"olingo1152" + "." + getSuffix(ContentType.APPLICATION_JSON));
+ClientEntity entity = client.getReader().readEntity(inputStream, 
ContentType.APPLICATION_JSON);
+assertNotNull(entity);
+ClientProperty prop = entity.getProperty("Gender");
+assertNotNull(prop);
+ClientValue value = prop.getValue();
+assertNotNull(value);
+assertTrue(value.asEnum() == null);
+
+  }
 }

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/0a2ebd79/lib/client-core/src/test/resources/org/apache/olingo/client/core/olingo1152.json
--
diff --git 
a/lib/client-core/src/test/resources/org/apache/olingo/client/core/olingo1152.json
 
b/lib/client-core/src/test/resources/org/apache/olingo/client/core/olingo1152.json
new file mode 100644
index 000..7f288c1
--- /dev/null
+++ 
b/lib/client-core/src/test/resources/org/apache/olingo/client/core/olingo1152.json
@@ -0,0 +1,6 @@
+{
+  "@odata.type": "#Microsoft.OData.SampleService.Models.TripPin.Person",
+  "@odata.id": 
"http://services.odata.org/V4/(S(fe5rsnxo3f2bvmh1nl1y))/TripPinServiceRW/People('russellwhyte')",
+  "gen...@odata.type": 
"#Microsoft.OData.SampleService.Models.TripPin.PersonGender",
+  "Gender": null
+}
\ No newline at end of file

svn commit: r1017733 - /websites/production/olingo/content/

[chrisam]

Author: chrisam
Date: Tue Sep  5 14:53:31 2017
New Revision: 1017733

Log:
publish website with updated release information

Added:
websites/production/olingo/content/
  - copied from r1017732, websites/staging/olingo/trunk/content/

svn commit: r1807358 - /olingo/site/trunk/content/doc/odata4/download.mdtext

[chrisam]

Author: chrisam
Date: Tue Sep  5 14:51:08 2017
New Revision: 1807358

URL: http://svn.apache.org/viewvc?rev=1807358=rev
Log:
Update Downloadpage

Modified:
olingo/site/trunk/content/doc/odata4/download.mdtext

Modified: olingo/site/trunk/content/doc/odata4/download.mdtext
URL: 
http://svn.apache.org/viewvc/olingo/site/trunk/content/doc/odata4/download.mdtext?rev=1807358=1807357=1807358=diff
==
--- olingo/site/trunk/content/doc/odata4/download.mdtext (original)
+++ olingo/site/trunk/content/doc/odata4/download.mdtext Tue Sep  5 14:51:08 
2017
@@ -21,26 +21,26 @@ Notice:Licensed to the Apache Softwa
 Apache Olingo OData4 is a collection of Java libraries for
 implementing [OData V4][1] protocol clients or servers.
 
-### Release 4.3.0 (2016-09-19)
+### Release 4.4.0 (2017-09-01)
 
 [Full download page][2] and [release notes][3].
 
-The Apache *Olingo OData 4 4.3.0* release is the fourth stable release for the 
*OData V4* specifications.
+The Apache *Olingo OData 4 4.4.0* release is the fourth stable release for the 
*OData V4* specifications.
 
 ### Commodity Packages
 
 Package | zip | Description
 --- | --- | -
-Olingo OData Sources
|[Download](http://www.apache.org/dyn/closer.lua/olingo/odata4/4.3.0/Olingo-OData-4.3.0-source-release.zip)
 
([md5](https://dist.apache.org/repos/dist/release/olingo/odata4/4.3.0/Olingo-OData-4.3.0-source-release.zip.md5),
 
[sha512](https://dist.apache.org/repos/dist/release/olingo/odata4/4.3.0/Olingo-OData-4.3.0-source-release.zip.sha512),
 
[pgp](https://dist.apache.org/repos/dist/release/olingo/odata4/4.3.0/Olingo-OData-4.3.0-source-release.zip.asc))
 | Complete source code.
-Olingo OData Docs   | 
[Download](http://www.apache.org/dyn/closer.lua/olingo/odata4/4.3.0/Olingo-OData-JavaDoc-4.3.0-javadoc.zip)
 
([md5](https://dist.apache.org/repos/dist/release/olingo/odata4/4.3.0/Olingo-OData-JavaDoc-4.3.0-javadoc.zip.md5),
 
[sha512](https://dist.apache.org/repos/dist/release/olingo/odata4/4.3.0/Olingo-OData-JavaDoc-4.3.0-javadoc.zip.sha512),
 
[pgp](https://dist.apache.org/repos/dist/release/olingo/odata4/4.3.0/Olingo-OData-JavaDoc-4.3.0-javadoc.zip.asc))
 | Documentation and JavaDoc.
-Olingo OData Server for Java| 
[Download](http://www.apache.org/dyn/closer.lua/olingo/odata4/4.3.0/Olingo-OData-Server-for-Java-4.3.0-lib.zip)
 
([md5](https://dist.apache.org/repos/dist/release/olingo/odata4/4.3.0/Olingo-OData-Server-for-Java-4.3.0-lib.zip.md5),
 
[sha512](https://dist.apache.org/repos/dist/release/olingo/odata4/4.3.0/Olingo-OData-Server-for-Java-4.3.0-lib.zip.sha512),
 
[pgp](https://dist.apache.org/repos/dist/release/olingo/odata4/4.3.0/Olingo-OData-Server-for-Java-4.3.0-lib.zip.asc))
 | All you need to implement an OData V4 Java server.
-Olingo OData Server Extension for Java| 
[Download](http://www.apache.org/dyn/closer.lua/olingo/odata4/4.3.0/Olingo-OData-Server-Extension-for-Java-4.3.0-lib.zip)
 
([md5](https://dist.apache.org/repos/dist/release/olingo/odata4/4.3.0/Olingo-OData-Server-Extension-for-Java-4.3.0-lib.zip.md5),
 
[sha512](https://dist.apache.org/repos/dist/release/olingo/odata4/4.3.0/Olingo-OData-Server-Extension-for-Java-4.3.0-lib.zip.sha512),
 
[pgp](https://dist.apache.org/repos/dist/release/olingo/odata4/4.3.0/Olingo-OData-Server-Extension-for-Java-4.3.0-lib.zip.asc))
 | Convenience API to implement an OData V4 Java server.
-Olingo OData Client for Java  | 
[Download](http://www.apache.org/dyn/closer.lua/olingo/odata4/4.3.0/Olingo-OData-Client-for-Java-4.3.0-lib.zip)
 
([md5](https://dist.apache.org/repos/dist/release/olingo/odata4/4.3.0/Olingo-OData-Client-for-Java-4.3.0-lib.zip.md5),
 
[sha512](https://dist.apache.org/repos/dist/release/olingo/odata4/4.3.0/Olingo-OData-Client-for-Java-4.3.0-lib.zip.sha512),
 
[pgp](https://dist.apache.org/repos/dist/release/olingo/odata4/4.3.0/Olingo-OData-Client-for-Java-4.3.0-lib.zip.asc))
 | All you need to implement an OData V4 Java client.
-Olingo OData Client for Android | 
[Download](http://www.apache.org/dyn/closer.lua/olingo/odata4/4.3.0/Olingo-OData-Client-for-Android-4.3.0-lib.zip)
 
([md5](https://dist.apache.org/repos/dist/release/olingo/odata4/4.3.0/Olingo-OData-Client-for-Android-4.3.0-lib.zip.md5),
 
[sha512](https://dist.apache.org/repos/dist/release/olingo/odata4/4.3.0/Olingo-OData-Client-for-Android-4.3.0-lib.zip.sha512),
 
[pgp](https://dist.apache.org/repos/dist/release/olingo/odata4/4.3.0/Olingo-OData-Client-for-Android-4.3.0-lib.zip.asc))
 | All you need to implement an OData V4 Android client.
+Olingo OData Sources
|[Download](http://www.apache.org/dyn/closer.lua/olingo/odata4/4.4.0/Olingo-OData-4.4.0-source-release.zip)
 
([md5](https://dist.apache.org/repos/dist/release/olingo/odata4/4.4.0/Olingo-OData-4.4.0-source-release.zip.md5),
 
[sha512](https://dist.apache.org/repos/dist/release/olingo/odata4/4.4.0/Olingo-OData-4.4.0-source

svn commit: r1807356 - in /olingo/site/trunk/content/javadoc/odata4: ./ org/ org/apache/ org/apache/olingo/ org/apache/olingo/client/ org/apache/olingo/client/api/ org/apache/olingo/client/api/class-u

[chrisam]

Author: chrisam
Date: Tue Sep  5 14:37:04 2017
New Revision: 1807356

URL: http://svn.apache.org/viewvc?rev=1807356=rev
Log:
add new 4.4.0 Javadoc


[This commit notification would consist of 308 parts, 
which exceeds the limit of 50 ones, so it was shortened to the summary.]

svn commit: r1807355 - /olingo/site/trunk/content/javadoc/odata4/

[chrisam]

Author: chrisam
Date: Tue Sep  5 14:29:31 2017
New Revision: 1807355

URL: http://svn.apache.org/viewvc?rev=1807355=rev
Log:
Delete old Javadoc

Removed:
olingo/site/trunk/content/javadoc/odata4/

svn commit: r21397 - /release/olingo/odata4/4.4.0/

[chrisam]

Author: chrisam
Date: Fri Sep  1 13:43:52 2017
New Revision: 21397

Log:
Add 4.4.0 release

Added:
release/olingo/odata4/4.4.0/
release/olingo/odata4/4.4.0/Olingo-OData-4.4.0-source-release.zip   (with 
props)
release/olingo/odata4/4.4.0/Olingo-OData-4.4.0-source-release.zip.asc
release/olingo/odata4/4.4.0/Olingo-OData-4.4.0-source-release.zip.md5
release/olingo/odata4/4.4.0/Olingo-OData-4.4.0-source-release.zip.sha512
release/olingo/odata4/4.4.0/Olingo-OData-Client-for-Android-4.4.0-lib.zip   
(with props)

release/olingo/odata4/4.4.0/Olingo-OData-Client-for-Android-4.4.0-lib.zip.asc

release/olingo/odata4/4.4.0/Olingo-OData-Client-for-Android-4.4.0-lib.zip.md5

release/olingo/odata4/4.4.0/Olingo-OData-Client-for-Android-4.4.0-lib.zip.sha512
release/olingo/odata4/4.4.0/Olingo-OData-Client-for-Java-4.4.0-lib.zip   
(with props)
release/olingo/odata4/4.4.0/Olingo-OData-Client-for-Java-4.4.0-lib.zip.asc
release/olingo/odata4/4.4.0/Olingo-OData-Client-for-Java-4.4.0-lib.zip.md5

release/olingo/odata4/4.4.0/Olingo-OData-Client-for-Java-4.4.0-lib.zip.sha512
release/olingo/odata4/4.4.0/Olingo-OData-JavaDoc-4.4.0-javadoc.zip   (with 
props)
release/olingo/odata4/4.4.0/Olingo-OData-JavaDoc-4.4.0-javadoc.zip.asc
release/olingo/odata4/4.4.0/Olingo-OData-JavaDoc-4.4.0-javadoc.zip.md5
release/olingo/odata4/4.4.0/Olingo-OData-JavaDoc-4.4.0-javadoc.zip.sha512

release/olingo/odata4/4.4.0/Olingo-OData-Server-Extension-for-Java-4.4.0-lib.zip
   (with props)

release/olingo/odata4/4.4.0/Olingo-OData-Server-Extension-for-Java-4.4.0-lib.zip.asc

release/olingo/odata4/4.4.0/Olingo-OData-Server-Extension-for-Java-4.4.0-lib.zip.md5

release/olingo/odata4/4.4.0/Olingo-OData-Server-Extension-for-Java-4.4.0-lib.zip.sha512
release/olingo/odata4/4.4.0/Olingo-OData-Server-for-Java-4.4.0-lib.zip   
(with props)
release/olingo/odata4/4.4.0/Olingo-OData-Server-for-Java-4.4.0-lib.zip.asc
release/olingo/odata4/4.4.0/Olingo-OData-Server-for-Java-4.4.0-lib.zip.md5

release/olingo/odata4/4.4.0/Olingo-OData-Server-for-Java-4.4.0-lib.zip.sha512

Added: release/olingo/odata4/4.4.0/Olingo-OData-4.4.0-source-release.zip
==
Binary file - no diff available.

Propchange: release/olingo/odata4/4.4.0/Olingo-OData-4.4.0-source-release.zip
--
svn:mime-type = application/octet-stream

Added: release/olingo/odata4/4.4.0/Olingo-OData-4.4.0-source-release.zip.asc
==
--- release/olingo/odata4/4.4.0/Olingo-OData-4.4.0-source-release.zip.asc 
(added)
+++ release/olingo/odata4/4.4.0/Olingo-OData-4.4.0-source-release.zip.asc Fri 
Sep  1 13:43:52 2017
@@ -0,0 +1,17 @@
+-BEGIN PGP SIGNATURE-
+Version: GnuPG v1
+
+iQIcBAABCgAGBQJZqV9OAAoJEEgk951HXZUid5IQALRLiXvqezhUBikglnNOE2JX
+dZkiGgs6AcQnbj8QX6bLwOyBheE7WjYgQa0Z6zUdyEPUuxqtzgh+uiPczHtK9pXV
+u7fMZh3IrbsXV4pFTqfON4ddBsDfFsf7gdesxxF4oIDgN17pfRP8HVE/fncRu9tD
+6d6awQhnM2Cev5t9TYtUJR8xNG7sCzP+0RYcpxJEx7WIeMZaI67XNxI9t0k68z2W
+6WZpYxeFGRNVTuJDW89nbkMeK4v2aP1He0dFC2QYvkLUvC/4V8/bTOQEvOgi4dM/
+u9kqgooT1p1UVnZfll6DEMXs9N7ksXd+cmo1N6OXpinTre7hiLu9NHrEEZXjaUfU
+YejHItwOquK7GHn/Pf34zqaOjyuKaQl55a/LH+JSLhEcG6uJk1CHqjIHV67k1ivk
+ING7mSuL5zNwhZqiL+ZQwWNrbafk3zDUJg7dfXioRqTipD+Jt95YVw96XchnxVpM
+8+mHBxkdbORhOfp99xfyViaGAS6UuagfZDnMWpX/u185Upsfkj1NIry2c3b6IOXp
+c0H0vdPNzfx4xBn8ITAyYNFt7sl1OttwHND4ALvCdtESuLbnqqWmZr5niob+SMW7
+i782r2f6QGNrtwKEky87emZHCMdyBX4hw2byWacwQLwgAvUx96/P4q+QU6r1euGJ
+3qxcPUdEsWY5/kyav4yy
+=oQqc
+-END PGP SIGNATURE-

Added: release/olingo/odata4/4.4.0/Olingo-OData-4.4.0-source-release.zip.md5
==
--- release/olingo/odata4/4.4.0/Olingo-OData-4.4.0-source-release.zip.md5 
(added)
+++ release/olingo/odata4/4.4.0/Olingo-OData-4.4.0-source-release.zip.md5 Fri 
Sep  1 13:43:52 2017
@@ -0,0 +1 @@
+(stdin)= d899e6c3fae014d4315caccae831587a

Added: release/olingo/odata4/4.4.0/Olingo-OData-4.4.0-source-release.zip.sha512
==
--- release/olingo/odata4/4.4.0/Olingo-OData-4.4.0-source-release.zip.sha512 
(added)
+++ release/olingo/odata4/4.4.0/Olingo-OData-4.4.0-source-release.zip.sha512 
Fri Sep  1 13:43:52 2017
@@ -0,0 +1,3 @@
+./target/Olingo-OData-4.4.0-source-release.zip: 
+6D055F15 CA8F1025 E773BFC0 BD8EC465 EBEE0360 45F6E0C9 8442C83F E64B4F87 
E9C62D98
+ 244BB733 309FDAC9 CE2007C7 F295AE30 A60701DB 36876A2E C2BD7C11

Added: release/olingo/odata4/4.4.0/Olingo-OData-Client-for-Android-4.4.0-lib.zip
==
Binary file - no diff available.

Propchange: 
release/olingo/odata4/4.4.0/Olingo-OData-Client-for-Android-4.4.0-lib.zip

[olingo-odata4] Git Push Summary

[chrisam]

Repository: olingo-odata4
Updated Tags:  refs/tags/4.4.0 [created] 9858f1d04

[1/2] olingo-odata4 git commit: [OLINGO-1171] Set 4.4.0 release version

[chrisam]

Repository: olingo-odata4
Updated Branches:
  refs/heads/master b98eb1fc6 -> 4cae638ff


[OLINGO-1171] Set 4.4.0 release version


Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/9858f1d0
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/9858f1d0
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/9858f1d0

Branch: refs/heads/master
Commit: 9858f1d04c0e5fe0763261a209ca298b08bc64d6
Parents: b98eb1f
Author: Christian Amend 
Authored: Fri Sep 1 15:15:49 2017 +0200
Committer: Christian Amend 
Committed: Fri Sep 1 15:15:49 2017 +0200

--
 dist/android-lib/pom.xml | 2 +-
 dist/client-lib/pom.xml  | 2 +-
 dist/javadoc/pom.xml | 2 +-
 dist/pom.xml | 2 +-
 dist/server-lib-ext/pom.xml  | 2 +-
 dist/server-lib/pom.xml  | 2 +-
 ext/client-android/pom.xml   | 2 +-
 ext/client-proxy/pom.xml | 2 +-
 ext/karaf/karaf-features/pom.xml | 2 +-
 ext/karaf/karaf-fit/pom.xml  | 2 +-
 .../org/apache/olingo/osgi/itests/server/CarServiceTest.java | 2 +-
 ext/karaf/pom.xml| 2 +-
 ext/pojogen-maven-plugin/pom.xml | 2 +-
 ext/pom.xml  | 2 +-
 fit/pom.xml  | 2 +-
 lib/client-api/pom.xml   | 2 +-
 lib/client-core/pom.xml  | 2 +-
 lib/commons-api/pom.xml  | 2 +-
 lib/commons-core/pom.xml | 2 +-
 lib/pom.xml  | 2 +-
 lib/server-api/pom.xml   | 2 +-
 lib/server-core-ext/pom.xml  | 2 +-
 lib/server-core/pom.xml  | 2 +-
 lib/server-tecsvc/pom.xml| 2 +-
 lib/server-test/pom.xml  | 2 +-
 pom.xml  | 2 +-
 samples/client/pom.xml   | 2 +-
 samples/osgi/server/pom.xml  | 2 +-
 samples/pom.xml  | 2 +-
 samples/server/pom.xml   | 2 +-
 samples/tutorials/p0_all/pom.xml | 4 ++--
 samples/tutorials/p10_media/pom.xml  | 4 ++--
 samples/tutorials/p11_batch/pom.xml  | 4 ++--
 samples/tutorials/p12_deep_insert/pom.xml| 4 ++--
 samples/tutorials/p12_deep_insert_preparation/pom.xml| 4 ++--
 samples/tutorials/p1_read/pom.xml| 4 ++--
 samples/tutorials/p2_readep/pom.xml  | 4 ++--
 samples/tutorials/p3_write/pom.xml   | 4 ++--
 samples/tutorials/p4_navigation/pom.xml  | 4 ++--
 samples/tutorials/p5_queryoptions-tcs/pom.xml| 4 ++--
 samples/tutorials/p6_queryoptions-es/pom.xml | 4 ++--
 samples/tutorials/p7_queryoptions-o/pom.xml  | 4 ++--
 samples/tutorials/p8_queryoptions-f/pom.xml  | 4 ++--
 samples/tutorials/p9_action/pom.xml  | 4 ++--
 samples/tutorials/p9_action_preparation/pom.xml  | 4 ++--
 samples/tutorials/pe_streaming/pom.xml   | 4 ++--
 samples/tutorials/pom.xml| 2 +-
 47 files changed, 63 insertions(+), 63 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/9858f1d0/dist/android-lib/pom.xml
--
diff --git a/dist/android-lib/pom.xml b/dist/android-lib/pom.xml
index f537621..6edc4f2 100644
--- a/dist/android-lib/pom.xml
+++ b/dist/android-lib/pom.xml
@@ -31,7 +31,7 @@
   
 org.apache.olingo
 odata-dist
-4.4.0-RC01
+4.4.0
 ..
   
 

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/9858f1d0/dist/client-lib/pom.xml
--
diff --git a/dist/client-lib/pom.xml 

[2/2] olingo-odata4 git commit: [OLINGO-1171] Set next 4.5.0-SNAPSHOT version

[chrisam]

[OLINGO-1171] Set next 4.5.0-SNAPSHOT version


Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/4cae638f
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/4cae638f
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/4cae638f

Branch: refs/heads/master
Commit: 4cae638ff58646cf782c4b7472020687f4d10e90
Parents: 9858f1d
Author: Christian Amend 
Authored: Fri Sep 1 15:35:37 2017 +0200
Committer: Christian Amend 
Committed: Fri Sep 1 15:35:37 2017 +0200

--
 dist/android-lib/pom.xml | 2 +-
 dist/client-lib/pom.xml  | 2 +-
 dist/javadoc/pom.xml | 2 +-
 dist/pom.xml | 2 +-
 dist/server-lib-ext/pom.xml  | 2 +-
 dist/server-lib/pom.xml  | 2 +-
 ext/client-android/pom.xml   | 2 +-
 ext/client-proxy/pom.xml | 2 +-
 ext/karaf/karaf-features/pom.xml | 2 +-
 ext/karaf/karaf-fit/pom.xml  | 2 +-
 .../org/apache/olingo/osgi/itests/server/CarServiceTest.java | 2 +-
 ext/karaf/pom.xml| 2 +-
 ext/pojogen-maven-plugin/pom.xml | 2 +-
 ext/pom.xml  | 2 +-
 fit/pom.xml  | 2 +-
 lib/client-api/pom.xml   | 2 +-
 lib/client-core/pom.xml  | 2 +-
 lib/commons-api/pom.xml  | 2 +-
 lib/commons-core/pom.xml | 2 +-
 lib/pom.xml  | 2 +-
 lib/server-api/pom.xml   | 2 +-
 lib/server-core-ext/pom.xml  | 2 +-
 lib/server-core/pom.xml  | 2 +-
 lib/server-tecsvc/pom.xml| 2 +-
 lib/server-test/pom.xml  | 2 +-
 pom.xml  | 2 +-
 samples/client/pom.xml   | 2 +-
 samples/osgi/server/pom.xml  | 2 +-
 samples/pom.xml  | 2 +-
 samples/server/pom.xml   | 2 +-
 samples/tutorials/p0_all/pom.xml | 4 ++--
 samples/tutorials/p10_media/pom.xml  | 4 ++--
 samples/tutorials/p11_batch/pom.xml  | 4 ++--
 samples/tutorials/p12_deep_insert/pom.xml| 4 ++--
 samples/tutorials/p12_deep_insert_preparation/pom.xml| 4 ++--
 samples/tutorials/p1_read/pom.xml| 4 ++--
 samples/tutorials/p2_readep/pom.xml  | 4 ++--
 samples/tutorials/p3_write/pom.xml   | 4 ++--
 samples/tutorials/p4_navigation/pom.xml  | 4 ++--
 samples/tutorials/p5_queryoptions-tcs/pom.xml| 4 ++--
 samples/tutorials/p6_queryoptions-es/pom.xml | 4 ++--
 samples/tutorials/p7_queryoptions-o/pom.xml  | 4 ++--
 samples/tutorials/p8_queryoptions-f/pom.xml  | 4 ++--
 samples/tutorials/p9_action/pom.xml  | 4 ++--
 samples/tutorials/p9_action_preparation/pom.xml  | 4 ++--
 samples/tutorials/pe_streaming/pom.xml   | 4 ++--
 samples/tutorials/pom.xml| 2 +-
 47 files changed, 63 insertions(+), 63 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/4cae638f/dist/android-lib/pom.xml
--
diff --git a/dist/android-lib/pom.xml b/dist/android-lib/pom.xml
index 6edc4f2..b338172 100644
--- a/dist/android-lib/pom.xml
+++ b/dist/android-lib/pom.xml
@@ -31,7 +31,7 @@
   
 org.apache.olingo
 odata-dist
-4.4.0
+4.5.0-SNAPSHOT
 ..
   
 

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/4cae638f/dist/client-lib/pom.xml
--
diff --git a/dist/client-lib/pom.xml b/dist/client-lib/pom.xml
index 7c37cec..8bb7f98 100644
--- a/dist/client-lib/pom.xml
+++ 

olingo-odata4 git commit: [OLINGO-1171] Set 4.4.0-RC01 version

[chrisam]

Repository: olingo-odata4
Updated Branches:
  refs/heads/master 6bc17b668 -> b98eb1fc6


[OLINGO-1171] Set 4.4.0-RC01 version


Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/b98eb1fc
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/b98eb1fc
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/b98eb1fc

Branch: refs/heads/master
Commit: b98eb1fc6c466d8e03d2eda4f39fba626619fadf
Parents: 6bc17b6
Author: Christian Amend 
Authored: Tue Aug 29 09:35:14 2017 +0200
Committer: Christian Amend 
Committed: Tue Aug 29 09:58:49 2017 +0200

--
 NOTICE   | 2 +-
 dist/android-lib/pom.xml | 2 +-
 dist/android-lib/src/main/resources/NOTICE   | 2 +-
 dist/client-lib/pom.xml  | 2 +-
 dist/client-lib/src/main/resources/NOTICE| 2 +-
 dist/javadoc/pom.xml | 2 +-
 dist/pom.xml | 2 +-
 dist/server-lib-ext/pom.xml  | 2 +-
 dist/server-lib-ext/src/main/resources/NOTICE| 2 +-
 dist/server-lib/pom.xml  | 2 +-
 dist/server-lib/src/main/resources/NOTICE| 2 +-
 ext/client-android/pom.xml   | 2 +-
 ext/client-proxy/pom.xml | 2 +-
 ext/karaf/karaf-features/pom.xml | 2 +-
 ext/karaf/karaf-fit/pom.xml  | 2 +-
 .../org/apache/olingo/osgi/itests/server/CarServiceTest.java | 2 +-
 ext/karaf/pom.xml| 2 +-
 ext/pojogen-maven-plugin/pom.xml | 2 +-
 ext/pom.xml  | 2 +-
 fit/pom.xml  | 2 +-
 lib/client-api/pom.xml   | 2 +-
 lib/client-core/pom.xml  | 2 +-
 lib/commons-api/pom.xml  | 2 +-
 lib/commons-core/pom.xml | 2 +-
 lib/pom.xml  | 2 +-
 lib/server-api/pom.xml   | 2 +-
 lib/server-core-ext/pom.xml  | 2 +-
 lib/server-core/pom.xml  | 2 +-
 lib/server-tecsvc/pom.xml| 2 +-
 lib/server-test/pom.xml  | 2 +-
 pom.xml  | 2 +-
 samples/client/pom.xml   | 2 +-
 samples/osgi/server/pom.xml  | 2 +-
 samples/pom.xml  | 2 +-
 samples/server/pom.xml   | 2 +-
 samples/tutorials/p0_all/pom.xml | 4 ++--
 samples/tutorials/p10_media/pom.xml  | 4 ++--
 samples/tutorials/p11_batch/pom.xml  | 4 ++--
 samples/tutorials/p12_deep_insert/pom.xml| 4 ++--
 samples/tutorials/p12_deep_insert_preparation/pom.xml| 4 ++--
 samples/tutorials/p1_read/pom.xml| 4 ++--
 samples/tutorials/p2_readep/pom.xml  | 4 ++--
 samples/tutorials/p3_write/pom.xml   | 4 ++--
 samples/tutorials/p4_navigation/pom.xml  | 4 ++--
 samples/tutorials/p5_queryoptions-tcs/pom.xml| 4 ++--
 samples/tutorials/p6_queryoptions-es/pom.xml | 4 ++--
 samples/tutorials/p7_queryoptions-o/pom.xml  | 4 ++--
 samples/tutorials/p8_queryoptions-f/pom.xml  | 4 ++--
 samples/tutorials/p9_action/pom.xml  | 4 ++--
 samples/tutorials/p9_action_preparation/pom.xml  | 4 ++--
 samples/tutorials/pe_streaming/pom.xml   | 4 ++--
 samples/tutorials/pom.xml| 2 +-
 52 files changed, 68 insertions(+), 68 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/b98eb1fc/NOTICE
--
diff --git a/NOTICE b/NOTICE
index 8898446..6e3d6f0 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,6 +1,6 @@
 
 Apache Olingo
-Copyright 

[olingo-odata4] Git Push Summary

[chrisam]

Repository: olingo-odata4
Updated Tags:  refs/tags/4.4.0-RC01 [created] a60680759

olingo-odata4 git commit: [OLINGO-1073] Collections with derived complex types

[chrisam]

Repository: olingo-odata4
Updated Branches:
  refs/heads/master 4a51d1642 -> 32ff14fe7


[OLINGO-1073] Collections with derived complex types

wrong odata.type

Signed-off-by: Christian Amend 


Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/32ff14fe
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/32ff14fe
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/32ff14fe

Branch: refs/heads/master
Commit: 32ff14fe788b5dbd80ffd61c1e83e460427bae9e
Parents: 4a51d16
Author: i050510 
Authored: Fri May 5 10:20:56 2017 +0530
Committer: Christian Amend 
Committed: Tue May 9 14:37:42 2017 +0200

--
 .../olingo/fit/tecsvc/client/BasicITCase.java   |   4 +-
 .../OdataTypesInBaseAndDerivedTypes.json|   4 +-
 .../core/serialization/AtomDeserializer.java|  18 +-
 .../core/serialization/AtomSerializer.java  |   8 +-
 .../core/serialization/JsonDeserializer.java|  13 +
 .../core/serialization/JsonSerializer.java  |   4 +-
 .../core/serialization/ODataBinderImpl.java |  14 +-
 .../org/apache/olingo/client/core/AtomTest.java | 209 +
 .../org/apache/olingo/client/core/JSONTest.java | 235 +++
 .../apache/olingo/client/core/olingo1073.json   |  17 ++
 .../apache/olingo/client/core/olingo1073_1.json |  66 ++
 .../apache/olingo/client/core/olingo1073_1.xml  |  65 +
 .../apache/olingo/client/core/olingo1073_2.json |  87 +++
 .../apache/olingo/client/core/olingo1073_2.xml  |  78 ++
 .../olingo/commons/api/data/ComplexValue.java   |  18 ++
 15 files changed, 828 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/32ff14fe/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/BasicITCase.java
--
diff --git 
a/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/BasicITCase.java 
b/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/BasicITCase.java
index 1e5cce3..3d33ee9 100644
--- a/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/BasicITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/BasicITCase.java
@@ -1598,9 +1598,9 @@ public class BasicITCase extends 
AbstractParamTecSvcITCase {
 getProperties().size());
 assertEquals(1, 
entity.getNavigationLinks().get(0).asInlineEntitySet().getEntitySet().getEntities().get(1).
 getProperties().size());
-assertEquals("olingo.odata.test1.ETBase", 
entity.getNavigationLinks().get(0).asInlineEntitySet().getEntitySet().
+assertEquals("#olingo.odata.test1.ETBase", 
entity.getNavigationLinks().get(0).asInlineEntitySet().getEntitySet().
 getEntities().get(0).getTypeName().toString());
-assertEquals("olingo.odata.test1.ETBase", 
entity.getNavigationLinks().get(0).asInlineEntitySet().getEntitySet().
+assertEquals("#olingo.odata.test1.ETBase", 
entity.getNavigationLinks().get(0).asInlineEntitySet().getEntitySet().
 getEntities().get(1).getTypeName().toString());
 assertEquals("olingo.odata.test1.ETAllPrim", 
entity.getTypeName().toString());
   }

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/32ff14fe/fit/src/test/resources/OdataTypesInBaseAndDerivedTypes.json
--
diff --git a/fit/src/test/resources/OdataTypesInBaseAndDerivedTypes.json 
b/fit/src/test/resources/OdataTypesInBaseAndDerivedTypes.json
index 88ae6b5..d64d26c 100644
--- a/fit/src/test/resources/OdataTypesInBaseAndDerivedTypes.json
+++ b/fit/src/test/resources/OdataTypesInBaseAndDerivedTypes.json
@@ -20,13 +20,13 @@
   "navpropertyettwoprimm...@odata.type": 
"#Collection(olingo.odata.test1.ETTwoPrim)",
   "NavPropertyETTwoPrimMany": [
 {
-  "@odata.type": "olingo.odata.test1.ETBase",
+  "@odata.type": "#olingo.odata.test1.ETBase",
   "PropertyInt16": -365,
   "PropertyString": "Test String2",
   "AdditionalPropertyString_5": "ABC"
 },
 {
-  "@odata.type": "olingo.odata.test1.ETBase",
+  "@odata.type": "#olingo.odata.test1.ETBase",
   "AdditionalPropertyString_5": "ABC"
 }
   ]

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/32ff14fe/lib/client-core/src/main/java/org/apache/olingo/client/core/serialization/AtomDeserializer.java
--
diff --git 
a/lib/client-core/src/main/java/org/apache/olingo/client/core/serialization/AtomDeserializer.java
 
b/lib/client-core/src/main/java/org/apache/olingo/client/core/serialization/AtomDeserializer.java
index 0fa1736..6930f87 100644
--- 

[2/2] olingo-odata4 git commit: [OLINGO-1099] OData V4.0: $levels refactoring

[chrisam]

[OLINGO-1099] OData V4.0: $levels refactoring

Signed-off-by: Christian Amend 


Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/f5520556
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/f5520556
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/f5520556

Branch: refs/heads/master
Commit: f55205561ea5a4f7d37b2015e5f06bfdbb704c89
Parents: 173f0d7
Author: Archana Rai 
Authored: Thu Apr 27 15:47:19 2017 +0530
Committer: Christian Amend 
Committed: Thu Apr 27 13:01:40 2017 +0200

--
 .../fit/tecsvc/client/BatchClientITCase.java|   8 +-
 .../serializer/json/ODataJsonSerializer.java| 104 +--
 .../core/serializer/utils/ContextURLHelper.java |   4 +-
 .../serializer/utils/ExpandSelectHelper.java|   9 --
 .../core/serializer/xml/ODataXmlSerializer.java | 101 --
 .../ExpandSystemQueryOptionHandler.java |   2 +-
 .../json/ODataJsonSerializerTest.java   |  17 ++-
 7 files changed, 111 insertions(+), 134 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/f5520556/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/BatchClientITCase.java
--
diff --git 
a/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/BatchClientITCase.java 
b/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/BatchClientITCase.java
index 53bfa58..9e1537d 100644
--- 
a/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/BatchClientITCase.java
+++ 
b/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/BatchClientITCase.java
@@ -161,7 +161,7 @@ public class BatchClientITCase extends 
AbstractParamTecSvcITCase {
 assertEquals(1, oDataResponse.getHeader(HttpHeader.ODATA_VERSION).size());
 assertEquals("4.0", 
oDataResponse.getHeader(HttpHeader.ODATA_VERSION).iterator().next());
 assertEquals(1, oDataResponse.getHeader(HttpHeader.CONTENT_LENGTH).size());
-assertEquals(isJson() ? "605" : "2246", 
oDataResponse.getHeader(HttpHeader.CONTENT_LENGTH).iterator().next());
+assertEquals(isJson() ? "605" : "2223", 
oDataResponse.getHeader(HttpHeader.CONTENT_LENGTH).iterator().next());
 assertContentType(oDataResponse.getContentType());
   }
 
@@ -193,7 +193,7 @@ public class BatchClientITCase extends 
AbstractParamTecSvcITCase {
 assertEquals(1, oDataResponse.getHeader(HttpHeader.ODATA_VERSION).size());
 assertEquals("4.0", 
oDataResponse.getHeader(HttpHeader.ODATA_VERSION).iterator().next());
 assertEquals(1, oDataResponse.getHeader(HttpHeader.CONTENT_LENGTH).size());
-assertEquals(isJson() ? "605" : "2246", 
oDataResponse.getHeader(HttpHeader.CONTENT_LENGTH).iterator().next());
+assertEquals(isJson() ? "605" : "2223", 
oDataResponse.getHeader(HttpHeader.CONTENT_LENGTH).iterator().next());
 assertContentType(oDataResponse.getContentType());
   }
 
@@ -292,7 +292,7 @@ public class BatchClientITCase extends 
AbstractParamTecSvcITCase {
 assertEquals(1, oDataResponse.getHeader(HttpHeader.ODATA_VERSION).size());
 assertEquals("4.0", 
oDataResponse.getHeader(HttpHeader.ODATA_VERSION).iterator().next());
 assertEquals(1, oDataResponse.getHeader(HttpHeader.CONTENT_LENGTH).size());
-assertEquals(isJson() ? "605" : "2246", 
oDataResponse.getHeader(HttpHeader.CONTENT_LENGTH).iterator().next());
+assertEquals(isJson() ? "605" : "2223", 
oDataResponse.getHeader(HttpHeader.CONTENT_LENGTH).iterator().next());
 assertContentType(oDataResponse.getContentType());
 
 // Check second get request
@@ -398,7 +398,7 @@ public class BatchClientITCase extends 
AbstractParamTecSvcITCase {
 assertEquals(1, oDataResponse.getHeader(HttpHeader.ODATA_VERSION).size());
 assertEquals("4.0", 
oDataResponse.getHeader(HttpHeader.ODATA_VERSION).iterator().next());
 assertEquals(1, oDataResponse.getHeader(HttpHeader.CONTENT_LENGTH).size());
-assertEquals(isJson() ? "605" : "2246", 
oDataResponse.getHeader(HttpHeader.CONTENT_LENGTH).iterator().next());
+assertEquals(isJson() ? "605" : "2223", 
oDataResponse.getHeader(HttpHeader.CONTENT_LENGTH).iterator().next());
 assertContentType(oDataResponse.getContentType());
 
 // Check second get request

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/f5520556/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/json/ODataJsonSerializer.java
--
diff --git 
a/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/json/ODataJsonSerializer.java
 
b/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/json/ODataJsonSerializer.java
index c5ac9f3..518b5cc 

[1/2] olingo-odata4 git commit: [OLINGO-975] Olingo client sends incorrect types for collection members

[chrisam]

Repository: olingo-odata4
Updated Branches:
  refs/heads/master a16a16841 -> f55205561


[OLINGO-975] Olingo client sends incorrect types for collection members

Signed-off-by: Christian Amend 


Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/173f0d78
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/173f0d78
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/173f0d78

Branch: refs/heads/master
Commit: 173f0d78ad0b5388ee75d744e91e7694b9da9671
Parents: a16a168
Author: i050510 
Authored: Thu Apr 27 14:17:50 2017 +0530
Committer: Christian Amend 
Committed: Thu Apr 27 13:00:35 2017 +0200

--
 .../olingo/fit/tecsvc/client/BasicITCase.java   | 30 ++
 .../OdataTypesInBaseAndDerivedTypes.json| 33 
 .../core/serialization/JsonDeserializer.java|  3 --
 3 files changed, 63 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/173f0d78/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/BasicITCase.java
--
diff --git 
a/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/BasicITCase.java 
b/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/BasicITCase.java
index 87dc3c3..1e5cce3 100644
--- a/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/BasicITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/BasicITCase.java
@@ -1574,4 +1574,34 @@ public class BasicITCase extends 
AbstractParamTecSvcITCase {
 assertNull(entity.getProperty(PROPERTY_COMP_TWO_PRIM).getComplexValue().
 get(PROPERTY_COMP_TWO_PRIM).getComplexValue());
   }
+  
+  @Test
+  public void testOLINGO975() throws ODataDeserializerException {
+EdmMetadataRequest request = 
getClient().getRetrieveRequestFactory().getMetadataRequest(SERVICE_URI);
+assertNotNull(request);
+setCookieHeader(request);
+
+ODataRetrieveResponse response = request.execute();
+saveCookieHeader(response);
+assertEquals(HttpStatusCode.OK.getStatusCode(), response.getStatusCode());
+
+Edm edm = response.getBody();
+
+EdmEnabledODataClient odataClient = 
ODataClientFactory.getEdmEnabledClient(SERVICE_URI, edm, null);
+final InputStream input = Thread.currentThread().getContextClassLoader().
+getResourceAsStream("OdataTypesInBaseAndDerivedTypes.json");
+ClientEntity entity = odataClient.getReader().readEntity(input, 
ContentType.JSON);
+assertEquals("NavPropertyETTwoPrimMany", 
entity.getNavigationLinks().get(0).getName());
+assertNotNull(entity.getNavigationLinks().get(0).asInlineEntitySet());
+assertEquals(2, 
entity.getNavigationLinks().get(0).asInlineEntitySet().getEntitySet().getEntities().size());
+assertEquals(3, 
entity.getNavigationLinks().get(0).asInlineEntitySet().getEntitySet().getEntities().get(0).
+getProperties().size());
+assertEquals(1, 
entity.getNavigationLinks().get(0).asInlineEntitySet().getEntitySet().getEntities().get(1).
+getProperties().size());
+assertEquals("olingo.odata.test1.ETBase", 
entity.getNavigationLinks().get(0).asInlineEntitySet().getEntitySet().
+getEntities().get(0).getTypeName().toString());
+assertEquals("olingo.odata.test1.ETBase", 
entity.getNavigationLinks().get(0).asInlineEntitySet().getEntitySet().
+getEntities().get(1).getTypeName().toString());
+assertEquals("olingo.odata.test1.ETAllPrim", 
entity.getTypeName().toString());
+  }
 }

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/173f0d78/fit/src/test/resources/OdataTypesInBaseAndDerivedTypes.json
--
diff --git a/fit/src/test/resources/OdataTypesInBaseAndDerivedTypes.json 
b/fit/src/test/resources/OdataTypesInBaseAndDerivedTypes.json
new file mode 100644
index 000..88ae6b5
--- /dev/null
+++ b/fit/src/test/resources/OdataTypesInBaseAndDerivedTypes.json
@@ -0,0 +1,33 @@
+{
+  "@odata.context": "$metadata#ESAllPrim/$entity",
+  "@odata.metadataEtag": "W/\"e5db7a43-370a-44d7-9600-9f0443e6e351\"",
+  "PropertyInt16": 32767,
+  "PropertyString": "First Resource - positive values",
+  "PropertyBoolean": true,
+  "PropertyByte": 255,
+  "PropertySByte": 127,
+  "PropertyInt32": 2147483647,
+  "PropertyInt64": 9223372036854775807,
+  "PropertySingle": 17900,
+  "PropertyDouble": -179000,
+  "PropertyDecimal": 34,
+  "PropertyBinary": "ASNFZ4mrze8=",
+  "PropertyDate": "2012-12-03",
+  "PropertyDateTimeOffset": "2012-12-03T07:16:23Z",
+  "PropertyDuration": "PT6S",
+  "PropertyGuid": "01234567-89ab-cdef-0123-456789abcdef",
+  "PropertyTimeOfDay": "03:26:05",
+  

olingo-odata4 git commit: [OLINGO-1102] Missing Detail error message for ODataServerErrorException

[chrisam]

Repository: olingo-odata4
Updated Branches:
  refs/heads/master 272719d59 -> a16a16841


[OLINGO-1102] Missing Detail error message for ODataServerErrorException

Signed-off-by: Christian Amend 


Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/a16a1684
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/a16a1684
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/a16a1684

Branch: refs/heads/master
Commit: a16a16841b03fe27b1fb0dab20a0d0029a6de335
Parents: 272719d
Author: i050510 
Authored: Wed Apr 26 11:13:13 2017 +0530
Committer: Christian Amend 
Committed: Wed Apr 26 16:28:18 2017 +0200

--
 .../header/ODataErrorResponseChecker.java   |  3 +-
 .../apache/olingo/client/core/ErrorTest.java| 48 +++-
 .../org/apache/olingo/client/core/500error.json | 10 
 .../apache/olingo/client/core/500error1.json|  6 +++
 4 files changed, 64 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/a16a1684/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/header/ODataErrorResponseChecker.java
--
diff --git 
a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/header/ODataErrorResponseChecker.java
 
b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/header/ODataErrorResponseChecker.java
index d83b8fb..274da3a 100644
--- 
a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/header/ODataErrorResponseChecker.java
+++ 
b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/header/ODataErrorResponseChecker.java
@@ -69,7 +69,8 @@ public final class ODataErrorResponseChecker {
 statusLine.getReasonPhrase());
   }
 
-  if (statusLine.getStatusCode() >= 500) {
+  if (statusLine.getStatusCode() >= 500 && (error.getDetails() == null || 
error.getDetails().size() == 0) && 
+  (error.getInnerError() == null || error.getInnerError().size() == 
0)) {
 result = new ODataServerErrorException(statusLine);
   } else {
 result = new ODataClientErrorException(statusLine, error);

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/a16a1684/lib/client-core/src/test/java/org/apache/olingo/client/core/ErrorTest.java
--
diff --git 
a/lib/client-core/src/test/java/org/apache/olingo/client/core/ErrorTest.java 
b/lib/client-core/src/test/java/org/apache/olingo/client/core/ErrorTest.java
index b930464..4446e92 100644
--- a/lib/client-core/src/test/java/org/apache/olingo/client/core/ErrorTest.java
+++ b/lib/client-core/src/test/java/org/apache/olingo/client/core/ErrorTest.java
@@ -18,14 +18,25 @@
  */
 package org.apache.olingo.client.core;
 
-import java.util.Map;
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
+import java.io.InputStream;
+import java.util.Map;
+
+import org.apache.http.StatusLine;
+import org.apache.olingo.client.api.ODataClient;
+import org.apache.olingo.client.api.communication.ODataClientErrorException;
+import org.apache.olingo.client.api.communication.ODataServerErrorException;
 import org.apache.olingo.client.api.serialization.ODataDeserializerException;
+import 
org.apache.olingo.client.core.communication.header.ODataErrorResponseChecker;
 import org.apache.olingo.commons.api.ex.ODataError;
 import org.apache.olingo.commons.api.ex.ODataErrorDetail;
 import org.apache.olingo.commons.api.format.ContentType;
-import static org.junit.Assert.assertEquals;
 import org.junit.Test;
 
 public class ErrorTest extends AbstractTest {
@@ -69,4 +80,37 @@ public class ErrorTest extends AbstractTest {
 simple(ContentType.APPLICATION_ATOM_XML);
   }
 
+  @Test
+  public void test1OLINGO1102() throws Exception {
+ODataClient odataClient = ODataClientFactory.getClient();
+InputStream entity = getClass().getResourceAsStream("500error." + 
getSuffix(ContentType.JSON));
+StatusLine statusLine = mock(StatusLine.class);
+when(statusLine.getStatusCode()).thenReturn(500);
+when(statusLine.toString()).thenReturn("Internal Server Error");
+
+ODataClientErrorException exp = (ODataClientErrorException) 
ODataErrorResponseChecker.
+checkResponse(odataClient, statusLine, entity, "Json");
+assertTrue(exp.getMessage().contains("(500) Internal Server Error"));
+ODataError error = exp.getODataError();
+

olingo-odata4 git commit: [OLINGO-1064] ComplexType is deserialized as Primitive Type if the value is NULL

[chrisam]

Repository: olingo-odata4
Updated Branches:
  refs/heads/master 7e262c8d0 -> 272719d59


[OLINGO-1064] ComplexType is deserialized as Primitive Type if the value is NULL

Signed-off-by: Christian Amend 


Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/272719d5
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/272719d5
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/272719d5

Branch: refs/heads/master
Commit: 272719d59fe84e7010b7c2117c1db0c31bfc0e00
Parents: 7e262c8
Author: i050510 
Authored: Tue Apr 25 14:05:30 2017 +0530
Committer: Christian Amend 
Committed: Wed Apr 26 16:13:08 2017 +0200

--
 .../olingo/fit/tecsvc/client/BasicITCase.java   | 110 +++
 ...AllPrimWithEmptyValueForComplexProperty.json |   7 ++
 ...pAllPrimWithNullValueForComplexProperty.json |   7 ++
 ...SCompAllPrimWithValueForComplexProperty.json |   7 ++
 .../ESTwoKeyNavWithNestedComplexTypes.json  |  38 +++
 .../core/serialization/ODataBinderImpl.java |  63 ++-
 6 files changed, 205 insertions(+), 27 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/272719d5/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/BasicITCase.java
--
diff --git 
a/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/BasicITCase.java 
b/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/BasicITCase.java
index 8cef37d..87dc3c3 100644
--- a/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/BasicITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/BasicITCase.java
@@ -29,6 +29,7 @@ import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 import static org.junit.Assume.assumeTrue;
 
+import java.io.InputStream;
 import java.math.BigDecimal;
 import java.net.URI;
 import java.util.Collections;
@@ -37,6 +38,7 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
+import org.apache.olingo.client.api.EdmEnabledODataClient;
 import org.apache.olingo.client.api.ODataClient;
 import org.apache.olingo.client.api.communication.ODataClientErrorException;
 import 
org.apache.olingo.client.api.communication.request.cud.ODataDeleteRequest;
@@ -72,7 +74,9 @@ import 
org.apache.olingo.client.api.domain.ClientServiceDocument;
 import org.apache.olingo.client.api.domain.ClientValue;
 import org.apache.olingo.client.api.edm.xml.Reference;
 import org.apache.olingo.client.api.edm.xml.XMLMetadata;
+import org.apache.olingo.client.api.serialization.ODataDeserializerException;
 import org.apache.olingo.client.api.uri.URIBuilder;
+import org.apache.olingo.client.core.ODataClientFactory;
 import org.apache.olingo.client.core.uri.URIUtils;
 import org.apache.olingo.commons.api.edm.Edm;
 import org.apache.olingo.commons.api.edm.EdmActionImport;
@@ -108,6 +112,9 @@ public class BasicITCase extends AbstractParamTecSvcITCase {
   private static final String ES_TWO_PRIM = "ESTwoPrim";
   private static final String ES_KEY_NAV = "ESKeyNav";
   private static final String ES_MIX_PRIM_COLL_COMP = "ESMixPrimCollComp";
+  private static final String PROPERTY_COMP_NAV = "CollPropertyCompNav";
+  private static final String COL_PROPERTY_COMP = "CollPropertyComp";
+  private static final String PROPERTY_COMP_TWO_PRIM = "PropertyCompTwoPrim";
 
   @Test
   public void readServiceDocument() {
@@ -1464,4 +1471,107 @@ public class BasicITCase extends 
AbstractParamTecSvcITCase {
 
 assertEquals(BigDecimal.valueOf(34), 
response.getBody().getPrimitiveValue().toValue());
   }
+  
+  
+  @Test
+  public void test1Olingo1064() throws ODataDeserializerException {
+EdmMetadataRequest request = 
getClient().getRetrieveRequestFactory().getMetadataRequest(SERVICE_URI);
+assertNotNull(request);
+setCookieHeader(request);
+
+ODataRetrieveResponse response = request.execute();
+saveCookieHeader(response);
+assertEquals(HttpStatusCode.OK.getStatusCode(), response.getStatusCode());
+
+Edm edm = response.getBody();
+
+EdmEnabledODataClient odataClient = 
ODataClientFactory.getEdmEnabledClient(SERVICE_URI, edm, null);
+final InputStream input = Thread.currentThread().getContextClassLoader().
+getResourceAsStream("ESCompAllPrimWithValueForComplexProperty.json");
+ClientEntity entity = odataClient.getReader().readEntity(input, 
ContentType.JSON);
+assertEquals(HttpStatusCode.OK.getStatusCode(), response.getStatusCode());
+assertNotNull(entity.getProperty(PROPERTY_COMP).getComplexValue());
+assertEquals("olingo.odata.test1.CTAllPrim", 
entity.getProperty(PROPERTY_COMP).getComplexValue().getTypeName());
+

olingo-odata2 git commit: [OLINGO-1093] Add Apache header to Util Class

[chrisam]

Repository: olingo-odata2
Updated Branches:
  refs/heads/master 0bce4ab78 -> e55daaa25


[OLINGO-1093] Add Apache header to Util Class


Project: http://git-wip-us.apache.org/repos/asf/olingo-odata2/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata2/commit/e55daaa2
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata2/tree/e55daaa2
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata2/diff/e55daaa2

Branch: refs/heads/master
Commit: e55daaa259ef2903c89d51c74cdea9fe33bf7f27
Parents: 0bce4ab
Author: Christian Amend 
Authored: Tue Apr 25 10:50:35 2017 +0200
Committer: Christian Amend 
Committed: Tue Apr 25 10:50:35 2017 +0200

--
 .../olingo/odata2/ref/processor/Util.java   | 26 +---
 1 file changed, 22 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/e55daaa2/odata2-lib/odata-ref/src/main/java/org/apache/olingo/odata2/ref/processor/Util.java
--
diff --git 
a/odata2-lib/odata-ref/src/main/java/org/apache/olingo/odata2/ref/processor/Util.java
 
b/odata2-lib/odata-ref/src/main/java/org/apache/olingo/odata2/ref/processor/Util.java
index 9bbdb2e..a99fcd0 100644
--- 
a/odata2-lib/odata-ref/src/main/java/org/apache/olingo/odata2/ref/processor/Util.java
+++ 
b/odata2-lib/odata-ref/src/main/java/org/apache/olingo/odata2/ref/processor/Util.java
@@ -1,15 +1,33 @@
+/***
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ 
**/
 package org.apache.olingo.odata2.ref.processor;
 
-
 public class Util {
 
-private static final Util instance = new Util();
-  
+  private static final Util instance = new Util();
+
   private byte[] binaryContent = null;
-  
+
   public static Util getInstance() {
 return instance;
   }
+
   /**
* @return the binaryContent
*/

olingo-odata2 git commit: [OLINGO-1093] Support Binary Content in Batch

[chrisam]

Repository: olingo-odata2
Updated Branches:
  refs/heads/master 474d8f3e7 -> 0bce4ab78


[OLINGO-1093] Support Binary Content in Batch

Contributed by Vasanth, Ramya in OLINGO-1093


Project: http://git-wip-us.apache.org/repos/asf/olingo-odata2/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata2/commit/0bce4ab7
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata2/tree/0bce4ab7
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata2/diff/0bce4ab7

Branch: refs/heads/master
Commit: 0bce4ab78054d83408782e2855d17b2dfadbc6c9
Parents: 474d8f3
Author: Christian Amend 
Authored: Tue Apr 25 10:14:34 2017 +0200
Committer: Christian Amend 
Committed: Tue Apr 25 10:14:34 2017 +0200

--
 .../api/client/batch/BatchChangeSetPart.java|  12 +-
 .../core/batch/BatchChangeSetPartImpl.java  |  18 +-
 .../olingo/odata2/core/batch/BatchHelper.java   |  71 ++-
 .../odata2/core/batch/BatchResponseWriter.java  |   5 +-
 .../odata2/core/batch/v2/BatchLineReader.java   |  13 +-
 .../odata2/core/batch/v2/BatchParserCommon.java |  12 +-
 .../batch/v2/BatchRequestTransformator.java |   2 +-
 .../odata2/core/batch/BatchRequestTest.java |  48 +
 .../odata2/core/batch/BatchResponseTest.java|  77 +++
 .../core/batch/v2/BatchLineReaderTest.java  |  53 +
 .../src/test/resources/Employee_1.png   | Bin 0 -> 8429 bytes
 .../apache/olingo/odata2/fit/ref/BatchTest.java | 204 +++
 .../odata-fit/src/test/resources/Employee_1.png | Bin 0 -> 8429 bytes
 .../src/test/resources/simpleGet.batch  |   8 +
 .../src/test/resources/simpleGet1.batch |   8 +
 .../ref/processor/ScenarioDataSource.java   |   2 +
 .../olingo/odata2/ref/processor/Util.java   |  26 +++
 17 files changed, 536 insertions(+), 23 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/0bce4ab7/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/client/batch/BatchChangeSetPart.java
--
diff --git 
a/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/client/batch/BatchChangeSetPart.java
 
b/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/client/batch/BatchChangeSetPart.java
index ecabf9b..93f86d5 100644
--- 
a/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/client/batch/BatchChangeSetPart.java
+++ 
b/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/client/batch/BatchChangeSetPart.java
@@ -30,7 +30,7 @@ public abstract class BatchChangeSetPart {
 
   public abstract Map getHeaders();
 
-  public abstract String getBody();
+  public abstract Object getBody();
 
   public abstract byte[] getBodyAsBytes();
 
@@ -55,6 +55,14 @@ public abstract class BatchChangeSetPart {
   public static BatchChangeSetPartBuilder body(final String body) {
 return newBuilder().body(body);
   }
+  
+  /**
+   * @param body a change request body
+   * @return a new builder object
+   */
+  public static BatchChangeSetPartBuilder body(final byte[] body) {
+return newBuilder().body(body);
+  }
 
   /**
* @param uri should not be null
@@ -100,6 +108,8 @@ public abstract class BatchChangeSetPart {
 public abstract BatchChangeSetPartBuilder headers(Map 
headers);
 
 public abstract BatchChangeSetPartBuilder body(String body);
+
+public abstract BatchChangeSetPartBuilder body(byte[] body);
 
 public abstract BatchChangeSetPartBuilder uri(String uri);
 

http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/0bce4ab7/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/BatchChangeSetPartImpl.java
--
diff --git 
a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/BatchChangeSetPartImpl.java
 
b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/BatchChangeSetPartImpl.java
index b1d83ab..2b5f44f 100644
--- 
a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/BatchChangeSetPartImpl.java
+++ 
b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/BatchChangeSetPartImpl.java
@@ -28,7 +28,7 @@ import java.util.Map;
 public class BatchChangeSetPartImpl extends BatchChangeSetPart {
   private String method;
   private Map headers = new HashMap();
-  private String body;
+  private Object body;
   private String uri;
   public String contentId;
   private static final String CHANGE_METHODS = "(PUT|POST|DELETE|MERGE|PATCH)";
@@ -40,7 +40,7 @@ public class BatchChangeSetPartImpl extends 
BatchChangeSetPart {
 
   @Override
   public String getBody() {
-return body;
+return body.toString();
   }
 
   @Override

olingo-odata2 git commit: [OLINGO-1098] Incorrect handling of SQL wildcards

[chrisam]

Repository: olingo-odata2
Updated Branches:
  refs/heads/master ff4ab9956 -> 474d8f3e7


[OLINGO-1098] Incorrect handling of SQL wildcards

'_' and '%' on filtering
Signed-off-by: Christian Amend 


Project: http://git-wip-us.apache.org/repos/asf/olingo-odata2/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata2/commit/474d8f3e
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata2/tree/474d8f3e
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata2/diff/474d8f3e

Branch: refs/heads/master
Commit: 474d8f3e76efa01a2a267d038aaa61a3bb14244f
Parents: ff4ab99
Author: i050510 
Authored: Fri Mar 31 13:17:20 2017 +0530
Committer: Christian Amend 
Committed: Mon Apr 24 14:00:14 2017 +0200

--
 .../processor/core/ODataExpressionParser.java   | 24 
 .../core/ODataFilterExpressionParserTest.java   | 24 +++-
 .../resources/SQL_Insert_Material.properties|  8 ++-
 3 files changed, 40 insertions(+), 16 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/474d8f3e/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/ODataExpressionParser.java
--
diff --git 
a/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/ODataExpressionParser.java
 
b/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/ODataExpressionParser.java
index 0f4b7ca..66190a4 100644
--- 
a/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/ODataExpressionParser.java
+++ 
b/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/ODataExpressionParser.java
@@ -193,20 +193,26 @@ public class ODataExpressionParser {
   case SUBSTRINGOF:
 if (methodFlag.get() != null && methodFlag.get() == 1) {
   methodFlag.set(null);
-  return String.format("(CASE WHEN (%s LIKE 
CONCAT('%%',CONCAT(%s,'%%'))) THEN TRUE ELSE FALSE END)",
+  updateValueIfWildcards(first);
+  return String.format("(CASE WHEN (%s LIKE 
CONCAT('%%',CONCAT(%s,'%%')) ESCAPE '\\') "
+  + "THEN TRUE ELSE FALSE END)",
   second, first);
 } else {
-  return String.format("(CASE WHEN (%s LIKE 
CONCAT('%%',CONCAT(%s,'%%'))) THEN TRUE ELSE FALSE END) = true",
+  first = updateValueIfWildcards(first);
+  return String.format("(CASE WHEN (%s LIKE 
CONCAT('%%',CONCAT(%s,'%%')) ESCAPE '\\') "
+  + "THEN TRUE ELSE FALSE END) = true",
   second, first);
 }
   case TOLOWER:
 return String.format("LOWER(%s)", first);
   case STARTSWITH:
 // second = second.substring(1, second.length() - 1);
-return String.format("%s LIKE CONCAT(%s,'%%')", first, second);
+second = updateValueIfWildcards(second);
+return String.format("%s LIKE CONCAT(%s,'%%') ESCAPE '\\'", first, 
second);
   case ENDSWITH:
 // second = second.substring(1, second.length() - 1);
-return String.format("%s LIKE CONCAT('%%',%s)", first, second);
+second = updateValueIfWildcards(second);
+return String.format("%s LIKE CONCAT('%%',%s) ESCAPE '\\'", first, 
second);
   default:
 throw new ODataNotImplementedException();
   }
@@ -217,6 +223,16 @@ public class ODataExpressionParser {
   }
 
   /**
+   * This method escapes the wildcards
+   * @param first
+   */
+  private static String updateValueIfWildcards(String value) {
+value = value.replace("\\", "");
+value = value.replace("%", "\\%");
+value = value.replace("_", "\\_");
+return value;
+  }
+  /**
* This method parses the select clause
*
* @param tableAlias

http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/474d8f3e/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/ODataFilterExpressionParserTest.java
--
diff --git 
a/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/ODataFilterExpressionParserTest.java
 
b/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/ODataFilterExpressionParserTest.java
index a29ba5c..af798fe 100644
--- 
a/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/ODataFilterExpressionParserTest.java
+++ 
b/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/ODataFilterExpressionParserTest.java
@@ -49,45 +49,47 @@ public class ODataFilterExpressionParserTest {
   private static final String[] EXPRESSION_BINARY_AND =
   {
   "id le 

olingo-odata4 git commit: [OLINGO-1106] JUnit for Custom Query Options in batch

[chrisam]

Repository: olingo-odata4
Updated Branches:
  refs/heads/master 548c6e4a1 -> af116170a


[OLINGO-1106] JUnit for Custom Query Options in batch

Signed-off-by: Christian Amend 


Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/af116170
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/af116170
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/af116170

Branch: refs/heads/master
Commit: af116170a2fe89dbaef3f859e65d596f79206c4e
Parents: 548c6e4
Author: Archana Rai 
Authored: Tue Apr 11 13:52:29 2017 +0530
Committer: Christian Amend 
Committed: Wed Apr 12 11:18:55 2017 +0200

--
 .../fit/tecsvc/http/BasicBatchITCase.java   | 105 ++-
 1 file changed, 104 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/af116170/fit/src/test/java/org/apache/olingo/fit/tecsvc/http/BasicBatchITCase.java
--
diff --git 
a/fit/src/test/java/org/apache/olingo/fit/tecsvc/http/BasicBatchITCase.java 
b/fit/src/test/java/org/apache/olingo/fit/tecsvc/http/BasicBatchITCase.java
index 1fb31a2..fa8cb1b 100644
--- a/fit/src/test/java/org/apache/olingo/fit/tecsvc/http/BasicBatchITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/tecsvc/http/BasicBatchITCase.java
@@ -70,6 +70,55 @@ public class BasicBatchITCase extends AbstractBaseTestITCase 
{
 
 reader.close();
   }
+  
+  /* Tests for custom query options. Services may support additional custom 
query options
+   * not defined in the OData specification, but they MUST NOT begin with the 
"$" .*/
+  
+  @Test
+  public void testCustomQuery1() throws IOException {
+final String content = getRequest("ESAllPrim(32767)");
+final HttpURLConnection connection = batchWithCustomQuery(content, "#");
+final BufferedReader reader = new BufferedReader(new 
InputStreamReader(connection.getInputStream()));
+
+assertTrue(reader.readLine().contains("batch_"));
+checkMimeHeader(reader);
+blankLine(reader);
+
+assertEquals("HTTP/1.1 200 OK", reader.readLine());
+assertEquals("OData-Version: 4.0", reader.readLine());
+assertEquals("Content-Type: application/json;odata.metadata=minimal", 
reader.readLine());
+assertEquals("Content-Length: 605", reader.readLine());
+blankLine(reader);
+
+reader.close();
+  }
+  
+  @Test
+  public void testCustomQuery2() throws IOException {
+final String content = getRequest("ESAllPrim(32767)");
+final HttpURLConnection connection = batchWithCustomQuery(content, "");
+final BufferedReader reader = new BufferedReader(new 
InputStreamReader(connection.getInputStream()));
+
+assertTrue(reader.readLine().contains("batch_"));
+checkMimeHeader(reader);
+blankLine(reader);
+
+assertEquals("HTTP/1.1 200 OK", reader.readLine());
+assertEquals("OData-Version: 4.0", reader.readLine());
+assertEquals("Content-Type: application/json;odata.metadata=minimal", 
reader.readLine());
+assertEquals("Content-Length: 605", reader.readLine());
+blankLine(reader);
+
+reader.close();
+  }
+  
+  @Test
+  public void testCustomQuery3() throws IOException {
+final String content = getRequest("ESAllPrim(32767)");
+batchFailWithCustomQuery(content, "$");
+  }
+  
+
 
   @Test
   public void testInvalidRelativeURI() throws IOException {
@@ -144,10 +193,48 @@ public class BasicBatchITCase extends 
AbstractBaseTestITCase {
 
 return connection;
   }
+  
+  private HttpURLConnection batchWithCustomQuery(final String content, final 
String query) 
+  throws IOException {
+HttpURLConnection connection = getConnectionForCustomQuery(content, query);
+assertEquals(HttpStatusCode.OK.getStatusCode(), 
connection.getResponseCode());
+return connection;
+  }
+
+  private HttpURLConnection batchFailWithCustomQuery(final String content, 
final String query) 
+  throws IOException {
+final HttpURLConnection connection = getConnectionForCustomQuery(content, 
query);
+
+assertEquals(HttpStatusCode.BAD_REQUEST.getStatusCode(), 
connection.getResponseCode());
+
+return connection;
+  }
 
   private HttpURLConnection getConnection(final String content) throws 
MalformedURLException, IOException,
   ProtocolException {
-final URL url = new URL(SERVICE_URI + "$batch");
+final URL url = getUrl();
+final HttpURLConnection connection = (HttpURLConnection) 
url.openConnection();
+connection.setRequestMethod(HttpMethod.POST.toString());
+connection.setRequestProperty(HttpHeader.CONTENT_TYPE, 
CONTENT_TYPE_HEADER_VALUE);
+connection.setRequestProperty(HttpHeader.ACCEPT, ACCEPT_HEADER_VALUE);
+

olingo-odata2 git commit: [OLINGO-1105] JUnits for Custom Query Options in batch

[chrisam]

Repository: olingo-odata2
Updated Branches:
  refs/heads/master 456f4c641 -> ff4ab9956


[OLINGO-1105] JUnits for Custom Query Options in batch

Signed-off-by: Christian Amend 


Project: http://git-wip-us.apache.org/repos/asf/olingo-odata2/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata2/commit/ff4ab995
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata2/tree/ff4ab995
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata2/diff/ff4ab995

Branch: refs/heads/master
Commit: ff4ab99569e322e0315b414e2b078d7548a7c0fb
Parents: 456f4c6
Author: Archana Rai 
Authored: Tue Apr 11 13:53:22 2017 +0530
Committer: Christian Amend 
Committed: Wed Apr 12 11:17:15 2017 +0200

--
 .../olingo/odata2/fit/basic/BasicBatchTest.java | 92 
 1 file changed, 92 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/ff4ab995/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/BasicBatchTest.java
--
diff --git 
a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/BasicBatchTest.java
 
b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/BasicBatchTest.java
index 0dfec68..4567501 100644
--- 
a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/BasicBatchTest.java
+++ 
b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/BasicBatchTest.java
@@ -181,6 +181,98 @@ public class BasicBatchTest extends AbstractBasicTest {
 assertTrue(body.contains("Content-Id: requestHeaderContentId1"));
 assertTrue(body.contains("HTTP/1.1 415 Unsupported Media Type"));
   }
+  
+ /* Tests for Custo Query options.A Custom Query String option is defined  
+  * as any name/value pair query string parameter where the name of the 
+  * parameter does not begin  with the "$" character. Any URI exposed by 
+  * an OData service may include one or more Custom Query Options.*/
+  
+  @Test
+  public void testBatchForCustomQuery() throws Exception {
+final HttpPost post = new HttpPost(URI.create(getEndpoint().toString() + 
+"$batch?language=de"));
+post.setHeader("Content-Type", 
"multipart/mixed;boundary=batch_98c1-8b13-36bb");
+HttpEntity entity = new StringEntity(REQUEST_PAYLOAD);
+post.setEntity(entity);
+HttpResponse response = getHttpClient().execute(post);
+
+assertNotNull(response);
+assertEquals(202, response.getStatusLine().getStatusCode());
+assertEquals("HTTP/1.1", response.getProtocolVersion().toString());
+assertTrue(response.containsHeader("Content-Length"));
+assertTrue(response.containsHeader("Content-Type"));
+assertTrue(response.containsHeader("DataServiceVersion"));
+
assertTrue(response.getEntity().getContentType().getValue().matches(REG_EX));
+assertNotNull(response.getEntity().getContent());
+
+String body = 
StringHelper.inputStreamToString(response.getEntity().getContent(), true);
+assertTrue(body.contains("Content-Id: mimeHeaderContentId1"));
+assertTrue(body.contains("Content-Id: requestHeaderContentId1"));
+assertTrue(body.contains("Content-Id: mimeHeaderContentId2"));
+assertTrue(body.contains("Content-Id: requestHeaderContentId2"));
+  }
+  
+  @Test
+  public void testBatchForCustomQueryFail() throws Exception {
+final HttpPost post = new HttpPost(URI.create(getEndpoint().toString() + 
+"$batch?$language=de"));
+post.setHeader("Content-Type", 
"multipart/mixed;boundary=batch_98c1-8b13-36bb");
+HttpEntity entity = new StringEntity(REQUEST_PAYLOAD);
+post.setEntity(entity);
+HttpResponse result = getHttpClient().execute(post);
+assertEquals(HttpStatusCodes.BAD_REQUEST.getStatusCode(), 
result.getStatusLine().getStatusCode());
+
+  }
+  
+  @Test
+  public void testBatchForCustomQuery2() throws Exception {
+final HttpPost post = new HttpPost(URI.create(getEndpoint().toString() + 
+"$batch?@language=de"));
+post.setHeader("Content-Type", 
"multipart/mixed;boundary=batch_98c1-8b13-36bb");
+HttpEntity entity = new StringEntity(REQUEST_PAYLOAD);
+post.setEntity(entity);
+HttpResponse response = getHttpClient().execute(post);
+
+assertNotNull(response);
+assertEquals(202, response.getStatusLine().getStatusCode());
+assertEquals("HTTP/1.1", response.getProtocolVersion().toString());
+assertTrue(response.containsHeader("Content-Length"));
+assertTrue(response.containsHeader("Content-Type"));
+assertTrue(response.containsHeader("DataServiceVersion"));
+
assertTrue(response.getEntity().getContentType().getValue().matches(REG_EX));
+assertNotNull(response.getEntity().getContent());
+
+String body = 

olingo-odata2 git commit: [OLINGO-1021] Add ability to use non strict batch parsing

[chrisam]

Repository: olingo-odata2
Updated Branches:
  refs/heads/master 22e787318 -> cceffb310


[OLINGO-1021] Add ability to use non strict batch parsing

Signed-off-by: Christian Amend 


Project: http://git-wip-us.apache.org/repos/asf/olingo-odata2/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata2/commit/cceffb31
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata2/tree/cceffb31
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata2/diff/cceffb31

Branch: refs/heads/master
Commit: cceffb31024be8e94a210c344ee68b6b98ddfdfb
Parents: 22e7873
Author: Dmitry.Tretyakov 
Authored: Fri Sep 9 20:03:51 2016 +0300
Committer: Christian Amend 
Committed: Thu Mar 23 14:03:59 2017 +0100

--
 .../api/ep/EntityProviderBatchProperties.java   | 14 ++
 .../odata2/core/ep/ProviderFacadeImpl.java  |  3 ++-
 .../core/batch/BatchRequestParserTest.java  | 20 +++-
 3 files changed, 35 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/cceffb31/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/EntityProviderBatchProperties.java
--
diff --git 
a/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/EntityProviderBatchProperties.java
 
b/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/EntityProviderBatchProperties.java
index 0cb47ec..59ef47f 100644
--- 
a/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/EntityProviderBatchProperties.java
+++ 
b/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/EntityProviderBatchProperties.java
@@ -31,6 +31,11 @@ public class EntityProviderBatchProperties {
*/
   private PathInfo pathInfo;
 
+  /**
+   * Defines whether to use strict batch parsing.
+   */
+  private boolean isStrict = true;
+
   public static EntityProviderBatchPropertiesBuilder init() {
 return new EntityProviderBatchPropertiesBuilder();
   }
@@ -39,6 +44,10 @@ public class EntityProviderBatchProperties {
 return pathInfo;
   }
 
+  public boolean isStrict() {
+return isStrict;
+  }
+
   public static class EntityProviderBatchPropertiesBuilder {
 private final EntityProviderBatchProperties properties = new 
EntityProviderBatchProperties();
 
@@ -53,6 +62,11 @@ public class EntityProviderBatchProperties {
   return this;
 }
 
+public EntityProviderBatchPropertiesBuilder setStrict(final boolean 
isStrict) {
+  properties.isStrict = isStrict;
+  return this;
+}
+
 public EntityProviderBatchProperties build() {
   return properties;
 }

http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/cceffb31/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/ProviderFacadeImpl.java
--
diff --git 
a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/ProviderFacadeImpl.java
 
b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/ProviderFacadeImpl.java
index 739513c..9acf487 100644
--- 
a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/ProviderFacadeImpl.java
+++ 
b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/ProviderFacadeImpl.java
@@ -241,7 +241,8 @@ public class ProviderFacadeImpl implements 
EntityProviderInterface {
   @Override
   public List parseBatchRequest(final String contentType, 
final InputStream content,
   final EntityProviderBatchProperties properties) throws BatchException {
-List batchParts = new BatchParser(contentType, 
properties, true).parseBatchRequest(content);
+BatchParser batchParser = new BatchParser(contentType, properties, 
properties.isStrict());
+List batchParts = batchParser.parseBatchRequest(content);
 return batchParts;
   }
 

http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/cceffb31/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/batch/BatchRequestParserTest.java
--
diff --git 
a/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/batch/BatchRequestParserTest.java
 
b/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/batch/BatchRequestParserTest.java
index cdf3c4d..269f512 100644
--- 
a/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/batch/BatchRequestParserTest.java
+++ 
b/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/batch/BatchRequestParserTest.java
@@ -1213,9 +1213,27 @@ public class BatchRequestParserTest {
 parser.parseBatchRequest(in);
   }
 
+  @Test
+  public void testNonStrictGetRequestWithMissingCRLF() throws BatchException {
+String batch = 

olingo-odata2 git commit: [OLINGO-1092] Extra Slash Issue with precceding segments

[chrisam]

Repository: olingo-odata2
Updated Branches:
  refs/heads/master 14ef0cdda -> 22e787318


[OLINGO-1092] Extra Slash Issue with precceding segments

Remove addition of extra slash when the servlet path does not have preceeding 
segments

Signed-off-by: Christian Amend 


Project: http://git-wip-us.apache.org/repos/asf/olingo-odata2/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata2/commit/22e78731
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata2/tree/22e78731
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata2/diff/22e78731

Branch: refs/heads/master
Commit: 22e787318d3a8cf067542ef232f3f359cb122dd7
Parents: 14ef0cd
Author: i050510 
Authored: Thu Mar 9 16:21:01 2017 +0530
Committer: Christian Amend 
Committed: Thu Mar 9 12:53:11 2017 +0100

--
 .../olingo/odata2/core/servlet/RestUtil.java|  4 ++-
 .../odata2/core/servlet/ODataServletTest.java   | 27 
 2 files changed, 30 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/22e78731/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/servlet/RestUtil.java
--
diff --git 
a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/servlet/RestUtil.java
 
b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/servlet/RestUtil.java
index da7b05b..1bdb1dd 100644
--- 
a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/servlet/RestUtil.java
+++ 
b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/servlet/RestUtil.java
@@ -230,7 +230,9 @@ public class RestUtil {
   StringBuilder stringBuilder = new StringBuilder();
   stringBuilder.append(req.getContextPath()).append(req.getServletPath());
   for (final PathSegment ps : precedingPathSegments) {
-stringBuilder.append("/").append(ps.getPath());
+if (!ps.getPath().equals("") && ps.getPath().length() > 0) {
+  stringBuilder.append("/").append(ps.getPath());
+}
 for (final String key : ps.getMatrixParameters().keySet()) {
   List matrixParameters = ps.getMatrixParameters().get(key);
   String matrixParameterString = ";" + key + "=";

http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/22e78731/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/servlet/ODataServletTest.java
--
diff --git 
a/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/servlet/ODataServletTest.java
 
b/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/servlet/ODataServletTest.java
index 78baf5f..b3231e3 100644
--- 
a/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/servlet/ODataServletTest.java
+++ 
b/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/servlet/ODataServletTest.java
@@ -298,4 +298,31 @@ public class ODataServletTest {
 String factoryClassName = ODataServiceFactoryImpl.class.getName();
 
Mockito.when(configMock.getInitParameter(ODataServiceFactory.FACTORY_LABEL)).thenReturn(factoryClassName);
   }
+  
+  @Test
+  public void testWithNoPathAfterServletPath() throws Exception {
+ODataServlet servlet = new ODataServlet();
+prepareServlet(servlet);
+prepareRequestWithNoPathAfterServletPath(reqMock, "", "/servlet-path");
+Mockito.when(reqMock.getPathInfo()).thenReturn("/Collection");
+
Mockito.when(reqMock.getRequestURI()).thenReturn("http://localhost:8080/servlet-path;v=1/Collection;);
+
Mockito.when(servlet.getInitParameter("org.apache.olingo.odata2.path.split")).thenReturn("1");
+
Mockito.when(respMock.getOutputStream()).thenReturn(Mockito.mock(ServletOutputStream.class));
+
+servlet.service(reqMock, respMock);
+
+
Mockito.verify(configMock).getInitParameter(ODataServiceFactory.FACTORY_LABEL);
+
Mockito.verify(reqMock).getAttribute(ODataServiceFactory.FACTORY_CLASSLOADER_LABEL);
+
+Assert.assertEquals(ODataServiceFactoryImpl.class, 
servlet.getServiceFactory(reqMock).getClass());
+  }
+  
+  private void prepareRequestWithNoPathAfterServletPath(final 
HttpServletRequest req, 
+  final String contextPath, final String servletPath) {
+Mockito.when(req.getMethod()).thenReturn("GET");
+Mockito.when(req.getContextPath()).thenReturn(contextPath);
+Mockito.when(req.getServletPath()).thenReturn(servletPath);
+Mockito.when(req.getRequestURI()).thenReturn(servletPath + ";v=1" + 
"/Collection");
+
Mockito.when(req.getHeaderNames()).thenReturn(Collections.enumeration(Collections.emptyList()));
+  }
 }

[2/2] olingo-odata2 git commit: [OLINGO-1091] Accept language es-419 in $batch payload

[chrisam]

[OLINGO-1091] Accept language es-419 in $batch payload

Signed-off-by: Christian Amend 


Project: http://git-wip-us.apache.org/repos/asf/olingo-odata2/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata2/commit/14ef0cdd
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata2/tree/14ef0cdd
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata2/diff/14ef0cdd

Branch: refs/heads/master
Commit: 14ef0cdda6d5155d0bc6811942b1606e22c5c0a3
Parents: cd4a075
Author: i050510 
Authored: Tue Mar 7 13:52:34 2017 +0530
Committer: Christian Amend 
Committed: Wed Mar 8 11:50:06 2017 +0100

--
 .../apache/olingo/odata2/core/batch/AcceptParser.java   |  2 +-
 .../olingo/odata2/core/batch/AcceptParserTest.java  | 12 
 2 files changed, 13 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/14ef0cdd/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/AcceptParser.java
--
diff --git 
a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/AcceptParser.java
 
b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/AcceptParser.java
index 5c8811c..3130942 100644
--- 
a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/AcceptParser.java
+++ 
b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/AcceptParser.java
@@ -40,7 +40,7 @@ public class AcceptParser {
   private static final Pattern REG_EX_ACCEPT_WITH_Q_FACTOR = 
Pattern.compile(REG_EX_ACCEPT + "(?:;"
   + REG_EX_OPTIONAL_WHITESPACE + REG_EX_QUALITY_FACTOR + ")?");
   private static final Pattern REG_EX_ACCEPT_LANGUAGES = Pattern
-  .compile("((?:(?:[a-z]{1,8})|(?:\\*))\\-?(?:[a-zA-Z]{1,8})?)");
+  .compile("((?:(?:[a-z]{1,8})|(?:\\*))\\-?(?:[a-zA-Z0-9]{1,8})?)");
   private static final Pattern REG_EX_ACCEPT_LANGUAGES_WITH_Q_FACTOR = 
Pattern.compile(REG_EX_ACCEPT_LANGUAGES + "(?:;"
   + REG_EX_OPTIONAL_WHITESPACE + REG_EX_QUALITY_FACTOR + ")?");
 

http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/14ef0cdd/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/batch/AcceptParserTest.java
--
diff --git 
a/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/batch/AcceptParserTest.java
 
b/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/batch/AcceptParserTest.java
index b7d7fac..b1baaa7 100644
--- 
a/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/batch/AcceptParserTest.java
+++ 
b/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/batch/AcceptParserTest.java
@@ -185,4 +185,16 @@ public class AcceptParserTest {
 parser.addAcceptLanguageHeaderValue("en_US");
 parser.parseAcceptableLanguages();
   }
+  
+  @Test
+  public void testAcceptLanguagesWithAlphaNumericValues() throws 
BatchException {
+AcceptParser parser = new AcceptParser();
+parser.addAcceptLanguageHeaderValue("es-419,en-US");
+List acceptLanguageHeaders = parser.parseAcceptableLanguages();
+
+assertNotNull(acceptLanguageHeaders);
+assertEquals(2, acceptLanguageHeaders.size());
+assertEquals("es-419", acceptLanguageHeaders.get(0));
+assertEquals("en-US", acceptLanguageHeaders.get(1));
+  }
 }

[1/2] olingo-odata2 git commit: [OLINGO-1090] Incorrect content format in batch error response

[chrisam]

Repository: olingo-odata2
Updated Branches:
  refs/heads/master 742560d27 -> 14ef0cdda


[OLINGO-1090] Incorrect content format in batch error response

happens when content type is application/json;odata=verbose

Signed-off-by: Christian Amend 


Project: http://git-wip-us.apache.org/repos/asf/olingo-odata2/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata2/commit/cd4a0752
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata2/tree/cd4a0752
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata2/diff/cd4a0752

Branch: refs/heads/master
Commit: cd4a0752c7adec31b7bff08b1e6e575b5c8e73fb
Parents: 742560d
Author: i050510 
Authored: Wed Mar 8 09:15:46 2017 +0530
Committer: Christian Amend 
Committed: Wed Mar 8 11:47:18 2017 +0100

--
 .../odata2/core/rest/ODataExceptionWrapper.java |  6 ++--
 .../odata2/fit/client/ClientBatchTest.java  | 32 
 2 files changed, 36 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/cd4a0752/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/ODataExceptionWrapper.java
--
diff --git 
a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/ODataExceptionWrapper.java
 
b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/ODataExceptionWrapper.java
index 4300ab1..9dc7cde 100644
--- 
a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/ODataExceptionWrapper.java
+++ 
b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/ODataExceptionWrapper.java
@@ -298,7 +298,8 @@ public class ODataExceptionWrapper {
 || 
ContentType.APPLICATION_ATOM_XML_CS_UTF_8.equals(convertedContentType)) {
   return ContentType.APPLICATION_XML;
 } else if (ContentType.APPLICATION_JSON.equals(convertedContentType)
-|| 
ContentType.APPLICATION_JSON_CS_UTF_8.equals(convertedContentType)) {
+|| 
ContentType.APPLICATION_JSON_CS_UTF_8.equals(convertedContentType)
+|| 
ContentType.APPLICATION_JSON_ODATA_VERBOSE.equals(convertedContentType)) {
   return ContentType.APPLICATION_JSON;
 }
   }
@@ -343,7 +344,8 @@ public class ODataExceptionWrapper {
 || 
ContentType.APPLICATION_ATOM_XML_CS_UTF_8.equals(convertedContentType)) {
   return ContentType.APPLICATION_XML;
 } else if (ContentType.APPLICATION_JSON.equals(convertedContentType)
-|| 
ContentType.APPLICATION_JSON_CS_UTF_8.equals(convertedContentType)) {
+|| 
ContentType.APPLICATION_JSON_CS_UTF_8.equals(convertedContentType)
+|| 
ContentType.APPLICATION_JSON_ODATA_VERBOSE.equals(convertedContentType)) {
   return ContentType.APPLICATION_JSON;
 }
   }

http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/cd4a0752/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/client/ClientBatchTest.java
--
diff --git 
a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/client/ClientBatchTest.java
 
b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/client/ClientBatchTest.java
index cf6c9f3..66be286 100644
--- 
a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/client/ClientBatchTest.java
+++ 
b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/client/ClientBatchTest.java
@@ -319,4 +319,36 @@ public class ClientBatchTest extends AbstractRefTest {
 assertTrue(requestBody.contains("--" + BOUNDARY));
 assertTrue(requestBody.contains("--" + BOUNDARY + "--"));
   }
+  
+  @Test
+  public void testContentFormatErrorBatch() throws Exception {
+List batch = new ArrayList();
+Map headers = new HashMap();
+headers.put("DataServiceVersion", "2.0");
+headers.put("MaxDataServiceVersion", "3.0");
+headers.put("Accept", "application/json;odata=verbose");
+BatchPart request = BatchQueryPart.method(ODataHttpMethod.GET.name())
+.uri("nonsense")
+.headers(headers)
+.build();
+batch.add(request);
+
+InputStream body = EntityProvider.writeBatchRequest(batch, BOUNDARY);
+String bodyAsString = StringHelper.inputStreamToStringCRLFLineBreaks(body);
+checkMimeHeaders(bodyAsString);
+checkBoundaryDelimiters(bodyAsString);
+
+assertTrue(bodyAsString.contains("GET nonsense HTTP/1.1"));
+HttpResponse batchResponse = execute(bodyAsString);
+InputStream responseBody = batchResponse.getEntity().getContent();
+String contentType = 
batchResponse.getFirstHeader(HttpHeaders.CONTENT_TYPE).getValue();
+List responses = 

olingo-odata4 git commit: [OLINGO-1080] Support Entity Iterator in batch requests

[chrisam]

Repository: olingo-odata4
Updated Branches:
  refs/heads/master 00a5b1d2e -> 89a6a69de


[OLINGO-1080] Support Entity Iterator in batch requests

Signed-off-by: Christian Amend 


Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/89a6a69d
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/89a6a69d
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/89a6a69d

Branch: refs/heads/master
Commit: 89a6a69de7a8c57fc4d2f59012019395ef2e001f
Parents: 00a5b1d
Author: i050510 
Authored: Wed Feb 8 09:08:56 2017 +0530
Committer: Christian Amend 
Committed: Wed Mar 1 17:01:25 2017 +0100

--
 .../serializer/BatchResponseSerializer.java |  23 ++-
 .../serializer/BatchResponseSerializerTest.java | 188 +++
 2 files changed, 204 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/89a6a69d/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/BatchResponseSerializer.java
--
diff --git 
a/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/BatchResponseSerializer.java
 
b/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/BatchResponseSerializer.java
index 7ef81b0..62d74cb 100644
--- 
a/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/BatchResponseSerializer.java
+++ 
b/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/BatchResponseSerializer.java
@@ -35,6 +35,7 @@ import org.apache.olingo.commons.api.ex.ODataRuntimeException;
 import org.apache.olingo.commons.api.format.ContentType;
 import org.apache.olingo.commons.api.http.HttpHeader;
 import org.apache.olingo.commons.api.http.HttpStatusCode;
+import org.apache.olingo.server.api.ODataContent;
 import org.apache.olingo.server.api.ODataResponse;
 import org.apache.olingo.server.api.deserializer.batch.ODataResponsePart;
 import org.apache.olingo.server.api.serializer.BatchSerializerException;
@@ -243,19 +244,27 @@ public class BatchResponseSerializer {
 }
 
 private byte[] getBody(final ODataResponse response) {
-  if (response == null || response.getContent() == null) {
+  if (response == null || (response.getContent() == null && 
+  response.getODataContent() == null)) {
 return new byte[0];
   }
 
   try {
 ByteArrayOutputStream output = new ByteArrayOutputStream();
 ByteBuffer inBuffer = ByteBuffer.allocate(BUFFER_SIZE);
-ReadableByteChannel ic = Channels.newChannel(response.getContent());
-WritableByteChannel oc = Channels.newChannel(output);
-while (ic.read(inBuffer) > 0) {
-  inBuffer.flip();
-  oc.write(inBuffer);
-  inBuffer.rewind();
+if (response.getContent() == null) {
+  if (response.getODataContent() != null) {
+ODataContent res = response.getODataContent();
+res.write(Channels.newChannel(output));
+}
+} else {
+  ReadableByteChannel ic = Channels.newChannel(response.getContent());
+  WritableByteChannel oc = Channels.newChannel(output);
+  while (ic.read(inBuffer) > 0) {
+inBuffer.flip();
+oc.write(inBuffer);
+inBuffer.rewind();
+  }
 }
 return output.toByteArray();
   } catch (IOException e) {

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/89a6a69d/lib/server-core/src/test/java/org/apache/olingo/server/core/serializer/BatchResponseSerializerTest.java
--
diff --git 
a/lib/server-core/src/test/java/org/apache/olingo/server/core/serializer/BatchResponseSerializerTest.java
 
b/lib/server-core/src/test/java/org/apache/olingo/server/core/serializer/BatchResponseSerializerTest.java
index cf427bf..e9ffb48 100644
--- 
a/lib/server-core/src/test/java/org/apache/olingo/server/core/serializer/BatchResponseSerializerTest.java
+++ 
b/lib/server-core/src/test/java/org/apache/olingo/server/core/serializer/BatchResponseSerializerTest.java
@@ -22,6 +22,7 @@ import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -34,11 +35,19 @@ import java.util.Random;
 import java.util.UUID;
 
 import org.apache.commons.io.IOUtils;
+import org.apache.olingo.commons.api.data.ContextURL;
+import org.apache.olingo.commons.api.data.Entity;
+import 

olingo-odata4 git commit: [OLINGO-1083] Change EntityType attribute to Type in Singletons accroding to spec

[chrisam]

Repository: olingo-odata4
Updated Branches:
  refs/heads/master e41b81ea0 -> 00a5b1d2e


[OLINGO-1083] Change EntityType attribute to Type in Singletons accroding to 
spec

Signed-off-by: Christian Amend 


Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/00a5b1d2
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/00a5b1d2
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/00a5b1d2

Branch: refs/heads/master
Commit: 00a5b1d2e15519d148ab6f1946b0bc8457dd0e65
Parents: e41b81e
Author: i036162 
Authored: Fri Feb 24 16:45:49 2017 +0100
Committer: Christian Amend 
Committed: Wed Mar 1 16:00:09 2017 +0100

--
 .../server/core/serializer/xml/MetadataDocumentXmlSerializer.java | 3 ++-
 .../core/serializer/xml/MetadataDocumentXmlSerializerTest.java| 2 +-
 .../olingo/server/core/serializer/xml/MetadataDocumentTest.java   | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/00a5b1d2/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/xml/MetadataDocumentXmlSerializer.java
--
diff --git 
a/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/xml/MetadataDocumentXmlSerializer.java
 
b/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/xml/MetadataDocumentXmlSerializer.java
index ff4b009..fe0fb54 100644
--- 
a/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/xml/MetadataDocumentXmlSerializer.java
+++ 
b/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/xml/MetadataDocumentXmlSerializer.java
@@ -113,6 +113,7 @@ public class MetadataDocumentXmlSerializer {
   private static final String XML_IS_COMPOSABLE = "IsComposable";
   private static final String XML_IS_BOUND = "IsBound";
   private static final String XML_ENTITY_TYPE = "EntityType";
+  private static final String XML_SINGLETON_TYPE = XML_TYPE;
   private static final String XML_SINGLETON = "Singleton";
   private static final String XML_ACTION = "Action";
   private static final String XML_ACTION_IMPORT = "ActionImport";
@@ -607,7 +608,7 @@ public class MetadataDocumentXmlSerializer {
 for (EdmSingleton singleton : singletons) {
   writer.writeStartElement(XML_SINGLETON);
   writer.writeAttribute(XML_NAME, singleton.getName());
-  writer.writeAttribute(XML_ENTITY_TYPE, 
getAliasedFullQualifiedName(singleton.getEntityType(), false));
+  writer.writeAttribute(XML_SINGLETON_TYPE, 
getAliasedFullQualifiedName(singleton.getEntityType(), false));
 
   appendNavigationPropertyBindings(writer, singleton);
   appendAnnotations(writer, singleton);

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/00a5b1d2/lib/server-core/src/test/java/org/apache/olingo/server/core/serializer/xml/MetadataDocumentXmlSerializerTest.java
--
diff --git 
a/lib/server-core/src/test/java/org/apache/olingo/server/core/serializer/xml/MetadataDocumentXmlSerializerTest.java
 
b/lib/server-core/src/test/java/org/apache/olingo/server/core/serializer/xml/MetadataDocumentXmlSerializerTest.java
index 27e3e90..d92d6ac 100644
--- 
a/lib/server-core/src/test/java/org/apache/olingo/server/core/serializer/xml/MetadataDocumentXmlSerializerTest.java
+++ 
b/lib/server-core/src/test/java/org/apache/olingo/server/core/serializer/xml/MetadataDocumentXmlSerializerTest.java
@@ -247,7 +247,7 @@ public class MetadataDocumentXmlSerializerTest {
 assertTrue(metadata.contains(""));
 assertTrue(metadata.contains(""));
 assertTrue(metadata.contains(""));
-assertTrue(metadata.contains(""));
+assertTrue(metadata.contains(""));
 assertTrue(metadata.contains(""));
 assertTrue(metadata.contains(""));

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/00a5b1d2/lib/server-test/src/test/java/org/apache/olingo/server/core/serializer/xml/MetadataDocumentTest.java
--
diff --git 
a/lib/server-test/src/test/java/org/apache/olingo/server/core/serializer/xml/MetadataDocumentTest.java
 
b/lib/server-test/src/test/java/org/apache/olingo/server/core/serializer/xml/MetadataDocumentTest.java
index a8ea4b5..3e9188e 100644
--- 
a/lib/server-test/src/test/java/org/apache/olingo/server/core/serializer/xml/MetadataDocumentTest.java
+++ 
b/lib/server-test/src/test/java/org/apache/olingo/server/core/serializer/xml/MetadataDocumentTest.java
@@ -116,7 +116,7 @@ public class MetadataDocumentTest {
 containsString(""));
 
 assertThat(metadata,
-containsString(""
+

olingo-odata2 git commit: [OLINGO-1088] Improve V2 serialization error messages

[chrisam]

Repository: olingo-odata2
Updated Branches:
  refs/heads/master ee4b64337 -> 742560d27


[OLINGO-1088] Improve V2 serialization error messages

Signed-off-by: Christian Amend 


Project: http://git-wip-us.apache.org/repos/asf/olingo-odata2/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata2/commit/742560d2
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata2/tree/742560d2
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata2/diff/742560d2

Branch: refs/heads/master
Commit: 742560d27b5498860a9fb4d63eb11f8cf1d294dd
Parents: ee4b643
Author: i050510 
Authored: Wed Mar 1 14:35:27 2017 +0530
Committer: Christian Amend 
Committed: Wed Mar 1 15:51:47 2017 +0100

--
 .../odata2/api/edm/EdmSimpleTypeException.java  |  13 ++
 .../odata2/api/exception/MessageReference.java  |  10 ++
 .../odata2/core/ep/BasicEntityProvider.java |   9 +-
 .../ep/producer/AtomEntryEntityProducer.java|  37 -
 .../ep/producer/JsonPropertyEntityProducer.java |  10 +-
 .../ep/producer/XmlPropertyEntityProducer.java  |  15 +-
 .../src/main/resources/i18n.properties  |   2 +
 .../core/ep/producer/AtomEntryProducerTest.java | 163 +++
 .../producer/JsonEntryEntityProducerTest.java   | 161 ++
 .../olingo/odata2/testutil/mock/EdmMock.java|  28 +++-
 10 files changed, 434 insertions(+), 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/742560d2/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmSimpleTypeException.java
--
diff --git 
a/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmSimpleTypeException.java
 
b/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmSimpleTypeException.java
index 771623c..a003808 100644
--- 
a/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmSimpleTypeException.java
+++ 
b/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmSimpleTypeException.java
@@ -53,6 +53,10 @@ public class EdmSimpleTypeException extends EdmException {
   "VALUE_ILLEGAL_CONTENT");
   public static final MessageReference VALUE_FACETS_NOT_MATCHED = 
createMessageReference(EdmSimpleTypeException.class,
   "VALUE_FACETS_NOT_MATCHED");
+  public static final MessageReference PROPERTY_VALUE_NULL_NOT_ALLOWED = 
createMessageReference(
+  EdmSimpleTypeException.class, "PROPERTY_VALUE_NULL_NOT_ALLOWED");
+  public static final MessageReference PROPERTY_VALUE_FACETS_NOT_MATCHED = 
createMessageReference(
+  EdmSimpleTypeException.class,"PROPERTY_VALUE_FACETS_NOT_MATCHED");
 
   public EdmSimpleTypeException(final MessageReference messageReference) {
 super(messageReference);
@@ -70,4 +74,13 @@ public class EdmSimpleTypeException extends EdmException {
   final String errorCode) {
 super(messageReference, cause, errorCode);
   }
+  
+  public static MessageReference getMessageReference(final MessageReference 
messageReference) {
+if 
(EdmSimpleTypeException.VALUE_NULL_NOT_ALLOWED.equals(messageReference)) {
+  return EdmSimpleTypeException.PROPERTY_VALUE_NULL_NOT_ALLOWED;
+} else if 
(EdmSimpleTypeException.VALUE_FACETS_NOT_MATCHED.equals(messageReference)) {
+  return EdmSimpleTypeException.PROPERTY_VALUE_FACETS_NOT_MATCHED;
+}
+return messageReference;
+  }
 }

http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/742560d2/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/MessageReference.java
--
diff --git 
a/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/MessageReference.java
 
b/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/MessageReference.java
index 4f0f5be..fe22695 100644
--- 
a/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/MessageReference.java
+++ 
b/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/MessageReference.java
@@ -172,4 +172,14 @@ public abstract class MessageReference {
 }
 return true;
   }
+  
+  public MessageReference updateContent(List oldContent, Object... 
newContent) {
+
+final List mergedContent = new ArrayList();
+if (oldContent != null && oldContent.size() > 0) {
+  mergedContent.addAll(oldContent); 
+}
+mergedContent.addAll(Arrays.asList(newContent));
+return new SimpleMessageReference(key, mergedContent);
+  }
 }

http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/742560d2/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/BasicEntityProvider.java
--
diff --git 

olingo-odata2 git commit: [OLINGO-] ODatav2 edmx Reference tag Issue

[chrisam]

Repository: olingo-odata2
Updated Branches:
  refs/heads/master ecd02e87b -> ee4b64337


[OLINGO-] ODatav2 edmx Reference tag Issue

Signed-off-by: Christian Amend 


Project: http://git-wip-us.apache.org/repos/asf/olingo-odata2/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata2/commit/ee4b6433
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata2/tree/ee4b6433
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata2/diff/ee4b6433

Branch: refs/heads/master
Commit: ee4b64337a35898a84508180d4f4e73d407c42e0
Parents: ecd02e8
Author: Archana Rai 
Authored: Wed Feb 8 11:51:53 2017 +0530
Committer: Christian Amend 
Committed: Tue Feb 21 12:36:45 2017 +0100

--
 .../core/ep/consumer/XmlMetadataConsumer.java   |  5 +++-
 .../ep/consumer/XmlMetadataConsumerTest.java| 29 
 2 files changed, 33 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/ee4b6433/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/XmlMetadataConsumer.java
--
diff --git 
a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/XmlMetadataConsumer.java
 
b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/XmlMetadataConsumer.java
index e245cad..df4cdcd 100644
--- 
a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/XmlMetadataConsumer.java
+++ 
b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/XmlMetadataConsumer.java
@@ -954,7 +954,10 @@ public class XmlMetadataConsumer {
   if (namespacePrefix == null || isDefaultNamespace(namespacePrefix)) {
 namespacePrefix = Edm.PREFIX_EDM;
   }
-  xmlNamespaceMap.put(namespacePrefix, namespaceUri);
+  //Ignoring the duplicate tags, parent tag namespace takes precedence
+  if (!xmlNamespaceMap.containsKey(namespacePrefix)) {
+xmlNamespaceMap.put(namespacePrefix, namespaceUri);
+  }
 }
   }
 

http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/ee4b6433/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/XmlMetadataConsumerTest.java
--
diff --git 
a/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/XmlMetadataConsumerTest.java
 
b/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/XmlMetadataConsumerTest.java
index fb95029..9c4877c 100644
--- 
a/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/XmlMetadataConsumerTest.java
+++ 
b/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/XmlMetadataConsumerTest.java
@@ -180,6 +180,35 @@ public class XmlMetadataConsumerTest extends 
AbstractXmlConsumerTest {
   "Nullable=\"false\" MaxLength=\"Max\"/>"
   + "";
 
+  private final String edmxRefFor1680364709 = 
+  "http://schemas.microsoft.com/ado/2007/06/edmx\; 
" +
+  
"xmlns:m=\"http://schemas.microsoft.com/ado/2007/08/dataservices/metadata\; 
xmlns:sap=\"" +
+  "http://www.sap.com/Protocols/SAPData\; Version=\"1.0\">" +
+  "http://docs.oasis-open.org/odata/ns/edmx\; 
" +
+  
"Uri=\"https://host:port/sap/opu/odata/IWFND/CATALOGSERVICE;v=2/Vocabularies"+
+  "(TechnicalName='%2FIWBEP%2FVOC_COMMON'"+
+  ",Version='0001',SAP__Origin='')/$value\">" +
+  "" +
+  "" + 
+  "";
+  
+  @Test
+  public void twoEdmxWithValidation() throws Exception {
+XmlMetadataConsumer parser = new XmlMetadataConsumer();
+XMLStreamReader reader = createStreamReader(edmxRefFor1680364709);
+DataServices result = parser.readMetadata(reader, true);   
+assertNotNull(result);
+
+  }
+  
+  @Test
+  public void twoEdmxWithoutValidation() throws Exception {
+XmlMetadataConsumer parser = new XmlMetadataConsumer();
+XMLStreamReader reader = createStreamReader(edmxRefFor1680364709);
+DataServices result = parser.readMetadata(reader, false);   
+assertNotNull(result);
+
+  }
   @Test
   public void testMetadataDokumentWithWhitepaces() throws Exception {
 final String metadata = ""

olingo-odata4 git commit: [OLINGO-1077] EntityIterator count support

[chrisam]

Repository: olingo-odata4
Updated Branches:
  refs/heads/master 2800fa0e9 -> e41b81ea0


[OLINGO-1077] EntityIterator count support

Signed-off-by: Christian Amend 


Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/e41b81ea
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/e41b81ea
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/e41b81ea

Branch: refs/heads/master
Commit: e41b81ea09c34353414d43280e535242133c4793
Parents: 2800fa0
Author: Archana Rai 
Authored: Tue Feb 7 11:28:41 2017 +0530
Committer: Christian Amend 
Committed: Tue Feb 7 12:09:16 2017 +0100

--
 .../fit/tecsvc/http/BasicStreamITCase.java  | 84 
 .../olingo/commons/api/data/EntityIterator.java | 19 +++--
 .../processor/TechnicalEntityProcessor.java |  5 ++
 3 files changed, 103 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/e41b81ea/fit/src/test/java/org/apache/olingo/fit/tecsvc/http/BasicStreamITCase.java
--
diff --git 
a/fit/src/test/java/org/apache/olingo/fit/tecsvc/http/BasicStreamITCase.java 
b/fit/src/test/java/org/apache/olingo/fit/tecsvc/http/BasicStreamITCase.java
index ce77536..42ddb93 100644
--- a/fit/src/test/java/org/apache/olingo/fit/tecsvc/http/BasicStreamITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/tecsvc/http/BasicStreamITCase.java
@@ -20,6 +20,7 @@ package org.apache.olingo.fit.tecsvc.http;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertFalse;
 
 import java.net.HttpURLConnection;
 import java.net.URL;
@@ -154,6 +155,89 @@ public class BasicStreamITCase extends 
AbstractBaseTestITCase {
 
assertTrue(content.contains("ESStreamServerSidePaging?$format=json&%24skiptoken=2%2A10"));
   }
   
+  
+  @Test
+  public void streamCountXml() throws Exception {
+URL url = new URL(SERVICE_URI + 
"ESStreamServerSidePaging?$count=true&$format=xml");
+
+HttpURLConnection connection = (HttpURLConnection) url.openConnection();
+connection.setRequestMethod(HttpMethod.GET.name());
+connection.connect();
+
+assertEquals(HttpStatusCode.OK.getStatusCode(), 
connection.getResponseCode());
+assertEquals(ContentType.APPLICATION_XML, 
ContentType.create(connection.getHeaderField(HttpHeader.CONTENT_TYPE)));
+
+final String content = IOUtils.toString(connection.getInputStream());
+assertTrue(content.contains(""));
+assertTrue(content.contains("ESStreamServerSidePaging(1)"));
+assertTrue(content.contains("504"));
+assertTrue(content.contains("1"));
+assertTrue(content.contains("readLink"));
+  }
+  
+   
+  @Test
+  public void streamCountJson() throws Exception {
+URL url = new URL(SERVICE_URI + 
"ESStreamServerSidePaging?$count=true&$format=json");
+
+HttpURLConnection connection = (HttpURLConnection) url.openConnection();
+connection.setRequestMethod(HttpMethod.GET.name());
+connection.connect();
+
+assertEquals(HttpStatusCode.OK.getStatusCode(), 
connection.getResponseCode());
+assertEquals(ContentType.JSON, 
ContentType.create(connection.getHeaderField(HttpHeader.CONTENT_TYPE)));
+
+final String content = IOUtils.toString(connection.getInputStream());
+
+assertTrue(content.contains("{\"PropertyInt16\":2,"+
+
"\"PropertyStream@odata.mediaEtag\":\"eTag\",\"PropertyStream@odata.mediaContentType\":\"image/jpeg\"}"));
+assertTrue(content.contains("\"@odata.nextLink\""));
+
assertTrue(content.contains("ESStreamServerSidePaging?$count=true&$format=json&%24skiptoken=1%2A10"));
+assertTrue(content.contains("\"@odata.count\":504"));
+  }
+  
+  @Test
+  public void streamCountFalsetXml() throws Exception {
+URL url = new URL(SERVICE_URI + 
"ESStreamServerSidePaging?$count=false&$format=xml");
+
+HttpURLConnection connection = (HttpURLConnection) url.openConnection();
+connection.setRequestMethod(HttpMethod.GET.name());
+connection.connect();
+
+assertEquals(HttpStatusCode.OK.getStatusCode(), 
connection.getResponseCode());
+assertEquals(ContentType.APPLICATION_XML, 
ContentType.create(connection.getHeaderField(HttpHeader.CONTENT_TYPE)));
+
+final String content = IOUtils.toString(connection.getInputStream());
+assertTrue(content.contains(""));
+assertTrue(content.contains("ESStreamServerSidePaging(1)"));
+assertTrue(content.contains("1"));
+assertTrue(content.contains("readLink"));
+assertFalse(content.contains("504"));
+}
+  
+   
+  @Test
+  public void streamCountFalseJson() throws Exception {
+URL url = new URL(SERVICE_URI + 

olingo-odata2 git commit: [OLINGO-974] Additional unit tests for Dynamic Entity Support

[chrisam]

Repository: olingo-odata2
Updated Branches:
  refs/heads/master b0376ca3f -> ecd02e87b


[OLINGO-974] Additional unit tests for Dynamic Entity Support

Signed-off-by: Christian Amend 


Project: http://git-wip-us.apache.org/repos/asf/olingo-odata2/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata2/commit/ecd02e87
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata2/tree/ecd02e87
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata2/diff/ecd02e87

Branch: refs/heads/master
Commit: ecd02e87b9dfe2d26e472934eca495a2c5c89bae
Parents: b0376ca
Author: Shankara G 
Authored: Wed Jun 22 09:19:05 2016 +0530
Committer: Christian Amend 
Committed: Thu Jan 26 11:54:53 2017 +0100

--
 .../core/access/data/JPAEntityParserTest.java   | 113 +--
 1 file changed, 106 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/ecd02e87/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAEntityParserTest.java
--
diff --git 
a/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAEntityParserTest.java
 
b/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAEntityParserTest.java
index 8035f2b..c0b3cf6 100644
--- 
a/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAEntityParserTest.java
+++ 
b/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAEntityParserTest.java
@@ -34,6 +34,7 @@ import org.apache.olingo.odata2.api.edm.EdmException;
 import org.apache.olingo.odata2.api.edm.EdmMapping;
 import org.apache.olingo.odata2.api.edm.EdmNavigationProperty;
 import org.apache.olingo.odata2.api.edm.EdmProperty;
+import org.apache.olingo.odata2.api.edm.EdmSimpleType;
 import org.apache.olingo.odata2.api.edm.EdmStructuralType;
 import org.apache.olingo.odata2.api.edm.EdmType;
 import org.apache.olingo.odata2.api.edm.EdmTypeKind;
@@ -177,7 +178,7 @@ public class JPAEntityParserTest {
 }
 
   }
-
+  
   @Test
   public void testparse2EdmPropertyListMap() {
 JPAEntityParser resultParser = new JPAEntityParser();
@@ -200,6 +201,39 @@ public class JPAEntityParserTest {
 } catch (EdmException e) {
   fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + 
ODataJPATestConstants.EXCEPTION_MSG_PART_2);
 }
+
+navigationPropertyList.add(navigationProperty);
+try {
+  HashMap result = 
resultParser.parse2EdmNavigationValueMap(jpaEntity, navigationPropertyList);
+  assertEquals(relatedEntity, result.get("RelatedEntities"));
+  
+} catch (ODataJPARuntimeException e) {
+  fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + 
ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+}
+  }
+
+  @Test
+  public void testparse2EdmPropertyListMapWithVirtualAccess() {
+JPAEntityParser resultParser = new JPAEntityParser();
+Map edmEntity = new HashMap();
+edmEntity.put("SoId", 1);
+DemoRelatedEntity relatedEntity = new DemoRelatedEntity("NewOrder");
+demoItem jpaEntity = new demoItem("laptop", 1);
+jpaEntity.setRelatedEntity(relatedEntity);
+List navigationPropertyList = new 
ArrayList();
+// Mocking a navigation property and its mapping object
+EdmNavigationProperty navigationProperty = 
EasyMock.createMock(EdmNavigationProperty.class);
+JPAEdmMappingImpl edmMapping = 
EasyMock.createMock(JPAEdmMappingImpl.class);
+try {
+  
EasyMock.expect(edmMapping.getInternalName()).andStubReturn("relatedEntity");
+  
EasyMock.expect(((JPAEdmMappingImpl)edmMapping).isVirtualAccess()).andStubReturn(true);
  
+  EasyMock.replay(edmMapping);
+  
EasyMock.expect(navigationProperty.getName()).andStubReturn("RelatedEntities");
+  
EasyMock.expect(navigationProperty.getMapping()).andStubReturn(edmMapping);
+  EasyMock.replay(navigationProperty);
+} catch (EdmException e) {
+  fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + 
ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+}
 
 navigationPropertyList.add(navigationProperty);
 try {
@@ -401,7 +435,7 @@ public class JPAEntityParserTest {
 
 }
   }
-
+  
   @Test
   public void testParse2EdmPropertyValueMap() {
 JPAEntityParser resultParser = new JPAEntityParser();
@@ -414,6 +448,17 @@ public class JPAEntityParserTest {
   }
 
   @Test
+  public void testParse2EdmPropertyValueMapWithVirtualAccess() {
+JPAEntityParser resultParser = new JPAEntityParser();
+Object jpaEntity = new DemoItem2("abc");
+

olingo-odata2 git commit: [OLINGO-1054] Fiz RAT check

[chrisam]

Repository: olingo-odata2
Updated Branches:
  refs/heads/master d6f9ddeed -> b0376ca3f


[OLINGO-1054] Fiz RAT check


Project: http://git-wip-us.apache.org/repos/asf/olingo-odata2/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata2/commit/b0376ca3
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata2/tree/b0376ca3
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata2/diff/b0376ca3

Branch: refs/heads/master
Commit: b0376ca3f39314585f0b91b9736b6b709fe4bd1b
Parents: d6f9dde
Author: Christian Amend 
Authored: Thu Jan 26 11:47:50 2017 +0100
Committer: Christian Amend 
Committed: Thu Jan 26 11:47:50 2017 +0100

--
 .../odata2/core/ep/consumer/FeedCallback.java | 18 ++
 .../resources/Employee_InlineRoomBuilding.xml | 18 ++
 .../resources/Room_EmptyInlineEmployeesToTeam.xml | 18 ++
 .../test/resources/Room_InlineEmployeesToTeam.xml | 18 ++
 .../resources/RoomsToEmployeesWithInlineTeams.xml | 18 ++
 .../test/resources/Rooms_InlineEmployeesTeams.xml | 18 ++
 .../Rooms_InlineEmployees_InlineBuildings.xml | 18 ++
 7 files changed, 126 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/b0376ca3/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/FeedCallback.java
--
diff --git 
a/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/FeedCallback.java
 
b/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/FeedCallback.java
index a8a9478..6433d0f 100644
--- 
a/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/FeedCallback.java
+++ 
b/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/FeedCallback.java
@@ -1,3 +1,21 @@
+/***
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ 
**/
 package org.apache.olingo.odata2.core.ep.consumer;
 
 import java.util.HashMap;

http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/b0376ca3/odata2-lib/odata-core/src/test/resources/Employee_InlineRoomBuilding.xml
--
diff --git 
a/odata2-lib/odata-core/src/test/resources/Employee_InlineRoomBuilding.xml 
b/odata2-lib/odata-core/src/test/resources/Employee_InlineRoomBuilding.xml
index 37ca6e8..a465b86 100644
--- a/odata2-lib/odata-core/src/test/resources/Employee_InlineRoomBuilding.xml
+++ b/odata2-lib/odata-core/src/test/resources/Employee_InlineRoomBuilding.xml
@@ -1,4 +1,22 @@
 
+
 http://www.w3.org/2005/Atom; 
xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata; 
xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices; 
xml:base="http://localhost:8080/olingo-odata2-ref-web/ReferenceScenario.svc/;>

http://localhost:8080/olingo-odata2-ref-web/ReferenceScenario.svc/Employees('1')
Walter Winter

http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/b0376ca3/odata2-lib/odata-core/src/test/resources/Room_EmptyInlineEmployeesToTeam.xml
--
diff --git 
a/odata2-lib/odata-core/src/test/resources/Room_EmptyInlineEmployeesToTeam.xml 
b/odata2-lib/odata-core/src/test/resources/Room_EmptyInlineEmployeesToTeam.xml
index 6ec35fe..8cdbbac 100644
--- 
a/odata2-lib/odata-core/src/test/resources/Room_EmptyInlineEmployeesToTeam.xml
+++ 
b/odata2-lib/odata-core/src/test/resources/Room_EmptyInlineEmployeesToTeam.xml
@@ -1,4 +1,22 @@
 
+
 http://www.w3.org/2005/Atom; 
xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata; 
xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices; 
xml:base="http://localhost:8080/olingo-odata2-ref-web/ReferenceScenario.svc/; 
m:etag="W/1">
 

olingo-odata2 git commit: [OLINGO-1035] Accept inline URI to create a reference to an existing entity.

[chrisam]

Repository: olingo-odata2
Updated Branches:
  refs/heads/master f24fc8bf4 -> d6f9ddeed


[OLINGO-1035] Accept inline URI to create a reference to an existing entity.

Signed-off-by: Christian Amend 


Project: http://git-wip-us.apache.org/repos/asf/olingo-odata2/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata2/commit/d6f9ddee
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata2/tree/d6f9ddee
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata2/diff/d6f9ddee

Branch: refs/heads/master
Commit: d6f9ddeedb928b32c0ef2f3ea0dbf0ea056b9d3a
Parents: f24fc8b
Author: Michael Strasser 
Authored: Tue Oct 18 11:42:47 2016 +1100
Committer: Christian Amend 
Committed: Thu Jan 26 11:11:31 2017 +0100

--
 .../processor/core/ListsProcessor.java  | 20 ++--
 1 file changed, 14 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/d6f9ddee/odata2-annotation-processor/annotation-processor-core/src/main/java/org/apache/olingo/odata2/annotation/processor/core/ListsProcessor.java
--
diff --git 
a/odata2-annotation-processor/annotation-processor-core/src/main/java/org/apache/olingo/odata2/annotation/processor/core/ListsProcessor.java
 
b/odata2-annotation-processor/annotation-processor-core/src/main/java/org/apache/olingo/odata2/annotation/processor/core/ListsProcessor.java
index df23b31..a896c80 100644
--- 
a/odata2-annotation-processor/annotation-processor-core/src/main/java/org/apache/olingo/odata2/annotation/processor/core/ListsProcessor.java
+++ 
b/odata2-annotation-processor/annotation-processor-core/src/main/java/org/apache/olingo/odata2/annotation/processor/core/ListsProcessor.java
@@ -1153,12 +1153,20 @@ public class ListsProcessor extends DataSourceProcessor 
{
   }
 } else if (relatedValue instanceof ODataEntry) {
   final ODataEntry relatedValueEntry = (ODataEntry) relatedValue;
-  Object relatedData = dataSource.newDataObject(relatedEntitySet);
-  setStructuralTypeValuesFromMap(relatedData, relatedEntityType, 
relatedValueEntry.getProperties(), false);
-  dataSource.createData(relatedEntitySet, relatedData);
-  dataSource.writeRelation(entitySet, data, relatedEntitySet, 
getStructuralTypeValueMap(relatedData,
-  relatedEntityType));
-  createInlinedEntities(relatedEntitySet, relatedData, 
relatedValueEntry);
+  final Map relatedProperties = 
relatedValueEntry.getProperties();
+  if (relatedProperties.isEmpty()) {
+final Map key = parseLinkUri(relatedEntitySet, 
relatedValueEntry.getMetadata().getUri());
+if (key != null) {
+  dataSource.writeRelation(entitySet, data, relatedEntitySet, key);
+}
+  } else {
+Object relatedData = dataSource.newDataObject(relatedEntitySet);
+setStructuralTypeValuesFromMap(relatedData, relatedEntityType, 
relatedProperties, false);
+dataSource.createData(relatedEntitySet, relatedData);
+dataSource.writeRelation(entitySet, data, relatedEntitySet, 
getStructuralTypeValueMap(relatedData,
+relatedEntityType));
+createInlinedEntities(relatedEntitySet, relatedData, 
relatedValueEntry);
+  }
 } else {
   throw new ODataException("Unexpected class for a related value: " + 
relatedValue.getClass().getSimpleName());
 }

[2/2] olingo-odata2 git commit: [OLINGO-1054] Inline Consumer Callback Data handling

[chrisam]

[OLINGO-1054] Inline Consumer Callback Data handling

Signed-off-by: Christian Amend 


Project: http://git-wip-us.apache.org/repos/asf/olingo-odata2/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata2/commit/f24fc8bf
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata2/tree/f24fc8bf
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata2/diff/f24fc8bf

Branch: refs/heads/master
Commit: f24fc8bf42aa225afee2913e47423f11dc9fc237
Parents: adda9d5
Author: i050510 
Authored: Thu Dec 1 13:31:59 2016 +0530
Committer: Christian Amend 
Committed: Thu Jan 26 11:06:21 2017 +0100

--
 .../odata2/api/ep/callback/ReadEntryResult.java |  11 +-
 .../odata2/api/ep/callback/ReadFeedResult.java  |  10 +-
 .../core/ep/consumer/JsonEntryConsumer.java |   9 +-
 .../core/ep/consumer/XmlEntryConsumer.java  |   6 +-
 .../odata2/core/ep/consumer/FeedCallback.java   |  82 +++
 .../core/ep/consumer/JsonEntryConsumerTest.java | 142 +++
 .../core/ep/consumer/JsonFeedConsumerTest.java  | 149 
 .../core/ep/consumer/XmlEntityConsumerTest.java | 141 +++
 .../core/ep/consumer/XmlFeedConsumerTest.java   | 151 
 .../resources/Employee_InlineRoomBuilding.xml   |  71 ++
 .../JsonEmployeeInlineRoomBuilding.json |  75 ++
 .../JsonRoom_EmptyInlineEmployeesToTeam.json|  22 ++
 .../JsonRoom_InlineEmployeesToTeam.json |  79 ++
 .../JsonRoomsToEmployeesWithInlineTeams.json| 118 +
 .../JsonRooms_InlineEmployeesTeams.json | 236 ++
 ...sonRooms_InlineEmployees_InlineBuilding.json | 236 ++
 .../Room_EmptyInlineEmployeesToTeam.xml |  30 +++
 .../resources/Room_InlineEmployeesToTeam.xml|  77 ++
 .../RoomsToEmployeesWithInlineTeams.xml | 104 
 .../resources/Rooms_InlineEmployeesTeams.xml| 238 +++
 .../Rooms_InlineEmployees_InlineBuildings.xml   | 197 +++
 21 files changed, 2176 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/f24fc8bf/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/callback/ReadEntryResult.java
--
diff --git 
a/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/callback/ReadEntryResult.java
 
b/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/callback/ReadEntryResult.java
index e6b8d8c..26968d2 100644
--- 
a/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/callback/ReadEntryResult.java
+++ 
b/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/callback/ReadEntryResult.java
@@ -35,7 +35,7 @@ import org.apache.olingo.odata2.api.ep.entry.ODataEntry;
 public class ReadEntryResult extends ReadResult {
 
   private final ODataEntry entry;
-
+  private final String parentEntryId;
   /**
* Constructor.
* Parameters MUST NOT BE NULL.
@@ -45,9 +45,10 @@ public class ReadEntryResult extends ReadResult {
* @param entry read entity as {@link ODataEntry}
*/
   public ReadEntryResult(final EntityProviderReadProperties properties, final 
EdmNavigationProperty navigationProperty,
-  final ODataEntry entry) {
+  final ODataEntry entry, final String entryMetadataId) {
 super(properties, navigationProperty);
 this.entry = entry;
+this.parentEntryId = entryMetadataId;
   }
 
   @Override
@@ -64,4 +65,10 @@ public class ReadEntryResult extends ReadResult {
   public String toString() {
 return super.toString() + "\n\t" + entry.toString();
   }
+  /**
+   * @return the rootEntryId
+   */
+  public String getParentEntryId() {
+return parentEntryId;
+  }
 }

http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/f24fc8bf/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/callback/ReadFeedResult.java
--
diff --git 
a/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/callback/ReadFeedResult.java
 
b/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/callback/ReadFeedResult.java
index 3e58609..011becf 100644
--- 
a/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/callback/ReadFeedResult.java
+++ 
b/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/callback/ReadFeedResult.java
@@ -35,6 +35,7 @@ import org.apache.olingo.odata2.api.ep.feed.ODataFeed;
 public class ReadFeedResult extends ReadResult {
 
   private final ODataFeed feed;
+  private final String parentEntryId;
 
   /**
* Constructor.
@@ -45,9 +46,10 @@ public class ReadFeedResult extends ReadResult {
* @param entry read entities as list of {@link 

[1/2] olingo-odata2 git commit: [OLINGO-1054] Inline Consumer Callback Data handling

[chrisam]

Repository: olingo-odata2
Updated Branches:
  refs/heads/master adda9d5d6 -> f24fc8bf4


http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/f24fc8bf/odata2-lib/odata-core/src/test/resources/Room_InlineEmployeesToTeam.xml
--
diff --git 
a/odata2-lib/odata-core/src/test/resources/Room_InlineEmployeesToTeam.xml 
b/odata2-lib/odata-core/src/test/resources/Room_InlineEmployeesToTeam.xml
new file mode 100644
index 000..95fd709
--- /dev/null
+++ b/odata2-lib/odata-core/src/test/resources/Room_InlineEmployeesToTeam.xml
@@ -0,0 +1,77 @@
+
+http://www.w3.org/2005/Atom; 
xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata; 
xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices; 
xml:base="http://localhost:8080/olingo-odata2-ref-web/ReferenceScenario.svc/; 
m:etag="W/1">
+   
http://localhost:8080/olingo-odata2-ref-web/ReferenceScenario.svc/Rooms('1')
+   Room 1
+   2016-11-30T11:10:06.334+05:30
+   http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"/>
+   
+   http://schemas.microsoft.com/ado/2007/08/dataservices/related/nr_Employees;
 title="nr_Employees" type="application/atom+xml;type=feed">
+   
+   http://localhost:8080/olingo-odata2-ref-web/ReferenceScenario.svc/;>
+   
http://localhost:8080/olingo-odata2-ref-web/ReferenceScenario.svc/Employees
+   Employees
+   2016-11-30T11:10:06.335+05:30
+   
+   
+   
+   
+   
+   
http://localhost:8080/olingo-odata2-ref-web/ReferenceScenario.svc/Employees('1')
+   Walter Winter
+   1999-01-01T00:00:00Z
+   http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"/>
+   
+   
+   http://schemas.microsoft.com/ado/2007/08/dataservices/related/ne_Manager; 
title="ne_Manager" type="application/atom+xml;type=entry"/>
+   http://schemas.microsoft.com/ado/2007/08/dataservices/related/ne_Team; 
title="ne_Team" type="application/atom+xml;type=entry">
+   
+   http://localhost:8080/olingo-odata2-ref-web/ReferenceScenario.svc/;>
+   
http://localhost:8080/olingo-odata2-ref-web/ReferenceScenario.svc/Teams('1')
+   Team 1
+   
2016-11-30T11:10:06.336+05:30
+   http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"/>
+   
+   http://schemas.microsoft.com/ado/2007/08/dataservices/related/nt_Employees;
 title="nt_Employees" type="application/atom+xml;type=feed"/>
+   
+   

+   
1
+   
Team 1
+   
false
+   

+   
+   
+   
+   
+   http://schemas.microsoft.com/ado/2007/08/dataservices/related/ne_Room; 
title="ne_Room" type="application/atom+xml;type=entry"/>
+   
+   
+   1
+   Walter 
Winter
+   1
+   1
+   1
+   
+   
+   
69124
+   
Heidelberg
+   
+   
Germany
+

svn commit: r1005417 - /websites/production/olingo/content/

[chrisam]

Author: chrisam
Date: Mon Jan 23 15:55:00 2017
New Revision: 1005417

Log:
Publish next release download page

Added:
websites/production/olingo/content/
  - copied from r1005416, websites/staging/olingo/trunk/content/

svn commit: r1779946 - /olingo/site/trunk/content/doc/odata2/download.mdtext

[chrisam]

Author: chrisam
Date: Mon Jan 23 15:48:33 2017
New Revision: 1779946

URL: http://svn.apache.org/viewvc?rev=1779946=rev
Log:
Edit homepage

Modified:
olingo/site/trunk/content/doc/odata2/download.mdtext

Modified: olingo/site/trunk/content/doc/odata2/download.mdtext
URL: 
http://svn.apache.org/viewvc/olingo/site/trunk/content/doc/odata2/download.mdtext?rev=1779946=1779945=1779946=diff
==
--- olingo/site/trunk/content/doc/odata2/download.mdtext (original)
+++ olingo/site/trunk/content/doc/odata2/download.mdtext Mon Jan 23 15:48:33 
2017
@@ -21,11 +21,11 @@ Notice:Licensed to the Apache Softwa
 Apache Olingo OData2 is a collection of Java libraries for
 implementing [OData V2][1] protocol clients or servers.
 
-### Release 2.0.7 (2016-08-17)
+### Release 2.0.8 (2017-01-23)
 
 [Full download page][2], [release notes][3]
 
-The Apache Olingo OData2 2.0.7 release is a patch release.
+The Apache Olingo OData2 2.0.8 release is a patch release.
 
 ### Commodity Packages
 
@@ -36,10 +36,10 @@ The *Core Library* is developed for the
 
 Package | zip | Description
 --- | --- | -
-Olingo OData2 Library| 
[Download](http://www.apache.org/dyn/closer.lua/olingo/odata2/2.0.7/olingo-odata2-dist-lib-2.0.7-lib.zip)
 
([md5](https://dist.apache.org/repos/dist/release/olingo/odata2/2.0.7/olingo-odata2-dist-lib-2.0.7-lib.zip.md5),
 
[sha512](https://dist.apache.org/repos/dist/release/olingo/odata2/2.0.7/olingo-odata2-dist-lib-2.0.7-lib.zip.sha512),
 
[pgp](https://dist.apache.org/repos/dist/release/olingo/odata2/2.0.7/olingo-odata2-dist-lib-2.0.7-lib.zip.asc))
 | All you need to implement an OData V2 client or server.
-Olingo OData2 Sources| 
[Download](http://www.apache.org/dyn/closer.lua/olingo/odata2/2.0.7/olingo-odata2-parent-2.0.7-source-release.zip)
 
([md5](https://dist.apache.org/repos/dist/release/olingo/odata2/2.0.7/olingo-odata2-parent-2.0.7-source-release.zip.md5),
 
[sha512](https://dist.apache.org/repos/dist/release/olingo/odata2/2.0.7/olingo-odata2-parent-2.0.7-source-release.zip.sha512),
 
[pgp](https://dist.apache.org/repos/dist/release/olingo/odata2/2.0.7/olingo-odata2-parent-2.0.7-source-release.zip.asc))
 | Olingo OData2 source code.
-Olingo OData2 Docs   | 
[Download](http://www.apache.org/dyn/closer.lua/olingo/odata2/2.0.7/olingo-odata2-dist-javadoc-2.0.7-javadoc.zip)
 
([md5](https://dist.apache.org/repos/dist/release/olingo/odata2/2.0.7/olingo-odata2-dist-javadoc-2.0.7-javadoc.zip.md5),
 
[sha512](https://dist.apache.org/repos/dist/release/olingo/odata2/2.0.7/olingo-odata2-dist-javadoc-2.0.7-javadoc.zip.sha512),
 
[pgp](https://dist.apache.org/repos/dist/release/olingo/odata2/2.0.7/olingo-odata2-dist-javadoc-2.0.7-javadoc.zip.asc))
 | Documentation and JavaDoc.
-Olingo OData2 Reference Scenario | 
[Download](http://www.apache.org/dyn/closer.lua/olingo/odata2/2.0.7/olingo-odata2-dist-ref-2.0.7-ref.zip)
 
([md5](https://dist.apache.org/repos/dist/release/olingo/odata2/2.0.7/olingo-odata2-dist-ref-2.0.7-ref.zip.md5),
 
[sha512](https://dist.apache.org/repos/dist/release/olingo/odata2/2.0.7/olingo-odata2-dist-ref-2.0.7-ref.zip.sha512),
 
[pgp](https://dist.apache.org/repos/dist/release/olingo/odata2/2.0.7/olingo-odata2-dist-ref-2.0.7-ref.zip.asc))
 | Deployable WAR files with reference scenario services using http://cxf.apache.org;>Apache CXF.
+Olingo OData2 Library| 
[Download](http://www.apache.org/dyn/closer.lua/olingo/odata2/2.0.8/olingo-odata2-dist-lib-2.0.8-lib.zip)
 
([md5](https://dist.apache.org/repos/dist/release/olingo/odata2/2.0.8/olingo-odata2-dist-lib-2.0.8-lib.zip.md5),
 
[sha512](https://dist.apache.org/repos/dist/release/olingo/odata2/2.0.8/olingo-odata2-dist-lib-2.0.8-lib.zip.sha512),
 
[pgp](https://dist.apache.org/repos/dist/release/olingo/odata2/2.0.8/olingo-odata2-dist-lib-2.0.8-lib.zip.asc))
 | All you need to implement an OData V2 client or server.
+Olingo OData2 Sources| 
[Download](http://www.apache.org/dyn/closer.lua/olingo/odata2/2.0.8/olingo-odata2-parent-2.0.8-source-release.zip)
 
([md5](https://dist.apache.org/repos/dist/release/olingo/odata2/2.0.8/olingo-odata2-parent-2.0.8-source-release.zip.md5),
 
[sha512](https://dist.apache.org/repos/dist/release/olingo/odata2/2.0.8/olingo-odata2-parent-2.0.8-source-release.zip.sha512),
 
[pgp](https://dist.apache.org/repos/dist/release/olingo/odata2/2.0.8/olingo-odata2-parent-2.0.8-source-release.zip.asc))
 | Olingo OData2 source code.
+Olingo OData2 Docs   | 
[Download](http://www.apache.org/dyn/closer.lua/olingo/odata2/2.0.8/olingo-odata2-dist-javadoc-2.0.8-javadoc.zip)
 
([md5](https://dist.apache.org/repos/dist/release/olingo/odata2/2.0.8/olingo-odata2-dist-javadoc-2.0.8-javadoc.zip.md5),
 
[sha512](https://dist.apache.org/repos/dist/release/olingo/odata2/2.0.8/olingo-odata2-dist-javadoc-2.0.8-javadoc.zip.sha512),
 
[pgp](https://dist.apache.org/repos/dist/release/oli

svn commit: r17935 - /release/olingo/odata2/2.0.7/

[chrisam]

Author: chrisam
Date: Mon Jan 23 15:46:07 2017
New Revision: 17935

Log:
delete old V2 release

Removed:
release/olingo/odata2/2.0.7/

svn commit: r17934 - /release/olingo/odata2/2.0.8/

[chrisam]

Author: chrisam
Date: Mon Jan 23 15:45:28 2017
New Revision: 17934

Log:
Add 2.0.8 release

Added:
release/olingo/odata2/2.0.8/
release/olingo/odata2/2.0.8/olingo-odata2-dist-janos-2.0.8-janos.zip   
(with props)
release/olingo/odata2/2.0.8/olingo-odata2-dist-janos-2.0.8-janos.zip.asc
release/olingo/odata2/2.0.8/olingo-odata2-dist-janos-2.0.8-janos.zip.md5
release/olingo/odata2/2.0.8/olingo-odata2-dist-janos-2.0.8-janos.zip.sha512
release/olingo/odata2/2.0.8/olingo-odata2-dist-javadoc-2.0.8-javadoc.zip   
(with props)
release/olingo/odata2/2.0.8/olingo-odata2-dist-javadoc-2.0.8-javadoc.zip.asc
release/olingo/odata2/2.0.8/olingo-odata2-dist-javadoc-2.0.8-javadoc.zip.md5

release/olingo/odata2/2.0.8/olingo-odata2-dist-javadoc-2.0.8-javadoc.zip.sha512
release/olingo/odata2/2.0.8/olingo-odata2-dist-jpa-2.0.8-jpa.zip   (with 
props)
release/olingo/odata2/2.0.8/olingo-odata2-dist-jpa-2.0.8-jpa.zip.asc
release/olingo/odata2/2.0.8/olingo-odata2-dist-jpa-2.0.8-jpa.zip.md5
release/olingo/odata2/2.0.8/olingo-odata2-dist-jpa-2.0.8-jpa.zip.sha512
release/olingo/odata2/2.0.8/olingo-odata2-dist-lib-2.0.8-lib.zip   (with 
props)
release/olingo/odata2/2.0.8/olingo-odata2-dist-lib-2.0.8-lib.zip.asc
release/olingo/odata2/2.0.8/olingo-odata2-dist-lib-2.0.8-lib.zip.md5
release/olingo/odata2/2.0.8/olingo-odata2-dist-lib-2.0.8-lib.zip.sha512
release/olingo/odata2/2.0.8/olingo-odata2-dist-ref-2.0.8-ref.zip   (with 
props)
release/olingo/odata2/2.0.8/olingo-odata2-dist-ref-2.0.8-ref.zip.asc
release/olingo/odata2/2.0.8/olingo-odata2-dist-ref-2.0.8-ref.zip.md5
release/olingo/odata2/2.0.8/olingo-odata2-dist-ref-2.0.8-ref.zip.sha512
release/olingo/odata2/2.0.8/olingo-odata2-parent-2.0.8-source-release.zip   
(with props)

release/olingo/odata2/2.0.8/olingo-odata2-parent-2.0.8-source-release.zip.asc

release/olingo/odata2/2.0.8/olingo-odata2-parent-2.0.8-source-release.zip.md5

release/olingo/odata2/2.0.8/olingo-odata2-parent-2.0.8-source-release.zip.sha512
release/olingo/odata2/2.0.8/olingo-odata2-spring-2.0.8-source-release.zip   
(with props)

release/olingo/odata2/2.0.8/olingo-odata2-spring-2.0.8-source-release.zip.asc

release/olingo/odata2/2.0.8/olingo-odata2-spring-2.0.8-source-release.zip.md5

release/olingo/odata2/2.0.8/olingo-odata2-spring-2.0.8-source-release.zip.sha512

Added: release/olingo/odata2/2.0.8/olingo-odata2-dist-janos-2.0.8-janos.zip
==
Binary file - no diff available.

Propchange: release/olingo/odata2/2.0.8/olingo-odata2-dist-janos-2.0.8-janos.zip
--
svn:mime-type = application/octet-stream

Added: release/olingo/odata2/2.0.8/olingo-odata2-dist-janos-2.0.8-janos.zip.asc
==
--- release/olingo/odata2/2.0.8/olingo-odata2-dist-janos-2.0.8-janos.zip.asc 
(added)
+++ release/olingo/odata2/2.0.8/olingo-odata2-dist-janos-2.0.8-janos.zip.asc 
Mon Jan 23 15:45:28 2017
@@ -0,0 +1,17 @@
+-BEGIN PGP SIGNATURE-
+Version: GnuPG v1
+
+iQIcBAABCgAGBQJYhh9nAAoJEEgk951HXZUijCUQAJ1qo1soxhZ/vV8RdvZQoKMV
+oNCbnR/f9REQAwLD9YGOBFy2ytSdBm2G42ckQ6phMQ5+23TpzD8INCqXeUhfLwcz
+4t1rxbpihYCHtpZpremhqwncBDrSYbzKcUtopTJb5u34Yaa2fZblAnHNX4MS/T9d
+zSRJWE3pR0eH9a9BZw5a5jQwskPZLpspDXDWktKNuJhA6CUTVkSpd9mIGDvNfYHh
+Rypsd30iElDKF3h3aE5Rdbzj/ZqoVq3HXTCKPRF34aJQnEEQBaeDA3SGKsaApplz
+BQ7YTXjvY/YYeiGBR8F5fC12V+mj5Hw3n6kAirHaInqK6XYlDC3ZZTr8zNbY6Xmz
+bSoRnGhIF3JIgPI0wcsquIll1YkUhKDUroBTZRzvUjMTzwYOhpnzWqHCwc6kKD7q
+s946lU/GU7dz0EX07A0dnjMIZnGkml1yq6+eDXVn97+t3tij8UjYf0JrzMjGwyhd
+yLWeOiStAGZMeVGSVBnDSI81fL+cpFmSxLz7ZoniCS9Vt/abHxvmjDVj/VW4XDLf
+JjWz/1ToVx4xFQY/v5O64N/YyvpXlWJhHd/6RnCGuftmVJQ3L47B1CN8rqXZyxo8
+ZLrv0pulrxzy9EquO4hsT4Yp9qdDG8dNTX30Q0QTrDPAHCg46+E3TIeGS8E9thfq
+TCM6sgptsFZN/32xLPYw
+=6jpC
+-END PGP SIGNATURE-

Added: release/olingo/odata2/2.0.8/olingo-odata2-dist-janos-2.0.8-janos.zip.md5
==
--- release/olingo/odata2/2.0.8/olingo-odata2-dist-janos-2.0.8-janos.zip.md5 
(added)
+++ release/olingo/odata2/2.0.8/olingo-odata2-dist-janos-2.0.8-janos.zip.md5 
Mon Jan 23 15:45:28 2017
@@ -0,0 +1 @@
+(stdin)= 7e21713b7e0484e8f11394cbe90d08e7

Added: 
release/olingo/odata2/2.0.8/olingo-odata2-dist-janos-2.0.8-janos.zip.sha512
==
--- release/olingo/odata2/2.0.8/olingo-odata2-dist-janos-2.0.8-janos.zip.sha512 
(added)
+++ release/olingo/odata2/2.0.8/olingo-odata2-dist-janos-2.0.8-janos.zip.sha512 
Mon Jan 23 15:45:28 2017
@@ -0,0 +1,3 @@
+./odata2-dist/janos/target/olingo-odata2-dist-janos-2.0.8-janos.zip: 
+41F16DB9 EBD4002B D7E27C2F 94585B6B 3EEE33CA C7530947 98283860 5D211E64 
CFEED344
+ 8B098F3C 7A4FECCB 6D611EFB 6B0C76AD 9636EA80 D5DF567E

olingo-odata2 git commit: [OLINGO-1069] Set 2.0.9-SNAPSHOT version

[chrisam]

Repository: olingo-odata2
Updated Branches:
  refs/heads/master 515797afb -> adda9d5d6


[OLINGO-1069] Set 2.0.9-SNAPSHOT version


Project: http://git-wip-us.apache.org/repos/asf/olingo-odata2/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata2/commit/adda9d5d
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata2/tree/adda9d5d
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata2/diff/adda9d5d

Branch: refs/heads/master
Commit: adda9d5d611c46f305709503fd6e0212481806f5
Parents: 515797a
Author: Christian Amend 
Authored: Mon Jan 23 16:40:08 2017 +0100
Committer: Christian Amend 
Committed: Mon Jan 23 16:40:08 2017 +0100

--
 odata2-annotation-processor/annotation-processor-api/pom.xml | 2 +-
 odata2-annotation-processor/annotation-processor-core/pom.xml| 2 +-
 odata2-annotation-processor/annotation-processor-ref/pom.xml | 2 +-
 odata2-annotation-processor/annotation-processor-web/pom.xml | 2 +-
 odata2-annotation-processor/pom.xml  | 2 +-
 odata2-dist/janos/pom.xml| 2 +-
 odata2-dist/javadoc/pom.xml  | 2 +-
 odata2-dist/jpa/pom.xml  | 2 +-
 odata2-dist/lib/pom.xml  | 2 +-
 odata2-dist/pom.xml  | 2 +-
 odata2-dist/ref/pom.xml  | 2 +-
 odata2-jpa-processor/jpa-api/pom.xml | 2 +-
 odata2-jpa-processor/jpa-core/pom.xml| 2 +-
 odata2-jpa-processor/jpa-ref/pom.xml | 2 +-
 odata2-jpa-processor/jpa-web/pom.xml | 2 +-
 odata2-jpa-processor/pom.xml | 2 +-
 odata2-lib/odata-annotation/pom.xml  | 2 +-
 odata2-lib/odata-api/pom.xml | 2 +-
 odata2-lib/odata-core/pom.xml| 2 +-
 odata2-lib/odata-fit/pom.xml | 2 +-
 odata2-lib/odata-ref/pom.xml | 2 +-
 odata2-lib/odata-testutil/pom.xml| 2 +-
 odata2-lib/odata-web/pom.xml | 2 +-
 odata2-lib/pom.xml   | 2 +-
 odata2-sample/cars-annotation-archetype/pom.xml  | 4 ++--
 .../src/main/resources/archetype-resources/pom.xml   | 2 +-
 odata2-sample/cars-jpa-archetype/pom.xml | 2 +-
 .../src/main/resources/archetype-resources/pom.xml   | 2 +-
 odata2-sample/cars-service-archetype/pom.xml | 4 ++--
 .../src/main/resources/archetype-resources/pom.xml   | 2 +-
 odata2-sample/pom.xml| 2 +-
 odata2-spring/pom.xml| 2 +-
 pom.xml  | 2 +-
 33 files changed, 35 insertions(+), 35 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/adda9d5d/odata2-annotation-processor/annotation-processor-api/pom.xml
--
diff --git a/odata2-annotation-processor/annotation-processor-api/pom.xml 
b/odata2-annotation-processor/annotation-processor-api/pom.xml
index e7baee6..85d4841 100644
--- a/odata2-annotation-processor/annotation-processor-api/pom.xml
+++ b/odata2-annotation-processor/annotation-processor-api/pom.xml
@@ -25,7 +25,7 @@
   
 org.apache.olingo
 olingo-odata2-annotation-processor
-2.0.8
+2.0.9-SNAPSHOT
 ..
   
 

http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/adda9d5d/odata2-annotation-processor/annotation-processor-core/pom.xml
--
diff --git a/odata2-annotation-processor/annotation-processor-core/pom.xml 
b/odata2-annotation-processor/annotation-processor-core/pom.xml
index 13647f2..a0b394d 100644
--- a/odata2-annotation-processor/annotation-processor-core/pom.xml
+++ b/odata2-annotation-processor/annotation-processor-core/pom.xml
@@ -20,7 +20,7 @@
   
 org.apache.olingo
 olingo-odata2-annotation-processor
-2.0.8
+2.0.9-SNAPSHOT
 ..
   
 

http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/adda9d5d/odata2-annotation-processor/annotation-processor-ref/pom.xml
--
diff --git a/odata2-annotation-processor/annotation-processor-ref/pom.xml 
b/odata2-annotation-processor/annotation-processor-ref/pom.xml
index fc648cd..60b5a99 100644
--- 

[olingo-odata2] Git Push Summary

[chrisam]

Repository: olingo-odata2
Updated Tags:  refs/tags/2.0.8 [created] 515797afb

olingo-odata2 git commit: [OLINGO-1069] Set release version 2.0.8

[chrisam]

Repository: olingo-odata2
Updated Branches:
  refs/heads/master 22331659f -> 515797afb


[OLINGO-1069] Set release version 2.0.8


Project: http://git-wip-us.apache.org/repos/asf/olingo-odata2/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata2/commit/515797af
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata2/tree/515797af
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata2/diff/515797af

Branch: refs/heads/master
Commit: 515797afbe440e0543a886f6501e3883e36a038e
Parents: 2233165
Author: Christian Amend 
Authored: Mon Jan 23 16:09:41 2017 +0100
Committer: Christian Amend 
Committed: Mon Jan 23 16:09:41 2017 +0100

--
 odata2-annotation-processor/annotation-processor-api/pom.xml | 2 +-
 odata2-annotation-processor/annotation-processor-core/pom.xml| 2 +-
 odata2-annotation-processor/annotation-processor-ref/pom.xml | 2 +-
 odata2-annotation-processor/annotation-processor-web/pom.xml | 2 +-
 odata2-annotation-processor/pom.xml  | 2 +-
 odata2-dist/janos/pom.xml| 2 +-
 odata2-dist/javadoc/pom.xml  | 2 +-
 odata2-dist/jpa/pom.xml  | 2 +-
 odata2-dist/lib/pom.xml  | 2 +-
 odata2-dist/pom.xml  | 2 +-
 odata2-dist/ref/pom.xml  | 2 +-
 odata2-jpa-processor/jpa-api/pom.xml | 2 +-
 odata2-jpa-processor/jpa-core/pom.xml| 2 +-
 odata2-jpa-processor/jpa-ref/pom.xml | 2 +-
 odata2-jpa-processor/jpa-web/pom.xml | 2 +-
 odata2-jpa-processor/pom.xml | 2 +-
 odata2-lib/odata-annotation/pom.xml  | 2 +-
 odata2-lib/odata-api/pom.xml | 2 +-
 odata2-lib/odata-core/pom.xml| 2 +-
 odata2-lib/odata-fit/pom.xml | 2 +-
 odata2-lib/odata-ref/pom.xml | 2 +-
 odata2-lib/odata-testutil/pom.xml| 2 +-
 odata2-lib/odata-web/pom.xml | 2 +-
 odata2-lib/pom.xml   | 2 +-
 odata2-sample/cars-annotation-archetype/pom.xml  | 4 ++--
 .../src/main/resources/archetype-resources/pom.xml   | 2 +-
 odata2-sample/cars-jpa-archetype/pom.xml | 2 +-
 .../src/main/resources/archetype-resources/pom.xml   | 2 +-
 odata2-sample/cars-service-archetype/pom.xml | 4 ++--
 .../src/main/resources/archetype-resources/pom.xml   | 2 +-
 odata2-sample/pom.xml| 2 +-
 odata2-spring/pom.xml| 2 +-
 pom.xml  | 2 +-
 33 files changed, 35 insertions(+), 35 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/515797af/odata2-annotation-processor/annotation-processor-api/pom.xml
--
diff --git a/odata2-annotation-processor/annotation-processor-api/pom.xml 
b/odata2-annotation-processor/annotation-processor-api/pom.xml
index ab3b823..e7baee6 100644
--- a/odata2-annotation-processor/annotation-processor-api/pom.xml
+++ b/odata2-annotation-processor/annotation-processor-api/pom.xml
@@ -25,7 +25,7 @@
   
 org.apache.olingo
 olingo-odata2-annotation-processor
-2.0.8-RC01
+2.0.8
 ..
   
 

http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/515797af/odata2-annotation-processor/annotation-processor-core/pom.xml
--
diff --git a/odata2-annotation-processor/annotation-processor-core/pom.xml 
b/odata2-annotation-processor/annotation-processor-core/pom.xml
index e23ef54..13647f2 100644
--- a/odata2-annotation-processor/annotation-processor-core/pom.xml
+++ b/odata2-annotation-processor/annotation-processor-core/pom.xml
@@ -20,7 +20,7 @@
   
 org.apache.olingo
 olingo-odata2-annotation-processor
-2.0.8-RC01
+2.0.8
 ..
   
 

http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/515797af/odata2-annotation-processor/annotation-processor-ref/pom.xml
--
diff --git a/odata2-annotation-processor/annotation-processor-ref/pom.xml 
b/odata2-annotation-processor/annotation-processor-ref/pom.xml
index 190cba7..fc648cd 100644
--- 

[olingo-odata2] Git Push Summary

[chrisam]

Repository: olingo-odata2
Updated Tags:  refs/tags/2.0.8-RC01 [created] 22331659f

olingo-odata2 git commit: [OLINGO-1069] Set release candidate version RC01

[chrisam]

Repository: olingo-odata2
Updated Branches:
  refs/heads/master 6a609b4db -> 22331659f


[OLINGO-1069] Set release candidate version RC01


Project: http://git-wip-us.apache.org/repos/asf/olingo-odata2/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata2/commit/22331659
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata2/tree/22331659
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata2/diff/22331659

Branch: refs/heads/master
Commit: 22331659fe4840ebec9782a7883a05f107797e69
Parents: 6a609b4
Author: Christian Amend 
Authored: Wed Jan 18 17:03:41 2017 +0100
Committer: Christian Amend 
Committed: Wed Jan 18 17:03:41 2017 +0100

--
 odata2-annotation-processor/annotation-processor-api/pom.xml | 2 +-
 odata2-annotation-processor/annotation-processor-core/pom.xml| 2 +-
 odata2-annotation-processor/annotation-processor-ref/pom.xml | 2 +-
 odata2-annotation-processor/annotation-processor-web/pom.xml | 2 +-
 odata2-annotation-processor/pom.xml  | 2 +-
 odata2-dist/janos/pom.xml| 2 +-
 odata2-dist/javadoc/pom.xml  | 2 +-
 odata2-dist/jpa/pom.xml  | 2 +-
 odata2-dist/lib/pom.xml  | 2 +-
 odata2-dist/pom.xml  | 2 +-
 odata2-dist/ref/pom.xml  | 2 +-
 odata2-jpa-processor/jpa-api/pom.xml | 2 +-
 odata2-jpa-processor/jpa-core/pom.xml| 2 +-
 odata2-jpa-processor/jpa-ref/pom.xml | 2 +-
 odata2-jpa-processor/jpa-web/pom.xml | 2 +-
 odata2-jpa-processor/pom.xml | 2 +-
 odata2-lib/odata-annotation/pom.xml  | 2 +-
 odata2-lib/odata-api/pom.xml | 2 +-
 odata2-lib/odata-core/pom.xml| 2 +-
 odata2-lib/odata-fit/pom.xml | 2 +-
 odata2-lib/odata-ref/pom.xml | 2 +-
 odata2-lib/odata-testutil/pom.xml| 2 +-
 odata2-lib/odata-web/pom.xml | 2 +-
 odata2-lib/pom.xml   | 2 +-
 odata2-sample/cars-annotation-archetype/pom.xml  | 4 ++--
 .../src/main/resources/archetype-resources/pom.xml   | 2 +-
 odata2-sample/cars-jpa-archetype/pom.xml | 2 +-
 .../src/main/resources/archetype-resources/pom.xml   | 2 +-
 odata2-sample/cars-service-archetype/pom.xml | 4 ++--
 .../src/main/resources/archetype-resources/pom.xml   | 2 +-
 odata2-sample/pom.xml| 2 +-
 odata2-spring/pom.xml| 2 +-
 pom.xml  | 2 +-
 33 files changed, 35 insertions(+), 35 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/22331659/odata2-annotation-processor/annotation-processor-api/pom.xml
--
diff --git a/odata2-annotation-processor/annotation-processor-api/pom.xml 
b/odata2-annotation-processor/annotation-processor-api/pom.xml
index f181005..ab3b823 100644
--- a/odata2-annotation-processor/annotation-processor-api/pom.xml
+++ b/odata2-annotation-processor/annotation-processor-api/pom.xml
@@ -25,7 +25,7 @@
   
 org.apache.olingo
 olingo-odata2-annotation-processor
-2.0.8-SNAPSHOT
+2.0.8-RC01
 ..
   
 

http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/22331659/odata2-annotation-processor/annotation-processor-core/pom.xml
--
diff --git a/odata2-annotation-processor/annotation-processor-core/pom.xml 
b/odata2-annotation-processor/annotation-processor-core/pom.xml
index 3ea6fe1..e23ef54 100644
--- a/odata2-annotation-processor/annotation-processor-core/pom.xml
+++ b/odata2-annotation-processor/annotation-processor-core/pom.xml
@@ -20,7 +20,7 @@
   
 org.apache.olingo
 olingo-odata2-annotation-processor
-2.0.8-SNAPSHOT
+2.0.8-RC01
 ..
   
 

http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/22331659/odata2-annotation-processor/annotation-processor-ref/pom.xml
--
diff --git a/odata2-annotation-processor/annotation-processor-ref/pom.xml 
b/odata2-annotation-processor/annotation-processor-ref/pom.xml
index 92dc985..190cba7 100644
--- 

olingo-odata2 git commit: [OLINGO-970] Remove unused imports

[chrisam]

Repository: olingo-odata2
Updated Branches:
  refs/heads/master d94c0456a -> 6a609b4db


[OLINGO-970] Remove unused imports


Project: http://git-wip-us.apache.org/repos/asf/olingo-odata2/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata2/commit/6a609b4d
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata2/tree/6a609b4d
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata2/diff/6a609b4d

Branch: refs/heads/master
Commit: 6a609b4db1f933e5682e696a08e2dfd45dea9e6c
Parents: d94c045
Author: Christian Amend 
Authored: Wed Jan 18 16:58:25 2017 +0100
Committer: Christian Amend 
Committed: Wed Jan 18 16:58:25 2017 +0100

--
 .../core/datasource/AnnotationsInMemoryDsTest.java  | 6 +++---
 .../annotation/processor/core/model/GuidKeyEntity.java  | 5 ++---
 .../jpa/processor/ref/listeners/CustomerQueryExtension.java | 9 +
 .../jpa/processor/ref/web/JPAReferenceServiceFactory.java   | 1 -
 4 files changed, 10 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/6a609b4d/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/annotation/processor/core/datasource/AnnotationsInMemoryDsTest.java
--
diff --git 
a/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/annotation/processor/core/datasource/AnnotationsInMemoryDsTest.java
 
b/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/annotation/processor/core/datasource/AnnotationsInMemoryDsTest.java
index fe75049..c1fc882 100644
--- 
a/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/annotation/processor/core/datasource/AnnotationsInMemoryDsTest.java
+++ 
b/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/annotation/processor/core/datasource/AnnotationsInMemoryDsTest.java
@@ -700,7 +700,7 @@ public class AnnotationsInMemoryDsTest {
 photo.setImageType("image/png");
 datasource.createData(edmEntitySet, photo);
 
-List photos = datasource.readData(edmEntitySet);
+List photos = datasource.readData(edmEntitySet);
 Photo readPhoto = (Photo) photos.get(0);
 Assert.assertEquals(automaticNameKeyValue + ":" + typeKeyValue,
 readPhoto.getName() + ":" + readPhoto.getType());
@@ -737,7 +737,7 @@ public class AnnotationsInMemoryDsTest {
 photo2.setImageType("image/png");
 datasource.createData(edmEntitySet, photo2);
 
-List photos = datasource.readData(edmEntitySet);
+List photos = datasource.readData(edmEntitySet);
 Assert.assertEquals(2, photos.size());
 
 // Check photo 1 has specified key values.
@@ -764,7 +764,7 @@ public class AnnotationsInMemoryDsTest {
 testEntity.setName(entityName);
 datasource.createData(edmEntitySet, testEntity);
 
-List entities = datasource.readData(edmEntitySet);
+List entities = datasource.readData(edmEntitySet);
 GuidKeyEntity readEntity = (GuidKeyEntity) entities.get(0);
 Assert.assertEquals(entityName, readEntity.getName());
   }

http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/6a609b4d/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/annotation/processor/core/model/GuidKeyEntity.java
--
diff --git 
a/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/annotation/processor/core/model/GuidKeyEntity.java
 
b/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/annotation/processor/core/model/GuidKeyEntity.java
index 36feabe..ce62894 100644
--- 
a/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/annotation/processor/core/model/GuidKeyEntity.java
+++ 
b/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/annotation/processor/core/model/GuidKeyEntity.java
@@ -15,6 +15,8 @@
  */
 package org.apache.olingo.odata2.annotation.processor.core.model;
 
+import java.util.UUID;
+
 import org.apache.olingo.odata2.api.annotation.edm.EdmEntitySet;
 import org.apache.olingo.odata2.api.annotation.edm.EdmEntityType;
 import org.apache.olingo.odata2.api.annotation.edm.EdmFacets;
@@ -22,9 +24,6 @@ import org.apache.olingo.odata2.api.annotation.edm.EdmKey;
 import org.apache.olingo.odata2.api.annotation.edm.EdmProperty;
 import org.apache.olingo.odata2.api.annotation.edm.EdmType;
 
-import java.util.AbstractMap;
-import java.util.UUID;
-
 @EdmEntityType(name = "GuidKeyEntity", namespace = 
ModelSharedConstants.NAMESPACE_1)
 @EdmEntitySet(name = 

[2/2] olingo-odata4 git commit: Cross Service EDM

[chrisam]

Cross Service EDM

Change-Id: I14ed9771c85e576c33d51ed3ea05e6323c20c51a
Signed-off-by: Archana Rai 
Signed-off-by: Christian Amend 


Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/01c6aa15
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/01c6aa15
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/01c6aa15

Branch: refs/heads/master
Commit: 01c6aa1592eeb041556be23253424cc2a04e1627
Parents: 4b3c023
Author: Archana Rai 
Authored: Wed Dec 7 15:29:04 2016 +0530
Committer: Christian Amend 
Committed: Tue Dec 13 10:10:22 2016 +0100

--
 .../commons/core/edm/CrossServiceTest.java  | 237 +++
 1 file changed, 237 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/01c6aa15/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/CrossServiceTest.java
--
diff --git 
a/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/CrossServiceTest.java
 
b/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/CrossServiceTest.java
new file mode 100644
index 000..f2c7430
--- /dev/null
+++ 
b/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/CrossServiceTest.java
@@ -0,0 +1,237 @@
+package org.apache.olingo.commons.core.edm;
+ /*
+  * Licensed to the Apache Software Foundation (ASF) under one
+  * or more contributor license agreements. See the NOTICE file
+  * distributed with this work for additional information
+  * regarding copyright ownership. The ASF licenses this file
+  * to you under the Apache License, Version 2.0 (the
+  * "License"); you may not use this file except in compliance
+  * with the License. You may obtain a copy of the License at
+  *
+  * http://www.apache.org/licenses/LICENSE-2.0
+  *
+  * Unless required by applicable law or agreed to in writing,
+  * software distributed under the License is distributed on an
+  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  * KIND, either express or implied. See the License for the
+  * specific language governing permissions and limitations
+  * under the License.
+  */
+ 
+ import java.util.Arrays;
+ import java.util.Collections;
+ import java.util.List;
+ 
+ import org.apache.olingo.commons.api.edm.Edm;
+ import org.apache.olingo.commons.api.edm.EdmEntitySet;
+ import org.apache.olingo.commons.api.edm.EdmEntityType;
+ import org.apache.olingo.commons.api.edm.FullQualifiedName;
+ import org.apache.olingo.commons.api.edm.provider.CsdlAbstractEdmProvider;
+ import org.apache.olingo.commons.api.edm.provider.CsdlAliasInfo;
+ import org.apache.olingo.commons.api.edm.provider.CsdlEdmProvider;
+ import org.apache.olingo.commons.api.edm.provider.CsdlEntityContainer;
+ import org.apache.olingo.commons.api.edm.provider.CsdlEntityContainerInfo;
+ import org.apache.olingo.commons.api.edm.provider.CsdlEntitySet;
+ import org.apache.olingo.commons.api.edm.provider.CsdlEntityType;
+ import org.apache.olingo.commons.api.edm.provider.CsdlNavigationProperty;
+ import org.apache.olingo.commons.api.edm.provider.CsdlProperty;
+ import org.apache.olingo.commons.api.edm.provider.CsdlPropertyRef;
+ import org.apache.olingo.commons.api.edm.provider.CsdlSchema;
+ import org.apache.olingo.commons.api.ex.ODataException;
+import org.apache.olingo.commons.core.edm.EdmProviderImpl;
+import org.junit.Assert;
+ import org.junit.Test;
+ 
+ public class CrossServiceTest {
+ 
+   private final CsdlEdmProvider provider1 = new CsdlProvider("One");
+   private final CsdlEdmProvider provider2 = new CsdlProvider("Two");
+   private final Edm edm1 = new EdmProviderImpl(provider1);
+   private final Edm edm2 = new EdmProviderImpl(provider2);
+ 
+   private class CsdlProvider extends CsdlAbstractEdmProvider {
+ 
+ private static final String NAMESPACE_PREFIX = "Namespace.";
+ private static final String ALIAS_PREFIX = "Alias";
+ private static final String CONTAINER_PREFIX = "Container";
+ private static final String ENTITY_SET_PREFIX = "EntitySet";
+ private static final String ENTITY_TYPE_PREFIX = "EntityType";
+ private final String name;
+ private final String namespace;
+ private final String other;
+ private final CsdlEntitySet entitySet;
+ private final CsdlEntityType entityType;
+ 
+ private CsdlProvider(final String name) {
+   this.name = name;
+namespace = NAMESPACE_PREFIX + name;
+   other = name.equals("One") ? "Two" : "One";
+   entitySet = new CsdlEntitySet().setName(ENTITY_SET_PREFIX + name)
+   .setType(new FullQualifiedName(namespace, ENTITY_TYPE_PREFIX + 
name));
+   entityType = new 

[1/2] olingo-odata4 git commit: NextLink Support in streaming

[chrisam]

Repository: olingo-odata4
Updated Branches:
  refs/heads/master 6a736db10 -> 01c6aa159


NextLink Support in streaming

Change-Id: I199fe29991f9c02b870fd524b4276d16c1e5382e
Signed-off-by: Archana Rai 
Signed-off-by: Christian Amend 


Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/4b3c0237
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/4b3c0237
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/4b3c0237

Branch: refs/heads/master
Commit: 4b3c02373fa4e237fbefbb0038628c6aef907283
Parents: 6a736db
Author: Archana Rai 
Authored: Wed Nov 30 00:09:08 2016 +0530
Committer: Christian Amend 
Committed: Tue Dec 13 10:09:44 2016 +0100

--
 .../fit/tecsvc/http/BasicStreamITCase.java  | 77 
 .../olingo/commons/api/data/EntityIterator.java | 20 +++--
 .../api/uri/queryoption/expression/Literal.java |  3 +-
 .../serializer/json/ODataJsonSerializer.java|  4 +-
 .../core/serializer/xml/ODataXmlSerializer.java |  4 +-
 .../olingo/server/tecsvc/data/DataCreator.java  | 32 
 .../processor/TechnicalEntityProcessor.java | 10 ++-
 .../options/ServerSidePagingHandler.java|  4 +-
 .../tecsvc/provider/ContainerProvider.java  | 19 -
 .../tecsvc/provider/EntityTypeProvider.java | 11 +++
 .../server/tecsvc/provider/SchemaProvider.java  |  1 +
 11 files changed, 171 insertions(+), 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/4b3c0237/fit/src/test/java/org/apache/olingo/fit/tecsvc/http/BasicStreamITCase.java
--
diff --git 
a/fit/src/test/java/org/apache/olingo/fit/tecsvc/http/BasicStreamITCase.java 
b/fit/src/test/java/org/apache/olingo/fit/tecsvc/http/BasicStreamITCase.java
index 8935f97..ce77536 100644
--- a/fit/src/test/java/org/apache/olingo/fit/tecsvc/http/BasicStreamITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/tecsvc/http/BasicStreamITCase.java
@@ -77,6 +77,83 @@ public class BasicStreamITCase extends 
AbstractBaseTestITCase {
 assertTrue(content.contains("TEST 
2->streamed"));
   }
 
+  @Test
+  public void streamESStreamServerSidePagingXml() throws Exception {
+URL url = new URL(SERVICE_URI + "ESStreamServerSidePaging?$format=xml");
+
+HttpURLConnection connection = (HttpURLConnection) url.openConnection();
+connection.setRequestMethod(HttpMethod.GET.name());
+connection.connect();
+
+assertEquals(HttpStatusCode.OK.getStatusCode(), 
connection.getResponseCode());
+assertEquals(ContentType.APPLICATION_XML, 
ContentType.create(connection.getHeaderField(HttpHeader.CONTENT_TYPE)));
+
+final String content = IOUtils.toString(connection.getInputStream());
+assertTrue(content.contains(""));
+assertTrue(content.contains("ESStreamServerSidePaging(1)"));
+assertTrue(content.contains("1"));
+assertTrue(content.contains("readLink"));
+  }
+  
+  @Test
+  public void streamESStreamServerSidePagingNextXml() throws Exception {
+URL url = new URL(SERVICE_URI + 
"ESStreamServerSidePaging?$format=xml&$skiptoken=1%2A10");
+
+HttpURLConnection connection = (HttpURLConnection) url.openConnection();
+connection.setRequestMethod(HttpMethod.GET.name());
+connection.connect();
+
+assertEquals(HttpStatusCode.OK.getStatusCode(), 
connection.getResponseCode());
+assertEquals(ContentType.APPLICATION_XML, 
ContentType.create(connection.getHeaderField(HttpHeader.CONTENT_TYPE)));
+
+final String content = IOUtils.toString(connection.getInputStream());
+assertTrue(content.contains(""));
+assertTrue(content.contains("ESStreamServerSidePaging(11)"));
+assertTrue(content.contains("11"));
+assertTrue(content.contains("readLink"));
+  }
+  
+  @Test
+  public void streamESStreamServerSidePagingJson() throws Exception {
+URL url = new URL(SERVICE_URI + "ESStreamServerSidePaging?$format=json");
+
+HttpURLConnection connection = (HttpURLConnection) url.openConnection();
+connection.setRequestMethod(HttpMethod.GET.name());
+connection.connect();
+
+assertEquals(HttpStatusCode.OK.getStatusCode(), 
connection.getResponseCode());
+assertEquals(ContentType.JSON, 
ContentType.create(connection.getHeaderField(HttpHeader.CONTENT_TYPE)));
+
+final String content = IOUtils.toString(connection.getInputStream());
+
+assertTrue(content.contains("{\"PropertyInt16\":2,"+
+
"\"PropertyStream@odata.mediaEtag\":\"eTag\",\"PropertyStream@odata.mediaContentType\":\"image/jpeg\"}"));
+assertTrue(content.contains("\"@odata.nextLink\""));
+
assertTrue(content.contains("ESStreamServerSidePaging?$format=json&%24skiptoken=1%2A10"));
+  }
+  
+  
+  

olingo-odata2 git commit: [OLINGO-1055] ODatav2: Omit empty inline tags for null data

[chrisam]

Repository: olingo-odata2
Updated Branches:
  refs/heads/master de4aec1bd -> 4e1667fcc


[OLINGO-1055] ODatav2: Omit empty inline tags for null data

Signed-off-by: Christian Amend 


Project: http://git-wip-us.apache.org/repos/asf/olingo-odata2/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata2/commit/4e1667fc
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata2/tree/4e1667fc
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata2/diff/4e1667fc

Branch: refs/heads/master
Commit: 4e1667fcc4ac320aed19e3b0360af4c7fec651f0
Parents: de4aec1
Author: Archana Rai 
Authored: Thu Dec 1 16:21:18 2016 +0530
Committer: Christian Amend 
Committed: Thu Dec 1 12:54:54 2016 +0100

--
 .../api/ep/EntityProviderWriteProperties.java   |  10 +
 .../ep/producer/AtomEntryEntityProducer.java|  15 +-
 .../ep/producer/JsonEntryEntityProducer.java|  14 +
 .../ep/ODataEntityProviderPropertiesTest.java   |   9 +-
 .../producer/JsonEntryEntityProducerTest.java   | 487 +++
 .../core/ep/producer/XmlExpandProducerTest.java |  48 ++
 .../fit/ref/InvalidDataInScenarioTest.java  |   2 +-
 7 files changed, 375 insertions(+), 210 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/4e1667fc/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/EntityProviderWriteProperties.java
--
diff --git 
a/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/EntityProviderWriteProperties.java
 
b/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/EntityProviderWriteProperties.java
index 354d0f5..ce448e0 100644
--- 
a/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/EntityProviderWriteProperties.java
+++ 
b/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/EntityProviderWriteProperties.java
@@ -50,8 +50,13 @@ public class EntityProviderWriteProperties {
   private boolean isResponsePayload = true;
   private boolean includeMetadataInContentOnly = false;
   private boolean isDataBasedPropertySerialization = false;
+  private boolean omitInlineForNullData = false;
 
   private EntityProviderWriteProperties() {}
+  
+  public final boolean isOmitInlineForNullData() {
+return omitInlineForNullData;
+  }
 
   /**
* Returns true if the payload has dynamic properties i.e. every entry has 
different property list
@@ -163,6 +168,10 @@ public class EntityProviderWriteProperties {
   public static class ODataEntityProviderPropertiesBuilder {
 private final EntityProviderWriteProperties properties = new 
EntityProviderWriteProperties();
 
+public final ODataEntityProviderPropertiesBuilder 
omitInlineForNullData(boolean omitInlineForNullData) {
+  properties.omitInlineForNullData = omitInlineForNullData;
+  return this;
+}
 /**
  * @param setting if payload has dynamic property
  */
@@ -312,6 +321,7 @@ public class EntityProviderWriteProperties {
   this.properties.isResponsePayload = properties.isResponsePayload;
   this.properties.includeMetadataInContentOnly = 
properties.includeMetadataInContentOnly;
   this.properties.isDataBasedPropertySerialization = 
properties.isDataBasedPropertySerialization;
+  this.properties.omitInlineForNullData = properties.omitInlineForNullData;
   return this;
 }
 

http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/4e1667fc/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/AtomEntryEntityProducer.java
--
diff --git 
a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/AtomEntryEntityProducer.java
 
b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/AtomEntryEntityProducer.java
index ea00c6f..9c20bff 100644
--- 
a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/AtomEntryEntityProducer.java
+++ 
b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/AtomEntryEntityProducer.java
@@ -256,7 +256,6 @@ public class AtomEntryEntityProducer {
 
 if 
(eia.getExpandedNavigationPropertyNames().contains(navigationPropertyName)) {
   if (properties.getCallbacks() != null && 
properties.getCallbacks().containsKey(navigationPropertyName)) {
-writer.writeStartElement(Edm.NAMESPACE_M_2007_08, FormatXml.M_INLINE);
 
 EdmNavigationProperty navProp = (EdmNavigationProperty) 
eia.getEntityType().getProperty(navigationPropertyName);
 WriteFeedCallbackContext context = new WriteFeedCallbackContext();
@@ -282,6 +281,12 @@ public class AtomEntryEntityProducer {
 if (inlineData == null) {
   inlineData = new 

olingo-odata2 git commit: [OLINGO-1051] Provide flexible inline property serialization

[chrisam]

Repository: olingo-odata2
Updated Branches:
  refs/heads/master 7236755aa -> 9142cbd34


[OLINGO-1051] Provide flexible inline property serialization

Contribution by Ramya in https://issues.apache.org/jira/browse/OLINGO-1051


Project: http://git-wip-us.apache.org/repos/asf/olingo-odata2/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata2/commit/9142cbd3
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata2/tree/9142cbd3
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata2/diff/9142cbd3

Branch: refs/heads/master
Commit: 9142cbd348ca348d92e80ad56980174b5348b7ae
Parents: 7236755
Author: Christian Amend 
Authored: Thu Nov 24 11:40:56 2016 +0100
Committer: Christian Amend 
Committed: Thu Nov 24 11:40:56 2016 +0100

--
 .../api/ep/EntityProviderWriteProperties.java   |  19 +
 .../ep/producer/AtomEntryEntityProducer.java|  46 ++-
 .../producer/JsonCollectionEntityProducer.java  |   2 +-
 .../ep/producer/JsonEntryEntityProducer.java|  46 ++-
 .../ep/producer/JsonPropertyEntityProducer.java |  20 +-
 .../ep/producer/XmlPropertyEntityProducer.java  |   5 +
 .../ep/ODataEntityProviderPropertiesTest.java   |   3 +
 .../core/ep/producer/AtomEntryProducerTest.java | 108 ++
 .../core/ep/producer/AtomFeedProducerTest.java  | 347 +++
 .../producer/JsonEntryEntityProducerTest.java   |  56 ++-
 .../ep/producer/JsonFeedEntityProducerTest.java | 309 +
 .../olingo/odata2/testutil/mock/EdmMock.java|  10 +
 12 files changed, 938 insertions(+), 33 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/9142cbd3/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/EntityProviderWriteProperties.java
--
diff --git 
a/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/EntityProviderWriteProperties.java
 
b/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/EntityProviderWriteProperties.java
index a2485a4..354d0f5 100644
--- 
a/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/EntityProviderWriteProperties.java
+++ 
b/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/EntityProviderWriteProperties.java
@@ -49,9 +49,18 @@ public class EntityProviderWriteProperties {
 
   private boolean isResponsePayload = true;
   private boolean includeMetadataInContentOnly = false;
+  private boolean isDataBasedPropertySerialization = false;
 
   private EntityProviderWriteProperties() {}
 
+  /**
+   * Returns true if the payload has dynamic properties i.e. every entry has 
different property list
+   * @return
+   */
+  public final boolean isDataBasedPropertySerialization() {
+return isDataBasedPropertySerialization;
+  }
+  
   public final boolean isOmitETag() {
 return omitETag;
   }
@@ -155,6 +164,15 @@ public class EntityProviderWriteProperties {
 private final EntityProviderWriteProperties properties = new 
EntityProviderWriteProperties();
 
 /**
+ * @param setting if payload has dynamic property
+ */
+public final ODataEntityProviderPropertiesBuilder 
isDataBasedPropertySerialization
+(boolean isDataBasedPropertySerialization) {
+  properties.isDataBasedPropertySerialization = 
isDataBasedPropertySerialization;
+  return this;
+}
+
+/**
  * @param includeSimplePropertyType true to include simple property type 
information in the payload
  */
 public final ODataEntityProviderPropertiesBuilder 
includeSimplePropertyType(
@@ -293,6 +311,7 @@ public class EntityProviderWriteProperties {
   this.properties.validatingFacets = properties.validatingFacets;
   this.properties.isResponsePayload = properties.isResponsePayload;
   this.properties.includeMetadataInContentOnly = 
properties.includeMetadataInContentOnly;
+  this.properties.isDataBasedPropertySerialization = 
properties.isDataBasedPropertySerialization;
   return this;
 }
 

http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/9142cbd3/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/AtomEntryEntityProducer.java
--
diff --git 
a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/AtomEntryEntityProducer.java
 
b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/AtomEntryEntityProducer.java
index 1c82a38..ea00c6f 100644
--- 
a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/AtomEntryEntityProducer.java
+++ 
b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/AtomEntryEntityProducer.java
@@ -584,27 +584,49 @@ public class AtomEntryEntityProducer {
   private void 

[1/2] olingo-odata4 git commit: [OLINGO-888] Support Singletons in OData dispatcher

[chrisam]

Repository: olingo-odata4
Updated Branches:
  refs/heads/master ecf9b9f9b -> 6a736db10


[OLINGO-888] Support Singletons in OData dispatcher

Contributed by Archana Rai via
https://issues.apache.org/jira/browse/OLINGO-888


Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/84a052dc
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/84a052dc
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/84a052dc

Branch: refs/heads/master
Commit: 84a052dcfa3825c37377c4cfd93c01f2c7e6af53
Parents: ecf9b9f
Author: Christian Amend 
Authored: Tue Nov 22 14:13:14 2016 +0100
Committer: Christian Amend 
Committed: Tue Nov 22 14:13:14 2016 +0100

--
 .../olingo/server/core/ODataDispatcher.java | 215 ---
 .../olingo/server/tecsvc/data/DataCreator.java  |  38 +++-
 .../olingo/server/tecsvc/data/DataProvider.java |   9 +
 .../processor/TechnicalEntityProcessor.java |  39 +++-
 .../tecsvc/processor/TechnicalProcessor.java|  53 +++--
 .../server/core/ODataHandlerImplTest.java   | 163 +-
 6 files changed, 420 insertions(+), 97 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/84a052dc/lib/server-core/src/main/java/org/apache/olingo/server/core/ODataDispatcher.java
--
diff --git 
a/lib/server-core/src/main/java/org/apache/olingo/server/core/ODataDispatcher.java
 
b/lib/server-core/src/main/java/org/apache/olingo/server/core/ODataDispatcher.java
index 138f45a..5d48e34 100644
--- 
a/lib/server-core/src/main/java/org/apache/olingo/server/core/ODataDispatcher.java
+++ 
b/lib/server-core/src/main/java/org/apache/olingo/server/core/ODataDispatcher.java
@@ -25,6 +25,7 @@ import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind;
 import org.apache.olingo.commons.api.edm.EdmReturnType;
 import org.apache.olingo.commons.api.edm.EdmType;
 import org.apache.olingo.commons.api.edm.constants.EdmTypeKind;
+import org.apache.olingo.commons.api.edm.EdmSingleton;
 import org.apache.olingo.commons.api.format.ContentType;
 import org.apache.olingo.commons.api.http.HttpHeader;
 import org.apache.olingo.commons.api.http.HttpMethod;
@@ -70,6 +71,7 @@ import 
org.apache.olingo.server.api.uri.UriResourcePrimitiveProperty;
 import org.apache.olingo.server.api.uri.UriResourceProperty;
 import org.apache.olingo.server.core.batchhandler.BatchHandler;
 import org.apache.olingo.server.core.etag.PreconditionsValidator;
+import org.apache.olingo.server.api.uri.UriResourceSingleton;
 
 public class ODataDispatcher {
 
@@ -144,7 +146,11 @@ public class ODataDispatcher {
   handleEntityDispatching(request, response,
   ((UriResourcePartTyped) lastPathSegment).isCollection(), 
isEntityOrNavigationMedia(lastPathSegment));
   break;
-
+  
+case singleton:
+  handleSingleEntityDispatching(request, response, 
isSingletonMedia(lastPathSegment), true);
+  break;
+  
 case count:
   checkMethod(request.getMethod(), HttpMethod.GET);
   handleCountDispatching(request, response, lastPathSegmentIndex);
@@ -304,62 +310,80 @@ public class ODataDispatcher {
   private void handleValueDispatching(final ODataRequest request, final 
ODataResponse response,
   final int lastPathSegmentIndex) throws ODataApplicationException, 
ODataLibraryException {
 // The URI Parser already checked if $value is allowed here so we only 
have to dispatch to the correct processor
-final HttpMethod method = request.getMethod();
 final UriResource resource = 
uriInfo.getUriResourceParts().get(lastPathSegmentIndex - 1);
 if (resource instanceof UriResourceProperty
 || resource instanceof UriResourceFunction
 && ((UriResourceFunction) resource).getType().getKind() == 
EdmTypeKind.PRIMITIVE) {
-  final EdmType type = resource instanceof UriResourceProperty ? 
((UriResourceProperty) resource).getType()
-  : ((UriResourceFunction) resource).getType();
-  final RepresentationType valueRepresentationType =
-  type == 
EdmPrimitiveTypeFactory.getInstance(EdmPrimitiveTypeKind.Binary) ? 
RepresentationType.BINARY
-  : RepresentationType.VALUE;
-  if (method == HttpMethod.GET) {
-final ContentType requestedContentType = 
ContentNegotiator.doContentNegotiation(uriInfo.getFormatOption(),
-request, handler.getCustomContentTypeSupport(), 
valueRepresentationType);
+  handlePrimitiveValueDispatching(request, response, resource);
+} else {
+  handleMediaValueDispatching(request, response, resource);
+}
+  }
 
-handler.selectProcessor(PrimitiveValueProcessor.class)
-.readPrimitiveValue(request, response, uriInfo, 

[2/2] olingo-odata4 git commit: [OLINGO-917] Fix $entity request handling

[chrisam]

[OLINGO-917] Fix $entity request handling

This is a contribution from Ramya in
https://issues.apache.org/jira/browse/OLINGO-917


Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/6a736db1
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/6a736db1
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/6a736db1

Branch: refs/heads/master
Commit: 6a736db10c3ef9d990dda637809a6514f27cb66b
Parents: 84a052d
Author: Christian Amend 
Authored: Tue Nov 22 14:17:59 2016 +0100
Committer: Christian Amend 
Committed: Tue Nov 22 14:17:59 2016 +0100

--
 .../olingo/server/core/ServiceDispatcher.java   |   2 +-
 .../olingo/server/core/ServiceRequest.java  |   3 +-
 .../olingo/server/core/ODataDispatcher.java |   1 +
 .../olingo/server/core/ODataHandlerImpl.java|   2 +-
 .../olingo/server/core/uri/UriHelperImpl.java   |   2 +-
 .../olingo/server/core/uri/parser/Parser.java   | 117 ++-
 .../server/core/uri/parser/UriDecoder.java  |   2 +-
 .../uri/parser/UriParserSemanticException.java  |   4 +-
 .../uri/parser/UriParserSyntaxException.java|   4 +-
 .../server-core-exceptions-i18n.properties  |   2 +
 .../tecsvc/processor/TechnicalProcessor.java|   2 +-
 .../server/core/PreconditionsValidatorTest.java |   4 +-
 .../server/core/uri/parser/ApplyParserTest.java |   2 +-
 .../core/uri/parser/ExpandParserTest.java   |   4 +-
 .../server/core/uri/parser/UriParserTest.java   |  76 +++-
 .../core/uri/testutil/FilterValidator.java  |   4 +-
 .../core/uri/testutil/ResourceValidator.java|   2 +-
 .../core/uri/testutil/TestUriValidator.java |  21 +++-
 .../core/uri/validator/UriValidatorTest.java|   4 +-
 19 files changed, 203 insertions(+), 55 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/6a736db1/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/ServiceDispatcher.java
--
diff --git 
a/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/ServiceDispatcher.java
 
b/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/ServiceDispatcher.java
index a6d39b6..877ea70 100644
--- 
a/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/ServiceDispatcher.java
+++ 
b/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/ServiceDispatcher.java
@@ -90,7 +90,7 @@ public class ServiceDispatcher extends 
RequestURLHierarchyVisitor {
 executeIdOption(query, odRequest, odResponse);
   } else {
 UriInfo uriInfo = new Parser(this.metadata.getEdm(), odata)
-  .parseUri(path, query, null);
+  .parseUri(path, query, null, odRequest.getRawBaseUri());
 
 contentType = 
ContentNegotiator.doContentNegotiation(uriInfo.getFormatOption(),
 odRequest, this.customContentSupport, RepresentationType.ERROR);   
   

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/6a736db1/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/ServiceRequest.java
--
diff --git 
a/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/ServiceRequest.java
 
b/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/ServiceRequest.java
index 29c7134..c973ba6 100644
--- 
a/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/ServiceRequest.java
+++ 
b/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/ServiceRequest.java
@@ -340,7 +340,8 @@ public abstract class ServiceRequest {
   rawPath = rawPath.substring(e+path.length());
 }
 
-UriInfo uriInfo = new Parser(serviceMetadata.getEdm(), 
odata).parseUri(rawPath, uri.getQuery(), null);
+UriInfo uriInfo = new Parser(serviceMetadata.getEdm(), 
odata).parseUri(rawPath, uri.getQuery(), null, 
+getODataRequest().getRawBaseUri());
 ServiceDispatcher dispatcher = new ServiceDispatcher(odata, 
serviceMetadata, null, customContentType);
 dispatcher.visit(uriInfo);
 dispatcher.request.setUriInfo(uriInfo);

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/6a736db1/lib/server-core/src/main/java/org/apache/olingo/server/core/ODataDispatcher.java
--
diff --git 
a/lib/server-core/src/main/java/org/apache/olingo/server/core/ODataDispatcher.java
 
b/lib/server-core/src/main/java/org/apache/olingo/server/core/ODataDispatcher.java
index 5d48e34..d460ee7 100644
--- 
a/lib/server-core/src/main/java/org/apache/olingo/server/core/ODataDispatcher.java
+++ 
b/lib/server-core/src/main/java/org/apache/olingo/server/core/ODataDispatcher.java
@@ -109,6 +109,7 

olingo-odata2 git commit: [OLINGO-947] enable local repo during maven build

[chrisam]

Repository: olingo-odata2
Updated Branches:
  refs/heads/master 066b5fbef -> 8edf569c4


[OLINGO-947] enable local repo during maven build


Project: http://git-wip-us.apache.org/repos/asf/olingo-odata2/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata2/commit/8edf569c
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata2/tree/8edf569c
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata2/diff/8edf569c

Branch: refs/heads/master
Commit: 8edf569c4646d336705a66b886b91c7aaa2b92cb
Parents: 066b5fb
Author: Christian Amend 
Authored: Thu Nov 10 14:34:00 2016 +0100
Committer: Christian Amend 
Committed: Thu Nov 10 14:34:00 2016 +0100

--
 pom.xml | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/8edf569c/pom.xml
--
diff --git a/pom.xml b/pom.xml
index f753bfa..edf6fce 100644
--- a/pom.xml
+++ b/pom.xml
@@ -360,6 +360,7 @@

**/goal.txt

**/target/**

**/*.iml
+.repository/**

olingo-odata4 git commit: [OLINGO-1004] refactored embedded tomcat

[chrisam]

Repository: olingo-odata4
Updated Branches:
  refs/heads/master cc0a6a51a -> 69659a1a9


[OLINGO-1004] refactored embedded tomcat

modified pom to write properties to a file.
refactored the embedded tomcat to use those properties.

Signed-off-by: Christian Amend 


Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/69659a1a
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/69659a1a
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/69659a1a

Branch: refs/heads/master
Commit: 69659a1a9027d6eb8e758694be20fd8198197c91
Parents: cc0a6a5
Author: Morten Riedel 
Authored: Tue Oct 18 14:39:24 2016 +0200
Committer: Christian Amend 
Committed: Wed Oct 19 14:35:03 2016 +0200

--
 fit/pom.xml | 48 ++--
 .../olingo/fit/server/TomcatTestServer.java | 32 ++---
 fit/src/main/resources/tomcat-fit.properties| 21 -
 fit/src/main/resources/tomcat-users.xml | 28 
 4 files changed, 49 insertions(+), 80 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/69659a1a/fit/pom.xml
--
diff --git a/fit/pom.xml b/fit/pom.xml
index ffb8599..7316376 100644
--- a/fit/pom.xml
+++ b/fit/pom.xml
@@ -39,6 +39,9 @@
 true
 
 .*proxy.*
+
${project.build.directory}/${project.build.finalName}
+${project.build.directory}/emb-tom-fit
+
${project.build.outputDirectory}
   
 
   
@@ -122,19 +125,6 @@
 
   org.apache.tomcat
   tomcat-jasper
-  
-
-  javax.servlet
-  javax.servlet-api
-
-  
-
-
-
-  javax.servlet
-  servlet-api
-  2.5
-  provided
 
 
 
@@ -194,10 +184,40 @@
   true
 
   
+
+
+org.codehaus.mojo
+properties-maven-plugin
+1.0.0
+
+  
+generate-resources
+
+  write-project-properties
+
+
+  
+${project.build.outputDirectory}/mavenBuild.properties
+  
+
+  
+
+  
+
   
 org.apache.maven.plugins
 maven-surefire-plugin
 
+
+   
+   buildDirectory
+   ${project.build.directory}
+   
+
+   finalName
+   ${project.build.finalName}
+   
+
   
 **/*ITCase.java
 **/*Test.java
@@ -205,7 +225,7 @@
   
 %regex[${exclude.regex}]
   
-
+ 
   
   
 org.apache.maven.plugins

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/69659a1a/fit/src/main/java/org/apache/olingo/fit/server/TomcatTestServer.java
--
diff --git 
a/fit/src/main/java/org/apache/olingo/fit/server/TomcatTestServer.java 
b/fit/src/main/java/org/apache/olingo/fit/server/TomcatTestServer.java
index 7d1ed46..9d2c4e4 100644
--- a/fit/src/main/java/org/apache/olingo/fit/server/TomcatTestServer.java
+++ b/fit/src/main/java/org/apache/olingo/fit/server/TomcatTestServer.java
@@ -48,7 +48,6 @@ import org.apache.catalina.Context;
 import org.apache.catalina.LifecycleException;
 import org.apache.catalina.LifecycleState;
 import org.apache.catalina.loader.WebappLoader;
-import org.apache.catalina.realm.MemoryRealm;
 import org.apache.catalina.startup.Tomcat;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
@@ -151,9 +150,9 @@ public class TomcatTestServer {
   }
 
   public static class TestServerBuilder {
-private static final String TOMCAT_BASE_DIR = "TOMCAT_BASE_DIR";
-private static final String PROJECT_WEB_APP_DIR = "PROJECT_WEB_APP_DIR";
-private static final String PROJECT_RESOURCES_DIR = 
"PROJECT_RESOURCES_DIR";
+private static final String TOMCAT_BASE_DIR = "tomcat-base-dir";
+private static final String PROJECT_RESOURCES_DIR = "project-resource-dir";
+private static final String PROJECT_WEB_APP_DIR = "project-web-app-dir";
 
 private final Tomcat tomcat;
 private final File baseDir;
@@ -163,7 +162,6 @@ public class TomcatTestServer {
 
 private TestServerBuilder(final int fixedPort) {
   initializeProperties();
-  // baseDir = new File(System.getProperty("java.io.tmpdir"), 
"tomcat-test");
   baseDir = getFileForDirProperty(TOMCAT_BASE_DIR);  
   if (!baseDir.exists() && !baseDir.mkdirs()) {
 throw new RuntimeException("Unable to create temporary test directory 
at {" + 

[1/2] olingo-odata4 git commit: [OLINGO-1037] Support GeoTypes in Json

[chrisam]

Repository: olingo-odata4
Updated Branches:
  refs/heads/master 5255c336e -> cc0a6a51a


http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/cc0a6a51/lib/server-test/src/test/java/org/apache/olingo/server/core/serializer/json/ODataJsonSerializerTest.java
--
diff --git 
a/lib/server-test/src/test/java/org/apache/olingo/server/core/serializer/json/ODataJsonSerializerTest.java
 
b/lib/server-test/src/test/java/org/apache/olingo/server/core/serializer/json/ODataJsonSerializerTest.java
index 82f49aa..cf29d5f 100644
--- 
a/lib/server-test/src/test/java/org/apache/olingo/server/core/serializer/json/ODataJsonSerializerTest.java
+++ 
b/lib/server-test/src/test/java/org/apache/olingo/server/core/serializer/json/ODataJsonSerializerTest.java
@@ -18,6 +18,9 @@
  */
 package org.apache.olingo.server.core.serializer.json;
 
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.fail;
+
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URI;
@@ -44,7 +47,17 @@ import org.apache.olingo.commons.api.edm.EdmEntityContainer;
 import org.apache.olingo.commons.api.edm.EdmEntitySet;
 import org.apache.olingo.commons.api.edm.EdmEntityType;
 import org.apache.olingo.commons.api.edm.EdmPrimitiveType;
+import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind;
 import org.apache.olingo.commons.api.edm.EdmProperty;
+import org.apache.olingo.commons.api.edm.geo.Point;
+import org.apache.olingo.commons.api.edm.geo.Polygon;
+import org.apache.olingo.commons.api.edm.geo.SRID;
+import org.apache.olingo.commons.api.edm.geo.Geospatial.Dimension;
+import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
+import org.apache.olingo.commons.api.edm.geo.LineString;
+import org.apache.olingo.commons.api.edm.geo.MultiLineString;
+import org.apache.olingo.commons.api.edm.geo.MultiPoint;
+import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
 import org.apache.olingo.commons.api.edmx.EdmxReference;
 import org.apache.olingo.commons.api.format.ContentType;
 import org.apache.olingo.server.api.OData;
@@ -647,13 +660,13 @@ public class ODataJsonSerializerTest {
 final EdmEntitySet edmEntitySet = 
entityContainer.getEntitySet("ESTwoPrim");
 final Entity entity = data.readAll(edmEntitySet).getEntities().get(0);
 InputStream result = serializer
-  .entity(metadata, edmEntitySet.getEntityType(), entity, 
EntitySerializerOptions.with()
-   
.contextURL(ContextURL.with().entitySet(edmEntitySet).suffix(Suffix.ENTITY).build())
-.build()).getContent();
+.entity(metadata, edmEntitySet.getEntityType(), entity, 
EntitySerializerOptions.with()
+
.contextURL(ContextURL.with().entitySet(edmEntitySet).suffix(Suffix.ENTITY).build())
+.build()).getContent();
 final String resultString = IOUtils.toString(result);
-final String expectedResult = 
"{\"@odata.context\":\"$metadata#ESTwoPrim/$entity\"," +
-"\"@odata.metadataEtag\":\"W/\\\"metadataETag\\\"\"," +
-"\"PropertyInt16\":32766,\"PropertyString\":\"Test String1\"}";
+final String expectedResult = 
"{\"@odata.context\":\"$metadata#ESTwoPrim/$entity\","
++ "\"@odata.metadataEtag\":\"W/\\\"metadataETag\\\"\","
++ "\"PropertyInt16\":32766,\"PropertyString\":\"Test String1\"}";
 Assert.assertEquals(expectedResult, resultString);
   }
 
@@ -673,67 +686,67 @@ public class ODataJsonSerializerTest {
 + 
"\"value\":[{\"@odata.type\":\"#olingo.odata.test1.ETTwoPrim\",\"@odata.id\":\"ESTwoPrim(32766)\","
 + "\"propertyin...@odata.type\":\"#Int16\",\"PropertyInt16\":32766,"
 + "\"PropertyString\":\"Test String1\","
-+"\"#olingo.odata.test1.BAETTwoPrimRTString\":"
-+"{\"title\":\"olingo.odata.test1.BAETTwoPrimRTString\","
-
+"\"target\":\"ESTwoPrim(32766)/olingo.odata.test1.BAETTwoPrimRTString\"},"
-+"\"#olingo.odata.test1.BAETTwoPrimRTCollString\":"
-+"{\"title\":\"olingo.odata.test1.BAETTwoPrimRTCollString\","
-
+"\"target\":\"ESTwoPrim(32766)/olingo.odata.test1.BAETTwoPrimRTCollString\"},"
-+"\"#olingo.odata.test1.BAETTwoPrimRTCTAllPrim\":"
-+"{\"title\":\"olingo.odata.test1.BAETTwoPrimRTCTAllPrim\","
-
+"\"target\":\"ESTwoPrim(32766)/olingo.odata.test1.BAETTwoPrimRTCTAllPrim\"},"
-+"\"#olingo.odata.test1.BAETTwoPrimRTCollCTAllPrim\":"
-+"{\"title\":\"olingo.odata.test1.BAETTwoPrimRTCollCTAllPrim\","
-
+"\"target\":\"ESTwoPrim(32766)/olingo.odata.test1.BAETTwoPrimRTCollCTAllPrim\"}"
++ "\"#olingo.odata.test1.BAETTwoPrimRTString\":"
++ "{\"title\":\"olingo.odata.test1.BAETTwoPrimRTString\","
++ 
"\"target\":\"ESTwoPrim(32766)/olingo.odata.test1.BAETTwoPrimRTString\"},"
++ "\"#olingo.odata.test1.BAETTwoPrimRTCollString\":"
++ 

[2/2] olingo-odata4 git commit: [OLINGO-1037] Support GeoTypes in Json

[chrisam]

[OLINGO-1037] Support GeoTypes in Json


Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/cc0a6a51
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/cc0a6a51
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/cc0a6a51

Branch: refs/heads/master
Commit: cc0a6a51a8d0b1a885b32d4b72e471b862343447
Parents: 5255c33
Author: Christian Amend 
Authored: Wed Oct 19 14:33:34 2016 +0200
Committer: Christian Amend 
Committed: Wed Oct 19 14:33:34 2016 +0200

--
 .../json/ODataJsonDeserializer.java | 190 -
 .../serializer/json/ODataJsonSerializer.java| 126 +++-
 .../json/ODataJsonDeserializerEntityTest.java   | 283 +++-
 .../json/ODataJsonSerializerTest.java   | 701 ---
 4 files changed, 990 insertions(+), 310 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/cc0a6a51/lib/server-core/src/main/java/org/apache/olingo/server/core/deserializer/json/ODataJsonDeserializer.java
--
diff --git 
a/lib/server-core/src/main/java/org/apache/olingo/server/core/deserializer/json/ODataJsonDeserializer.java
 
b/lib/server-core/src/main/java/org/apache/olingo/server/core/deserializer/json/ODataJsonDeserializer.java
index d30d973..9106613 100644
--- 
a/lib/server-core/src/main/java/org/apache/olingo/server/core/deserializer/json/ODataJsonDeserializer.java
+++ 
b/lib/server-core/src/main/java/org/apache/olingo/server/core/deserializer/json/ODataJsonDeserializer.java
@@ -20,9 +20,12 @@ package org.apache.olingo.server.core.deserializer.json;
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.math.BigDecimal;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -53,6 +56,14 @@ import org.apache.olingo.commons.api.edm.EdmType;
 import org.apache.olingo.commons.api.edm.EdmTypeDefinition;
 import org.apache.olingo.commons.api.edm.FullQualifiedName;
 import org.apache.olingo.commons.api.edm.constants.EdmTypeKind;
+import org.apache.olingo.commons.api.edm.geo.Geospatial;
+import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
+import org.apache.olingo.commons.api.edm.geo.LineString;
+import org.apache.olingo.commons.api.edm.geo.MultiLineString;
+import org.apache.olingo.commons.api.edm.geo.MultiPoint;
+import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
+import org.apache.olingo.commons.api.edm.geo.Point;
+import org.apache.olingo.commons.api.edm.geo.Polygon;
 import org.apache.olingo.commons.api.format.ContentType;
 import org.apache.olingo.server.api.ServiceMetadata;
 import org.apache.olingo.server.api.deserializer.DeserializerException;
@@ -76,6 +87,19 @@ import com.fasterxml.jackson.databind.node.ObjectNode;
 
 public class ODataJsonDeserializer implements ODataDeserializer {
 
+  private static final Map 
jsonNameToGeoDataType;
+  static {
+Map temp = new HashMap();
+temp.put(Constants.ELEM_POINT, Point.class);
+temp.put(Constants.ELEM_MULTIPOINT, MultiPoint.class);
+temp.put(Constants.ELEM_LINESTRING, LineString.class);
+temp.put("MultiLineString", MultiLineString.class);
+temp.put(Constants.ELEM_POLYGON, Polygon.class);
+temp.put("MultiPolygon", MultiPolygon.class);
+temp.put("GeometryCollection", GeospatialCollection.class);
+jsonNameToGeoDataType = Collections.unmodifiableMap(temp);
+  }
+
   private static final String ODATA_ANNOTATION_MARKER = "@";
   private static final String ODATA_CONTROL_INFORMATION_PREFIX = "@odata.";
 
@@ -594,16 +618,21 @@ public class ODataJsonDeserializer implements 
ODataDeserializer {
   private Object readPrimitiveValue(final String name, final EdmPrimitiveType 
type,
   final boolean isNullable, final Integer maxLength, final Integer 
precision, final Integer scale,
   final boolean isUnicode, final EdmMapping mapping, final JsonNode 
jsonNode) throws DeserializerException {
-checkForValueNode(name, jsonNode);
 if (isValidNull(name, isNullable, jsonNode)) {
   return null;
 }
+final boolean isGeoType = type.getName().startsWith("Geo");
+if (!isGeoType) {
+  checkForValueNode(name, jsonNode);
+}
 checkJsonTypeBasedOnPrimitiveType(name, type, jsonNode);
-Class javaClass = getJavaClassForPrimitiveType(mapping, type);
 try {
+  if (isGeoType) {
+return readPrimitiveGeoValue(name, type, (ObjectNode) jsonNode);
+  }
   return type.valueOfString(jsonNode.asText(),
   isNullable, maxLength, precision, 

olingo-odata4 git commit: [OLINGO-1033] Add # for primitive type annotations

[chrisam]

Repository: olingo-odata4
Updated Branches:
  refs/heads/master 9e67d0e3e -> 5255c336e


[OLINGO-1033] Add # for primitive type annotations


Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/5255c336
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/5255c336
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/5255c336

Branch: refs/heads/master
Commit: 5255c336ebde38493337bd6761b49a80654a3289
Parents: 9e67d0e
Author: Christian Amend 
Authored: Tue Oct 18 15:58:13 2016 +0200
Committer: Christian Amend 
Committed: Tue Oct 18 15:58:13 2016 +0200

--
 .../json/EdmAssistedJsonSerializer.java | 24 ++--
 .../json/EdmAssistedJsonSerializerTest.java | 30 ++--
 2 files changed, 36 insertions(+), 18 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/5255c336/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/json/EdmAssistedJsonSerializer.java
--
diff --git 
a/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/json/EdmAssistedJsonSerializer.java
 
b/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/json/EdmAssistedJsonSerializer.java
index 66cc15c..3d86953 100644
--- 
a/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/json/EdmAssistedJsonSerializer.java
+++ 
b/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/json/EdmAssistedJsonSerializer.java
@@ -385,9 +385,7 @@ public class EdmAssistedJsonSerializer implements 
EdmAssistedSerializer {
 }
   }
   if (typeName != null) {
-json.writeStringField(
-name + Constants.JSON_TYPE,
-new 
EdmTypeInfo.Builder().setTypeExpression(typeName).build().external());
+json.writeStringField(name + Constants.JSON_TYPE, 
constructTypeExpression(typeName));
   }
 }
 
@@ -398,4 +396,24 @@ public class EdmAssistedJsonSerializer implements 
EdmAssistedSerializer {
 json.writeFieldName(name);
 value(json, valuable, type, edmProperty);
   }
+
+  private String constructTypeExpression(String typeName) {
+EdmTypeInfo typeInfo = new 
EdmTypeInfo.Builder().setTypeExpression(typeName).build();
+StringBuilder stringBuilder = new StringBuilder();
+
+if (typeInfo.isCollection()) {
+  stringBuilder.append("#Collection(");
+} else {
+  stringBuilder.append('#');
+}
+
+stringBuilder.append(typeInfo.isPrimitiveType() ? 
typeInfo.getFullQualifiedName().getName() : typeInfo
+.getFullQualifiedName().getFullQualifiedNameAsString());
+
+if (typeInfo.isCollection()) {
+  stringBuilder.append(')');
+}
+
+return stringBuilder.toString();
+  }
 }

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/5255c336/lib/server-test/src/test/java/org/apache/olingo/server/core/serializer/json/EdmAssistedJsonSerializerTest.java
--
diff --git 
a/lib/server-test/src/test/java/org/apache/olingo/server/core/serializer/json/EdmAssistedJsonSerializerTest.java
 
b/lib/server-test/src/test/java/org/apache/olingo/server/core/serializer/json/EdmAssistedJsonSerializerTest.java
index 030a5eb..808e459 100644
--- 
a/lib/server-test/src/test/java/org/apache/olingo/server/core/serializer/json/EdmAssistedJsonSerializerTest.java
+++ 
b/lib/server-test/src/test/java/org/apache/olingo/server/core/serializer/json/EdmAssistedJsonSerializerTest.java
@@ -69,7 +69,7 @@ public class EdmAssistedJsonSerializerTest {
 EntityCollection entityCollection = new EntityCollection();
 entityCollection.getEntities().add(entity);
 
Assert.assertEquals("{\"@odata.context\":\"$metadata#EntitySet(Property1)\","
-+ 
"\"value\":[{\"@odata.id\":null,\"proper...@odata.type\":\"Single\",\"Property1\":1.25}]}",
++ 
"\"value\":[{\"@odata.id\":null,\"proper...@odata.type\":\"#Single\",\"Property1\":1.25}]}",
 serialize(serializer, metadata, null, entityCollection, null));
   }
 
@@ -85,7 +85,7 @@ public class EdmAssistedJsonSerializerTest {
 entityCollection.getEntities().add(entity);
 
Assert.assertEquals("{\"@odata.context\":\"$metadata#ESTwoPrim\",\"value\":[{\"@odata.id\":null,"
 + "\"PropertyInt16\":1,\"PropertyString\":\"test\","
-+ 
"\"additionalprope...@odata.type\":\"SByte\",\"AdditionalProperty\":42}]}",
++ 
"\"additionalprope...@odata.type\":\"#SByte\",\"AdditionalProperty\":42}]}",
 serialize(serializer, metadata, entitySet, entityCollection, null));
   }
 
@@ -111,9 +111,9 @@ public class EdmAssistedJsonSerializerTest {
 + "\"@odata.count\":2,"
   

[1/2] olingo-odata4 git commit: [OLINGO-935] $apply as option for $expand should be possible

[chrisam]

Repository: olingo-odata4
Updated Branches:
  refs/heads/master 72fcaa1a5 -> 9e67d0e3e


[OLINGO-935] $apply as option for $expand should be possible

Signed-off-by: Christian Amend 


Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/1600684d
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/1600684d
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/1600684d

Branch: refs/heads/master
Commit: 1600684d4f7dab8db570d02212f4bd12bb73a1a0
Parents: 72fcaa1
Author: Klaus Straubinger 
Authored: Fri Oct 7 14:36:51 2016 +0200
Committer: Christian Amend 
Committed: Fri Oct 7 14:51:57 2016 +0200

--
 .../server/api/uri/queryoption/ExpandItem.java  |   5 +
 .../server/core/uri/parser/ExpandParser.java|   7 +
 .../core/uri/queryoption/ExpandItemImpl.java|  12 +-
 .../core/uri/queryoption/ExpandOptionImpl.java  |   3 +-
 .../core/uri/queryoption/OrderByItemImpl.java   |   4 +-
 .../core/uri/queryoption/SearchOptionImpl.java  |   3 +-
 .../olingo/server/core/uri/UriInfoImplTest.java |   6 +-
 .../core/uri/parser/ExpandParserTest.java   | 491 ---
 .../server/core/uri/parser/UriParserTest.java   |  24 +-
 .../core/uri/testutil/ExpandValidator.java  |  37 +-
 .../core/uri/testutil/FilterTreeToText.java |  12 +-
 .../core/uri/testutil/TestUriValidator.java |  28 +-
 12 files changed, 284 insertions(+), 348 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/1600684d/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/ExpandItem.java
--
diff --git 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/ExpandItem.java
 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/ExpandItem.java
index 4e71157..8ae8898 100644
--- 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/ExpandItem.java
+++ 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/ExpandItem.java
@@ -73,6 +73,11 @@ public interface ExpandItem {
   ExpandOption getExpandOption();
 
   /**
+   * @return Information on the option $apply when used within $expand
+   */
+  ApplyOption getApplyOption();
+
+  /**
* @return A {@link UriInfoResource} object containing the resource path 
segments to be expanded
*/
   UriInfoResource getResourcePath();

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/1600684d/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/ExpandParser.java
--
diff --git 
a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/ExpandParser.java
 
b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/ExpandParser.java
index 8a493ff..53a14d7 100644
--- 
a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/ExpandParser.java
+++ 
b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/ExpandParser.java
@@ -50,6 +50,7 @@ import 
org.apache.olingo.server.core.uri.queryoption.ExpandOptionImpl;
 import org.apache.olingo.server.core.uri.queryoption.LevelsOptionImpl;
 import org.apache.olingo.server.core.uri.queryoption.SkipOptionImpl;
 import org.apache.olingo.server.core.uri.queryoption.TopOptionImpl;
+import 
org.apache.olingo.server.core.uri.queryoption.apply.DynamicStructuredType;
 import org.apache.olingo.server.core.uri.validator.UriValidationException;
 
 public class ExpandParser {
@@ -276,6 +277,12 @@ public class ExpandParser {
   topOption.setValue(value);
   systemQueryOption = topOption;
 
+} else if (!forRef && !forCount && tokenizer.next(TokenKind.APPLY)) {
+  ParserHelper.requireNext(tokenizer, TokenKind.EQ);
+  systemQueryOption = new ApplyParser(edm, odata).parse(tokenizer,
+  // Data aggregation may change the structure of the result, so 
we create a new dynamic type.
+  new DynamicStructuredType(referencedType), null, aliases);
+
 } else {
   throw new UriParserSyntaxException("Allowed query option expected.",
   UriParserSyntaxException.MessageKeys.SYNTAX);

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/1600684d/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/ExpandItemImpl.java
--
diff --git 
a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/ExpandItemImpl.java
 
b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/ExpandItemImpl.java
index 

[2/2] olingo-odata4 git commit: [OLINGO-935] improved debug support

[chrisam]

[OLINGO-935] improved debug support

including more unit tests

Signed-off-by: Christian Amend 


Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/9e67d0e3
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/9e67d0e3
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/9e67d0e3

Branch: refs/heads/master
Commit: 9e67d0e3e8ae71ea15098ba24fd22bf74c2faaa4
Parents: 1600684
Author: Klaus Straubinger 
Authored: Fri Oct 7 14:41:17 2016 +0200
Committer: Christian Amend 
Committed: Fri Oct 7 14:52:41 2016 +0200

--
 .../olingo/server/core/debug/DebugTabBody.java  |  43 +-
 .../server/core/debug/DebugTabRuntime.java  |   8 +-
 .../server/core/debug/DebugTabStacktrace.java   |   2 +-
 .../olingo/server/core/debug/DebugTabUri.java   |  49 ++-
 .../core/debug/ExpressionJsonVisitor.java   |  78 +++-
 .../server/core/debug/AbstractDebugTabTest.java |  28 +-
 .../server/core/debug/DebugTabBodyTest.java |  67 +++
 .../server/core/debug/DebugTabRuntimeTest.java  |  73 
 .../core/debug/DebugTabStacktraceTest.java  | 107 +
 .../server/core/debug/DebugTabUriTest.java  | 405 +++
 .../core/debug/ServerCoreDebuggerTest.java  |  37 +-
 11 files changed, 832 insertions(+), 65 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/9e67d0e3/lib/server-core/src/main/java/org/apache/olingo/server/core/debug/DebugTabBody.java
--
diff --git 
a/lib/server-core/src/main/java/org/apache/olingo/server/core/debug/DebugTabBody.java
 
b/lib/server-core/src/main/java/org/apache/olingo/server/core/debug/DebugTabBody.java
index b0c5314..9bca8eb 100644
--- 
a/lib/server-core/src/main/java/org/apache/olingo/server/core/debug/DebugTabBody.java
+++ 
b/lib/server-core/src/main/java/org/apache/olingo/server/core/debug/DebugTabBody.java
@@ -23,7 +23,6 @@ import java.io.InputStream;
 import java.io.Writer;
 
 import org.apache.commons.codec.binary.Base64;
-import org.apache.olingo.commons.api.ex.ODataRuntimeException;
 import org.apache.olingo.commons.api.http.HttpHeader;
 import org.apache.olingo.server.api.ODataResponse;
 import org.apache.olingo.server.api.deserializer.DeserializerException;
@@ -70,33 +69,12 @@ public class DebugTabBody implements DebugTab {
 return "Body";
   }
 
-  //
   @Override
-  public void appendJson(final JsonGenerator gen) throws IOException {
+  public void appendJson(final JsonGenerator json) throws IOException {
 if (response == null || response.getContent() == null) {
-  gen.writeNull();
+  json.writeNull();
 } else {
-  gen.writeString(getContentString());
-}
-  }
-
-  private String getContentString() {
-try {
-  String contentString;
-  switch (responseContent) {
-  case IMAGE:
-contentString = 
Base64.encodeBase64String(streamToBytes(response.getContent()));
-break;
-  case JSON:
-  case XML:
-  case TEXT:
-  default:
-contentString = new String(streamToBytes(response.getContent()), 
"UTF-8");
-break;
-  }
-  return contentString;
-} catch (IOException e) {
-  return "Could not parse Body for Debug Output";
+  json.writeString(getContentString());
 }
   }
 
@@ -130,12 +108,23 @@ public class DebugTabBody implements DebugTab {
 }
   }
 
-  private byte[] streamToBytes(final InputStream input) {
+  private String getContentString() {
+try {
+  final byte[] content = streamToBytes(response.getContent());
+  return responseContent == ResponseContent.IMAGE ?
+  Base64.encodeBase64String(content) :
+  new String(content, "UTF-8");
+} catch (final IOException e) {
+  return "Could not parse Body for Debug Output";
+}
+  }
+
+  private byte[] streamToBytes(final InputStream input) throws IOException {
 if (input != null) {
   try {
 return new FixedFormatDeserializerImpl().binary(input);
   } catch (final DeserializerException e) {
-throw new ODataRuntimeException("Error on reading request content", e);
+throw new IOException("Error on reading request content", e);
   }
 }
 return null;

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/9e67d0e3/lib/server-core/src/main/java/org/apache/olingo/server/core/debug/DebugTabRuntime.java
--
diff --git 
a/lib/server-core/src/main/java/org/apache/olingo/server/core/debug/DebugTabRuntime.java
 
b/lib/server-core/src/main/java/org/apache/olingo/server/core/debug/DebugTabRuntime.java
index 4214050..7416594 100644
--- 

[1/7] olingo-odata4 git commit: [OLINGO-1028] stricter multiplicity tests in expression parser + clean-up

[chrisam]

Repository: olingo-odata4
Updated Branches:
  refs/heads/master b9a71ff88 -> 72fcaa1a5


http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/72fcaa1a/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/testutil/ResourceValidator.java
--
diff --git 
a/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/testutil/ResourceValidator.java
 
b/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/testutil/ResourceValidator.java
index 2bcdbc1..658f2c0 100644
--- 
a/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/testutil/ResourceValidator.java
+++ 
b/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/testutil/ResourceValidator.java
@@ -23,8 +23,6 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
-import java.util.List;
-
 import org.apache.olingo.commons.api.edm.Edm;
 import org.apache.olingo.commons.api.edm.EdmElement;
 import org.apache.olingo.commons.api.edm.EdmType;
@@ -38,7 +36,6 @@ import org.apache.olingo.server.api.uri.UriInfoResource;
 import org.apache.olingo.server.api.uri.UriParameter;
 import org.apache.olingo.server.api.uri.UriResource;
 import org.apache.olingo.server.api.uri.UriResourceAction;
-import org.apache.olingo.server.api.uri.UriResourceComplexProperty;
 import org.apache.olingo.server.api.uri.UriResourceEntitySet;
 import org.apache.olingo.server.api.uri.UriResourceFunction;
 import org.apache.olingo.server.api.uri.UriResourceKind;
@@ -46,8 +43,9 @@ import org.apache.olingo.server.api.uri.UriResourceLambdaAll;
 import org.apache.olingo.server.api.uri.UriResourceLambdaAny;
 import org.apache.olingo.server.api.uri.UriResourceNavigation;
 import org.apache.olingo.server.api.uri.UriResourcePartTyped;
-import org.apache.olingo.server.api.uri.UriResourcePrimitiveProperty;
+import org.apache.olingo.server.api.uri.UriResourceProperty;
 import org.apache.olingo.server.api.uri.UriResourceSingleton;
+import org.apache.olingo.server.core.uri.UriResourceTypedImpl;
 import org.apache.olingo.server.core.uri.UriResourceWithKeysImpl;
 import org.apache.olingo.server.core.uri.parser.Parser;
 import org.apache.olingo.server.core.uri.validator.UriValidationException;
@@ -57,7 +55,7 @@ public class ResourceValidator implements TestValidator {
   private final OData odata = OData.newInstance();
   private Edm edm;
   private TestValidator invokedBy;
-  private UriInfo uriInfo = null;
+  private UriInfoResource uriInfo = null;
 
   private UriResource uriPathInfo = null;
   private int uriResourceIndex;
@@ -75,10 +73,8 @@ public class ResourceValidator implements TestValidator {
   }
 
   public ResourceValidator setUriInfoPath(final UriInfoResource uriInfoPath) {
-uriInfo = (UriInfo) uriInfoPath;
-if (!uriInfo.getUriResourceParts().isEmpty()) {
-  last();
-}
+uriInfo = uriInfoPath;
+first();
 return this;
   }
 
@@ -86,7 +82,6 @@ public class ResourceValidator implements TestValidator {
 
   public ResourceValidator run(final String path) {
 UriInfo uriInfoTmp = null;
-uriPathInfo = null;
 try {
   uriInfoTmp = new Parser(edm, odata).parseUri(path, null, null);
 } catch (final ODataLibraryException e) {
@@ -101,10 +96,10 @@ public class ResourceValidator implements TestValidator {
   + " Message: " + e.getMessage());
 }
 
-uriInfo = uriInfoTmp;
-isKind(UriInfoKind.resource);
+assertEquals("Invalid UriInfoKind: " + uriInfoTmp.getKind().toString(),
+UriInfoKind.resource, uriInfoTmp.getKind());
 
-first();
+setUriInfoPath(uriInfoTmp.asUriInfoResource());
 return this;
   }
 
@@ -123,12 +118,10 @@ public class ResourceValidator implements TestValidator {
   }
 
   public FilterValidator goParameter(final int index) {
-assertEquals(UriResourceKind.function, uriPathInfo.getKind());
-UriResourceFunction function = (UriResourceFunction) uriPathInfo;
-
+isUriPathInfoKind(UriResourceKind.function);
 return new FilterValidator()
 .setEdm(edm)
-.setExpression(function.getParameters().get(index).getExpression())
+.setExpression(((UriResourceFunction) 
uriPathInfo).getParameters().get(index).getExpression())
 .setValidator(this);
   }
 
@@ -148,10 +141,6 @@ public class ResourceValidator implements TestValidator {
 return at(0);
   }
 
-  public ResourceValidator last() {
-return at(uriInfo.getUriResourceParts().size() - 1);
-  }
-
   public ResourceValidator n() {
 return at(uriResourceIndex + 1);
   }
@@ -166,33 +155,21 @@ public class ResourceValidator implements TestValidator {
   // --- Validation ---
 
   public ResourceValidator isLambdaVar(final String var) {
-String actualVar = null;
-if (uriPathInfo.getKind() == UriResourceKind.lambdaAll) {
-  actualVar = ((UriResourceLambdaAll) uriPathInfo).getLambdaVariable();
-} else if 

[6/7] olingo-odata4 git commit: [OLINGO-1028] stricter multiplicity tests in expression parser + clean-up

[chrisam]

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/72fcaa1a/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/parser/ExpressionParserTest.java
--
diff --git 
a/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/parser/ExpressionParserTest.java
 
b/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/parser/ExpressionParserTest.java
new file mode 100644
index 000..c267754
--- /dev/null
+++ 
b/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/parser/ExpressionParserTest.java
@@ -0,0 +1,2389 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.olingo.server.core.uri.parser;
+
+import java.util.Arrays;
+import java.util.Collections;
+
+import org.apache.olingo.commons.api.edm.Edm;
+import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind;
+import org.apache.olingo.commons.api.edmx.EdmxReference;
+import org.apache.olingo.server.api.OData;
+import org.apache.olingo.server.api.uri.UriResourceKind;
+import 
org.apache.olingo.server.api.uri.queryoption.expression.BinaryOperatorKind;
+import org.apache.olingo.server.api.uri.queryoption.expression.MethodKind;
+import 
org.apache.olingo.server.core.uri.parser.UriParserSemanticException.MessageKeys;
+import org.apache.olingo.server.core.uri.testutil.FilterValidator;
+import org.apache.olingo.server.core.uri.validator.UriValidationException;
+import org.apache.olingo.server.tecsvc.provider.ComplexTypeProvider;
+import org.apache.olingo.server.tecsvc.provider.EdmTechProvider;
+import org.apache.olingo.server.tecsvc.provider.EntityTypeProvider;
+import org.apache.olingo.server.tecsvc.provider.EnumTypeProvider;
+import org.apache.olingo.server.tecsvc.provider.PropertyProvider;
+import org.apache.olingo.server.tecsvc.provider.TypeDefinitionProvider;
+import org.junit.Test;
+
+/** Tests of the parts of the URI parser that parse the sytem query options 
$filter and $orderby. */
+public class ExpressionParserTest {
+
+  private static final OData oData = OData.newInstance();
+  private static final Edm edm = oData.createServiceMetadata(
+  new EdmTechProvider(), Collections. emptyList()).getEdm();
+
+  private final FilterValidator testFilter = new FilterValidator().setEdm(edm);
+
+  @Test
+  public void filter() throws Exception {
+testFilter.runOnETAllPrim("PropertyBoolean")
+.is("")
+.isType(PropertyProvider.nameBoolean);
+
+testFilter.runOnETTwoKeyNav("PropertyComp/PropertyInt16 gt 0")
+.is("< gt <0>>")
+.left().isType(PropertyProvider.nameInt16);
+
+testFilter.runOnETTwoKeyNav("PropertyComp/PropertyComp/PropertyDate ne 
null")
+.is("< ne >")
+.left().isType(PropertyProvider.nameDate);
+
+testFilter.runOnETTwoKeyNav("NavPropertyETTwoKeyNavOne eq null")
+.is("< eq >")
+.left().isType(EntityTypeProvider.nameETTwoKeyNav);
+
+testFilter.runOnETTwoKeyNav("NavPropertyETTwoKeyNavOne/PropertyString eq 
''")
+.is("< eq <''>>")
+.left().isType(PropertyProvider.nameString);
+
+testFilter.runOnETTwoKeyNav("NavPropertyETTwoKeyNavOne/PropertyComp eq 
null")
+.is("< eq >")
+.left().isType(ComplexTypeProvider.nameCTPrimComp);
+
+
testFilter.runOnETTwoKeyNav("NavPropertyETTwoKeyNavOne/PropertyComp/PropertyComp
 eq null")
+.is("< eq 
>")
+.left().isType(ComplexTypeProvider.nameCTAllPrim);
+
+
testFilter.runOnETTwoKeyNav("NavPropertyETTwoKeyNavOne/PropertyComp/PropertyInt16
 eq 1")
+.is("< eq <1>>")
+.left().isType(PropertyProvider.nameInt16)
+.root().right().isLiteral("1");
+
+
testFilter.runOnETTwoKeyNav("NavPropertyETKeyNavMany(1)/NavPropertyETTwoKeyNavMany(PropertyString='2')/"
++ "PropertyString eq 'SomeString'")
+
.is("< eq 
<'SomeString'>>")
+.left()
+.isType(PropertyProvider.nameString)
+.isMember().goPath()
+.first()
+.isNavProperty("NavPropertyETKeyNavMany", 
EntityTypeProvider.nameETKeyNav, false)
+.isKeyPredicate(0, "PropertyInt16", "1")
+.n()
+.isNavProperty("NavPropertyETTwoKeyNavMany", 

[2/7] olingo-odata4 git commit: [OLINGO-1028] stricter multiplicity tests in expression parser + clean-up

[chrisam]

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/72fcaa1a/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/parser/TestUriParserImpl.java
--
diff --git 
a/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/parser/TestUriParserImpl.java
 
b/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/parser/TestUriParserImpl.java
deleted file mode 100644
index 6c7feec..000
--- 
a/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/parser/TestUriParserImpl.java
+++ /dev/null
@@ -1,1047 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.olingo.server.core.uri.parser;
-
-import java.util.Arrays;
-import java.util.Collections;
-
-import org.apache.olingo.commons.api.edm.Edm;
-import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind;
-import org.apache.olingo.commons.api.edmx.EdmxReference;
-import org.apache.olingo.server.api.OData;
-import org.apache.olingo.server.api.uri.UriInfoKind;
-import org.apache.olingo.server.api.uri.UriResourceKind;
-import org.apache.olingo.server.api.uri.queryoption.expression.MethodKind;
-import org.apache.olingo.server.core.uri.testutil.FilterValidator;
-import org.apache.olingo.server.core.uri.testutil.ResourceValidator;
-import org.apache.olingo.server.core.uri.testutil.TestUriValidator;
-import org.apache.olingo.server.core.uri.validator.UriValidationException;
-import org.apache.olingo.server.tecsvc.provider.ActionProvider;
-import org.apache.olingo.server.tecsvc.provider.ComplexTypeProvider;
-import org.apache.olingo.server.tecsvc.provider.ContainerProvider;
-import org.apache.olingo.server.tecsvc.provider.EdmTechProvider;
-import org.apache.olingo.server.tecsvc.provider.EntityTypeProvider;
-import org.apache.olingo.server.tecsvc.provider.PropertyProvider;
-import org.junit.Test;
-
-public class TestUriParserImpl {
-  private static final OData oData = OData.newInstance();
-  private final Edm edm = oData.createServiceMetadata(
-  new EdmTechProvider(), Collections. emptyList()).getEdm();
-  private final TestUriValidator testUri = new TestUriValidator().setEdm(edm);
-  private final ResourceValidator testRes = new 
ResourceValidator().setEdm(edm);
-  private final FilterValidator testFilter = new FilterValidator().setEdm(edm);
-
-  private final String PropertyBoolean = "PropertyBoolean=true";
-  private final String PropertyByte = "PropertyByte=1";
-  private final String PropertyDate = "PropertyDate=2013-09-25";
-  private final String PropertyDateTimeOffset = 
"PropertyDateTimeOffset=2002-10-10T12:00:00-05:00";
-  private final String PropertyDecimal = "PropertyDecimal=12";
-  private final String PropertyDuration = 
"PropertyDuration=duration'P50903316DT2H25M4S'";
-  private final String PropertyGuid = 
"PropertyGuid=12345678-1234-1234-1234-123456789012";
-  private final String PropertyInt16 = "PropertyInt16=1";
-  private final String PropertyInt32 = "PropertyInt32=12";
-  private final String PropertyInt64 = "PropertyInt64=64";
-  private final String PropertySByte = "PropertySByte=1";
-  private final String PropertyString = "PropertyString='ABC'";
-  private final String PropertyTimeOfDay = "PropertyTimeOfDay=12:34:55";
-
-  private final String allKeys = PropertyString + "," + PropertyInt16 + "," + 
PropertyBoolean + "," + PropertyByte
-  + "," + PropertySByte + "," + PropertyInt32 + "," + PropertyInt64 + "," 
+ PropertyDecimal + "," + PropertyDate
-  + "," + PropertyDateTimeOffset + "," + PropertyDuration + "," + 
PropertyGuid + "," + PropertyTimeOfDay;
-
-  @Test
-  public void boundFunctionImport_VarParameters() {
-// no input
-testRes.run("ESKeyNav(1)/olingo.odata.test1.BFCETKeyNavRTETKeyNav()")
-.at(0).isUriPathInfoKind(UriResourceKind.entitySet)
-.at(1).isUriPathInfoKind(UriResourceKind.function);
-
-// one input
-
testRes.run("ESTwoKeyNav/olingo.odata.test1.BFC_RTESTwoKeyNav_(ParameterString='ABC')")
-.at(0).isUriPathInfoKind(UriResourceKind.entitySet)
-.at(1).isUriPathInfoKind(UriResourceKind.function)
-.isParameter(0, "ParameterString", "'ABC'");
-
-// two input
-

[3/7] olingo-odata4 git commit: [OLINGO-1028] stricter multiplicity tests in expression parser + clean-up

[chrisam]

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/72fcaa1a/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/parser/TestFullResourcePath.java
--
diff --git 
a/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/parser/TestFullResourcePath.java
 
b/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/parser/TestFullResourcePath.java
deleted file mode 100644
index 53e9c88..000
--- 
a/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/parser/TestFullResourcePath.java
+++ /dev/null
@@ -1,6003 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.olingo.server.core.uri.parser;
-
-import java.util.Arrays;
-import java.util.Collections;
-
-import org.apache.olingo.commons.api.edm.Edm;
-import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind;
-import org.apache.olingo.commons.api.edm.FullQualifiedName;
-import org.apache.olingo.commons.api.edmx.EdmxReference;
-import org.apache.olingo.commons.api.format.ContentType;
-import org.apache.olingo.server.api.OData;
-import org.apache.olingo.server.api.uri.UriInfoKind;
-import org.apache.olingo.server.api.uri.UriResourceKind;
-import 
org.apache.olingo.server.api.uri.queryoption.expression.BinaryOperatorKind;
-import org.apache.olingo.server.api.uri.queryoption.expression.MethodKind;
-import 
org.apache.olingo.server.core.uri.parser.UriParserSemanticException.MessageKeys;
-import org.apache.olingo.server.core.uri.parser.search.SearchParserException;
-import org.apache.olingo.server.core.uri.testutil.FilterValidator;
-import org.apache.olingo.server.core.uri.testutil.TestUriValidator;
-import org.apache.olingo.server.core.uri.validator.UriValidationException;
-import org.apache.olingo.server.tecsvc.provider.ActionProvider;
-import org.apache.olingo.server.tecsvc.provider.ComplexTypeProvider;
-import org.apache.olingo.server.tecsvc.provider.ContainerProvider;
-import org.apache.olingo.server.tecsvc.provider.EdmTechProvider;
-import org.apache.olingo.server.tecsvc.provider.EntityTypeProvider;
-import org.apache.olingo.server.tecsvc.provider.EnumTypeProvider;
-import org.apache.olingo.server.tecsvc.provider.FunctionProvider;
-import org.apache.olingo.server.tecsvc.provider.PropertyProvider;
-import org.apache.olingo.server.tecsvc.provider.TypeDefinitionProvider;
-import org.junit.Test;
-
-public class TestFullResourcePath {
-
-  private static final OData oData = OData.newInstance();
-  private static final Edm edm = oData.createServiceMetadata(
-  new EdmTechProvider(), Collections. emptyList()).getEdm();
-
-  private final TestUriValidator testUri = new TestUriValidator().setEdm(edm);
-  private final FilterValidator testFilter = new FilterValidator().setEdm(edm);
-
-  @Test
-  public void allowedSystemQueryOptionsOnAll() throws Exception {
-testUri.run("$all", 
"$count=true&$format=json&$search=abc&$skip=5&$top=5&$skiptoken=abc")
-.isKind(UriInfoKind.all)
-.isInlineCountText("true")
-.isFormatText("json")
-.isSearchSerialized("'abc'")
-.isSkipText("5")
-.isTopText("5")
-.isSkipTokenText("abc");
-  }
-
-  @Test
-  public void allowedSystemQueryOptionsOnCrossjoin() throws Exception {
-testUri.run("$crossjoin(ESAllPrim,ESTwoPrim)", 
"$count=true&$expand=ESAllPrim"
-+ "&$filter=ESAllPrim/PropertyInt16 eq 
2&$format=json&$orderby=ESAllPrim/PropertyInt16"
-+ "&$search=abc&$skip=5&$top=5&$skiptoken=abc")
-.isKind(UriInfoKind.crossjoin)
-.isInlineCountText("true")
-.goExpand().goPath().isEntitySet("ESAllPrim")
-.goUpExpandValidator().goUpToUriValidator()
-.goFilter().left().goPath().first().isEntitySet("ESAllPrim")
-.n().isPrimitiveProperty("PropertyInt16", PropertyProvider.nameInt16, 
false)
-.goUpFilterValidator().goUpToUriValidator()
-.isFormatText("json")
-.isSearchSerialized("'abc'")
-.isSkipText("5")
-.isTopText("5")
-.isSkipTokenText("abc");
-  }
-
-  @Test
-  public void trimQueryOptionsValue() throws Exception {
-// OLINGO-846 trim query option value
-

[7/7] olingo-odata4 git commit: [OLINGO-1028] stricter multiplicity tests in expression parser + clean-up

[chrisam]

[OLINGO-1028] stricter multiplicity tests in expression parser + clean-up

Signed-off-by: Christian Amend 


Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/72fcaa1a
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/72fcaa1a
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/72fcaa1a

Branch: refs/heads/master
Commit: 72fcaa1a54a3607ee2b94f66414677ab6f9c8e92
Parents: b9a71ff
Author: Klaus Straubinger 
Authored: Thu Sep 29 16:25:33 2016 +0200
Committer: Christian Amend 
Committed: Thu Sep 29 16:31:24 2016 +0200

--
 .../core/uri/parser/ExpressionParser.java   |   59 +-
 .../uri/parser/UriParserSemanticException.java  |3 +-
 .../uri/queryoption/expression/MemberImpl.java  |   14 +-
 .../server-core-exceptions-i18n.properties  |1 +
 .../core/uri/parser/ExpandParserTest.java   |  561 ++
 .../core/uri/parser/ExpressionParserTest.java   | 2389 +++
 .../core/uri/parser/ResourcePathParserTest.java | 2100 ++
 .../core/uri/parser/SearchParserTest.java   |  187 +
 .../core/uri/parser/SelectParserTest.java   |  177 +
 .../core/uri/parser/TestFullResourcePath.java   | 6003 --
 .../core/uri/parser/TestUriParserImpl.java  | 1047 ---
 .../server/core/uri/parser/UriParserTest.java   |  843 +++
 .../core/uri/testutil/ResourceValidator.java|  221 +-
 13 files changed, 6388 insertions(+), 7217 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/72fcaa1a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/ExpressionParser.java
--
diff --git 
a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/ExpressionParser.java
 
b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/ExpressionParser.java
index 23fd8a4..7a34095 100644
--- 
a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/ExpressionParser.java
+++ 
b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/ExpressionParser.java
@@ -180,15 +180,19 @@ public class ExpressionParser {
 this.crossjoinEntitySetNames = crossjoinEntitySetNames;
 this.aliases = aliases;
 
-return parseExpression();
+final Expression expression = parseExpression();
+checkNoCollection(expression);
+return expression;
   }
 
   private Expression parseExpression() throws UriParserException, 
UriValidationException {
 Expression left = parseAnd();
 while (tokenizer.next(TokenKind.OrOperator)) {
-  final Expression right = parseAnd();
   checkType(left, EdmPrimitiveTypeKind.Boolean);
+  checkNoCollection(left);
+  final Expression right = parseAnd();
   checkType(right, EdmPrimitiveTypeKind.Boolean);
+  checkNoCollection(right);
   left = new BinaryImpl(left, BinaryOperatorKind.OR, right,
   odata.createPrimitiveTypeInstance(EdmPrimitiveTypeKind.Boolean));
 }
@@ -198,9 +202,11 @@ public class ExpressionParser {
   private Expression parseAnd() throws UriParserException, 
UriValidationException {
 Expression left = parseExprEquality();
 while (tokenizer.next(TokenKind.AndOperator)) {
-  final Expression right = parseExprEquality();
   checkType(left, EdmPrimitiveTypeKind.Boolean);
+  checkNoCollection(left);
+  final Expression right = parseExprEquality();
   checkType(right, EdmPrimitiveTypeKind.Boolean);
+  checkNoCollection(right);
   left = new BinaryImpl(left, BinaryOperatorKind.AND, right,
   odata.createPrimitiveTypeInstance(EdmPrimitiveTypeKind.Boolean));
 }
@@ -285,8 +291,8 @@ public class ExpressionParser {
 TokenKind.MulOperator, TokenKind.DivOperator, TokenKind.ModOperator);
 // Null for everything other than MUL or DIV or MOD
 while (operatorTokenKind != null) {
-  final Expression right = parseExprUnary();
   checkNumericType(left);
+  final Expression right = parseExprUnary();
   checkNumericType(right);
   left = new BinaryImpl(left, 
tokenToBinaryOperator.get(operatorTokenKind), right,
   odata.createPrimitiveTypeInstance(EdmPrimitiveTypeKind.Double));
@@ -306,6 +312,7 @@ public class ExpressionParser {
 } else if (tokenizer.next(TokenKind.NotOperator)) {
   final Expression expression = parseExprPrimary();
   checkType(expression, EdmPrimitiveTypeKind.Boolean);
+  checkNoCollection(expression);
   return new UnaryImpl(UnaryOperatorKind.NOT, expression, 
getType(expression));
 } else if (tokenizer.next(TokenKind.CastMethod)) {
   return parseIsOfOrCastMethod(MethodKind.CAST);
@@ -443,6 +450,7 @@ public class ExpressionParser {
 case 

[4/7] olingo-odata4 git commit: [OLINGO-1028] stricter multiplicity tests in expression parser + clean-up

[chrisam]

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/72fcaa1a/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/parser/SearchParserTest.java
--
diff --git 
a/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/parser/SearchParserTest.java
 
b/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/parser/SearchParserTest.java
new file mode 100644
index 000..743439a
--- /dev/null
+++ 
b/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/parser/SearchParserTest.java
@@ -0,0 +1,187 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.olingo.server.core.uri.parser;
+
+import java.util.Collections;
+
+import org.apache.olingo.commons.api.edm.Edm;
+import org.apache.olingo.commons.api.edmx.EdmxReference;
+import org.apache.olingo.server.api.OData;
+import org.apache.olingo.server.core.uri.parser.search.SearchParserException;
+import org.apache.olingo.server.core.uri.testutil.TestUriValidator;
+import org.apache.olingo.server.tecsvc.provider.EdmTechProvider;
+import org.junit.Test;
+
+/** Tests of the parts of the URI parser that parse the sytem query option 
$search. */
+public class SearchParserTest {
+
+  private static final Edm edm = OData.newInstance().createServiceMetadata(
+  new EdmTechProvider(), Collections. emptyList()).getEdm();
+
+  private final TestUriValidator testUri = new TestUriValidator().setEdm(edm);
+
+  @Test
+  public void search() throws Exception {
+testUri.run("ESTwoKeyNav", "$search=abc");
+testUri.run("ESTwoKeyNav", "$search=NOT abc");
+
+testUri.run("ESTwoKeyNav", "$search=abc AND def");
+testUri.run("ESTwoKeyNav", "$search=abc  OR def");
+testUri.run("ESTwoKeyNav", "$search=abc def");
+
+testUri.run("ESTwoKeyNav", "$search=abc AND def AND ghi");
+testUri.run("ESTwoKeyNav", "$search=abc AND def  OR ghi");
+testUri.run("ESTwoKeyNav", "$search=abc AND def ghi");
+
+testUri.run("ESTwoKeyNav", "$search=abc  OR def AND ghi");
+testUri.run("ESTwoKeyNav", "$search=abc  OR def  OR ghi");
+testUri.run("ESTwoKeyNav", "$search=abc  OR def ghi");
+
+testUri.run("ESTwoKeyNav", "$search=abc def AND ghi");
+testUri.run("ESTwoKeyNav", "$search=abc def  OR ghi");
+testUri.run("ESTwoKeyNav", "$search=abc def ghi");
+
+// mixed not
+testUri.run("ESTwoKeyNav", "$search=abc def AND ghi");
+testUri.run("ESTwoKeyNav", "$search=NOT abc  NOTdef  OR NOT ghi");
+testUri.run("ESTwoKeyNav", "$search=abc def NOT ghi");
+
+// parenthesis
+testUri.run("ESTwoKeyNav", "$search=(abc)");
+testUri.run("ESTwoKeyNav", "$search=(abc AND  def)");
+testUri.run("ESTwoKeyNav", "$search=(abc AND  def)   OR  ghi ");
+testUri.run("ESTwoKeyNav", "$search=(abc AND  def)   ghi ");
+testUri.run("ESTwoKeyNav", "$search=abc AND (defOR  ghi)");
+testUri.run("ESTwoKeyNav", "$search=abc AND (defghi)");
+
+// search in function-import return value
+testUri.run("FICRTCollESTwoKeyNavParam(ParameterInt16=1)", "$search=test");
+
+// percent encoded characters
+testUri.run("ESTwoKeyNav", "$search=%41%42%43");
+testUri.run("ESTwoKeyNav", "$search=\"100%25\"");
+
+// escaped characters
+testUri.run("ESTwoKeyNav", "$search=\"abc\"");
+testUri.run("ESTwoKeyNav", "$search=\"a\\\"bc\"");
+testUri.run("ESTwoKeyNav", "$search=%22abc%22");
+testUri.run("ESTwoKeyNav", "$search=%22a%5C%22bc%22");
+testUri.run("ESTwoKeyNav", "$search=%22a%5C%5Cbc%22");
+
+// wrong escaped characters
+testUri.runEx("ESTwoKeyNav", "$search=%22a%22bc%22")
+
.isExceptionMessage(SearchParserException.MessageKeys.TOKENIZER_EXCEPTION);
+testUri.runEx("ESTwoKeyNav", "$search=%22a%5Cbc%22")
+
.isExceptionMessage(SearchParserException.MessageKeys.TOKENIZER_EXCEPTION);
+testUri.runEx("ESTwoKeyNav", "$search=not%27allowed")
+
.isExceptionMessage(SearchParserException.MessageKeys.TOKENIZER_EXCEPTION);
+  }
+
+  @Test
+  public void searchTree() throws Exception {
+testUri.run("ESTwoKeyNav", 

[2/3] olingo-odata4 git commit: [OLINGO-1004] TecSvc batch handling changes

[chrisam]

[OLINGO-1004] TecSvc batch handling changes

Modified response status code in batch case from 202 Accepted to 200 OK and 
adjusted tests. See odata protocol documentation 11.7.4

Signed-off-by: Christian Amend 


Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/f3cee9b7
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/f3cee9b7
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/f3cee9b7

Branch: refs/heads/master
Commit: f3cee9b73ba1f62f77c4d755dde462371501345a
Parents: b687190
Author: Morten Riedel 
Authored: Wed Sep 28 14:48:21 2016 +0200
Committer: Christian Amend 
Committed: Thu Sep 29 14:15:55 2016 +0200

--
 .../fit/tecsvc/client/AuthBatchTestITCase.java  |  4 +--
 .../fit/tecsvc/client/BatchClientITCase.java| 28 ++--
 .../fit/tecsvc/http/BasicAsyncITCase.java   |  4 +--
 .../fit/tecsvc/http/BasicBatchITCase.java   |  2 +-
 .../processor/TechnicalBatchProcessor.java  |  2 +-
 5 files changed, 20 insertions(+), 20 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/f3cee9b7/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/AuthBatchTestITCase.java
--
diff --git 
a/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/AuthBatchTestITCase.java
 
b/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/AuthBatchTestITCase.java
index 89ad124..259aabc 100644
--- 
a/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/AuthBatchTestITCase.java
+++ 
b/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/AuthBatchTestITCase.java
@@ -96,8 +96,8 @@ public class AuthBatchTestITCase extends 
AbstractParamTecSvcITCase{
 // ---
 
 final ODataBatchResponse response = streamManager.getResponse();
-assertEquals(202, response.getStatusCode());
-assertEquals("Accepted", response.getStatusMessage());
+assertEquals(200, response.getStatusCode());
+assertEquals("OK", response.getStatusMessage());
   }
   
 }

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/f3cee9b7/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/BatchClientITCase.java
--
diff --git 
a/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/BatchClientITCase.java 
b/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/BatchClientITCase.java
index a03d3c7..53bfa58 100644
--- 
a/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/BatchClientITCase.java
+++ 
b/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/BatchClientITCase.java
@@ -103,7 +103,7 @@ public class BatchClientITCase extends 
AbstractParamTecSvcITCase {
 changeset.addRequest(createRequest);
 
 final ODataBatchResponse response = payloadManager.getResponse();
-assertEquals(HttpStatusCode.ACCEPTED.getStatusCode(), 
response.getStatusCode());
+assertEquals(HttpStatusCode.OK.getStatusCode(), response.getStatusCode());
 
 // Check response items
 final Iterator responseBodyIter = 
response.getBody();
@@ -128,8 +128,8 @@ public class BatchClientITCase extends 
AbstractParamTecSvcITCase {
 final ODataBatchResponse response = request.payloadManager().getResponse();
 saveCookieHeader(response);
 
-assertEquals(HttpStatusCode.ACCEPTED.getStatusCode(), 
response.getStatusCode());
-assertEquals("Accepted", response.getStatusMessage());
+assertEquals(HttpStatusCode.OK.getStatusCode(), response.getStatusCode());
+assertEquals("OK", response.getStatusMessage());
 
 final Iterator iter = response.getBody();
 assertFalse(iter.hasNext());
@@ -146,8 +146,8 @@ public class BatchClientITCase extends 
AbstractParamTecSvcITCase {
 final ODataBatchResponse response = payload.getResponse();
 saveCookieHeader(response);
 
-assertEquals(HttpStatusCode.ACCEPTED.getStatusCode(), 
response.getStatusCode());
-assertEquals("Accepted", response.getStatusMessage());
+assertEquals(HttpStatusCode.OK.getStatusCode(), response.getStatusCode());
+assertEquals("OK", response.getStatusMessage());
 
 final Iterator iter = response.getBody();
 assertTrue(iter.hasNext());
@@ -178,8 +178,8 @@ public class BatchClientITCase extends 
AbstractParamTecSvcITCase {
 final ODataBatchResponse response = payload.getResponse();
 saveCookieHeader(response);
 
-assertEquals(HttpStatusCode.ACCEPTED.getStatusCode(), 
response.getStatusCode());
-assertEquals("Accepted", response.getStatusMessage());
+assertEquals(HttpStatusCode.OK.getStatusCode(), response.getStatusCode());
+assertEquals("OK", response.getStatusMessage());
 
 final Iterator iter = 

[3/3] olingo-odata4 git commit: [OLINGO-1004] moved ClientAsyncTest to AsyncSupportITCase

[chrisam]

[OLINGO-1004] moved ClientAsyncTest to AsyncSupportITCase

Signed-off-by: Christian Amend 


Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/b9a71ff8
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/b9a71ff8
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/b9a71ff8

Branch: refs/heads/master
Commit: b9a71ff88a8f304d4bb2b382b6ffb46e5cc8cb1e
Parents: f3cee9b
Author: Morten Riedel 
Authored: Thu Sep 8 11:01:04 2016 +0200
Committer: Christian Amend 
Committed: Thu Sep 29 14:19:04 2016 +0200

--
 .../apache/olingo/fit/base/AsyncTestITCase.java | 20 --
 .../fit/tecsvc/client/AsyncSupportITCase.java   | 28 +---
 2 files changed, 24 insertions(+), 24 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/b9a71ff8/fit/src/test/java/org/apache/olingo/fit/base/AsyncTestITCase.java
--
diff --git a/fit/src/test/java/org/apache/olingo/fit/base/AsyncTestITCase.java 
b/fit/src/test/java/org/apache/olingo/fit/base/AsyncTestITCase.java
index 1f2cc23..f862de7 100644
--- a/fit/src/test/java/org/apache/olingo/fit/base/AsyncTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/base/AsyncTestITCase.java
@@ -25,8 +25,6 @@ import static org.junit.Assert.assertTrue;
 
 import java.net.URI;
 import java.util.List;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.Future;
 
 import org.apache.olingo.client.api.communication.request.AsyncRequestWrapper;
 import 
org.apache.olingo.client.api.communication.request.retrieve.ODataEntityRequest;
@@ -45,24 +43,6 @@ import org.junit.Test;
 
 public class AsyncTestITCase extends AbstractTestITCase {
 
-  @Test
-  public void clientAsync() throws InterruptedException, ExecutionException {
-final URIBuilder uriBuilder = 
client.newURIBuilder(testStaticServiceRootURL).
-appendEntitySetSegment("Customers");
-final Future futureRes =
-
client.getRetrieveRequestFactory().getEntitySetRequest(uriBuilder.build()).asyncExecute();
-assertNotNull(futureRes);
-
-while (!futureRes.isDone()) {
-  Thread.sleep(1000L);
-}
-
-final ODataRetrieveResponse res = futureRes.get();
-assertNotNull(res);
-assertEquals(200, res.getStatusCode());
-assertFalse(res.getBody().getEntities().isEmpty());
-  }
-
   private void withInlineEntry(final ContentType contentType) {
 final URIBuilder uriBuilder = 
client.newURIBuilder(testStaticServiceRootURL).
 
appendEntitySetSegment("Customers").appendKeySegment(1).expand("Company");

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/b9a71ff8/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/AsyncSupportITCase.java
--
diff --git 
a/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/AsyncSupportITCase.java 
b/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/AsyncSupportITCase.java
index ed23cc3..68098e6 100644
--- 
a/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/AsyncSupportITCase.java
+++ 
b/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/AsyncSupportITCase.java
@@ -18,14 +18,14 @@
  */
 package org.apache.olingo.fit.tecsvc.client;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
 import java.net.URI;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
 
 import org.apache.olingo.client.api.ODataClient;
 import org.apache.olingo.client.api.communication.ODataClientErrorException;
@@ -45,12 +45,17 @@ import org.apache.olingo.client.api.data.ResWrap;
 import org.apache.olingo.client.api.domain.ClientEntity;
 import org.apache.olingo.client.api.domain.ClientEntitySet;
 import org.apache.olingo.client.api.domain.ClientProperty;
+import org.apache.olingo.client.api.uri.URIBuilder;
 import org.apache.olingo.commons.api.data.Entity;
 import org.apache.olingo.commons.api.data.EntityCollection;
 import org.apache.olingo.commons.api.edm.FullQualifiedName;
 import org.apache.olingo.commons.api.format.PreferenceName;
 import org.apache.olingo.commons.api.http.HttpHeader;
 import org.apache.olingo.commons.api.http.HttpStatusCode;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static 

[1/3] olingo-odata4 git commit: [OLINGO-1004] Fit refactoring

[chrisam]

Repository: olingo-odata4
Updated Branches:
  refs/heads/master 59e53d6bc -> b9a71ff88


[OLINGO-1004] Fit refactoring

Added basic authentication to embedded tomcat in fit module. Refactored 
AuthBatchTestITCase.

Signed-off-by: Christian Amend 


Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/b6871904
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/b6871904
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/b6871904

Branch: refs/heads/master
Commit: b6871904ac1e59fa30abcbc789bdbb4c172616e2
Parents: 59e53d6
Author: Morten Riedel 
Authored: Tue Sep 27 15:07:48 2016 +0200
Committer: Christian Amend 
Committed: Thu Sep 29 14:14:43 2016 +0200

--
 .../olingo/fit/server/TomcatTestServer.java |  41 ++-
 fit/src/main/resources/tomcat-users.xml |   7 +-
 fit/src/main/resources/web.xml  |  49 
 .../olingo/fit/AbstractBaseTestITCase.java  |   5 +-
 .../olingo/fit/base/AuthBatchTestITCase.java| 119 ---
 .../apache/olingo/fit/tecsvc/TecSvcConst.java   |   1 +
 .../fit/tecsvc/client/AbstractTecSvcITCase.java |  12 ++
 .../fit/tecsvc/client/AuthBatchTestITCase.java  | 103 
 8 files changed, 208 insertions(+), 129 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/b6871904/fit/src/main/java/org/apache/olingo/fit/server/TomcatTestServer.java
--
diff --git 
a/fit/src/main/java/org/apache/olingo/fit/server/TomcatTestServer.java 
b/fit/src/main/java/org/apache/olingo/fit/server/TomcatTestServer.java
index eb79dd8..7d1ed46 100644
--- a/fit/src/main/java/org/apache/olingo/fit/server/TomcatTestServer.java
+++ b/fit/src/main/java/org/apache/olingo/fit/server/TomcatTestServer.java
@@ -48,6 +48,7 @@ import org.apache.catalina.Context;
 import org.apache.catalina.LifecycleException;
 import org.apache.catalina.LifecycleState;
 import org.apache.catalina.loader.WebappLoader;
+import org.apache.catalina.realm.MemoryRealm;
 import org.apache.catalina.startup.Tomcat;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
@@ -156,17 +157,23 @@ public class TomcatTestServer {
 
 private final Tomcat tomcat;
 private final File baseDir;
+private final File resourceDir;
 private TomcatTestServer server;
 private Properties properties;
 
 private TestServerBuilder(final int fixedPort) {
   initializeProperties();
   // baseDir = new File(System.getProperty("java.io.tmpdir"), 
"tomcat-test");
-  baseDir = getFileForDirProperty(TOMCAT_BASE_DIR);
+  baseDir = getFileForDirProperty(TOMCAT_BASE_DIR);  
   if (!baseDir.exists() && !baseDir.mkdirs()) {
 throw new RuntimeException("Unable to create temporary test directory 
at {" + baseDir.getAbsolutePath() + "}");
   }
-  //
+  resourceDir = getFileForDirProperty(PROJECT_RESOURCES_DIR);
+  if(!resourceDir.exists()){
+  throw new RuntimeException("Unable to load resources");
+  }
+
+  final String TOMCAT_USERS_XML = "tomcat-users.xml";
   tomcat = new Tomcat();
   tomcat.setBaseDir(baseDir.getParentFile().getAbsolutePath());
   tomcat.setPort(fixedPort);
@@ -174,8 +181,12 @@ public class TomcatTestServer {
   tomcat.getHost().setDeployOnStartup(true);
   tomcat.getConnector().setSecure(false);
   tomcat.setSilent(true);
-  tomcat.addUser("odatajclient", "odatajclient");
-  tomcat.addRole("odatajclient", "odatajclient");
+  // tomcat.addUser("odatajclient", "odatajclient");
+  // tomcat.addRole("odatajclient", "odatajclient");
+  String tomcatUserPath = resourceDir.getPath() + File.separator + 
TOMCAT_USERS_XML;
+  MemoryRealm realm = new MemoryRealm();
+  realm.setPathname(tomcatUserPath);
+  tomcat.getEngine().setRealm(realm);
 }
 
 private void initializeProperties() {
@@ -253,7 +264,7 @@ public class TomcatTestServer {
 }
 
 public TestServerBuilder addServlet(final Class 
factoryClass, final String path)
-throws InstantiationException, IllegalAccessException, 
ClassNotFoundException {
+throws InstantiationException, IllegalAccessException, 
ClassNotFoundException, IOException {
   if (server != null) {
 return this;
   }
@@ -263,11 +274,29 @@ public class TomcatTestServer {
   String randomServletId = UUID.randomUUID().toString();
   Tomcat.addServlet(cxt, randomServletId, httpServlet);
   cxt.addServletMapping(path, randomServletId);
-  //
   LOG.info("Added servlet {} at context {} (mapping id={}).", 
servletClassname, path, randomServletId);
   return this;
  

olingo-odata2 git commit: [OLINGO-1026] existence check of navigation target in filter/orderby

[chrisam]

Repository: olingo-odata2
Updated Branches:
  refs/heads/master 7d882075a -> 919d4ac0f


[OLINGO-1026] existence check of navigation target in filter/orderby

Signed-off-by: Christian Amend 


Project: http://git-wip-us.apache.org/repos/asf/olingo-odata2/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata2/commit/919d4ac0
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata2/tree/919d4ac0
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata2/diff/919d4ac0

Branch: refs/heads/master
Commit: 919d4ac0f85f59295f7fde00a9f8cdc12085e441
Parents: 7d88207
Author: Klaus Straubinger 
Authored: Wed Sep 21 15:16:04 2016 +0200
Committer: Christian Amend 
Committed: Wed Sep 21 15:23:18 2016 +0200

--
 .../expression/ExpressionParserException.java   |  10 +-
 .../expression/FilterParserExceptionImpl.java   |  13 +-
 .../core/uri/expression/FilterParserImpl.java   | 108 ++
 .../src/main/resources/i18n.properties  |   5 +-
 .../src/main/resources/i18n_en.properties   |   5 +-
 .../odata2/core/uri/expression/ParserTool.java  | 384 +++
 .../odata2/core/uri/expression/TestBase.java|  12 +-
 .../odata2/core/uri/expression/TestParser.java  | 233 +--
 .../odata2/ref/processor/ListsProcessor.java|  84 ++--
 .../olingo/odata2/testutil/mock/TecEdmInfo.java |  22 +-
 .../mock/TechnicalScenarioEdmProvider.java  |  21 +-
 11 files changed, 289 insertions(+), 608 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/919d4ac0/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/ExpressionParserException.java
--
diff --git 
a/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/ExpressionParserException.java
 
b/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/ExpressionParserException.java
index c9b84a5..1ca309a 100644
--- 
a/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/ExpressionParserException.java
+++ 
b/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/ExpressionParserException.java
@@ -45,10 +45,10 @@ public class ExpressionParserException extends 
ODataBadRequestException {
   ExpressionParserException.class, "COMMA_OR_END_EXPECTED_AT_POS");
   public static final MessageReference EXPRESSION_EXPECTED_AT_POS = 
createMessageReference(
   ExpressionParserException.class, "EXPRESSION_EXPECTED_AT_POS");
-  public static final MessageReference MISSING_CLOSING_PHARENTHESIS = 
createMessageReference(
-  ExpressionParserException.class, "MISSING_CLOSING_PHARENTHESIS");
-  public static final MessageReference 
COMMA_OR_CLOSING_PHARENTHESIS_EXPECTED_AFTER_POS = createMessageReference(
-  ExpressionParserException.class, 
"COMMA_OR_CLOSING_PHARENTHESIS_EXPECTED_AFTER_POS");
+  public static final MessageReference MISSING_CLOSING_PARENTHESIS = 
createMessageReference(
+  ExpressionParserException.class, "MISSING_CLOSING_PARENTHESIS");
+  public static final MessageReference 
COMMA_OR_CLOSING_PARENTHESIS_EXPECTED_AFTER_POS = createMessageReference(
+  ExpressionParserException.class, 
"COMMA_OR_CLOSING_PARENTHESIS_EXPECTED_AFTER_POS");
   public static final MessageReference INVALID_METHOD_CALL = 
createMessageReference(ExpressionParserException.class,
   "INVALID_METHOD_CALL");
   public static final MessageReference TYPE_EXPECTED_AT = 
createMessageReference(ExpressionParserException.class,
@@ -73,6 +73,8 @@ public class ExpressionParserException extends 
ODataBadRequestException {
   ExpressionParserException.class, "LEFT_SIDE_NOT_A_PROPERTY");
   public static final MessageReference PROPERTY_NAME_NOT_FOUND_IN_TYPE = 
createMessageReference(
   ExpressionParserException.class, "PROPERTY_NAME_NOT_FOUND_IN_TYPE");
+  public static final MessageReference INVALID_MULTIPLICITY = 
createMessageReference(
+  ExpressionParserException.class, "INVALID_MULTIPLICITY");
 
   // validation exceptions texts - binary
   public static final MessageReference INVALID_TYPES_FOR_BINARY_OPERATOR = 
createMessageReference(

http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/919d4ac0/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/FilterParserExceptionImpl.java
--
diff --git 
a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/FilterParserExceptionImpl.java
 
b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/FilterParserExceptionImpl.java
index 403fe2f..25a4d36 100644
--- 

svn commit: r997738 - /websites/production/olingo/content/

[chrisam]

Author: chrisam
Date: Mon Sep 19 12:38:13 2016
New Revision: 997738

Log:
Publish 4.3.0 download site

Added:
websites/production/olingo/content/
  - copied from r997737, websites/staging/olingo/trunk/content/

svn commit: r1761427 - in /olingo/site/trunk/content/javadoc/odata4: ./ org/ org/apache/ org/apache/olingo/ org/apache/olingo/client/ org/apache/olingo/client/api/ org/apache/olingo/client/api/class-u

[chrisam]

Author: chrisam
Date: Mon Sep 19 12:28:07 2016
New Revision: 1761427

URL: http://svn.apache.org/viewvc?rev=1761427=rev
Log:
Add 4.3.0 JavaDoc


[This commit notification would consist of 304 parts, 
which exceeds the limit of 50 ones, so it was shortened to the summary.]

svn commit: r1761426 - /olingo/site/trunk/content/javadoc/odata4/

[chrisam]

Author: chrisam
Date: Mon Sep 19 12:22:30 2016
New Revision: 1761426

URL: http://svn.apache.org/viewvc?rev=1761426=rev
Log:
Delete 4.2.0 JavaDoc

Removed:
olingo/site/trunk/content/javadoc/odata4/

svn commit: r15418 - /release/olingo/odata2/rel-2.0.6/

[chrisam]

Author: chrisam
Date: Mon Sep 19 12:14:46 2016
New Revision: 15418

Log:
Delete old rel folder

Removed:
release/olingo/odata2/rel-2.0.6/

[olingo-odata4] Git Push Summary

[chrisam]

Repository: olingo-odata4
Updated Tags:  refs/tags/4.3.0 [created] 31401845a
  refs/tags/4.3.0-RC01 [created] 8515b48dd

olingo-odata4 git commit: [OLINGO-1023] Set 4.3.0 release version

[chrisam]

Repository: olingo-odata4
Updated Branches:
  refs/heads/master 8515b48dd -> 31401845a


[OLINGO-1023] Set 4.3.0 release version


Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/31401845
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/31401845
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/31401845

Branch: refs/heads/master
Commit: 31401845a7d4cffc612e8a1afb881fb451ddca0e
Parents: 8515b48
Author: Christian Amend 
Authored: Mon Sep 19 13:46:34 2016 +0200
Committer: Christian Amend 
Committed: Mon Sep 19 13:46:34 2016 +0200

--
 dist/android-lib/pom.xml | 2 +-
 dist/client-lib/pom.xml  | 2 +-
 dist/javadoc/pom.xml | 2 +-
 dist/pom.xml | 2 +-
 dist/server-lib-ext/pom.xml  | 2 +-
 dist/server-lib/pom.xml  | 2 +-
 ext/client-android/pom.xml   | 2 +-
 ext/client-proxy/pom.xml | 2 +-
 ext/karaf/karaf-features/pom.xml | 2 +-
 ext/karaf/karaf-fit/pom.xml  | 2 +-
 .../org/apache/olingo/osgi/itests/server/CarServiceTest.java | 2 +-
 ext/karaf/pom.xml| 2 +-
 ext/pojogen-maven-plugin/pom.xml | 2 +-
 ext/pom.xml  | 2 +-
 fit/pom.xml  | 2 +-
 lib/client-api/pom.xml   | 2 +-
 lib/client-core/pom.xml  | 2 +-
 lib/commons-api/pom.xml  | 2 +-
 lib/commons-core/pom.xml | 2 +-
 lib/pom.xml  | 2 +-
 lib/server-api/pom.xml   | 2 +-
 lib/server-core-ext/pom.xml  | 2 +-
 lib/server-core/pom.xml  | 2 +-
 lib/server-tecsvc/pom.xml| 2 +-
 lib/server-test/pom.xml  | 2 +-
 pom.xml  | 2 +-
 samples/client/pom.xml   | 2 +-
 samples/osgi/server/pom.xml  | 2 +-
 samples/pom.xml  | 2 +-
 samples/server/pom.xml   | 2 +-
 samples/tutorials/p0_all/pom.xml | 4 ++--
 samples/tutorials/p10_media/pom.xml  | 4 ++--
 samples/tutorials/p11_batch/pom.xml  | 4 ++--
 samples/tutorials/p12_deep_insert/pom.xml| 4 ++--
 samples/tutorials/p12_deep_insert_preparation/pom.xml| 4 ++--
 samples/tutorials/p1_read/pom.xml| 4 ++--
 samples/tutorials/p2_readep/pom.xml  | 4 ++--
 samples/tutorials/p3_write/pom.xml   | 4 ++--
 samples/tutorials/p4_navigation/pom.xml  | 4 ++--
 samples/tutorials/p5_queryoptions-tcs/pom.xml| 4 ++--
 samples/tutorials/p6_queryoptions-es/pom.xml | 4 ++--
 samples/tutorials/p7_queryoptions-o/pom.xml  | 4 ++--
 samples/tutorials/p8_queryoptions-f/pom.xml  | 4 ++--
 samples/tutorials/p9_action/pom.xml  | 4 ++--
 samples/tutorials/p9_action_preparation/pom.xml  | 4 ++--
 samples/tutorials/pe_streaming/pom.xml   | 4 ++--
 samples/tutorials/pom.xml| 2 +-
 47 files changed, 63 insertions(+), 63 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/31401845/dist/android-lib/pom.xml
--
diff --git a/dist/android-lib/pom.xml b/dist/android-lib/pom.xml
index c0a1e83..c78257c 100644
--- a/dist/android-lib/pom.xml
+++ b/dist/android-lib/pom.xml
@@ -31,7 +31,7 @@
   
 org.apache.olingo
 odata-dist
-4.3.0-RC01
+4.3.0
 ..
   
 

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/31401845/dist/client-lib/pom.xml
--
diff --git a/dist/client-lib/pom.xml 

olingo-odata4 git commit: [OLINGO-1023] Set 4.3.0-RC01 version

[chrisam]

Repository: olingo-odata4
Updated Branches:
  refs/heads/master 14278ac18 -> 8515b48dd


[OLINGO-1023] Set 4.3.0-RC01 version


Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/8515b48d
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/8515b48d
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/8515b48d

Branch: refs/heads/master
Commit: 8515b48dd5e09e4597d0b396326bd6a074efa1f5
Parents: 14278ac
Author: Christian Amend 
Authored: Thu Sep 15 14:28:27 2016 +0200
Committer: Christian Amend 
Committed: Thu Sep 15 14:28:27 2016 +0200

--
 dist/android-lib/pom.xml | 2 +-
 dist/client-lib/pom.xml  | 2 +-
 dist/javadoc/pom.xml | 2 +-
 dist/pom.xml | 2 +-
 dist/server-lib-ext/pom.xml  | 2 +-
 dist/server-lib/pom.xml  | 2 +-
 ext/client-android/pom.xml   | 2 +-
 ext/client-proxy/pom.xml | 2 +-
 ext/karaf/karaf-features/pom.xml | 2 +-
 ext/karaf/karaf-fit/pom.xml  | 2 +-
 .../org/apache/olingo/osgi/itests/server/CarServiceTest.java | 2 +-
 ext/karaf/pom.xml| 2 +-
 ext/pojogen-maven-plugin/pom.xml | 2 +-
 ext/pom.xml  | 2 +-
 fit/pom.xml  | 2 +-
 lib/client-api/pom.xml   | 2 +-
 lib/client-core/pom.xml  | 2 +-
 lib/commons-api/pom.xml  | 2 +-
 lib/commons-core/pom.xml | 2 +-
 lib/pom.xml  | 2 +-
 lib/server-api/pom.xml   | 2 +-
 lib/server-core-ext/pom.xml  | 2 +-
 lib/server-core/pom.xml  | 2 +-
 lib/server-tecsvc/pom.xml| 2 +-
 lib/server-test/pom.xml  | 2 +-
 pom.xml  | 2 +-
 samples/client/pom.xml   | 2 +-
 samples/osgi/server/pom.xml  | 2 +-
 samples/pom.xml  | 2 +-
 samples/server/pom.xml   | 2 +-
 samples/tutorials/p0_all/pom.xml | 4 ++--
 samples/tutorials/p10_media/pom.xml  | 4 ++--
 samples/tutorials/p11_batch/pom.xml  | 4 ++--
 samples/tutorials/p12_deep_insert/pom.xml| 4 ++--
 samples/tutorials/p12_deep_insert_preparation/pom.xml| 4 ++--
 samples/tutorials/p1_read/pom.xml| 4 ++--
 samples/tutorials/p2_readep/pom.xml  | 4 ++--
 samples/tutorials/p3_write/pom.xml   | 4 ++--
 samples/tutorials/p4_navigation/pom.xml  | 4 ++--
 samples/tutorials/p5_queryoptions-tcs/pom.xml| 4 ++--
 samples/tutorials/p6_queryoptions-es/pom.xml | 4 ++--
 samples/tutorials/p7_queryoptions-o/pom.xml  | 4 ++--
 samples/tutorials/p8_queryoptions-f/pom.xml  | 4 ++--
 samples/tutorials/p9_action/pom.xml  | 4 ++--
 samples/tutorials/p9_action_preparation/pom.xml  | 4 ++--
 samples/tutorials/pe_streaming/pom.xml   | 4 ++--
 samples/tutorials/pom.xml| 2 +-
 47 files changed, 63 insertions(+), 63 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8515b48d/dist/android-lib/pom.xml
--
diff --git a/dist/android-lib/pom.xml b/dist/android-lib/pom.xml
index cc84b17..c0a1e83 100644
--- a/dist/android-lib/pom.xml
+++ b/dist/android-lib/pom.xml
@@ -31,7 +31,7 @@
   
 org.apache.olingo
 odata-dist
-4.3.0-SNAPSHOT
+4.3.0-RC01
 ..
   
 

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8515b48d/dist/client-lib/pom.xml
--
diff --git a/dist/client-lib/pom.xml