Repository: tomee Updated Branches: refs/heads/master 9b11bae07 -> 274ff56ad
TOMEE-2012 jpa 2.1 provider test was wrong when wrapped Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/274ff56a Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/274ff56a Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/274ff56a Branch: refs/heads/master Commit: 274ff56ad12b5c69aa0407ab9df6c0dddda08465 Parents: 9b11bae Author: rmannibucau <[email protected]> Authored: Thu Feb 2 08:44:36 2017 +0100 Committer: rmannibucau <[email protected]> Committed: Thu Feb 2 08:44:36 2017 +0100 ---------------------------------------------------------------------- .../openejb/persistence/JtaEntityManager.java | 2 +- .../persistence/JtaEntityManagerTest.java | 75 ++++++++++++++++++++ 2 files changed, 76 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/274ff56a/container/openejb-core/src/main/java/org/apache/openejb/persistence/JtaEntityManager.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/persistence/JtaEntityManager.java b/container/openejb-core/src/main/java/org/apache/openejb/persistence/JtaEntityManager.java index 79d3154..2661942 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/persistence/JtaEntityManager.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/persistence/JtaEntityManager.java @@ -122,7 +122,7 @@ public class JtaEntityManager implements EntityManager, Serializable { return ReloadableEntityManagerFactory.class.isInstance(entityManagerFactory) ? hasMethod( ReloadableEntityManagerFactory.class.cast(entityManagerFactory).getEntityManagerFactoryCallable().getProvider(), - "createEntityManager", SynchronizationType.class) + "generateSchema", String.class, Map.class) : hasMethod(entityManagerFactory.getClass(), "createEntityManager", SynchronizationType.class); } http://git-wip-us.apache.org/repos/asf/tomee/blob/274ff56a/container/openejb-core/src/test/java/org/apache/openejb/persistence/JtaEntityManagerTest.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/test/java/org/apache/openejb/persistence/JtaEntityManagerTest.java b/container/openejb-core/src/test/java/org/apache/openejb/persistence/JtaEntityManagerTest.java new file mode 100644 index 0000000..3660691 --- /dev/null +++ b/container/openejb-core/src/test/java/org/apache/openejb/persistence/JtaEntityManagerTest.java @@ -0,0 +1,75 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.openejb.persistence; + +import org.apache.openejb.assembler.classic.ComparableValidationConfig; +import org.apache.openejb.assembler.classic.EntityManagerFactoryCallable; +import org.apache.openejb.assembler.classic.ReloadableEntityManagerFactory; +import org.junit.Test; + +import javax.persistence.EntityManagerFactory; +import javax.persistence.spi.PersistenceProvider; +import javax.persistence.spi.PersistenceUnitInfo; +import javax.persistence.spi.ProviderUtil; +import javax.validation.ValidatorFactory; +import java.util.HashMap; +import java.util.Map; +import java.util.Properties; + +import static org.junit.Assert.assertTrue; + +public class JtaEntityManagerTest { + @Test + public void isJpa21() { + final PersistenceUnitInfoImpl info = new PersistenceUnitInfoImpl(); + info.setProperties(new Properties()); + + final ClassLoader loader = Thread.currentThread().getContextClassLoader(); + + assertTrue(JtaEntityManager.isJPA21(new ReloadableEntityManagerFactory( + loader, + new EntityManagerFactoryCallable(Jpa21Provider.class.getName(), info, loader, new HashMap<ComparableValidationConfig, ValidatorFactory>(), false), + info))); + } + + public static class Jpa21Provider implements PersistenceProvider { + @Override + public EntityManagerFactory createEntityManagerFactory(final String emName, final Map map) { + return null; + } + + @Override + public EntityManagerFactory createContainerEntityManagerFactory(final PersistenceUnitInfo info, final Map map) { + return null; + } + + @Override + public void generateSchema(final PersistenceUnitInfo info, final Map map) { + // no-op + } + + @Override + public boolean generateSchema(final String persistenceUnitName, final Map map) { + return false; + } + + @Override + public ProviderUtil getProviderUtil() { + return null; + } + } +}
