You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by tv...@apache.org on 2014/02/19 16:48:09 UTC
svn commit: r1569795 [18/35] - in
/tomee/tomee/trunk/container/openejb-core/src/main: config/pmd/
java/javax/xml/ws/ java/javax/xml/ws/wsaddressing/ java/org/apache/openejb/
java/org/apache/openejb/assembler/
java/org/apache/openejb/assembler/classic/ ...
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/BaseSessionContext.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/BaseSessionContext.java?rev=1569795&r1=1569794&r2=1569795&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/BaseSessionContext.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/BaseSessionContext.java Wed Feb 19 15:47:58 2014
@@ -44,18 +44,18 @@ import java.util.List;
* @version $Rev$ $Date$
*/
public abstract class BaseSessionContext extends BaseContext implements SessionContext {
- protected BaseSessionContext(SecurityService securityService) {
+ protected BaseSessionContext(final SecurityService securityService) {
super(securityService);
}
- public BaseSessionContext(SecurityService securityService, UserTransaction userTransaction) {
+ public BaseSessionContext(final SecurityService securityService, final UserTransaction userTransaction) {
super(securityService, userTransaction);
}
public boolean wasCancelCalled() {
- ThreadContext threadContext = ThreadContext.getThreadContext();
- BeanContext di = threadContext.getBeanContext();
- Method runningMethod = threadContext.get(Method.class);
+ final ThreadContext threadContext = ThreadContext.getThreadContext();
+ final BeanContext di = threadContext.getBeanContext();
+ final Method runningMethod = threadContext.get(Method.class);
if (di.isAsynchronous(runningMethod)) {
if(runningMethod.getReturnType() == void.class) {
throw new IllegalStateException("Current running method " + runningMethod.getName() + " is an asynchronous method, but its return type is void :" + di.getDestinationId());
@@ -67,8 +67,8 @@ public abstract class BaseSessionContext
public EJBLocalObject getEJBLocalObject() throws IllegalStateException {
check(Call.getEJBLocalObject);
- ThreadContext threadContext = ThreadContext.getThreadContext();
- BeanContext di = threadContext.getBeanContext();
+ final ThreadContext threadContext = ThreadContext.getThreadContext();
+ final BeanContext di = threadContext.getBeanContext();
if (di.getLocalHomeInterface() == null) throw new IllegalStateException("Bean does not have an EJBLocalObject interface: "+di.getDeploymentID());
@@ -77,8 +77,8 @@ public abstract class BaseSessionContext
public EJBObject getEJBObject() throws IllegalStateException {
check(Call.getEJBObject);
- ThreadContext threadContext = ThreadContext.getThreadContext();
- BeanContext di = threadContext.getBeanContext();
+ final ThreadContext threadContext = ThreadContext.getThreadContext();
+ final BeanContext di = threadContext.getBeanContext();
if (di.getHomeInterface() == null) throw new IllegalStateException("Bean does not have an EJBObject interface: "+di.getDeploymentID());
return (EJBObject) EjbObjectProxyHandler.createProxy(di, threadContext.getPrimaryKey(), InterfaceType.EJB_OBJECT, di.getRemoteInterface());
@@ -86,13 +86,13 @@ public abstract class BaseSessionContext
public MessageContext getMessageContext() throws IllegalStateException {
check(Call.getMessageContext);
- ThreadContext threadContext = ThreadContext.getThreadContext();
- MessageContext messageContext = threadContext.get(MessageContext.class);
+ final ThreadContext threadContext = ThreadContext.getThreadContext();
+ final MessageContext messageContext = threadContext.get(MessageContext.class);
if (messageContext == null) throw new IllegalStateException("Only calls on the service-endpoint have a MessageContext.");
return messageContext;
}
- public Object getBusinessObject(Class interfce) {
+ public Object getBusinessObject(final Class interfce) {
check(Call.getBusinessObject);
if (interfce == null) throw new IllegalStateException("Interface argument cannot me null.");
@@ -111,7 +111,7 @@ public abstract class BaseSessionContext
}
try {
- EjbObjectProxyHandler handler;
+ final EjbObjectProxyHandler handler;
switch(di.getComponentType()){
case STATEFUL: {
handler = new StatefulEjbObjectHandler(di, threadContext.getPrimaryKey(), interfaceType, new ArrayList<Class>(), interfce);
@@ -142,7 +142,7 @@ public abstract class BaseSessionContext
return LocalBeanProxyFactory.newProxyInstance(di.getClassLoader(), handler, di.getBeanClass(), interfaces.toArray(new Class<?>[interfaces.size()]));
} else {
- List<Class> interfaces = new ArrayList<Class>();
+ final List<Class> interfaces = new ArrayList<Class>();
interfaces.addAll(di.getInterfaces(interfaceType));
interfaces.add(Serializable.class);
interfaces.add(IntraVmProxy.class);
@@ -151,16 +151,16 @@ public abstract class BaseSessionContext
}
return ProxyManager.newProxyInstance(interfaces.toArray(new Class[interfaces.size()]), handler);
}
- } catch (IllegalAccessException iae) {
+ } catch (final IllegalAccessException iae) {
throw new InternalErrorException("Could not create IVM proxy for " + interfce.getName() + " interface", iae);
}
}
public Class getInvokedBusinessInterface() {
check(Call.getInvokedBusinessInterface);
- ThreadContext threadContext = ThreadContext.getThreadContext();
- Class invokedInterface = threadContext.getInvokedInterface();
- InterfaceType type = threadContext.getBeanContext().getInterfaceType(invokedInterface);
+ final ThreadContext threadContext = ThreadContext.getThreadContext();
+ final Class invokedInterface = threadContext.getInvokedInterface();
+ final InterfaceType type = threadContext.getBeanContext().getInterfaceType(invokedInterface);
if (!type.isBusiness()) throw new IllegalStateException("The EJB spec requires us to cripple the use of this method for anything but business interface proxy. But FYI, your invoked interface is: "+invokedInterface.getName());
if (invokedInterface == null){
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ConnectorReference.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ConnectorReference.java?rev=1569795&r1=1569794&r2=1569795&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ConnectorReference.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ConnectorReference.java Wed Feb 19 15:47:58 2014
@@ -39,16 +39,16 @@ public class ConnectorReference extends
private ConnectionManager conMngr;
private ManagedConnectionFactory mngedConFactory;
- public ConnectorReference(ConnectionManager manager, ManagedConnectionFactory factory) {
+ public ConnectorReference(final ConnectionManager manager, final ManagedConnectionFactory factory) {
conMngr = manager;
mngedConFactory = factory;
}
public Object getObject() throws NamingException {
try {
- Object connection = mngedConFactory.createConnectionFactory(conMngr);
+ final Object connection = mngedConFactory.createConnectionFactory(conMngr);
return connection;
- } catch (ResourceException re) {
+ } catch (final ResourceException re) {
throw (NamingException) new NamingException("Could not create ConnectionFactory from " + mngedConFactory.getClass()).initCause(re);
}
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/CoreContainerSystem.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/CoreContainerSystem.java?rev=1569795&r1=1569794&r2=1569795&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/CoreContainerSystem.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/CoreContainerSystem.java Wed Feb 19 15:47:58 2014
@@ -67,7 +67,7 @@ public class CoreContainerSystem impleme
|| !(jndiContext.lookup("openejb/global") instanceof Context)) {
throw new OpenEJBRuntimeException("core openejb naming context not properly initialized. It must have subcontexts for openejb/local, openejb/remote, openejb/client, and openejb/Deployment already present");
}
- } catch (NamingException exception) {
+ } catch (final NamingException exception) {
throw new OpenEJBRuntimeException("core openejb naming context not properly initialized. It must have subcontexts for openejb/local, openejb/remote, openejb/client, and openejb/Deployment already present", exception);
}
SystemInstance.get().setComponent(JndiFactory.class, jndiFactory);
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/InstanceContext.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/InstanceContext.java?rev=1569795&r1=1569794&r2=1569795&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/InstanceContext.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/InstanceContext.java Wed Feb 19 15:47:58 2014
@@ -37,7 +37,7 @@ public class InstanceContext {
*/
private Object instanceData;
- public InstanceContext(BeanContext beanContext, Object bean, Map<String, Object> interceptors, CreationalContext creationalContext) {
+ public InstanceContext(final BeanContext beanContext, final Object bean, final Map<String, Object> interceptors, final CreationalContext creationalContext) {
this.beanContext = beanContext;
this.bean = bean;
this.interceptors = interceptors;
@@ -64,7 +64,7 @@ public class InstanceContext {
return instanceData;
}
- public void setInstanceData(Object instanceData) {
+ public void setInstanceData(final Object instanceData) {
this.instanceData = instanceData;
}
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/LocalInitialContext.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/LocalInitialContext.java?rev=1569795&r1=1569794&r2=1569795&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/LocalInitialContext.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/LocalInitialContext.java Wed Feb 19 15:47:58 2014
@@ -131,7 +131,7 @@ public class LocalInitialContext extends
clientIdentity = securityService.login(realmName, user, pass);
}
ClientSecurity.setIdentity(clientIdentity);
- } catch (LoginException e) {
+ } catch (final LoginException e) {
throw (AuthenticationException) new AuthenticationException("User could not be authenticated: " + user).initCause(e);
}
}
@@ -148,7 +148,7 @@ public class LocalInitialContext extends
securityService.logout(clientIdentity);
ClientSecurity.setIdentity(null);
}
- } catch (LoginException e) {
+ } catch (final LoginException e) {
throw new OpenEJBRuntimeException("User could not be logged out.", e);
}
}
@@ -161,7 +161,7 @@ public class LocalInitialContext extends
try {
serviceManager = new ServiceManagerProxy();
serviceManager.start();
- } catch (ServiceManagerProxy.AlreadyStartedException e) {
+ } catch (final ServiceManagerProxy.AlreadyStartedException e) {
logger.debug("Network services already started. Ignoring option " + OPENEJB_EMBEDDED_REMOTABLE);
}
}
@@ -189,7 +189,7 @@ public class LocalInitialContext extends
private void inject(final Object obj) throws NamingException {
try {
ClientInjections.clientInjector(obj).createInstance();
- } catch (OpenEJBException e) {
+ } catch (final OpenEJBException e) {
throw (NamingException) new NamingException("Injection failed").initCause(e);
}
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/LocalInitialContextFactory.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/LocalInitialContextFactory.java?rev=1569795&r1=1569794&r2=1569795&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/LocalInitialContextFactory.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/LocalInitialContextFactory.java Wed Feb 19 15:47:58 2014
@@ -59,7 +59,7 @@ public class LocalInitialContextFactory
final Properties properties = new Properties();
properties.putAll(env);
init(properties);
- } catch (Exception e) {
+ } catch (final Exception e) {
throw (NamingException) new NamingException("Attempted to load OpenEJB. " + e.getMessage()).initCause(e);
}
} finally {
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/MailSessionFactory.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/MailSessionFactory.java?rev=1569795&r1=1569794&r2=1569795&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/MailSessionFactory.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/MailSessionFactory.java Wed Feb 19 15:47:58 2014
@@ -65,16 +65,16 @@ public class MailSessionFactory {
return properties;
}
- public void setProperties(Properties properties) {
+ public void setProperties(final Properties properties) {
this.properties.clear();
- for (Map.Entry<Object, Object> entry : properties.entrySet()) {
+ for (final Map.Entry<Object, Object> entry : properties.entrySet()) {
if (entry.getKey() instanceof String && entry.getValue() instanceof String) {
this.properties.put(entry.getKey(), entry.getValue());
}
}
}
- public void setUseDefault(boolean useDefault) {
+ public void setUseDefault(final boolean useDefault) {
this.useDefault = useDefault;
}
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/NoSuchObjectException.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/NoSuchObjectException.java?rev=1569795&r1=1569794&r2=1569795&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/NoSuchObjectException.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/NoSuchObjectException.java Wed Feb 19 15:47:58 2014
@@ -25,7 +25,7 @@ import java.io.PrintWriter;
public class NoSuchObjectException extends java.rmi.NoSuchObjectException {
private Throwable cause = this;
- public NoSuchObjectException(String detailMessage) {
+ public NoSuchObjectException(final String detailMessage) {
super(detailMessage);
}
@@ -36,12 +36,12 @@ public class NoSuchObjectException exten
* @param detailMessage String The detail message for the exception.
* @param throwable The cause of this Throwable
*/
- public NoSuchObjectException(String detailMessage, Throwable throwable) {
+ public NoSuchObjectException(final String detailMessage, final Throwable throwable) {
super(detailMessage);
cause = throwable;
}
- public NoSuchObjectException(Throwable throwable) {
+ public NoSuchObjectException(final Throwable throwable) {
super(throwable == null ? null : throwable.toString());
cause = throwable;
}
@@ -74,12 +74,12 @@ public class NoSuchObjectException exten
* @param parentStack a stack to compare
* @return the number of duplicate stack frames.
*/
- private static int countDuplicates(StackTraceElement[] currentStack,
- StackTraceElement[] parentStack) {
+ private static int countDuplicates(final StackTraceElement[] currentStack,
+ final StackTraceElement[] parentStack) {
int duplicates = 0;
int parentIndex = parentStack.length;
for (int i = currentStack.length; --i >= 0 && --parentIndex >= 0;) {
- StackTraceElement parentFrame = parentStack[parentIndex];
+ final StackTraceElement parentFrame = parentStack[parentIndex];
if (parentFrame.equals(currentStack[i])) {
duplicates++;
} else {
@@ -95,11 +95,11 @@ public class NoSuchObjectException exten
*
* @param err PrintStream The stream to write the walkback on.
*/
- public void printStackTrace(PrintStream err) {
+ public void printStackTrace(final PrintStream err) {
err.println(toString());
// Don't use getStackTrace() as it calls clone()
// Get stackTrace, in case stackTrace is reassigned
- StackTraceElement[] stack = getStackTrace();
+ final StackTraceElement[] stack = getStackTrace();
for (int i = 0; i < stack.length; i++) {
err.println("\tat " + stack[i]);
}
@@ -109,8 +109,8 @@ public class NoSuchObjectException exten
while (throwable != null) {
err.print("Caused by: ");
err.println(throwable);
- StackTraceElement[] currentStack = throwable.getStackTrace();
- int duplicates = countDuplicates(currentStack, parentStack);
+ final StackTraceElement[] currentStack = throwable.getStackTrace();
+ final int duplicates = countDuplicates(currentStack, parentStack);
for (int i = 0; i < currentStack.length - duplicates; i++) {
err.println("\tat " + currentStack[i]);
}
@@ -128,11 +128,11 @@ public class NoSuchObjectException exten
*
* @param err PrintWriter The writer to write the walkback on.
*/
- public void printStackTrace(PrintWriter err) {
+ public void printStackTrace(final PrintWriter err) {
err.println(toString());
// Don't use getStackTrace() as it calls clone()
// Get stackTrace, in case stackTrace is reassigned
- StackTraceElement[] stack = getStackTrace();
+ final StackTraceElement[] stack = getStackTrace();
for (int i = 0; i < stack.length; i++) {
err.println("\tat " + stack[i]);
}
@@ -142,8 +142,8 @@ public class NoSuchObjectException exten
while (throwable != null) {
err.print("Caused by: ");
err.println(throwable);
- StackTraceElement[] currentStack = throwable.getStackTrace();
- int duplicates = countDuplicates(currentStack, parentStack);
+ final StackTraceElement[] currentStack = throwable.getStackTrace();
+ final int duplicates = countDuplicates(currentStack, parentStack);
for (int i = 0; i < currentStack.length - duplicates; i++) {
err.println("\tat " + currentStack[i]);
}
@@ -162,8 +162,8 @@ public class NoSuchObjectException exten
* @return String a printable representation for the receiver.
*/
public String toString() {
- String msg = getLocalizedMessage();
- String name = getClass().getName();
+ final String msg = getLocalizedMessage();
+ final String name = getClass().getName();
if (msg == null) {
return name;
}
@@ -178,7 +178,7 @@ public class NoSuchObjectException exten
* @throws IllegalArgumentException when the cause is the receiver
* @throws IllegalStateException when the cause has already been initialized
*/
- public synchronized NoSuchObjectException initCause(Throwable throwable) {
+ public synchronized NoSuchObjectException initCause(final Throwable throwable) {
cause = throwable;
return this;
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/Operation.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/Operation.java?rev=1569795&r1=1569794&r2=1569795&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/Operation.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/Operation.java Wed Feb 19 15:47:58 2014
@@ -41,7 +41,7 @@ public enum Operation {
private boolean callback;
- Operation(boolean callback) {
+ Operation(final boolean callback) {
this.callback = callback;
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ServerFederation.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ServerFederation.java?rev=1569795&r1=1569794&r2=1569795&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ServerFederation.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ServerFederation.java Wed Feb 19 15:47:58 2014
@@ -31,31 +31,31 @@ public class ServerFederation implements
private static final ThreadLocal<ApplicationServer> applicationServer = new ThreadLocal<ApplicationServer>();
- public Handle getHandle(ProxyInfo proxyInfo) {
+ public Handle getHandle(final ProxyInfo proxyInfo) {
return getApplicationServer().getHandle(proxyInfo);
}
- public EJBMetaData getEJBMetaData(ProxyInfo proxyInfo) {
+ public EJBMetaData getEJBMetaData(final ProxyInfo proxyInfo) {
return getApplicationServer().getEJBMetaData(proxyInfo);
}
- public HomeHandle getHomeHandle(ProxyInfo proxyInfo) {
+ public HomeHandle getHomeHandle(final ProxyInfo proxyInfo) {
return getApplicationServer().getHomeHandle(proxyInfo);
}
- public EJBObject getEJBObject(ProxyInfo proxyInfo) {
+ public EJBObject getEJBObject(final ProxyInfo proxyInfo) {
return getApplicationServer().getEJBObject(proxyInfo);
}
- public EJBHome getEJBHome(ProxyInfo proxyInfo) {
+ public EJBHome getEJBHome(final ProxyInfo proxyInfo) {
return getApplicationServer().getEJBHome(proxyInfo);
}
- public Object getBusinessObject(ProxyInfo proxyInfo) {
+ public Object getBusinessObject(final ProxyInfo proxyInfo) {
return getApplicationServer().getBusinessObject(proxyInfo);
}
- public static void setApplicationServer(ApplicationServer server) {
+ public static void setApplicationServer(final ApplicationServer server) {
// todo why do we restrict null? This makes call to setApplicationServer non symetrical. Throw an exception?
if (server != null) {
applicationServer.set(server);
@@ -63,7 +63,7 @@ public class ServerFederation implements
}
public static ApplicationServer getApplicationServer() {
- ApplicationServer server = applicationServer.get();
+ final ApplicationServer server = applicationServer.get();
if (server == null) {
// todo: consider making this the thread local intialValue
return localServer;
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/SimpleTransactionSynchronizationRegistry.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/SimpleTransactionSynchronizationRegistry.java?rev=1569795&r1=1569794&r2=1569795&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/SimpleTransactionSynchronizationRegistry.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/SimpleTransactionSynchronizationRegistry.java Wed Feb 19 15:47:58 2014
@@ -29,14 +29,14 @@ public class SimpleTransactionSynchroniz
private final TransactionManager transactionManager;
private final Map<Transaction,Map<Object,Object>> transactionResources = new HashMap<Transaction,Map<Object,Object>>();
- public SimpleTransactionSynchronizationRegistry(TransactionManager transactionManager) {
+ public SimpleTransactionSynchronizationRegistry(final TransactionManager transactionManager) {
this.transactionManager = transactionManager;
}
public Transaction getTransactionKey() {
try {
return transactionManager.getTransaction();
- } catch (SystemException e) {
+ } catch (final SystemException e) {
return null;
}
}
@@ -50,15 +50,15 @@ public class SimpleTransactionSynchroniz
return resources.get(key);
}
- public void putResource(Object key, Object value) {
- Transaction transaction = getActiveTransaction();
+ public void putResource(final Object key, final Object value) {
+ final Transaction transaction = getActiveTransaction();
Map<Object, Object> resources = transactionResources.get(transaction);
if (resources == null) {
// after transaction completes clean up resources
try {
transaction.registerSynchronization(new RemoveTransactionResources(transaction));
- } catch (Exception e) {
+ } catch (final Exception e) {
throw new IllegalStateException("No transaction active", e);
}
resources = new HashMap<Object,Object>();
@@ -71,54 +71,54 @@ public class SimpleTransactionSynchroniz
public int getTransactionStatus() {
try {
return transactionManager.getStatus();
- } catch (SystemException e) {
+ } catch (final SystemException e) {
return Status.STATUS_NO_TRANSACTION;
}
}
- public void registerInterposedSynchronization(Synchronization synchronization) {
+ public void registerInterposedSynchronization(final Synchronization synchronization) {
if (synchronization == null) {
throw new NullPointerException("synchronization is null");
}
- Transaction transaction = getActiveTransaction();
+ final Transaction transaction = getActiveTransaction();
try {
transaction.registerSynchronization(synchronization);
- } catch (Exception ignored) {
+ } catch (final Exception ignored) {
// no-op
}
}
public boolean getRollbackOnly() {
- Transaction transaction = getActiveTransaction();
+ final Transaction transaction = getActiveTransaction();
try {
return transaction.getStatus() == Status.STATUS_MARKED_ROLLBACK;
- } catch (Exception e) {
+ } catch (final Exception e) {
throw new IllegalStateException("No transaction active", e);
}
}
public void setRollbackOnly() {
- Transaction transaction = getActiveTransaction();
+ final Transaction transaction = getActiveTransaction();
try {
transaction.setRollbackOnly();
- } catch (Exception e) {
+ } catch (final Exception e) {
throw new IllegalStateException("No transaction active", e);
}
}
private Transaction getActiveTransaction() {
try {
- Transaction transaction = transactionManager.getTransaction();
+ final Transaction transaction = transactionManager.getTransaction();
if (transaction == null) {
throw new IllegalStateException("No transaction active");
}
- int status = transaction.getStatus();
+ final int status = transaction.getStatus();
if (status != Status.STATUS_ACTIVE && status != Status.STATUS_MARKED_ROLLBACK) {
throw new IllegalStateException("No transaction active");
}
return transaction;
- } catch (SystemException e) {
+ } catch (final SystemException e) {
throw new IllegalStateException("No transaction active", e);
}
}
@@ -126,14 +126,14 @@ public class SimpleTransactionSynchroniz
private class RemoveTransactionResources implements Synchronization {
private final Transaction transaction;
- public RemoveTransactionResources(Transaction transaction) {
+ public RemoveTransactionResources(final Transaction transaction) {
this.transaction = transaction;
}
public void beforeCompletion() {
}
- public void afterCompletion(int i) {
+ public void afterCompletion(final int i) {
transactionResources.remove(transaction);
}
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/TempClassLoader.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/TempClassLoader.java?rev=1569795&r1=1569794&r2=1569795&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/TempClassLoader.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/TempClassLoader.java Wed Feb 19 15:47:58 2014
@@ -146,7 +146,7 @@ public class TempClassLoader extends URL
IO.copy(in, this.bout);
bytes = this.bout.toByteArray();
- } catch (IOException e) {
+ } catch (final IOException e) {
throw new ClassNotFoundException(name, e);
} finally {
IO.close(in);
@@ -174,10 +174,10 @@ public class TempClassLoader extends URL
// define the class
try {
return this.defineClass(name, bytes, 0, bytes.length);
- } catch (SecurityException e) {
+ } catch (final SecurityException e) {
// possible prohibited package: defer to the parent
return super.loadClass(name, resolve);
- } catch (LinkageError le) {
+ } catch (final LinkageError le) {
// fallback
return super.loadClass(name, resolve);
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ThreadContext.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ThreadContext.java?rev=1569795&r1=1569794&r2=1569795&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ThreadContext.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ThreadContext.java Wed Feb 19 15:47:58 2014
@@ -54,7 +54,7 @@ public class ThreadContext {
for (final ThreadContextListener listener : listeners) {
try {
listener.contextEntered(oldContext, newContext);
- } catch (Throwable e) {
+ } catch (final Throwable e) {
log.warning("ThreadContextListener threw an exception", e);
}
}
@@ -80,7 +80,7 @@ public class ThreadContext {
for (final ThreadContextListener listener : listeners) {
try {
listener.contextExited(exitingContext, oldContext);
- } catch (Throwable e) {
+ } catch (final Throwable e) {
log.debug("ThreadContextListener threw an exception", e);
}
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/TransactionSynchronizationRegistryWrapper.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/TransactionSynchronizationRegistryWrapper.java?rev=1569795&r1=1569794&r2=1569795&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/TransactionSynchronizationRegistryWrapper.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/TransactionSynchronizationRegistryWrapper.java Wed Feb 19 15:47:58 2014
@@ -29,13 +29,13 @@ public class TransactionSynchronizationR
private TransactionSynchronizationRegistry registry;
public TransactionSynchronizationRegistryWrapper() {
- SystemInstance system = SystemInstance.get();
+ final SystemInstance system = SystemInstance.get();
this.registry = system.getComponent(TransactionSynchronizationRegistry.class);
this.system = system;
}
public TransactionSynchronizationRegistry getRegistry() {
- SystemInstance system = SystemInstance.get();
+ final SystemInstance system = SystemInstance.get();
if (system != this.system){
this.registry = system.getComponent(TransactionSynchronizationRegistry.class);
this.system = system;
@@ -43,7 +43,7 @@ public class TransactionSynchronizationR
return registry;
}
- public Object getResource(Object o) {
+ public Object getResource(final Object o) {
return getRegistry().getResource(o);
}
@@ -59,11 +59,11 @@ public class TransactionSynchronizationR
return getRegistry().getTransactionStatus();
}
- public void putResource(Object o, Object o1) {
+ public void putResource(final Object o, final Object o1) {
getRegistry().putResource(o, o1);
}
- public void registerInterposedSynchronization(Synchronization synchronization) {
+ public void registerInterposedSynchronization(final Synchronization synchronization) {
getRegistry().registerInterposedSynchronization(synchronization);
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/WebContext.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/WebContext.java?rev=1569795&r1=1569794&r2=1569795&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/WebContext.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/WebContext.java Wed Feb 19 15:47:58 2014
@@ -61,7 +61,7 @@ public class WebContext {
if (initialContext != null) return initialContext;
try {
initialContext = (Context) new InitialContext().lookup("java:");
- } catch (NamingException e) {
+ } catch (final NamingException e) {
throw new IllegalStateException(e);
}
return initialContext;
@@ -79,7 +79,7 @@ public class WebContext {
this.initialContext = initialContext;
}
- public WebContext(AppContext appContext) {
+ public WebContext(final AppContext appContext) {
this.appContext = appContext;
}
@@ -87,7 +87,7 @@ public class WebContext {
return id;
}
- public void setId(String id) {
+ public void setId(final String id) {
this.id = id;
}
@@ -95,7 +95,7 @@ public class WebContext {
return classLoader;
}
- public void setClassLoader(ClassLoader classLoader) {
+ public void setClassLoader(final ClassLoader classLoader) {
this.classLoader = classLoader;
}
@@ -107,7 +107,7 @@ public class WebContext {
return jndiEnc;
}
- public void setJndiEnc(Context jndiEnc) {
+ public void setJndiEnc(final Context jndiEnc) {
this.jndiEnc = jndiEnc;
}
@@ -115,7 +115,7 @@ public class WebContext {
return appContext;
}
- public Object newInstance(Class beanClass) throws OpenEJBException {
+ public Object newInstance(final Class beanClass) throws OpenEJBException {
final WebBeansContext webBeansContext = getWebBeansContext();
final ConstructorInjectionBean<Object> beanDefinition = getConstructorInjectionBean(beanClass, webBeansContext);
@@ -142,7 +142,7 @@ public class WebContext {
final Object beanInstance = injectionProcessor.createInstance();
if (webBeansContext != null) {
- InjectionTargetBean<Object> bean = InjectionTargetBean.class.cast(beanDefinition);
+ final InjectionTargetBean<Object> bean = InjectionTargetBean.class.cast(beanDefinition);
bean.getInjectionTarget().inject(beanInstance, creationalContext);
creatonalContexts.put(beanInstance, creationalContext);
@@ -208,7 +208,7 @@ public class WebContext {
final ConstructorInjectionBean<Object> beanDefinition = getConstructorInjectionBean(o.getClass(), webBeansContext);
final CreationalContext<Object> creationalContext = webBeansContext.getBeanManagerImpl().createCreationalContext(beanDefinition);
- InjectionTargetBean<Object> bean = InjectionTargetBean.class.cast(beanDefinition);
+ final InjectionTargetBean<Object> bean = InjectionTargetBean.class.cast(beanDefinition);
bean.getInjectionTarget().inject(beanInstance, creationalContext);
// if the bean is dependent simply cleanup the creational context once it is created
@@ -219,12 +219,12 @@ public class WebContext {
}
return beanInstance;
- } catch (NamingException e) {
+ } catch (final NamingException e) {
throw new OpenEJBException(e);
}
}
- public void setBindings(Map<String, Object> bindings) {
+ public void setBindings(final Map<String, Object> bindings) {
this.bindings = bindings;
}
@@ -232,7 +232,7 @@ public class WebContext {
return bindings;
}
- public void setWebbeansContext(WebBeansContext webbeansContext) {
+ public void setWebbeansContext(final WebBeansContext webbeansContext) {
this.webbeansContext = webbeansContext;
}
@@ -240,7 +240,7 @@ public class WebContext {
return webbeansContext;
}
- public void setContextRoot(String contextRoot) {
+ public void setContextRoot(final String contextRoot) {
this.contextRoot = contextRoot;
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/AbstractKeyGenerator.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/AbstractKeyGenerator.java?rev=1569795&r1=1569794&r2=1569795&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/AbstractKeyGenerator.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/AbstractKeyGenerator.java Wed Feb 19 15:47:58 2014
@@ -23,35 +23,35 @@ import java.lang.reflect.Field;
import java.lang.reflect.Modifier;
public abstract class AbstractKeyGenerator implements KeyGenerator {
- public static boolean isValidPkField(Field field) {
- int modifiers = field.getModifiers();
+ public static boolean isValidPkField(final Field field) {
+ final int modifiers = field.getModifiers();
return Modifier.isPublic(modifiers) && !Modifier.isStatic(modifiers);
}
- public static Field getField(Class clazz, String fieldName) throws OpenEJBException {
+ public static Field getField(final Class clazz, final String fieldName) throws OpenEJBException {
try {
return clazz.getField(fieldName);
- } catch (NoSuchFieldException e) {
+ } catch (final NoSuchFieldException e) {
throw new OpenEJBException("Unable to get primary key field from entity bean class: " + clazz.getName(), e);
}
}
- public static Object getFieldValue(Field field, Object object) throws EJBException {
+ public static Object getFieldValue(final Field field, final Object object) throws EJBException {
if (field == null) throw new NullPointerException("field is null");
if (object == null) throw new NullPointerException("object is null");
try {
return field.get(object);
- } catch (Exception e) {
+ } catch (final Exception e) {
throw new EJBException("Could not get field value for field " + field, e);
}
}
- public static void setFieldValue(Field field, Object object, Object value) throws EJBException {
+ public static void setFieldValue(final Field field, final Object object, final Object value) throws EJBException {
if (field == null) throw new NullPointerException("field is null");
if (object == null) throw new NullPointerException("object is null");
try {
field.set(object, value);
- } catch (Exception e) {
+ } catch (final Exception e) {
throw new EJBException("Could not set field value for field " + field, e);
}
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/CmpContainer.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/CmpContainer.java?rev=1569795&r1=1569794&r2=1569795&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/CmpContainer.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/CmpContainer.java Wed Feb 19 15:47:58 2014
@@ -124,7 +124,7 @@ public class CmpContainer implements Rpc
try {
final Class<?> cmpEngineFactoryClass = classLoader.loadClass(cmpEngineFactory);
factory = (CmpEngineFactory) cmpEngineFactoryClass.newInstance();
- } catch (Exception e) {
+ } catch (final Exception e) {
throw new OpenEJBException("Unable to create cmp engine factory " + cmpEngineFactory, e);
}
factory.setTransactionManager(transactionManager);
@@ -175,7 +175,7 @@ public class CmpContainer implements Rpc
try {
final Field field = beanContext.getCmpImplClass().getField("deploymentInfo");
field.set(null, beanContext);
- } catch (Exception e) {
+ } catch (final Exception e) {
// ignore
}
@@ -208,7 +208,7 @@ public class CmpContainer implements Rpc
try {
final Field field = beanContext.getCmpImplClass().getField("deploymentInfo");
field.set(null, null);
- } catch (Exception e) {
+ } catch (final Exception e) {
// ignore
}
@@ -296,7 +296,7 @@ public class CmpContainer implements Rpc
final BeanContext beanContext = callContext.getBeanContext();
try {
return (EntityBean) beanContext.getCmpImplClass().newInstance();
- } catch (Exception e) {
+ } catch (final Exception e) {
throw new EJBException("Unable to create new entity bean instance " + beanContext.getCmpImplClass(), e);
}
}
@@ -327,7 +327,7 @@ public class CmpContainer implements Rpc
final ThreadContext oldCallContext = ThreadContext.enter(callContext);
try {
entityBean.setEntityContext(new EntityContext(securityService));
- } catch (RemoteException e) {
+ } catch (final RemoteException e) {
throw new EJBException(e);
} finally {
ThreadContext.exit(oldCallContext);
@@ -345,7 +345,7 @@ public class CmpContainer implements Rpc
final ThreadContext oldCallContext = ThreadContext.enter(callContext);
try {
entityBean.unsetEntityContext();
- } catch (RemoteException e) {
+ } catch (final RemoteException e) {
throw new EJBException(e);
} finally {
ThreadContext.exit(oldCallContext);
@@ -363,7 +363,7 @@ public class CmpContainer implements Rpc
final ThreadContext oldCallContext = ThreadContext.enter(callContext);
try {
entityBean.ejbLoad();
- } catch (RemoteException e) {
+ } catch (final RemoteException e) {
throw new EJBException(e);
} finally {
ThreadContext.exit(oldCallContext);
@@ -395,7 +395,7 @@ public class CmpContainer implements Rpc
});
}
registeredEntities.add(entityBean);
- } catch (Exception e) {
+ } catch (final Exception e) {
// no-op
}
}
@@ -411,7 +411,7 @@ public class CmpContainer implements Rpc
final ThreadContext oldCallContext = ThreadContext.enter(callContext);
try {
entityBean.ejbStore();
- } catch (RemoteException e) {
+ } catch (final RemoteException e) {
throw new EJBException(e);
} finally {
ThreadContext.exit(oldCallContext);
@@ -432,14 +432,14 @@ public class CmpContainer implements Rpc
final ThreadContext oldCallContext = ThreadContext.enter(callContext);
try {
entityBean.ejbRemove();
- } catch (RemoteException e) {
+ } catch (final RemoteException e) {
throw new EJBException(e);
} finally {
// clear relationships
// todo replace with interface call when CmpEntityBean interface is added
try {
entityBean.getClass().getMethod("OpenEJB_deleted").invoke(entityBean);
- } catch (Exception ignored) {
+ } catch (final Exception ignored) {
// no-op
}
cancelTimers(callContext);
@@ -450,9 +450,9 @@ public class CmpContainer implements Rpc
private boolean isDeleted(final EntityBean entityBean) {
try {
return (Boolean) entityBean.getClass().getMethod("OpenEJB_isDeleted").invoke(entityBean);
- } catch (NoSuchMethodException e) {
+ } catch (final NoSuchMethodException e) {
return false;
- } catch (Exception e) {
+ } catch (final Exception e) {
throw new EJBException(e);
}
}
@@ -468,7 +468,7 @@ public class CmpContainer implements Rpc
final ThreadContext oldCallContext = ThreadContext.enter(callContext);
try {
entityBean.ejbActivate();
- } catch (RemoteException e) {
+ } catch (final RemoteException e) {
throw new EJBException(e);
} finally {
ThreadContext.exit(oldCallContext);
@@ -486,7 +486,7 @@ public class CmpContainer implements Rpc
final ThreadContext oldCallContext = ThreadContext.enter(callContext);
try {
entityBean.ejbPassivate();
- } catch (RemoteException e) {
+ } catch (final RemoteException e) {
throw new EJBException(e);
} finally {
ThreadContext.exit(oldCallContext);
@@ -516,7 +516,7 @@ public class CmpContainer implements Rpc
// when there is not transaction, merge the data from the bean back into the cmp engine
cmpEngine.storeBeanIfNoTx(callContext, bean);
- } catch (NoSuchObjectException e) {
+ } catch (final NoSuchObjectException e) {
handleApplicationException(txPolicy, e, false);
} catch (Throwable e) {
if (e instanceof InvocationTargetException) {
@@ -562,7 +562,7 @@ public class CmpContainer implements Rpc
try {
returnValue = runMethod.invoke(bean, args);
- } catch (IllegalArgumentException e) {
+ } catch (final IllegalArgumentException e) {
System.out.println("********************************************************");
System.out.println("callMethod = " + callMethod);
System.out.println("runMethod = " + runMethod);
@@ -682,9 +682,9 @@ public class CmpContainer implements Rpc
// create a new ProxyInfo based on the deployment info and primary key
return new ProxyInfo(beanContext, primaryKey);
- } catch (FinderException fe) {
+ } catch (final FinderException fe) {
handleApplicationException(txPolicy, fe, false);
- } catch (Throwable e) {// handle reflection exception
+ } catch (final Throwable e) {// handle reflection exception
handleSystemException(txPolicy, e, callContext);
} finally {
afterInvoke(txPolicy, callContext);
@@ -744,9 +744,9 @@ public class CmpContainer implements Rpc
return new ProxyInfo(beanContext, primaryKey);
}
}
- } catch (FinderException fe) {
+ } catch (final FinderException fe) {
handleApplicationException(txPolicy, fe, false);
- } catch (Throwable e) {// handle reflection exception
+ } catch (final Throwable e) {// handle reflection exception
handleSystemException(txPolicy, e, callContext);
} finally {
afterInvoke(txPolicy, callContext);
@@ -816,7 +816,7 @@ public class CmpContainer implements Rpc
// return the single item.... multiple return values was handled in for loop above
return proxies.iterator().next();
- } catch (RuntimeException e) {
+ } catch (final RuntimeException e) {
throw new EJBException(e);
}
}
@@ -840,9 +840,9 @@ public class CmpContainer implements Rpc
}
ejbRemove(entityBean);
cmpEngine.removeBean(callContext);
- } catch (NoSuchObjectException e) {
+ } catch (final NoSuchObjectException e) {
handleApplicationException(txPolicy, e, false);
- } catch (Throwable e) {// handle reflection exception
+ } catch (final Throwable e) {// handle reflection exception
handleSystemException(txPolicy, e, callContext);
} finally {
afterInvoke(txPolicy, callContext);
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/CmpUtil.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/CmpUtil.java?rev=1569795&r1=1569794&r2=1569795&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/CmpUtil.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/CmpUtil.java Wed Feb 19 15:47:58 2014
@@ -17,9 +17,9 @@
package org.apache.openejb.core.cmp;
public class CmpUtil {
- public static String getCmpImplClassName(String abstractSchemaName, String ejbClass) {
+ public static String getCmpImplClassName(final String abstractSchemaName, final String ejbClass) {
// locate the end of the package portion
- int packageEnd = ejbClass.lastIndexOf('.');
+ final int packageEnd = ejbClass.lastIndexOf('.');
// we have a package, pull that out and add "openejb." in front of the package
if (packageEnd != -1) {
return "openejb." + ejbClass.substring(0, packageEnd + 1) + abstractSchemaName;
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/ComplexKeyGenerator.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/ComplexKeyGenerator.java?rev=1569795&r1=1569794&r2=1569795&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/ComplexKeyGenerator.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/ComplexKeyGenerator.java Wed Feb 19 15:47:58 2014
@@ -29,31 +29,31 @@ public class ComplexKeyGenerator extends
protected final List<PkField> fields;
private final Class pkClass;
- public ComplexKeyGenerator(Class entityBeanClass, Class pkClass) throws OpenEJBException {
+ public ComplexKeyGenerator(final Class entityBeanClass, final Class pkClass) throws OpenEJBException {
this.pkClass = pkClass;
- List<ComplexKeyGenerator.PkField> fields = new ArrayList<PkField>();
- for (Field pkObjectField : pkClass.getFields()) {
+ final List<ComplexKeyGenerator.PkField> fields = new ArrayList<PkField>();
+ for (final Field pkObjectField : pkClass.getFields()) {
if (isValidPkField(pkObjectField)) {
- Field entityBeanField = getField(entityBeanClass, pkObjectField.getName());
+ final Field entityBeanField = getField(entityBeanClass, pkObjectField.getName());
if (!isValidPkField(entityBeanField)) {
throw new OpenEJBException("Invalid primray key field: " + entityBeanField);
}
- PkField pkField = new PkField(entityBeanField, pkObjectField);
+ final PkField pkField = new PkField(entityBeanField, pkObjectField);
fields.add(pkField);
}
}
this.fields = Collections.unmodifiableList(fields);
}
- public Object getPrimaryKey(EntityBean bean) {
+ public Object getPrimaryKey(final EntityBean bean) {
Object pkObject = null;
try {
pkObject = pkClass.newInstance();
- } catch (Exception e) {
+ } catch (final Exception e) {
throw new EJBException("Unable to create complex primary key instance: " + pkClass.getName(), e);
}
- for (PkField pkField : fields) {
+ for (final PkField pkField : fields) {
pkField.copyToPkObject(bean, pkObject);
}
return pkObject;
@@ -63,7 +63,7 @@ public class ComplexKeyGenerator extends
private final Field entityBeanField;
private final Field pkObjectField;
- public PkField(Field entityBeanField, Field pkObjectField) {
+ public PkField(final Field entityBeanField, final Field pkObjectField) {
entityBeanField.setAccessible(true);
pkObjectField.setAccessible(true);
@@ -71,13 +71,13 @@ public class ComplexKeyGenerator extends
this.pkObjectField = pkObjectField;
}
- public void copyToPkObject(EntityBean bean, Object pkObject) {
- Object value = getFieldValue(entityBeanField, bean);
+ public void copyToPkObject(final EntityBean bean, final Object pkObject) {
+ final Object value = getFieldValue(entityBeanField, bean);
setFieldValue(pkObjectField, pkObject, value);
}
- public Object getPkFieldValue(Object pkObject) {
- Object value = getFieldValue(pkObjectField, pkObject);
+ public Object getPkFieldValue(final Object pkObject) {
+ final Object value = getFieldValue(pkObjectField, pkObject);
return value;
}
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/ProxyFactory.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/ProxyFactory.java?rev=1569795&r1=1569794&r2=1569795&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/ProxyFactory.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/ProxyFactory.java Wed Feb 19 15:47:58 2014
@@ -33,13 +33,13 @@ public class ProxyFactory {
private final Class localInterface;
private final EntityEjbHomeHandler localHandler;
- public ProxyFactory(BeanContext beanContext) {
+ public ProxyFactory(final BeanContext beanContext) {
this.beanContext = beanContext;
keyGenerator = beanContext.getKeyGenerator();
remoteInterface = beanContext.getRemoteInterface();
if (remoteInterface != null) {
- EJBHome homeProxy = beanContext.getEJBHome();
+ final EJBHome homeProxy = beanContext.getEJBHome();
remoteHandler = (EntityEjbHomeHandler) ProxyManager.getInvocationHandler(homeProxy);
} else {
remoteHandler = null;
@@ -47,30 +47,30 @@ public class ProxyFactory {
localInterface = beanContext.getLocalInterface();
if (localInterface != null) {
- EJBLocalHome localHomeProxy = beanContext.getEJBLocalHome();
+ final EJBLocalHome localHomeProxy = beanContext.getEJBLocalHome();
localHandler = (EntityEjbHomeHandler) ProxyManager.getInvocationHandler(localHomeProxy);
} else {
localHandler = null;
}
}
- public Object createRemoteProxy(EntityBean bean, RpcContainer container) {
+ public Object createRemoteProxy(final EntityBean bean, final RpcContainer container) {
// The KeyGenerator creates a new primary key and populates its fields with the
// primary key fields of the bean instance. Each deployment has its own KeyGenerator.
- Object primaryKey = keyGenerator.getPrimaryKey(bean);
+ final Object primaryKey = keyGenerator.getPrimaryKey(bean);
// create the proxy
- Object proxy = remoteHandler.createProxy(primaryKey, beanContext.getRemoteInterface());
+ final Object proxy = remoteHandler.createProxy(primaryKey, beanContext.getRemoteInterface());
return proxy;
}
- public Object createLocalProxy(EntityBean bean, RpcContainer container) {
+ public Object createLocalProxy(final EntityBean bean, final RpcContainer container) {
// The KeyGenerator creates a new primary key and populates its fields with the
// primary key fields of the bean instance. Each deployment has its own KeyGenerator.
- Object primaryKey = keyGenerator.getPrimaryKey(bean);
+ final Object primaryKey = keyGenerator.getPrimaryKey(bean);
// create the proxy
- Object proxy = localHandler.createProxy(primaryKey, beanContext.getLocalInterface());
+ final Object proxy = localHandler.createProxy(primaryKey, beanContext.getLocalInterface());
return proxy;
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/SimpleKeyGenerator.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/SimpleKeyGenerator.java?rev=1569795&r1=1569794&r2=1569795&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/SimpleKeyGenerator.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/SimpleKeyGenerator.java Wed Feb 19 15:47:58 2014
@@ -24,15 +24,15 @@ import java.lang.reflect.Field;
public class SimpleKeyGenerator extends AbstractKeyGenerator {
private final Field pkField;
- public SimpleKeyGenerator(Class beanClass, String pkField) throws OpenEJBException {
+ public SimpleKeyGenerator(final Class beanClass, final String pkField) throws OpenEJBException {
this.pkField = getField(beanClass, pkField);
if (!isValidPkField(this.pkField)) {
throw new OpenEJBException("Invalid primray key field: " + pkField);
}
}
- public Object getPrimaryKey(EntityBean bean) {
- Object value = getFieldValue(pkField, bean);
+ public Object getPrimaryKey(final EntityBean bean) {
+ final Object value = getFieldValue(pkField, bean);
return value;
}
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/Cmp1Generator.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/Cmp1Generator.java?rev=1569795&r1=1569794&r2=1569795&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/Cmp1Generator.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/Cmp1Generator.java Wed Feb 19 15:47:58 2014
@@ -40,7 +40,7 @@ public class Cmp1Generator implements Op
* The name of the generated implementation class.
* @param beanClass The source Bean class we're wrappering.
*/
- public Cmp1Generator(String cmpImplClass, Class beanClass) {
+ public Cmp1Generator(final String cmpImplClass, final Class beanClass) {
beanClassName = Type.getInternalName(beanClass);
implClassName = cmpImplClass.replace('.', '/');
@@ -63,7 +63,7 @@ public class Cmp1Generator implements Op
// if we have an unknown pk, we need to add a field for the pk
if (unknownPk) {
// public Long OpenEJB_pk;
- FieldVisitor fv = cw.visitField(ACC_PUBLIC, "OpenEJB_pk", "Ljava/lang/Long;", null, null);
+ final FieldVisitor fv = cw.visitField(ACC_PUBLIC, "OpenEJB_pk", "Ljava/lang/Long;", null, null);
fv.visitEnd();
}
@@ -99,7 +99,7 @@ public class Cmp1Generator implements Op
return unknownPk;
}
- public void setUnknownPk(boolean unknownPk) {
+ public void setUnknownPk(final boolean unknownPk) {
this.unknownPk = unknownPk;
}
}