diff --git a/README.md b/README.md index 1c094b274..43ae09d85 100644 --- a/README.md +++ b/README.md @@ -93,3 +93,4 @@ Detailed information including third-party components and their licensing/copyri |0.3.8| - Update Olingo dependency to 4.7.1
- Support of `java.time` data types. Prerequisite is the usage of JPA 2.2.
- Support of Absolute Context URL. See issue [#103](https://github.com/SAP/olingo-jpa-processor-v4/issues/103)
- Temporal data types do not longer require a Precision [#98](https://github.com/SAP/olingo-jpa-processor-v4/issues/98)
Support of MappedSuperclass|No| |0.3.9| - Solutions for issue [#112](https://github.com/SAP/olingo-jpa-processor-v4/issues/112)
- Solutions for issue [#114](https://github.com/SAP/olingo-jpa-processor-v4/issues/114)|No| |0.3.10| - Update Olingo dependency to 4.8.0
- Deprecation of ```setExternalName``` in ```IntermediateModelItemAccess```
- Solutions for issue [#134](https://github.com/SAP/olingo-jpa-processor-v4/issues/136)
- Solutions for issue [#136](https://github.com/SAP/olingo-jpa-processor-v4/issues/136) |No| +|0.3.10| - - Solutions for issue [#138](https://github.com/SAP/olingo-jpa-processor-v4/issues/138)|No| diff --git a/jpa-archetype/jpa-archetype-spring/pom.xml b/jpa-archetype/jpa-archetype-spring/pom.xml index 0a78febf8..e91175a6f 100644 --- a/jpa-archetype/jpa-archetype-spring/pom.xml +++ b/jpa-archetype/jpa-archetype-spring/pom.xml @@ -5,7 +5,7 @@ com.sap.olingo odata-jpa-archetype - 0.3.10 + 0.3.11 odata-jpa-archetype-spring Archetype - odata-jpa-archetype-spring @@ -33,4 +33,4 @@ - \ No newline at end of file + diff --git a/jpa-archetype/jpa-archetype-spring/src/main/resources/archetype-resources/pom.xml b/jpa-archetype/jpa-archetype-spring/src/main/resources/archetype-resources/pom.xml index 1e3ec2c9e..cb904597f 100644 --- a/jpa-archetype/jpa-archetype-spring/src/main/resources/archetype-resources/pom.xml +++ b/jpa-archetype/jpa-archetype-spring/src/main/resources/archetype-resources/pom.xml @@ -16,7 +16,7 @@ - 0.3.10-SNAPSHOT + 0.3.11-SNAPSHOT 1.8 diff --git a/jpa-archetype/pom.xml b/jpa-archetype/pom.xml index fe697027d..b7019835c 100644 --- a/jpa-archetype/pom.xml +++ b/jpa-archetype/pom.xml @@ -5,14 +5,14 @@ 4.0.0 com.sap.olingo odata-jpa-archetype - 0.3.10 + 0.3.11 pom https://github.com/SAP/olingo-jpa-processor-v4 UTF-8 1.8 - 0.3.10-SNAPSHOT + 0.3.11-SNAPSHOT diff --git a/jpa/odata-jpa-annotation/pom.xml b/jpa/odata-jpa-annotation/pom.xml index 7af649a7e..d6bcf45ae 100644 --- a/jpa/odata-jpa-annotation/pom.xml +++ b/jpa/odata-jpa-annotation/pom.xml @@ -5,8 +5,8 @@ 4.0.0 com.sap.olingo - odata-jpa - 0.3.10-SNAPSHOT + odata-jpa + 0.3.11-SNAPSHOT odata-jpa-annotation odata-jpa-annotation diff --git a/jpa/odata-jpa-coverage/pom.xml b/jpa/odata-jpa-coverage/pom.xml index 54a3a2f11..0196a9077 100644 --- a/jpa/odata-jpa-coverage/pom.xml +++ b/jpa/odata-jpa-coverage/pom.xml @@ -5,7 +5,7 @@ com.sap.olingo odata-jpa - 0.3.10-SNAPSHOT + 0.3.11-SNAPSHOT odata-jpa-coverage diff --git a/jpa/odata-jpa-metadata/pom.xml b/jpa/odata-jpa-metadata/pom.xml index 5669f4154..9f608e805 100644 --- a/jpa/odata-jpa-metadata/pom.xml +++ b/jpa/odata-jpa-metadata/pom.xml @@ -7,7 +7,7 @@ com.sap.olingo odata-jpa - 0.3.10-SNAPSHOT + 0.3.11-SNAPSHOT diff --git a/jpa/odata-jpa-processor/pom.xml b/jpa/odata-jpa-processor/pom.xml index 260179d60..5a6362e3f 100644 --- a/jpa/odata-jpa-processor/pom.xml +++ b/jpa/odata-jpa-processor/pom.xml @@ -6,8 +6,8 @@ 4.0.0 com.sap.olingo - odata-jpa - 0.3.10-SNAPSHOT + odata-jpa + 0.3.11-SNAPSHOT odata-jpa-processor diff --git a/jpa/odata-jpa-processor/src/main/java/com/sap/olingo/jpa/processor/core/processor/JPAODataRequestContextImpl.java b/jpa/odata-jpa-processor/src/main/java/com/sap/olingo/jpa/processor/core/processor/JPAODataRequestContextImpl.java index 9cc143259..cb091ab83 100644 --- a/jpa/odata-jpa-processor/src/main/java/com/sap/olingo/jpa/processor/core/processor/JPAODataRequestContextImpl.java +++ b/jpa/odata-jpa-processor/src/main/java/com/sap/olingo/jpa/processor/core/processor/JPAODataRequestContextImpl.java @@ -193,6 +193,7 @@ private void copyContextValues(final JPAODataRequestContextAccess context) { this.em = context.getEntityManager(); this.jpaCUDRequestHandler = context.getCUDRequestHandler(); this.debugger = context.getDebugger(); + this.transactionFactory = context.getTransactionFactory(); } private void createDefaultTransactionFactory() { diff --git a/jpa/odata-jpa-processor/src/test/java/com/sap/olingo/jpa/processor/core/processor/TestJPAODataRequestContextImpl.java b/jpa/odata-jpa-processor/src/test/java/com/sap/olingo/jpa/processor/core/processor/TestJPAODataRequestContextImpl.java index af83199f2..93284782a 100644 --- a/jpa/odata-jpa-processor/src/test/java/com/sap/olingo/jpa/processor/core/processor/TestJPAODataRequestContextImpl.java +++ b/jpa/odata-jpa-processor/src/test/java/com/sap/olingo/jpa/processor/core/processor/TestJPAODataRequestContextImpl.java @@ -121,7 +121,7 @@ public void testThrowsExceptionOnSerializerIsNull() throws JPAIllicalAccessExcep } @Test - public void testCopyConstructorCopysExternalAndAddsUriInfo() throws JPAIllicalAccessException { + public void testCopyConstructorCopyExternalAndAddsUriInfo() throws JPAIllicalAccessException { fillContextForCopyConstructor(); final JPASerializer serializer = mock(JPASerializer.class); final UriInfo uriInfo = mock(UriInfo.class); @@ -135,7 +135,7 @@ public void testCopyConstructorCopysExternalAndAddsUriInfo() throws JPAIllicalAc } @Test - public void testCopyConstructorCopysExternalAndAddsPageSerializer() { + public void testCopyConstructorCopyExternalAndAddsPageSerializer() { fillContextForCopyConstructor(); final UriInfo uriInfo = mock(UriInfo.class); JPAODataRequestContextImpl act = new JPAODataRequestContextImpl(uriInfo, cut); @@ -145,7 +145,7 @@ public void testCopyConstructorCopysExternalAndAddsPageSerializer() { } @Test - public void testCopyConstructorCopysExternalAndAddsUriInfoSerializer() { + public void testCopyConstructorCopyExternalAndAddsUriInfoSerializer() { fillContextForCopyConstructor(); final UriInfo uriInfo = mock(UriInfo.class); final JPASerializer serializer = mock(JPASerializer.class); @@ -157,7 +157,7 @@ public void testCopyConstructorCopysExternalAndAddsUriInfoSerializer() { } @Test - public void testCopyConstructorCopysExternalAndAddsUriInfoSerializerNull() { + public void testCopyConstructorCopyExternalAndAddsUriInfoSerializerNull() { fillContextForCopyConstructor(); final UriInfo uriInfo = mock(UriInfo.class); JPAODataRequestContextImpl act = new JPAODataRequestContextImpl(uriInfo, null, cut); @@ -166,6 +166,14 @@ public void testCopyConstructorCopysExternalAndAddsUriInfoSerializerNull() { assertEquals(null, act.getSerializer()); assertCopied(act); } + @Test + public void testCopyConstructorCopyTransactionFactory() { + fillContextForCopyConstructor(); + final UriInfo uriInfo = mock(UriInfo.class); + JPAODataRequestContextImpl act = new JPAODataRequestContextImpl(uriInfo, null, cut); + + assertEquals(cut.getTransactionFactory(), act.getTransactionFactory()); + } @Test public void testReturnsDefaultTransactionFactory() throws JPAIllicalAccessException { @@ -191,8 +199,10 @@ private void fillContextForCopyConstructor() { final EntityManager expEm = mock(EntityManager.class); final JPAODataClaimProvider expCp = new JPAODataClaimsProvider(); final JPAODataGroupProvider expGp = new JPAODataGroupsProvider(); + final JPAODataTransactionFactory expTF = mock(JPAODataTransactionFactory.class); cut.setEntityManager(expEm); cut.setClaimsProvider(expCp); cut.setGroupsProvider(expGp); + cut.setTransactionFactory(expTF); } } diff --git a/jpa/odata-jpa-spring-support/pom.xml b/jpa/odata-jpa-spring-support/pom.xml index 56d5e4440..358277a5f 100644 --- a/jpa/odata-jpa-spring-support/pom.xml +++ b/jpa/odata-jpa-spring-support/pom.xml @@ -6,7 +6,7 @@ com.sap.olingo odata-jpa - 0.3.10-SNAPSHOT + 0.3.11-SNAPSHOT odata-jpa-spring-support diff --git a/jpa/odata-jpa-test/pom.xml b/jpa/odata-jpa-test/pom.xml index 9d2664a96..7f9d5d7d8 100644 --- a/jpa/odata-jpa-test/pom.xml +++ b/jpa/odata-jpa-test/pom.xml @@ -6,8 +6,8 @@ 4.0.0 com.sap.olingo - odata-jpa - 0.3.10-SNAPSHOT + odata-jpa + 0.3.11-SNAPSHOT odata-jpa-test diff --git a/jpa/pom.xml b/jpa/pom.xml index 8adb2c379..91a83bd75 100644 --- a/jpa/pom.xml +++ b/jpa/pom.xml @@ -5,7 +5,7 @@ com.sap.olingo odata-jpa - 0.3.10-SNAPSHOT + 0.3.11-SNAPSHOT pom odata-jpa