Commit Graph

1189 Commits

Author SHA1 Message Date
Michael Bolz 09fd6d9b48 [OlINGO-832] Clean up and basic IT test 2016-02-19 21:57:31 +01:00
Ramesh Reddy c86009a242 OLINGO-868: Fixing a error, where a repeated annotation element is not skipped correctly 2016-02-19 12:06:12 -06:00
Michael Bolz 4aa1277a12 [OLINGO-832] ODataJsonSerializer changes for streaming 2016-02-19 15:11:40 +01:00
Michael Bolz 396a39baec [OLINGO-832] Merge branch 'master' into OLINGO-832_StreamSerializerPoC 2016-02-19 09:39:49 +01:00
Christian Amend d040afe784 [OLINGO-887] Set timezone fix for testing 2016-02-17 14:48:02 +01:00
Michael Bolz 5b6cccfa9c [OLINGO-832] Added WriteContentErrorContext and first tests 2016-02-16 15:46:42 +01:00
mibo febf6ed5cf [OLINGO-856] Added OlingoExtension interface 2016-02-15 22:24:30 +01:00
Ramesh Reddy a8d1d4c647 OLINGO-878: Adding support to remove invalid xml characters from Atom payload 2016-02-15 12:31:34 -06:00
mibo 67494a7897 [OLINGO-832] Merge branch 'master' into OLINGO-832_StreamSerializerPoC 2016-02-13 07:28:32 +01:00
mibo e07abf0b0f [OLINGO-856] Created ODataHandler Interface 2016-02-13 07:08:33 +01:00
Ramesh Reddy d880d6c480 OLINGO-878: Adding support to remove unvalid xml characters from Atom payload 2016-02-12 19:37:58 -06:00
Ramesh Reddy 3c205f907e Merge branch 'OLINGO-864' 2016-02-12 09:23:09 -06:00
Ramesh Reddy 187c229b60 OLINGO-880: Enable MetadataParser to load core vocabularies based on a perference setting, these are loaded loaded from local classpath, instead of making a web call 2016-02-12 09:16:00 -06:00
Ramesh Reddy 7b26cc6ee7 OLINGO-864: Refining the Edm.Date and Edm.Time behavior not to assume GMT but use default timezone of the JVM 2016-02-10 13:04:42 -06:00
Ramesh Reddy 801899a085 OLINGO-861: Adding support to resolve entities defined in the reference documents 2016-02-10 10:03:20 -06:00
Michael Bolz 5174f70897 [OLINGO-832] Removed actual not supported/wanted methods 2016-02-10 06:38:25 +01:00
Ramesh Reddy 7a68ae68ad OLINGO-874: Error handling improvements 2016-02-09 14:44:02 -06:00
Michael Bolz dc2c972c46 [OLINGO-832] Added new SerializerStreamResult 2016-02-09 11:00:34 +01:00
Ramesh Reddy b7005b774f OLINGO-825: Adding the support for odata.type such that the extended entity and complex types are correctly de-serilized 2016-02-08 15:41:32 -06:00
mibo 31dea712ef [OLINGO-832] New ODataContent for streamed and basic content 2016-02-08 16:06:01 +01:00
mibo 18a78981fb [OLINGO-832] Removed 'write' from ODataResponse 2016-02-08 11:30:11 +01:00
Ramesh Reddy 8468308aeb OLINGO-865: fixing the bug with extended complex types during serilization 2016-02-07 17:06:22 -06:00
mibo a6e0fb1a56 [OLINGO-832] Pass out stream to json generator 2016-02-07 20:01:15 +01:00
mibo 2a80ca3391 [OLINGO-832] New approach with ODataResponse change 2016-02-07 19:27:55 +01:00
Ramesh Reddy 280bc019ce Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/olingo-odata4 2016-02-06 13:32:04 -06:00
Ramesh Reddy 6d94f0e386 OLINGO-861, OLINGO-863, OLINGO-868, OLINGO-869 : Improvements to MetadataParser for annotation support 2016-02-06 13:31:26 -06:00
Frederik Zimmer 53065cdfac OLINGO-862: MediaEntity Type: HasStream is not inherited
Signed-off-by: Christian Amend <christian.amend@sap.com>
2016-02-04 15:12:40 +01:00
Klaus Straubinger 5d7c1287f0 [OLINGO-852] less warnings + general clean-up
Signed-off-by: Christian Amend <christian.amend@sap.com>
2016-02-04 12:42:29 +01:00
Klaus Straubinger 110c7b0e5a [OLINGO-834] better alias support in URI parser
Signed-off-by: Christian Amend <christian.amend@sap.com>
2016-02-04 12:38:10 +01:00
Ramesh Reddy f63bba70ad OLINGO-864: Refining the Edm.Date and Edm.Time behavior not to assume GMT 2016-02-03 11:48:04 -06:00
shawkins 382ec16ee1 OLINGO-864 refining date time behavior 2016-02-03 09:46:24 -05:00
mibo 1a7c28a743 [OLINGO-832] Reverted change for inline entities 2016-01-31 17:43:55 +01:00
Michael Bolz c6d45d9f51 [OLINGO-832] Introduced AbstractEntityCollection 2016-01-26 14:41:49 +01:00
Ramesh Reddy b317b9006d OLINGO-855: adding support for odata-isolation header support acknowledgement to ServiceHandler interface 2016-01-25 09:20:54 -06:00
Michael Bolz 44e1b02633 [OLINGO-832] Minor change for PoC demo 2016-01-25 14:43:24 +01:00
Michael Bolz c02215e2ef [OLINGO-832] Merge branch 'master' into OLINGO-832_StreamSerializerPoC 2016-01-25 14:18:13 +01:00
Michael Bolz 0cc2199437 [OLINGO-832] Fixed channel copy 2016-01-25 14:14:02 +01:00
mibo 69f58e84bf [OLINGO-832] Added iterable 2016-01-24 12:31:02 +01:00
Ramesh Reddy b9512eda4b OLINGO-853: correcting the encoding behavior as I reverted the change in EdmString from OLINGO-854, this will also localize the change to this perticular method 2016-01-22 11:45:06 -06:00
Ramesh Reddy 322085df6b OLINGO-854: reverting the changes from previous commit 2016-01-22 11:36:29 -06:00
Michael Bolz 885ec27ef2 [OLINGO-832] Added additional methods for Java NIO Channels 2016-01-22 13:14:06 +01:00
Ramesh Reddy b5eae4f6c2 OLINGO-854: The conversion of string to URI and from URI to string need to be correcty encoded and decoded, this fix addresses that 2016-01-21 16:17:18 -06:00
Ramesh Reddy 16d238f96f OLINGO-853: Correcting the encoding of datetime properties correctly to be used in a URI 2016-01-21 16:01:59 -06:00
Ramesh Reddy 03aa1d07d9 OLINGO-853: Correcting the encoding of datetime properties correctly to be used in a URI 2016-01-21 13:13:37 -06:00
Klaus Straubinger 8537f3a512 [OLINGO-834] small URI parser improvements
Signed-off-by: Christian Amend <christian.amend@sap.com>
2016-01-20 15:30:39 +01:00
Christian Amend 27e17aba90 [OLINGO-851] Added getInternalName to Mapping object
I also added the mapping to the EdmBindingTarget.
2016-01-20 14:25:38 +01:00
Klaus Straubinger 36e6dc9295 [OLINGO-852] reduced usage of Serializable and org.apache.commons.lang3 in commons
Signed-off-by: Christian Amend <christian.amend@sap.com>
2016-01-20 13:27:21 +01:00
Klaus Straubinger 26f7d2a6b1 [OLINGO-???] less use of reflection in equals() and hashCode()
Signed-off-by: Christian Amend <christian.amend@sap.com>
2016-01-18 13:36:52 +01:00
Klaus Straubinger a283bddbbf [OLINGO-834] parsing of most geo literals in URI parser
Signed-off-by: Christian Amend <christian.amend@sap.com>
2016-01-18 13:36:18 +01:00
Klaus Straubinger c7aa842fb4 [OLINGO-575] removal of some test V3 code
Signed-off-by: Christian Amend <christian.amend@sap.com>
2016-01-18 13:35:48 +01:00
Klaus Straubinger 1b6259b979 reduced usage of org.slf4j and org.apache.commons.lang3
Signed-off-by: Christian Amend <christian.amend@sap.com>
2016-01-18 13:30:40 +01:00
Klaus Straubinger 6837fd7651 [OLINGO-834] clean-up exceptions
Signed-off-by: Christian Amend <christian.amend@sap.com>
2016-01-18 13:30:11 +01:00
Klaus Straubinger b881e9caac [OLINGO-834] better debug output
Signed-off-by: Christian Amend <christian.amend@sap.com>
2016-01-18 13:29:41 +01:00
Klaus Straubinger 3295bcc062 [OLINGO-834] URI parser shall not ignore empty path segments
Signed-off-by: Christian Amend <christian.amend@sap.com>
2016-01-12 15:18:45 +01:00
Christian Amend b0866014df [OLINGO-834] Shift dependecies from commons to core
The dependencies were not used in the commons part of the library
2016-01-08 13:12:45 +01:00
Christian Amend 53d2e8bb8c [OLINGO-834] Adjust LICENSE file
I removed the Antlr and treelayout bsd license.
2016-01-08 10:03:04 +01:00
Christian Amend 26080f420a [OLINGO-834] Delete AntLR dependecies 2016-01-07 15:00:17 +01:00
Christian Amend 010642c506 Merge branch 'master' into OLINGO-834_Filter_Parser
Conflicts:
	lib/server-core/src/main/java/org/apache/olingo/server/core/uri/UriResourceComplexPropertyImpl.java
	lib/server-core/src/main/java/org/apache/olingo/server/core/uri/UriResourceCountImpl.java
	lib/server-core/src/main/java/org/apache/olingo/server/core/uri/UriResourceEntitySetImpl.java
	lib/server-core/src/main/java/org/apache/olingo/server/core/uri/UriResourceItImpl.java
	lib/server-core/src/main/java/org/apache/olingo/server/core/uri/UriResourceLambdaAllImpl.java
	lib/server-core/src/main/java/org/apache/olingo/server/core/uri/UriResourceLambdaAnyImpl.java
	lib/server-core/src/main/java/org/apache/olingo/server/core/uri/UriResourceLambdaVarImpl.java
	lib/server-core/src/main/java/org/apache/olingo/server/core/uri/UriResourceNavigationPropertyImpl.java
	lib/server-core/src/main/java/org/apache/olingo/server/core/uri/UriResourcePrimitivePropertyImpl.java
	lib/server-core/src/main/java/org/apache/olingo/server/core/uri/UriResourceRefImpl.java
	lib/server-core/src/main/java/org/apache/olingo/server/core/uri/UriResourceRootImpl.java
	lib/server-core/src/main/java/org/apache/olingo/server/core/uri/UriResourceSingletonImpl.java
	lib/server-core/src/main/java/org/apache/olingo/server/core/uri/UriResourceStartingTypeFilterImpl.java
	lib/server-core/src/main/java/org/apache/olingo/server/core/uri/UriResourceWithKeysImpl.java
	lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/CheckFullContextListener.java
	lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/Parser.java
	lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/RawUri.java
	lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/UriContext.java
	lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/UriDecoder.java
	lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/UriParseTreeVisitor.java
	lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/UriParserSemanticException.java
	lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/expression/ExpressionImpl.java
	lib/server-core/src/main/java/org/apache/olingo/server/core/uri/validator/UriValidator.java
	lib/server-core/src/test/java/org/apache/olingo/server/core/uri/parser/search/SearchParserAndTokenizerTest.java
