You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by an...@apache.org on 2013/04/02 09:54:25 UTC
svn commit: r1463416 [1/3] - in
/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb:
assembler/classic/PersistenceBuilder.java config/AppModule.java
config/AutoConfig.java resource/jdbc/DataSourceFactory.java
Author: andygumbrecht
Date: Tue Apr 2 07:54:25 2013
New Revision: 1463416
URL: http://svn.apache.org/r1463416
Log:
Use 'String.equals' in place of '='
Finals and overrides.
Modified:
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/PersistenceBuilder.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AppModule.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/DataSourceFactory.java
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/PersistenceBuilder.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/PersistenceBuilder.java?rev=1463416&r1=1463415&r2=1463416&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/PersistenceBuilder.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/PersistenceBuilder.java Tue Apr 2 07:54:25 2013
@@ -27,15 +27,13 @@ import org.apache.openejb.util.Logger;
import javax.naming.Context;
import javax.naming.InitialContext;
import javax.naming.NamingException;
-import javax.persistence.EntityManagerFactory;
import javax.persistence.SharedCacheMode;
import javax.persistence.ValidationMode;
import javax.persistence.spi.PersistenceUnitTransactionType;
import javax.sql.DataSource;
-import java.util.Map;
-import java.util.concurrent.*;
public class PersistenceBuilder {
+
public static final Logger logger = Logger.getInstance(LogCategory.OPENEJB_STARTUP, PersistenceBuilder.class);
/**
@@ -43,12 +41,12 @@ public class PersistenceBuilder {
*/
private final PersistenceClassLoaderHandler persistenceClassLoaderHandler;
- public PersistenceBuilder(PersistenceClassLoaderHandler persistenceClassLoaderHandler) {
+ public PersistenceBuilder(final PersistenceClassLoaderHandler persistenceClassLoaderHandler) {
this.persistenceClassLoaderHandler = persistenceClassLoaderHandler;
}
- public ReloadableEntityManagerFactory createEntityManagerFactory(PersistenceUnitInfo info, ClassLoader classLoader) throws Exception {
- PersistenceUnitInfoImpl unitInfo = new PersistenceUnitInfoImpl(persistenceClassLoaderHandler);
+ public ReloadableEntityManagerFactory createEntityManagerFactory(final PersistenceUnitInfo info, final ClassLoader classLoader) throws Exception {
+ final PersistenceUnitInfoImpl unitInfo = new PersistenceUnitInfoImpl(persistenceClassLoaderHandler);
// Persistence Unit Id
unitInfo.setId(info.id);
@@ -67,7 +65,7 @@ public class PersistenceBuilder {
unitInfo.setLazilyInitialized(info.webappName != null);
- Context context = SystemInstance.get().getComponent(ContainerSystem.class).getJNDIContext();
+ final Context context = SystemInstance.get().getComponent(ContainerSystem.class).getJNDIContext();
// JTA Datasource
String jtaDataSourceId = info.jtaDataSource;
@@ -75,14 +73,14 @@ public class PersistenceBuilder {
if (jtaDataSourceId != null) {
if (!SystemInstance.get().hasProperty("openejb.geronimo")) {
- String initialJndiName = jtaDataSourceId;
+ final String initialJndiName = jtaDataSourceId;
try {
if (!jtaDataSourceId.startsWith("java:openejb/Resource/")
- && !jtaDataSourceId.startsWith("openejb/Resource/")) {
- jtaDataSourceId = "openejb/Resource/"+jtaDataSourceId;
+ && !jtaDataSourceId.startsWith("openejb/Resource/")) {
+ jtaDataSourceId = "openejb/Resource/" + jtaDataSourceId;
}
- DataSource jtaDataSource = (DataSource) context.lookup(jtaDataSourceId);
+ final DataSource jtaDataSource = (DataSource) context.lookup(jtaDataSourceId);
unitInfo.setJtaDataSource(jtaDataSource);
} catch (NamingException e) {
try {
@@ -107,15 +105,15 @@ public class PersistenceBuilder {
unitInfo.setPersistenceXMLSchemaVersion(info.persistenceXMLSchemaVersion);
// Second-level cache mode for the persistence unit
- SharedCacheMode sharedCacheMode = Enum.valueOf(SharedCacheMode.class, info.sharedCacheMode);
+ final SharedCacheMode sharedCacheMode = Enum.valueOf(SharedCacheMode.class, info.sharedCacheMode);
unitInfo.setSharedCacheMode(sharedCacheMode);
// The validation mode to be used for the persistence unit
- ValidationMode validationMode = Enum.valueOf(ValidationMode.class, info.validationMode);
+ final ValidationMode validationMode = Enum.valueOf(ValidationMode.class, info.validationMode);
unitInfo.setValidationMode(validationMode);
// Persistence Unit Transaction Type
- PersistenceUnitTransactionType type = Enum.valueOf(PersistenceUnitTransactionType.class, info.transactionType);
+ final PersistenceUnitTransactionType type = Enum.valueOf(PersistenceUnitTransactionType.class, info.transactionType);
unitInfo.setTransactionType(type);
// Non JTA Datasource
@@ -123,11 +121,13 @@ public class PersistenceBuilder {
unitInfo.setNonJtaDataSourceName(nonJtaDataSourceId);
if (nonJtaDataSourceId != null) {
if (!SystemInstance.get().hasProperty("openejb.geronimo")) {
- String initialJndiName = nonJtaDataSourceId;
+ final String initialJndiName = nonJtaDataSourceId;
try {
- if (!nonJtaDataSourceId.startsWith("java:openejb/Resource/")) nonJtaDataSourceId = "java:openejb/Resource/"+nonJtaDataSourceId;
+ if (!nonJtaDataSourceId.startsWith("java:openejb/Resource/")) {
+ nonJtaDataSourceId = "java:openejb/Resource/" + nonJtaDataSourceId;
+ }
- DataSource nonJtaDataSource = (DataSource) context.lookup(nonJtaDataSourceId);
+ final DataSource nonJtaDataSource = (DataSource) context.lookup(nonJtaDataSourceId);
unitInfo.setNonJtaDataSource(nonJtaDataSource);
} catch (NamingException e) {
try {
@@ -143,14 +143,14 @@ public class PersistenceBuilder {
unitInfo.setRootUrlAndJarUrls(info.persistenceUnitRootUrl, info.jarFiles);
// create the persistence provider
- String persistenceProviderClassName = unitInfo.getPersistenceProviderClassName();
+ final String persistenceProviderClassName = unitInfo.getPersistenceProviderClassName();
unitInfo.setPersistenceProviderClassName(persistenceProviderClassName);
final EntityManagerFactoryCallable callable = new EntityManagerFactoryCallable(persistenceProviderClassName, unitInfo, classLoader);
return new ReloadableEntityManagerFactory(classLoader, callable, unitInfo);
}
- public static String getOpenEJBJndiName(String unit) {
+ public static String getOpenEJBJndiName(final String unit) {
return Assembler.PERSISTENCE_UNIT_NAMING_CONTEXT + unit;
}
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AppModule.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AppModule.java?rev=1463416&r1=1463415&r2=1463416&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AppModule.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AppModule.java Tue Apr 2 07:54:25 2013
@@ -58,7 +58,7 @@ public class AppModule implements Deploy
private final Collection<org.apache.openejb.config.sys.Service> services = new HashSet<org.apache.openejb.config.sys.Service>();
private final ClassLoader classLoader;
private EntityMappings cmpMappings;
- private final Map<String,Object> altDDs = new HashMap<String,Object>();
+ private final Map<String, Object> altDDs = new HashMap<String, Object>();
private final Set<String> watchedResources = new TreeSet<String>();
private final boolean standaloneModule;
private boolean delegateFirst = true;
@@ -70,11 +70,11 @@ public class AppModule implements Deploy
private ID id;
private boolean webapp = false;
- public AppModule(ClassLoader classLoader, String jarLocation) {
+ public AppModule(final ClassLoader classLoader, final String jarLocation) {
this(classLoader, jarLocation, null, false);
}
- public <T extends DeploymentModule> AppModule(T module) {
+ public <T extends DeploymentModule> AppModule(final T module) {
this.standaloneModule = true;
this.classLoader = module.getClassLoader();
this.application = new Application(module.getModuleId());
@@ -107,6 +107,7 @@ public class AppModule implements Deploy
this.delegateFirst = delegateFirst;
}
+ @Override
public Properties getProperties() {
return properties;
}
@@ -116,11 +117,11 @@ public class AppModule implements Deploy
return this;
}
- public AppModule(ClassLoader classLoader, String jarLocation, Application application, boolean standaloneModule) {
+ public AppModule(final ClassLoader classLoader, final String jarLocation, final Application application, final boolean standaloneModule) {
this.classLoader = classLoader;
this.application = application;
-
- File file = (jarLocation == null) ? null : new File(jarLocation);
+
+ final File file = (jarLocation == null) ? null : new File(jarLocation);
this.id = new ID(null, application, null, file, null, this);
this.validation = new ValidationContext(this);
this.standaloneModule = standaloneModule;
@@ -130,114 +131,153 @@ public class AppModule implements Deploy
return additionalLibMbeans;
}
+ @Override
public boolean isStandaloneModule() {
return standaloneModule;
}
-
- public void setStandaloneModule(boolean isStandalone) {
- //do nothing
- }
+ @Override
+ public void setStandaloneModule(final boolean isStandalone) {
+ //do nothing
+ }
+
+ @Override
public ValidationContext getValidation() {
return validation;
}
public boolean hasWarnings() {
- if (validation.hasWarnings()) return true;
- for (EjbModule module : ejbModules) {
- if (module.getValidation().hasWarnings()) return true;
+ if (validation.hasWarnings()) {
+ return true;
}
- for (ClientModule module : clientModules) {
- if (module.getValidation().hasWarnings()) return true;
+ for (final EjbModule module : ejbModules) {
+ if (module.getValidation().hasWarnings()) {
+ return true;
+ }
}
- for (ConnectorModule module : connectorModules) {
- if (module.getValidation().hasWarnings()) return true;
+ for (final ClientModule module : clientModules) {
+ if (module.getValidation().hasWarnings()) {
+ return true;
+ }
}
- for (WebModule module : webModules) {
- if (module.getValidation().hasWarnings()) return true;
+ for (final ConnectorModule module : connectorModules) {
+ if (module.getValidation().hasWarnings()) {
+ return true;
+ }
+ }
+ for (final WebModule module : webModules) {
+ if (module.getValidation().hasWarnings()) {
+ return true;
+ }
}
return false;
}
public boolean hasFailures() {
- if (validation.hasFailures()) return true;
- for (EjbModule module : ejbModules) {
- if (module.getValidation().hasFailures()) return true;
+ if (validation.hasFailures()) {
+ return true;
+ }
+ for (final EjbModule module : ejbModules) {
+ if (module.getValidation().hasFailures()) {
+ return true;
+ }
}
- for (ClientModule module : clientModules) {
- if (module.getValidation().hasFailures()) return true;
+ for (final ClientModule module : clientModules) {
+ if (module.getValidation().hasFailures()) {
+ return true;
+ }
}
- for (ConnectorModule module : connectorModules) {
- if (module.getValidation().hasFailures()) return true;
+ for (final ConnectorModule module : connectorModules) {
+ if (module.getValidation().hasFailures()) {
+ return true;
+ }
}
- for (WebModule module : webModules) {
- if (module.getValidation().hasFailures()) return true;
+ for (final WebModule module : webModules) {
+ if (module.getValidation().hasFailures()) {
+ return true;
+ }
}
return false;
}
public boolean hasErrors() {
- if (validation.hasErrors()) return true;
- for (EjbModule module : ejbModules) {
- if (module.getValidation().hasErrors()) return true;
+ if (validation.hasErrors()) {
+ return true;
}
- for (ClientModule module : clientModules) {
- if (module.getValidation().hasErrors()) return true;
+ for (final EjbModule module : ejbModules) {
+ if (module.getValidation().hasErrors()) {
+ return true;
+ }
+ }
+ for (final ClientModule module : clientModules) {
+ if (module.getValidation().hasErrors()) {
+ return true;
+ }
}
- for (ConnectorModule module : connectorModules) {
- if (module.getValidation().hasErrors()) return true;
+ for (final ConnectorModule module : connectorModules) {
+ if (module.getValidation().hasErrors()) {
+ return true;
+ }
}
- for (WebModule module : webModules) {
- if (module.getValidation().hasErrors()) return true;
+ for (final WebModule module : webModules) {
+ if (module.getValidation().hasErrors()) {
+ return true;
+ }
}
return false;
}
public List<ValidationContext> getValidationContexts() {
- List<ValidationContext> contexts = new ArrayList<ValidationContext>();
+ final List<ValidationContext> contexts = new ArrayList<ValidationContext>();
contexts.add(getValidation());
- for (EjbModule module : ejbModules) {
+ for (final EjbModule module : ejbModules) {
contexts.add(module.getValidation());
}
- for (ClientModule module : clientModules) {
+ for (final ClientModule module : clientModules) {
contexts.add(module.getValidation());
}
- for (ConnectorModule module : connectorModules) {
+ for (final ConnectorModule module : connectorModules) {
contexts.add(module.getValidation());
}
- for (WebModule module : webModules) {
+ for (final WebModule module : webModules) {
contexts.add(module.getValidation());
}
return contexts;
}
+ @Override
public String getJarLocation() {
return (id.getLocation() != null) ? id.getLocation().getAbsolutePath() : null;
}
-
- public void setModuleId(String moduleId) {
-
+
+ public void setModuleId(final String moduleId) {
+
this.id = new ID(null, application, moduleId, id.getLocation(), id.getUri(), this);
- }
+ }
+ @Override
public String getModuleId() {
return id.getName();
}
+ @Override
public File getFile() {
return id.getLocation();
}
+ @Override
public URI getModuleUri() {
return id.getUri();
}
+ @Override
public Map<String, Object> getAltDDs() {
return altDDs;
}
+ @Override
public ClassLoader getClassLoader() {
return classLoader;
}
@@ -266,7 +306,7 @@ public class AppModule implements Deploy
return cmpMappings;
}
- public void setCmpMappings(EntityMappings cmpMappings) {
+ public void setCmpMappings(final EntityMappings cmpMappings) {
this.cmpMappings = cmpMappings;
}
@@ -278,6 +318,7 @@ public class AppModule implements Deploy
return webModules;
}
+ @Override
public Set<String> getWatchedResources() {
return watchedResources;
}
@@ -291,7 +332,7 @@ public class AppModule implements Deploy
}
public Collection<DeploymentModule> getDeploymentModule() {
- ArrayList<DeploymentModule> modules = new ArrayList<DeploymentModule>();
+ final ArrayList<DeploymentModule> modules = new ArrayList<DeploymentModule>();
modules.addAll(ejbModules);
modules.addAll(webModules);
modules.addAll(connectorModules);
@@ -299,12 +340,11 @@ public class AppModule implements Deploy
return modules;
}
-
@Override
public String toString() {
return "AppModule{" +
- "moduleId='" + id.getName() + '\'' +
- '}';
+ "moduleId='" + id.getName() + '\'' +
+ '}';
}
public void setStandloneWebModule() {
@@ -323,13 +363,13 @@ public class AppModule implements Deploy
persistenceModules.add(root);
final Persistence persistence = root.getPersistence();
- for (PersistenceUnit unit : persistence.getPersistenceUnit()) {
+ for (final PersistenceUnit unit : persistence.getPersistenceUnit()) {
txTypeByUnit.put(unit.getName(), unit.getTransactionType());
}
}
public void addPersistenceModules(final Collection<PersistenceModule> roots) {
- for (PersistenceModule root : roots) {
+ for (final PersistenceModule root : roots) {
addPersistenceModule(root);
}
}