1005 Commits

Author SHA1 Message Date
Christian Amend
9f663baf5c Merge branch 'master' into olingo786
Conflicts:
	lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/xml/MetadataDocumentXmlSerializer.java
2015-10-22 10:28:23 +02:00
Michael Bolz
23fb86a870 [OLINGO-801] better enum and alias support in technical service 2015-10-22 10:04:49 +02:00
Klaus Straubinger
4134b2e82c [OLINGO-795] enum type validation in URI parser
Signed-off-by: Michael Bolz <michael.bolz@sap.com>
2015-10-22 10:03:31 +02:00
Klaus Straubinger
85bebce009 [OLINGO-804] removed primitive type Uint7
Signed-off-by: Christian Amend <christian.amend@sap.com>
2015-10-21 11:14:34 +02:00
Christian Amend
9c53108ee5 [OLINGO-786] Enhance TecSvc Edm with description annotations 2015-10-21 11:12:47 +02:00
Christian Amend
a57b7d0541 [OLINGO-786] Added terms to metadata document 2015-10-20 16:48:05 +02:00
Christian Amend
15164da8f1 [OLINGO-786] Fix alias usage in metadata for annotations 2015-10-20 15:51:40 +02:00
Christian Amend
d00e3881dc [OLINGO-786] Annotation metadata serialization and tests 2015-10-20 15:27:11 +02:00
Christian Amend
41210245d7 [OLINGO786] FIx edm annotation classes
This also includes tests for all edm classes.
2015-10-19 15:11:15 +02:00
Christian Amend
67ccbf9ddb [OLINGO-786] Make annotaion csdl classes spec compliant` 2015-10-16 14:12:24 +02:00
Klaus Straubinger
85ed370707 [OLINGO-801] support for function-parameter aliases in tech. service
Change-Id: I57b222418cf2760d3926da185f4dba0207311f4a

Signed-off-by: Christian Holzer <c.holzer@sap.com>
2015-10-15 10:56:38 +02:00
Klaus Straubinger
587f904338 [OLINGO-795] server support for Enums with implicit values
Change-Id: I1d96eecb108479a654f10426204d4d1e1383bb09

Signed-off-by: Christian Holzer <c.holzer@sap.com>
2015-10-15 10:03:42 +02:00
Christian Amend
576acf466b [OLINGO-786] Fix merge issues 2015-10-13 10:45:13 +02:00
Christian Amend
b1d03d6ba9 Merge branch 'master' into olingo786
Conflicts:
	lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmEnumTypeImpl.java
	lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/EdmEnumTest.java
	lib/commons-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmEnumTest.java
	lib/commons-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmTypeDefinitionImplTest.java
	lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmEnumTest.java
	lib/server-test/src/test/java/org/apache/olingo/server/core/deserializer/xml/ODataXmlDeserializerTest.java
2015-10-13 10:35:50 +02:00
Christian Amend
5d66c9cf18 [OLINGO-786] Enhance Edm Tests 2015-10-12 15:59:33 +02:00
Christian Amend
d9d33abe85 [OLINGO-768] Delete getTarget method at EdmAnnotations interface
The method never worked. Also the design dod not allow to return all
possible target types. For example an entity type as target results in
returning the EdmEntityType object but for functions we would have to
return a list of functions. If needed we can implement another method
later.
2015-10-12 13:59:56 +02:00
Christian Amend
1ac59b22a8 [OLINGO-786] Make Annotations annotatable 2015-10-09 16:06:06 +02:00
Christian Amend
2ffb813931 [OLINGO-786] Unify Annotations setter for csdl classes 2015-10-09 15:48:48 +02:00
Klaus Straubinger
5d364dfa27 [OLINGO-795] server support for Enums and Type Definitions
Signed-off-by: Christian Amend <christian.amend@sap.com>
2015-10-09 14:47:21 +02:00
Christian Amend
b69cd6e605 [OLINGO-786] Add edm annotations tests 2015-10-09 14:42:38 +02:00
mibo
9933cb0bdc [OLINGO-794] Removed outdated 'inlinecount' 2015-10-09 14:38:22 +02:00
Christian Amend
3f7df13a63 [OLINGO-786] Add EdmTerm tests and refacotor getAppliesTo
AppliesTo delivered a list of classes. This functionallity is not needed
thus I deleted it. Now it is just a list of strings. As a conveniece we
could use a list of enums in the future.
2015-10-08 17:11:07 +02:00
Christian Amend
9c1981c410 [OLINGO-786] Move edm tests to commons core
Tests for the edm only depend on the commons part so they should be there
as  well.
2015-10-08 13:45:16 +02:00
Christian Amend
546cf34c57 [OLINGO-786] Implement Tests for qualifiermapkey 2015-10-08 13:43:54 +02:00
Christian Amend
3647a63177 [OLINGO-786] Fix lazy loading for annotiation groups 2015-10-08 12:59:48 +02:00
Christian Holzer
f221962f72 [OLINGO-780] Minor EDM adjustment 2015-10-07 15:20:52 +02:00
Christian Holzer
0989fbd074 [OLINGO-791] Namespaces are not longer allowed for entity sets, singeltons, action imports, function imports 2015-10-06 17:27:02 +02:00
Christian Holzer
d0b225bf18 [OLINGO-792] Improve URI parser error message 2015-10-06 16:41:09 +02:00
Michael Bolz
26c923b6f3 [OLINGO-789] Minor clean up 2015-10-05 08:24:48 +02:00
Michael Bolz
507236dd8c [OLINGO-786] Merge branch 'master' into olingo786 2015-10-05 07:57:29 +02:00
Klaus Straubinger
b736c43495 [OLINGO-789] more tests of server support for action parameters
Signed-off-by: Michael Bolz <michael.bolz@sap.com>
2015-10-05 07:50:00 +02:00
Klaus Straubinger
d6db341db7 [OLINGO-789] server support for action parameters of all types
Signed-off-by: Michael Bolz <michael.bolz@sap.com>
2015-10-01 12:11:33 +02:00
Michael Bolz
3ec5a161ef [OLINGO-786] First minor adaption to MetadataSerializer 2015-09-30 15:28:00 +02:00
Christia Holzer
b9403cd394 [OLINGO-780] The URI Parser validates if a function is composable or not 2015-09-30 15:04:24 +02:00
Christia Holzer
b7dcae862a [OLINGO-781] TecSvc: The atom id for functions without entity set is
calculated by the URI of the function
2015-09-30 15:04:23 +02:00
Christia Holzer
64388ecf2b [OLINGO-782] Functions with key predicates get validated 2015-09-30 15:04:22 +02:00
Christian Amend
a88800c47a [OLINGO-786] Add qualifier to key 2015-09-29 15:06:30 +02:00
Christian Amend
addfe512cd [OLINGO-786] Delete getAnnotations convenience method 2015-09-29 14:26:16 +02:00
Michael Bolz
c9d42e49fa [OLINGO-772] Set version to 4.1.0-SNAPSHOT 2015-09-21 14:46:38 +02:00
Michael Bolz
ca40833b20 [OLINGO-772] Change version to 4.0.0 2015-09-21 10:54:21 +02:00
Michael Bolz
111308124c [OLINGO-772] Change version to 4.0.0-RC03 2015-09-17 09:26:27 +02:00
Michael Bolz
87f829e5ae [OLINGO-659] Renamed setter/getter to fit code conventions 2015-09-17 09:18:24 +02:00
Michael Bolz
91bd50bc25 [OLINGO-659] Merge branch 'OLINGO-659_ReleaseFixes' 2015-09-17 08:56:06 +02:00
Michael Bolz
0ed241e0e2 [OLINGO-773] Merge branch 'OLINGO-773_ReplaceCommonsIo' 2015-09-17 08:55:18 +02:00
Klaus Straubinger
805028da2f [OLINGO-659] still more API clean-up
Signed-off-by: Michael Bolz <michael.bolz@sap.com>
2015-09-16 14:39:50 +02:00
Klaus Straubinger
fbca4ef33e [OLINGO-659] more robust Accept and Content-Type handling
Change-Id: I34e25df981650a2155729a6cf92806dbe36546b3

Signed-off-by: Michael Bolz <michael.bolz@sap.com>
2015-09-16 14:30:53 +02:00
Christia Holzer
32bad834f1 [OLINGO-659] Fix TechnicalActionProcessor 2015-09-15 14:25:19 +02:00
Klaus Straubinger
cffdb7384c [OLINGO-659] empty JSON input should result in Bad Request
Change-Id: Ib46d7454abcc405e3fa6a41fd3e17d9e947490c2

Signed-off-by: Christia Holzer <c.holzer@sap.com>
2015-09-15 14:18:20 +02:00
Michael Bolz
48810032a1 [OLINGO-773] Replaced IOUtils with separate method 2015-09-15 13:55:16 +02:00
Christia Holzer
d84c3275cb [OLINGO-659] Lexer recognizes invalid charaters 2015-09-15 12:57:31 +02:00