2016-01-07 14:27:27 +01:00
Klaus Straubinger 8925274c0b [OLINGO-834] $expand parser in Java + clean-up
Signed-off-by: Christian Amend <christian.amend@sap.com>
2016-01-07 14:02:09 +01:00
Christian Holzer 8919d3ef11 [OLINGO-834] ExpressionParser improvements 2015-12-22 17:07:51 +01:00
Christian Amend 0d6f4821f2 [OLINGO-841] Set new 4.2.0-SNAPSHOT version 2015-12-21 12:55:05 +01:00
Christian Amend 0242519cc4 [OLINGO-841] Set release version 4.1.0 2015-12-21 12:18:07 +01:00
Klaus Straubinger a809165896 [OLINGO-834] ExpressionParser parses path expressions
Signed-off-by: Christian Amend <christian.amend@sap.com>
2015-12-21 10:10:35 +01:00
Christian Amend d1c4c743fd [OLINGO-841] Set 4.1.0-RC01 release candidate version 2015-12-18 15:56:11 +01:00
Christian Amend 371bf9a55c [OLINGO-841] CleanUp ServerCore 2015-12-18 13:47:48 +01:00
Christian Amend d4902f725b [OLINGO-841] CleanUp Server API 2015-12-18 13:42:53 +01:00
Klaus Straubinger 104ecf43d2 [OLINGO-834] Type checks in ExpressionParser
Signed-off-by: Christian Amend <christian.amend@sap.com>
2015-12-16 16:26:51 +01:00
Christian Amend d1055fd8ef [OLINGO-778] Change operation separator 2015-12-16 15:14:04 +01:00
Klaus Straubinger 2f3bc2866b [OLINGO-834] ExpressionParser uses UriTokenizer
Signed-off-by: Christian Amend <christian.amend@sap.com>
2015-12-14 10:12:22 +01:00
Michael Bolz f4ad8892ad [OLINGO-832] First idea of PoC 2015-12-14 09:12:03 +01:00
Klaus Straubinger 208f26c746 [OLINGO-834] clean-up Expression implementations
Signed-off-by: Christian Amend <christian.amend@sap.com>
2015-12-11 12:30:10 +01:00
Klaus Straubinger d7e23bf89a [OLINGO-834] $select parser in Java + clean-up
Signed-off-by: Christian Amend <christian.amend@sap.com>
2015-12-10 15:51:45 +01:00
Christian Amend ef19c9be1f Merge remote-tracking branch 'origin/OLINGO-834_RefactorUriParsing' into OLINGO-834_Filter_Parser 2015-12-10 15:34:39 +01:00
Christian Amend 7bc932aae9 Merge branch 'master' into refactorUriParsing 2015-12-10 15:32:44 +01:00
Christian Amend 7b23ad71a7 [OLINGO-834] Filter parser refactoring first draft 2015-12-09 14:11:46 +01:00
Christian Holzer a47e9f6ad2 [OLINGO-796] Add support for java.sql.time 2015-12-08 16:01:35 +01:00
Klaus Straubinger 927ecb93e3 [OLINGO-834] URI resource-path parser in Java
Signed-off-by: Michael Bolz <michael.bolz@sap.com>
2015-12-07 13:17:50 +01:00
mibo d88913fc6b [OLINGO-833] Replace unicode 6.x characters in test 2015-12-04 20:58:12 +01:00
Michael Bolz dacc318523 [OLINGO-568] Added tests and activated unicode tests 2015-12-02 12:06:22 +01:00
Michael Bolz 6f35651436 [OLINGO-568] Minor code clean up 2015-12-01 15:30:03 +01:00
Michael Bolz e5ac590794 [OLINGO-568] Added support for escape of escape and quote characters 2015-11-30 15:15:00 +01:00
Christian Holzer 6dd0a0f3e5 [OLINGO-568] Search grammar rewritten 2015-11-24 17:02:17 +01:00
Klaus Straubinger 8674a1f299 [OLINGO-568] improved search in technical service
Signed-off-by: Christian Amend <christian.amend@sap.com>
2015-11-24 09:21:02 +01:00
mibo 69ef9f5194 [OLINGO-568] Added tests and exception messages 2015-11-20 14:45:40 +01:00
Klaus Straubinger 16a856eaea [OLINGO-568] validation for system query option $search
Signed-off-by: Christian Amend <christian.amend@sap.com>
2015-11-20 12:26:10 +01:00
mibo 63db8b36c4 [OLINGO-568] More tests and fixes 2015-11-19 19:50:34 +01:00
Klaus Straubinger 233ea61f3b [OLINGO-568] Debug-support output for $search
Signed-off-by: Christian Amend <christian.amend@sap.com>
2015-11-19 15:44:58 +01:00
Michael Bolz ee3501dd87 [OLINGO-568] Minor code clean up 2015-11-19 07:59:08 +01:00
mibo ca7059c778 [OLINGO-568] More tests and fixes for Tokenizer 2015-11-18 20:14:50 +01:00
mibo 326e1775a7 [OLINGO-568] Minor TecSvc enhancements 2015-11-17 22:07:56 +01:00
Klaus Straubinger 3eb1b8ed20 [OLINGO-801] minor bug fix in technical service + code clean-up
Change-Id: I59a83b9cca725ef9be74250e50a43eb306c46acc

