Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/olingo-odata2.git
Conflicts:
odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/jpql/JPQLJoinStatementBuilderTest.java
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata2/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata2/commit/cdecf6f1
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata2/tree/cdecf6f1
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata2/diff/cdecf6f1
Branch: refs/heads/master
Commit: cdecf6f1022f668f3b4dce400ee9d3885dfe9124
Parents: bd4e7ef 6c321d0
Author: Chandan V A <[email protected]>
Authored: Sun May 3 13:38:13 2015 +0530
Committer: Chandan V A <[email protected]>
Committed: Sun May 3 13:38:13 2015 +0530
----------------------------------------------------------------------
.../annotation-processor-web/pom.xml | 2 +-
.../core/jpql/JPQLJoinStatementBuilderTest.java | 2 +-
.../processor/core/mock/ODataContextMock.java | 4 -
odata2-jpa-processor/jpa-web/pom.xml | 2 +-
.../apache/olingo/odata2/api/uri/UriParser.java | 21 +++
.../olingo/odata2/core/ContentNegotiator.java | 2 +-
.../olingo/odata2/core/ODataContextImpl.java | 13 +-
.../odata2/core/ODataPathSegmentImpl.java | 12 +-
.../odata2/core/batch/v2/BatchParserCommon.java | 8 +-
.../core/debug/ODataDebugResponseWrapper.java | 17 ++-
.../core/ep/consumer/XmlMetadataConsumer.java | 1 +
.../olingo/odata2/core/uri/UriParserImpl.java | 35 +++--
.../ep/consumer/XmlMetadataConsumerTest.java | 7 +-
.../JsonServiceDocumentProducerTest.java | 1 -
.../olingo/odata2/core/uri/UriParserTest.java | 123 ++++++++++++++--
.../olingo/odata2/fit/basic/BasicBatchTest.java | 24 +++
.../ContentNegotiationDollarFormatTest.java | 23 +++
.../odata2/fit/basic/DebugDisabledTest.java | 147 +++++++++++++++++++
.../olingo/odata2/fit/basic/MetadataTest.java | 8 +
.../odata2/fit/basic/ServiceResolutionTest.java | 40 +++--
.../apache/olingo/odata2/fit/ref/BatchTest.java | 18 +++
.../odata2/fit/ref/EntryJsonReadOnlyTest.java | 14 ++
.../odata2/fit/ref/FunctionImportXmlTest.java | 17 ++-
.../test/resources/employeesWithFilter.batch | 8 +
.../src/test/resources/functionImport.batch | 8 +
.../odata2/testutil/fit/AbstractFitTest.java | 17 +++
.../testutil/fit/DebugCallbackFactoryFlase.java | 41 ++++++
.../testutil/fit/DebugCallbackFactoryTrue.java | 41 ++++++
.../odata2/testutil/server/TestServer.java | 25 +---
odata2-lib/odata-web/pom.xml | 10 +-
.../odata-web/src/main/resources/log4j.xml | 8 +-
.../main/resources/archetype-resources/pom.xml | 3 +-
.../java/service/ODataJPACarServiceFactory.java | 66 ++++++++-
.../src/main/resources/META-INF/persistence.xml | 21 ++-
.../src/main/webapp/WEB-INF/web.xml | 6 +
pom.xml | 5 +
36 files changed, 677 insertions(+), 123 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/cdecf6f1/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/jpql/JPQLJoinStatementBuilderTest.java
----------------------------------------------------------------------
diff --cc
odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/jpql/JPQLJoinStatementBuilderTest.java
index 5701a4c,5d6910b..c4812d6
---
a/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/jpql/JPQLJoinStatementBuilderTest.java
+++
b/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/jpql/JPQLJoinStatementBuilderTest.java
@@@ -52,8 -54,10 +52,8 @@@ public class JPQLJoinStatementBuilderTe
EasyMock.expect(context.getType()).andStubReturn(JPQLContextType.SELECT);
EasyMock.expect(context.getSelectExpression()).andStubReturn("mat");
EasyMock.expect(context.getWhereExpression()).andStubReturn("soh.buyerId
= 2");
- HashMap<String, String> orderByMap = new LinkedHashMap<String, String>();
- orderByMap.put("mat.buyerId", "asc");
- orderByMap.put("mat.city", "desc");
- EasyMock.expect(context.getOrderByCollection()).andStubReturn(orderByMap);
+ String orderByMap = new String("mat.buyerId asc , mat.city desc");
- EasyMock.expect(context.getOrderByCollection()).andStubReturn(orderByMap);
++
EasyMock.expect(context.getOrderByCollection()).andStubReturn(orderByMap);
EasyMock.expect(context.getJPAJoinClauses()).andStubReturn(joinClauseList);
EasyMock.replay(context);
}
