You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by mi...@apache.org on 2022/01/10 20:25:19 UTC
[olingo-odata2] branch pr-33-fix updated (f07c705 -> 07cc3ca)
This is an automated email from the ASF dual-hosted git repository.
mibo pushed a change to branch pr-33-fix
in repository https://gitbox.apache.org/repos/asf/olingo-odata2.git.
discard f07c705 Fixing incompatibilities
new 07cc3ca Fixing incompatibilities
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (f07c705)
\
N -- N -- N refs/heads/pr-33-fix (07cc3ca)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
pom.xml | 1 +
1 file changed, 1 insertion(+)
[olingo-odata2] 01/01: Fixing incompatibilities
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mibo pushed a commit to branch pr-33-fix
in repository https://gitbox.apache.org/repos/asf/olingo-odata2.git
commit 07cc3ca28ba7c016aab08c81ab743aec67a582cb
Author: Michael Bolz <mi...@sap.com>
AuthorDate: Wed Nov 17 07:02:40 2021 +0100
Fixing incompatibilities
---
.../jpa/processor/core/ODataJPAContextImpl.java | 13 ++++++-----
.../core/jpql/JPQLBuilderFactoryTest.java | 25 ++++++++++++----------
pom.xml | 1 +
3 files changed, 21 insertions(+), 18 deletions(-)
diff --git a/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/ODataJPAContextImpl.java b/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/ODataJPAContextImpl.java
index b327ad7..075d0a1 100644
--- a/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/ODataJPAContextImpl.java
+++ b/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/ODataJPAContextImpl.java
@@ -33,7 +33,7 @@ public class ODataJPAContextImpl implements ODataJPAContext {
private String pUnitName;
private EntityManagerFactory emf;
- private static final ThreadLocal<EntityManager> emThreadLocal = new ThreadLocal<>();
+ private static final ThreadLocal<EntityManager> emThreadLocal = new ThreadLocal<EntityManager>();
private ODataContext odataContext;
private ODataProcessor processor;
private EdmProvider edmProvider;
@@ -123,17 +123,16 @@ public class ODataJPAContextImpl implements ODataJPAContext {
@Override
public EntityManager getEntityManager() {
EntityManager em = emThreadLocal.get();
- if (em == null || !em.isOpen()) {
- em = emf.createEntityManager();
- setEntityManager(em);
- }
- return em;
+ if (em == null || !em.isOpen()) {
+ em = emf.createEntityManager();
+ setEntityManager(em);
+ }
+ return em;
}
@Override
public void setJPAEdmExtension(final JPAEdmExtension jpaEdmExtension) {
this.jpaEdmExtension = jpaEdmExtension;
-
}
@Override
diff --git a/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/jpql/JPQLBuilderFactoryTest.java b/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/jpql/JPQLBuilderFactoryTest.java
index 5aef018..de74ccb 100644
--- a/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/jpql/JPQLBuilderFactoryTest.java
+++ b/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/jpql/JPQLBuilderFactoryTest.java
@@ -238,20 +238,20 @@ public class JPQLBuilderFactoryTest {
ODataJPAContextImpl oDataJPAContextImpl = new ODataJPAContextImpl();
Class<?> clazz = oDataJPAContextImpl.getClass();
try {
- Field field = clazz.getDeclaredField("em");
- field.setAccessible(true);
- field.set(oDataJPAContextImpl, new JPAProcessorImplTest().getLocalEntityManager());
+// Field field = clazz.getDeclaredField("emThreadLocal");
+// field.setAccessible(true);
+// ThreadLocal<EntityManager> emThreadLocal = new ThreadLocal<EntityManager>();
+// emThreadLocal.set(new JPAProcessorImplTest().getLocalEntityManager());
+// field.set(oDataJPAContextImpl, emThreadLocal);
+ oDataJPAContextImpl.setEntityManager(new JPAProcessorImplTest().getLocalEntityManager());
} catch (SecurityException e) {
fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
- } catch (NoSuchFieldException e) {
- fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
} catch (IllegalArgumentException e) {
fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
- } catch (IllegalAccessException e) {
- fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
}
final EntityManager em = EasyMock.createMock(EntityManager.class);
- EasyMock.expect(em.getMetamodel()).andReturn(null);
+ Metamodel metamodel = EasyMock.createMock(Metamodel.class);
+ EasyMock.expect(em.getMetamodel()).andReturn(metamodel);
EasyMock.expect(em.isOpen()).andReturn(true).anyTimes();
EasyMock.replay(em);
@@ -270,7 +270,8 @@ public class JPQLBuilderFactoryTest {
ODataJPAContextImpl oDataJPAContextImpl = new ODataJPAContextImpl();
final EntityManager em = EasyMock.createMock(EntityManager.class);
- EasyMock.expect(em.getMetamodel()).andReturn(null);
+ Metamodel metamodel = EasyMock.createMock(Metamodel.class);
+ EasyMock.expect(em.getMetamodel()).andReturn(metamodel);
EasyMock.expect(em.isOpen()).andReturn(true).anyTimes();
EasyMock.replay(em);
@@ -288,7 +289,8 @@ public class JPQLBuilderFactoryTest {
ODataJPAContextImpl oDataJPAContextImpl = new ODataJPAContextImpl();
final EntityManager em = EasyMock.createMock(EntityManager.class);
- EasyMock.expect(em.getMetamodel()).andReturn(null);
+ Metamodel metamodel = EasyMock.createMock(Metamodel.class);
+ EasyMock.expect(em.getMetamodel()).andReturn(metamodel).anyTimes();
EasyMock.expect(em.isOpen()).andReturn(true).anyTimes();
EasyMock.replay(em);
@@ -308,7 +310,8 @@ public class JPQLBuilderFactoryTest {
ODataJPAContextImpl oDataJPAContextImpl = new ODataJPAContextImpl();
EntityManager em = EasyMock.createMock(EntityManager.class);
- EasyMock.expect(em.getMetamodel()).andReturn(null);
+ Metamodel metamodel = EasyMock.createMock(Metamodel.class);
+ EasyMock.expect(em.getMetamodel()).andReturn(metamodel);
EasyMock.expect(em.isOpen()).andReturn(true).anyTimes();
EasyMock.replay(em);
diff --git a/pom.xml b/pom.xml
index d786a88..9e5b8ad 100644
--- a/pom.xml
+++ b/pom.xml
@@ -46,6 +46,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <maven.compiler.release>8</maven.compiler.release>
<javadoc.phase>package</javadoc.phase>
<!-- required for correct Sonar coverage data reporting (list of artifactIds) -->