Skip to content

Added classloader for persistence unit info #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 15, 2015
Merged

Added classloader for persistence unit info #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...port/jpa/src/it/resources/META-INF/configuration/org.seedstack.seed.persistence.jpa.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ property.sql.enforce_strict_size=true
[org.seedstack.seed.persistence.jpa.unit.unit4]
datasource=datasource1
#jta-datasource=datasource1
mapping-file = META-INF/otherItem.xml
mapping-files = META-INF/otherItem.xml
property.hibernate.dialect=org.hibernate.dialect.HSQLDialect
property.hibernate.hbm2ddl.auto=create

Expand Down
3 changes: 1 addition & 2 deletions persistence-support/jpa/src/it/resources/META-INF/otherItem.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@

-->
<entity-mappings xmlns="http://java.sun.com/xml/ns/persistence/orm" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm ;
http://java.sun.com/xml/ns/persistence/orm_1_0.xsd" version="1.0">
xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm http://java.sun.com/xml/ns/persistence/orm_1_0.xsd" version="1.0">
<description>My First JPA XML Application</description>
<package>org.seedstack.seed.persistence.jpa.sample2</package>
<entity class="OtherItem" name="OtherItem">
Expand Down
10 changes: 5 additions & 5 deletions ...rc/main/java/org/seedstack/seed/persistence/jpa/internal/InternalPersistenceUnitInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
*/
package org.seedstack.seed.persistence.jpa.internal;

import org.seedstack.seed.core.utils.SeedReflectionUtils;