Signed-off-by: Christian Holzer <c.holzer@sap.com>
2015-11-17 16:45:45 +01:00
Christian Amend 2314c18aac [OLINGO-568] Ignore UnicodeTest for now
The test fails in some environments. I set it to ignore until I can figure
out why.
2015-11-17 16:26:42 +01:00
Michael Bolz ae1b2754b7 [OLINGO-568] Added exception messages and some tests 2015-11-17 15:58:28 +01:00
Michael Bolz 1a59a5804b [OLINGO-568] Merge branch 'OLINGO-568_SearchParser_Draft' 2015-11-17 15:31:44 +01:00
Michael Bolz 6235f3a443 [OLINGO-568] Minor code and character validation improvements 2015-11-17 15:29:01 +01:00
Christian Amend be3b10a245 [OLINGO-826] Added Annotations to all EntitySets 2015-11-17 13:08:06 +01:00
Michael Bolz c0adc020b2 [OLINGO-568] Merge branch 'master' into OLINGO-568_SearchParser_Draft
arser_Draft
2015-11-17 10:50:06 +01:00
Christian Amend a11cb6d659 [OLINGO-826] Add Containment EntitySet 2015-11-17 10:36:57 +01:00
Klaus Straubinger 3fa2b3df2f [OLINGO-801] support for non-primitive function parameters
Signed-off-by: Christian Amend <christian.amend@sap.com>
2015-11-17 09:20:57 +01:00
mibo 9ff30e729d [OLINGO-568] Added search integration test 2015-11-17 06:30:23 +01:00
mibo 21e115b6bf [OLINGO-568] Enabled serch option in TevSvc 2015-11-16 23:06:29 +01:00
mibo 7d4944d10e [OLINGO-568] Minor code clean up 2015-11-13 17:51:24 +01:00
Christian Amend 8457c0f60a [OLINGO-568] SearchParser negative tests 2015-11-13 14:56:29 +01:00
mibo cef72e45ab [OLINGO-568] Added missing SearchParser parse paths 2015-11-13 08:16:15 +01:00
mibo 40962a9a18 [OLINGO-568] Refactored SearchParser for further development 2015-11-12 23:08:35 +01:00
Christian Amend a8d63fbee2 [OLINGO-568] Fix unused stuff 2015-11-12 14:05:55 +01:00
Christian Amend 22d152fc4c [OLINGO-568] search parser tests refactoring 2015-11-12 13:58:38 +01:00
mibo ba5220ab4a [OLINGO-568] Removed implicit and and added unicode for words 2015-11-11 20:58:11 +01:00
Michael Bolz 37c5827f93 [OLINGO-568] Added Search*Impl classes 2015-11-11 12:48:09 +01:00
mibo 3eef0bf605 [OLINGO-568] Added SearchTokenizerException 2015-11-10 20:10:02 +01:00
Klaus Straubinger 6614aea6ba [OLINGO-821] small fix for UriParser handling of Enum/TypeDefinition
Signed-off-by: Christian Amend <christian.amend@sap.com>
2015-11-10 16:16:53 +01:00
Christian Amend 0c100df480 [OLINGO-821] Optimize alias handling in enum types 2015-11-10 10:52:33 +01:00
Michael Bolz f64abe136b [OLINGO-568] Fixed issue with implicit and 2015-11-10 06:25:54 +01:00
mibo 96483ae559 [OLINGO-568] Removed not necessary code and enums 2015-11-09 20:33:05 +01:00
Christian Amend c7838a678d [OLINGO-821] Support alias for enum values in URI 2015-11-09 15:46:12 +01:00
Michael Bolz 43bc49f963 [OLINGO-568] Improved states 2015-11-09 15:39:02 +01:00
Michael Bolz b3bbfa6fe1 [OLINGO-568] Code clean up 2015-11-09 13:29:32 +01:00
Michael Bolz bbdd0d755e [OLINGO-568] Added implicit AND support 2015-11-09 12:02:02 +01:00
mibo 762c924cf6 [OLINGO-568] Merge branch 'master' into OLINGO-568_SearchParserPoC 2015-11-06 21:33:03 +01:00
mibo 81fcbeafcf [OLINGO-568] Minor tokenizer optimization 2015-11-06 21:31:35 +01:00
Christian Amend 639362caa3 [OLINGO-821] Verify Enum and TypeDef support
Included full integration tests for all components
2015-11-06 16:29:55 +01:00
Michael Bolz 452ebcbdd8 [OLINGO-568] SearchTokenizer for SearchParser 2015-11-06 15:43:36 +01:00
Klaus Straubinger ac828a3554 [OLINGO-806] small fix for JSON deserializer
Signed-off-by: Michael Bolz <michael.bolz@sap.com>
2015-11-06 09:08:49 +01:00
Christian Holzer 303c4e869f [OLINGO-818] All verbs are allowed for individual requests in batch requests 2015-11-05 14:30:51 +01:00
Christian Holzer 734ea91988 [OLINGO-801] Added tests for complex function parameters 2015-11-03 14:18:08 +01:00
Christian Holzer a794f7ee7a [OLINGO-801] Resolve merge conflict 2015-10-29 16:26:26 +01:00
Christian Holzer 483ee9de15 Merge branch 'OLINGO-801_ComplexParameter' 2015-10-29 15:42:05 +01:00
Christian Holzer 3584e1d71d [OLINGO-801] UriParser supports Complex / Entity Parameters. 2015-10-29 15:31:38 +01:00
Christian Amend 2ceacd87f7 [OLINGO-587] Fix json title, client and add tests 2015-10-27 17:24:13 +01:00
mibo fa084ac98a [OLINGO-799] Remove explicit import of aalto-xml 2015-10-26 22:10:58 +01:00
Christian Amend 26c6764846 [OLINGO-587] Enable title for service document 2015-10-26 16:02:12 +01:00
Klaus Straubinger 837c3565a1 [OLINGO-806] Minor clean-up
Signed-off-by: Michael Bolz <michael.bolz@sap.com>
2015-10-26 09:07:11 +01:00
Christian Amend 17e4a3aeff [OLINGO-784] Prevent NPE in combination with typeinfo objects 2015-10-22 16:51:07 +02:00
Christian Amend 46cad03fed [OLINGO-798] Fix potential nullpointer in client getContainerCase 2015-10-22 15:06:09 +02:00
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