import java.net.URL;
import java.util.Collections;
import java.util.List;
Expand Down Expand Up @@ -121,19 +123,17 @@ public String getPersistenceXMLSchemaVersion() {

@Override
public ClassLoader getClassLoader() {
// not supported
return null;
return SeedReflectionUtils.findMostCompleteClassLoader(InternalPersistenceUnitInfo.class);
}

@Override
public void addTransformer(ClassTransformer transformer) {
// does nothing
throw new UnsupportedOperationException("class transformation is not supported by managed JPA units");
}

@Override
public ClassLoader getNewTempClassLoader() {
// not supported
return null;
throw new UnsupportedOperationException("temporary classloader is not supported by managed JPA units");
}

}
12 changes: 10 additions & 2 deletions ...ence-support/jpa/src/main/java/org/seedstack/seed/persistence/jpa/internal/JpaPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ public InitState init(InitContext initContext) {
TransactionPlugin transactionPlugin = null;
JdbcPlugin jdbcPlugin = null;
Application application = null;

for (Plugin plugin : initContext.pluginsRequired()) {
if (plugin instanceof ApplicationPlugin) {
application = ((ApplicationPlugin) plugin).getApplication();
Expand All @@ -82,21 +83,25 @@ public InitState init(InitContext initContext) {
}

String[] persistenceUnitNames = jpaConfiguration.getStringArray("units");
if (persistenceUnitNames != null && persistenceUnitNames.length == 0) {

if (persistenceUnitNames == null || persistenceUnitNames.length == 0) {
LOGGER.info("No JPA persistence unit configured, JPA support disabled");
return InitState.INITIALIZED;
}

for (String persistenceUnit : persistenceUnitNames) {
Configuration persistenceUnitConfiguration = jpaConfiguration.subset("unit." + persistenceUnit);
Iterator<String> it = persistenceUnitConfiguration.getKeys("property");
Map<String, String> properties = new HashMap<String, String>();

while (it.hasNext()) {
String name = it.next();
properties.put(name.substring(9), persistenceUnitConfiguration.getString(name));
}

SeedConfEntityManagerFactoryResolver confResolver = new SeedConfEntityManagerFactoryResolver();
EntityManagerFactory emf = null;
EntityManagerFactory emf;

try {
emf = Persistence.createEntityManagerFactory(persistenceUnit, properties);
} catch (PersistenceException e) {
Expand All @@ -113,7 +118,9 @@ public InitState init(InitContext initContext) {
throw e;
}
}

entityManagerFactories.put(persistenceUnit, emf);

String exceptionHandler = persistenceUnitConfiguration.getString("exception-handler");
if (exceptionHandler != null && !exceptionHandler.isEmpty()) {
try {
Expand All @@ -123,6 +130,7 @@ public InitState init(InitContext initContext) {
}
}
}

if (persistenceUnitNames.length == 1) {
JpaTransactionMetadataResolver.defaultJpaUnit = persistenceUnitNames[0];
}
Expand Down
62 changes: 36 additions & 26 deletions ...ava/org/seedstack/seed/persistence/jpa/internal/SeedConfEntityManagerFactoryResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,9 @@
package org.seedstack.seed.persistence.jpa.internal;

import io.nuun.kernel.api.plugin.PluginException;

import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Properties;
import org.apache.commons.configuration.Configuration;
import org.seedstack.seed.core.api.Application;
import org.seedstack.seed.persistence.jdbc.internal.JdbcPlugin;

import javax.persistence.EntityManagerFactory;
import javax.persistence.PersistenceException;
Expand All @@ -31,27 +25,28 @@
import javax.persistence.spi.PersistenceProviderResolverHolder;
import javax.persistence.spi.PersistenceUnitTransactionType;
import javax.sql.DataSource;

import org.apache.commons.configuration.Configuration;
import org.seedstack.seed.core.api.Application;
import org.seedstack.seed.persistence.jdbc.internal.JdbcPlugin;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Properties;

class SeedConfEntityManagerFactoryResolver {

Map<String, EntityManagerFactory> entityManagerFactories = new HashMap<String, EntityManagerFactory>();

Map<String, Exception> unitsInException = new HashMap<String, Exception>();

EntityManagerFactory resolve(String persistenceUnit, Map<String, String> properties, Configuration unitConfiguration, Application application,
JdbcPlugin jdbcPlugin, Collection<Class<?>> scannedClasses) throws UnitNotConfiguredException {
EntityManagerFactory resolve(String persistenceUnit, Map<String, String> properties, Configuration unitConfiguration, Application application, JdbcPlugin jdbcPlugin, Collection<Class<?>> scannedClasses) throws UnitNotConfiguredException {
String dataSourceName = unitConfiguration.getString("datasource");
String jtaDataSourceName = unitConfiguration.getString("jta-datasource");

if (dataSourceName == null && jtaDataSourceName == null) {
throw new UnitNotConfiguredException("No property datasource or jta-datasource found for persistenceUnit [" + persistenceUnit
+ "]. One of these properties is required to load the persistence unit from seed configuration");
}

DataSource dataSource;
boolean isJta = false;

if (jtaDataSourceName != null) {
dataSource = jdbcPlugin.getDataSources().get(jtaDataSourceName);
isJta = true;
Expand All @@ -60,34 +55,45 @@ EntityManagerFactory resolve(String persistenceUnit, Map<String, String> propert
}

InternalPersistenceUnitInfo unitInfo = new InternalPersistenceUnitInfo();

unitInfo.persistenceUnitName = persistenceUnit;
if (isJta)
if (isJta) {
unitInfo.jtaDataSource = dataSource;
else
} else {
unitInfo.nonJtaDataSource = dataSource;
}

unitInfo.managedClassNames = new ArrayList<String>();
for (Class<?> managed : scannedClasses) {
if (persistenceUnit.equals(application.getConfiguration(managed).getString("jpa-unit"))) {
unitInfo.managedClassNames.add(managed.getName());
}
}

if (unitInfo.managedClassNames.isEmpty()) {
throw new PluginException("No class was configured to belong to jpa unit [" + persistenceUnit + "]");
}
if (unitConfiguration.getString("mapping-file") != null) {
unitInfo.mappingFileNames = Arrays.asList(unitConfiguration.getString("mapping-file"));

if (unitConfiguration.getString("mapping-files") != null) {
unitInfo.mappingFileNames = Arrays.asList(unitConfiguration.getStringArray("mapping-files"));
} else {
unitInfo.mappingFileNames = Collections.emptyList();
}

unitInfo.properties = new Properties();
unitInfo.properties.putAll(properties);
if (unitConfiguration.getString("validation-mode") != null)

if (unitConfiguration.getString("validation-mode") != null) {
unitInfo.validationMode = ValidationMode.valueOf(unitConfiguration.getString("validation-mode"));
if (unitConfiguration.getString("shared-cache-mode") != null)
}

if (unitConfiguration.getString("shared-cache-mode") != null) {
unitInfo.sharedCacheMode = SharedCacheMode.valueOf(unitConfiguration.getString("shared-cache-mode"));
if (unitConfiguration.getString("transaction-type") != null)
}

if (unitConfiguration.getString("transaction-type") != null) {
unitInfo.persistenceUnitTransactionType = PersistenceUnitTransactionType.valueOf(unitConfiguration.getString("transaction-type"));
}

return createEntityManagerFactory(unitInfo, properties);
}
Expand All @@ -96,16 +102,20 @@ EntityManagerFactory resolve(String persistenceUnit, Map<String, String> propert
private EntityManagerFactory createEntityManagerFactory(InternalPersistenceUnitInfo info, Map<String, String> map) {
EntityManagerFactory fac = null;
List<PersistenceProvider> persistenceProviders = PersistenceProviderResolverHolder.getPersistenceProviderResolver().getPersistenceProviders();

for (PersistenceProvider persistenceProvider : persistenceProviders) {
info.persistenceProviderClassName = persistenceProvider.getClass().getName();
fac = persistenceProvider.createContainerEntityManagerFactory(info, map);
if (fac != null) {
break;
}
}

if (fac == null) {
throw new PersistenceException("No Persistence provider for EntityManager named " + info.getPersistenceUnitName());
}

return fac;
}

}