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 [2/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/ j...
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/DeploymentNotFoundException.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/DeploymentNotFoundException.java?rev=1569795&r1=1569794&r2=1569795&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/DeploymentNotFoundException.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/DeploymentNotFoundException.java Wed Feb 19 15:47:58 2014
@@ -24,15 +24,15 @@ public class DeploymentNotFoundException
super();
}
- public DeploymentNotFoundException(String message) {
+ public DeploymentNotFoundException(final String message) {
super(message);
}
- public DeploymentNotFoundException(String message, Throwable cause) {
+ public DeploymentNotFoundException(final String message, final Throwable cause) {
super(message, cause);
}
- public DeploymentNotFoundException(Throwable cause) {
+ public DeploymentNotFoundException(final Throwable cause) {
super(cause);
}
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/DuplicateDeploymentIdException.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/DuplicateDeploymentIdException.java?rev=1569795&r1=1569794&r2=1569795&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/DuplicateDeploymentIdException.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/DuplicateDeploymentIdException.java Wed Feb 19 15:47:58 2014
@@ -23,15 +23,15 @@ public class DuplicateDeploymentIdExcept
public DuplicateDeploymentIdException() {
}
- public DuplicateDeploymentIdException(String message) {
+ public DuplicateDeploymentIdException(final String message) {
super(message);
}
- public DuplicateDeploymentIdException(String message, Throwable rootCause) {
+ public DuplicateDeploymentIdException(final String message, final Throwable rootCause) {
super(message, rootCause);
}
- public DuplicateDeploymentIdException(Throwable rootCause) {
+ public DuplicateDeploymentIdException(final Throwable rootCause) {
super(rootCause);
}
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/Extensions.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/Extensions.java?rev=1569795&r1=1569794&r2=1569795&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/Extensions.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/Extensions.java Wed Feb 19 15:47:58 2014
@@ -61,7 +61,7 @@ public final class Extensions {
public static Collection<Class<?>> findExtensions(final ResourceFinder finder) {
try {
return finder.findAvailableClasses("org.apache.openejb.extension");
- } catch (IOException e) {
+ } catch (final IOException e) {
LOGGER.error("Extension scanning of 'META-INF/org.apache.openejb.extension' files failed", e);
return Collections.emptySet();
}
@@ -71,7 +71,7 @@ public final class Extensions {
try {
final List<Class<?>> classes = finder.findAvailableClasses("org.apache.openejb.extension");
addExtensions(classes);
- } catch (IOException e) {
+ } catch (final IOException e) {
LOGGER.error("Extension scanning of 'META-INF/org.apache.openejb.extension' files failed", e);
}
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/Injection.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/Injection.java?rev=1569795&r1=1569794&r2=1569795&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/Injection.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/Injection.java Wed Feb 19 15:47:58 2014
@@ -25,14 +25,14 @@ public class Injection {
private final String name;
private final String jndiName;
- public Injection(String jndiName, String name, Class target) {
+ public Injection(final String jndiName, final String name, final Class target) {
this.jndiName = jndiName;
this.name = name;
this.target = target;
this.classname = target.getName();
}
- public Injection(String jndiName, String name, String classname) {
+ public Injection(final String jndiName, final String name, final String classname) {
this.jndiName = jndiName;
this.name = name;
this.classname = classname;
@@ -51,7 +51,7 @@ public class Injection {
return target;
}
- public void setTarget(Class<?> target) {
+ public void setTarget(final Class<?> target) {
this.target = target;
}
@@ -69,11 +69,11 @@ public class Injection {
}
@Override
- public boolean equals(Object o) {
+ public boolean equals(final Object o) {
if (this == o) return true;
if (!(o instanceof Injection)) return false;
- Injection injection = (Injection) o;
+ final Injection injection = (Injection) o;
if (name != null ? !name.equals(injection.name) : injection.name != null) return false;
if (classname != null ? !classname.equals(injection.classname) : injection.classname != null) return false;
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/InjectionProcessor.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/InjectionProcessor.java?rev=1569795&r1=1569794&r2=1569795&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/InjectionProcessor.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/InjectionProcessor.java Wed Feb 19 15:47:58 2014
@@ -51,7 +51,7 @@ public class InjectionProcessor<T> {
private final Map<String, Object> bindings = new HashMap<String, Object>();
- public InjectionProcessor(T suppliedInstance, Collection<Injection> injections, Context context) {
+ public InjectionProcessor(final T suppliedInstance, final Collection<Injection> injections, final Context context) {
this.beanClass = null;
this.suppliedInstance = suppliedInstance;
this.injections = injections;
@@ -60,7 +60,7 @@ public class InjectionProcessor<T> {
preDestroyMethods = null;
}
- public InjectionProcessor(Class<? extends T> beanClass, Collection<Injection> injections, Context context) {
+ public InjectionProcessor(final Class<? extends T> beanClass, final Collection<Injection> injections, final Context context) {
this.beanClass = beanClass;
this.injections = injections;
this.context = context;
@@ -68,7 +68,7 @@ public class InjectionProcessor<T> {
preDestroyMethods = null;
}
- public InjectionProcessor(Class<? extends T> beanClass, Collection<Injection> injections, List<Method> postConstructMethods, List<Method> preDestroyMethods, Context context) {
+ public InjectionProcessor(final Class<? extends T> beanClass, final Collection<Injection> injections, final List<Method> postConstructMethods, final List<Method> preDestroyMethods, final Context context) {
this.beanClass = beanClass;
this.injections = injections;
this.postConstructMethods = postConstructMethods;
@@ -76,12 +76,12 @@ public class InjectionProcessor<T> {
this.context = context;
}
- public InjectionProcessor(Class<? extends T> beanClass, Collection<Injection> injections, List<Method> postConstructMethods, List<Method> preDestroyMethods, Context context, Map<String, Object> bindings) {
+ public InjectionProcessor(final Class<? extends T> beanClass, final Collection<Injection> injections, final List<Method> postConstructMethods, final List<Method> preDestroyMethods, final Context context, final Map<String, Object> bindings) {
this(beanClass, injections, postConstructMethods, preDestroyMethods, context);
this.bindings.putAll(bindings);
}
- public void setProperty(String name, Object value) {
+ public void setProperty(final String name, final Object value) {
properties.put(name, value);
}
@@ -101,7 +101,7 @@ public class InjectionProcessor<T> {
Class<? extends T> clazz = beanClass;
- ObjectRecipe objectRecipe;
+ final ObjectRecipe objectRecipe;
if (suppliedInstance != null) {
clazz = (Class<? extends T>) suppliedInstance.getClass();
objectRecipe = PassthroughFactory.recipe(suppliedInstance);
@@ -118,20 +118,20 @@ public class InjectionProcessor<T> {
bindings.clear();
- for (Entry<String, Object> entry : properties.entrySet()) {
+ for (final Entry<String, Object> entry : properties.entrySet()) {
objectRecipe.setProperty(entry.getKey(), entry.getValue());
}
- Object object;
+ final Object object;
try {
object = objectRecipe.create(clazz.getClassLoader());
- } catch (Exception e) {
+ } catch (final Exception e) {
throw new OpenEJBException("Error while creating bean " + clazz.getName(), e);
}
- Map unsetProperties = objectRecipe.getUnsetProperties();
+ final Map unsetProperties = objectRecipe.getUnsetProperties();
if (unsetProperties.size() > 0) {
- for (Object property : unsetProperties.keySet()) {
+ for (final Object property : unsetProperties.keySet()) {
logger.warning("Injection: No such property '" + property + "' in class " + clazz.getName());
}
}
@@ -141,7 +141,7 @@ public class InjectionProcessor<T> {
public void postConstruct() throws OpenEJBException {
if (instance == null) throw new IllegalStateException("Instance has not been constructed");
if (postConstructMethods == null) return;
- for (Method postConstruct : postConstructMethods) {
+ for (final Method postConstruct : postConstructMethods) {
try {
postConstruct.invoke(instance);
} catch (Exception e) {
@@ -156,7 +156,7 @@ public class InjectionProcessor<T> {
public void preDestroy() {
if (instance == null) return;
if (preDestroyMethods == null) return;
- for (Method preDestroy : preDestroyMethods) {
+ for (final Method preDestroy : preDestroyMethods) {
try {
preDestroy.invoke(instance);
} catch (Exception e) {
@@ -168,13 +168,13 @@ public class InjectionProcessor<T> {
}
}
- private void fillInjectionProperties(ObjectRecipe objectRecipe) {
+ private void fillInjectionProperties(final ObjectRecipe objectRecipe) {
if (injections == null) return;
boolean usePrefix = true;
try {
if (beanClass != null) beanClass.getConstructor();
- } catch (NoSuchMethodException e) {
+ } catch (final NoSuchMethodException e) {
// Using constructor injection
// xbean can't handle the prefix yet
usePrefix = false;
@@ -185,25 +185,25 @@ public class InjectionProcessor<T> {
if (suppliedInstance != null) clazz = suppliedInstance.getClass();
if (context != null) {
- for (Injection injection : injections) {
+ for (final Injection injection : injections) {
if (injection.getTarget() == null) continue;
if (!injection.getTarget().isAssignableFrom(clazz)) continue;
- String jndiName = injection.getJndiName();
+ final String jndiName = injection.getJndiName();
Object value;
try {
value = context.lookup(jndiName);
- } catch (NamingException ne) { // some fallback
+ } catch (final NamingException ne) { // some fallback
value = bindings.get(jndiName);
if (value instanceof SimpleReference) {
try {
value = ((SimpleReference) value).getContent();
- } catch (NamingException e) {
+ } catch (final NamingException e) {
if (value instanceof JndiUrlReference) {
try {
value = SystemInstance.get().getComponent(ContainerSystem.class).getJNDIContext()
.lookup(((JndiUrlReference) value).getJndiName());
- } catch (NamingException e1) {
+ } catch (final NamingException e1) {
value = null;
}
}
@@ -234,7 +234,7 @@ public class InjectionProcessor<T> {
}
}
- public static Context unwrap(Context context) {
+ public static Context unwrap(final Context context) {
// if (context == null) return null;
// try {
// context = (Context) context.lookup("comp/env/");
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/InternalErrorException.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/InternalErrorException.java?rev=1569795&r1=1569794&r2=1569795&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/InternalErrorException.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/InternalErrorException.java Wed Feb 19 15:47:58 2014
@@ -28,15 +28,15 @@ public class InternalErrorException exte
super();
}
- public InternalErrorException(String message) {
+ public InternalErrorException(final String message) {
super(message);
}
- public InternalErrorException(String message, Throwable cause) {
+ public InternalErrorException(final String message, final Throwable cause) {
super(message, cause);
}
- public InternalErrorException(Throwable cause) {
+ public InternalErrorException(final Throwable cause) {
super(cause);
}
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/MethodContext.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/MethodContext.java?rev=1569795&r1=1569794&r2=1569795&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/MethodContext.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/MethodContext.java Wed Feb 19 15:47:58 2014
@@ -42,12 +42,12 @@ public class MethodContext {
private Duration accessTimeout;
private boolean asynchronous;
- public MethodContext(BeanContext beanContext, Method beanMethod) {
+ public MethodContext(final BeanContext beanContext, final Method beanMethod) {
this.beanContext = beanContext;
this.beanMethod = beanMethod;
}
- public void setAccessTimeout(Duration accessTimeout) {
+ public void setAccessTimeout(final Duration accessTimeout) {
this.accessTimeout = accessTimeout;
}
@@ -67,13 +67,13 @@ public class MethodContext {
cdiInterceptors.add(data);
}
- public void setInterceptors(List<InterceptorData> interceptors) {
+ public void setInterceptors(final List<InterceptorData> interceptors) {
this.interceptors.clear();
this.interceptors.addAll(interceptors);
}
public List<InterceptorData> getInterceptors() {
- List<InterceptorData> datas = beanContext.getInterceptorData();
+ final List<InterceptorData> datas = beanContext.getInterceptorData();
datas.addAll(interceptors);
datas.addAll(beanContext.getCdiInterceptors());
datas.addAll(cdiInterceptors);
@@ -84,7 +84,7 @@ public class MethodContext {
return lockType != null? lockType: beanContext.getLockType();
}
- public void setLockType(LockType lockType) {
+ public void setLockType(final LockType lockType) {
this.lockType = lockType;
}
@@ -92,7 +92,7 @@ public class MethodContext {
return transactionType != null? transactionType: beanContext.getTransactionType();
}
- public void setTransactionType(TransactionType transactionType) {
+ public void setTransactionType(final TransactionType transactionType) {
this.transactionType = transactionType;
}
@@ -104,7 +104,7 @@ public class MethodContext {
return asynchronous;
}
- public void setAsynchronous(boolean asynchronous) {
+ public void setAsynchronous(final boolean asynchronous) {
this.asynchronous = asynchronous;
}
@@ -118,7 +118,7 @@ public class MethodContext {
private final Method method;
private TransactionType transactionType;
- public InterfaceMethodContext(MethodContext beanMethod, Method method) {
+ public InterfaceMethodContext(final MethodContext beanMethod, final Method method) {
this.beanMethod = beanMethod;
this.method = method;
}
@@ -127,7 +127,7 @@ public class MethodContext {
return method;
}
- public void setTransactionType(TransactionType transactionType) {
+ public void setTransactionType(final TransactionType transactionType) {
this.transactionType = transactionType;
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/MethodSpec.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/MethodSpec.java?rev=1569795&r1=1569794&r2=1569795&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/MethodSpec.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/MethodSpec.java Wed Feb 19 15:47:58 2014
@@ -32,26 +32,26 @@ public class MethodSpec implements Compa
private final String methodName;
private final String[] parameterTypes;
- public MethodSpec(String methodIntf, String methodName, String[] parameterTypes) {
+ public MethodSpec(final String methodIntf, final String methodName, final String[] parameterTypes) {
this.methodIntf = methodIntf;
this.methodName = methodName;
this.parameterTypes = parameterTypes;
}
- public MethodSpec(String text) {
- Pattern p = Pattern.compile("(\\S+) (\\S+)\\((\\S*)\\)");
- Matcher m = p.matcher(text);
+ public MethodSpec(final String text) {
+ final Pattern p = Pattern.compile("(\\S+) (\\S+)\\((\\S*)\\)");
+ final Matcher m = p.matcher(text);
if (!m.matches()) {
throw new IllegalArgumentException("Text must match (\\S+) (\\S+)\\((\\S*)\\) : " + text);
}
- String intfString = m.group(1);
+ final String intfString = m.group(1);
if (intfString.equals("all")) {
methodIntf = null;
} else {
methodIntf = intfString;
}
methodName = m.group(2);
- String parameters = m.group(3);
+ final String parameters = m.group(3);
if (parameters.length() > 0) {
parameterTypes = parameters.split(" *, *");
} else {
@@ -81,7 +81,7 @@ public class MethodSpec implements Compa
return result;
}
- public boolean equals(Object obj) {
+ public boolean equals(final Object obj) {
if (obj == this) {
return true;
}
@@ -90,14 +90,14 @@ public class MethodSpec implements Compa
return false;
}
- MethodSpec methodSpec = (MethodSpec) obj;
+ final MethodSpec methodSpec = (MethodSpec) obj;
return methodIntf.equals(methodSpec.methodIntf) &&
methodName.equals(methodSpec.methodName) &&
Arrays.equals(parameterTypes, methodSpec.parameterTypes);
}
public String toString() {
- StringBuilder buffer = new StringBuilder();
+ final StringBuilder buffer = new StringBuilder();
if (methodIntf != null) {
buffer.append(methodIntf);
} else {
@@ -106,7 +106,7 @@ public class MethodSpec implements Compa
buffer.append(" ").append(methodName).append('(');
if (parameterTypes != null) {
for (int i = 0; i < parameterTypes.length; i++) {
- String parameterType = parameterTypes[i];
+ final String parameterType = parameterTypes[i];
if (i > 0) {
buffer.append(',');
}
@@ -117,7 +117,7 @@ public class MethodSpec implements Compa
return buffer.toString();
}
- public boolean matches(String methodIntf, String methodName, String[] parameterTypes) {
+ public boolean matches(final String methodIntf, final String methodName, final String[] parameterTypes) {
assert methodIntf != null;
assert methodName != null;
assert parameterTypes != null;
@@ -140,14 +140,14 @@ public class MethodSpec implements Compa
return Arrays.equals(parameterTypes, this.parameterTypes);
}
- public int compareTo(Object o) {
+ public int compareTo(final Object o) {
if (!(o instanceof MethodSpec)) {
return -1;
}
if (this == o) {
return 0;
}
- MethodSpec other = (MethodSpec) o;
+ final MethodSpec other = (MethodSpec) o;
if (parameterTypes != null) {
if (other.parameterTypes == null) {
//parameter types always come before no param types
@@ -160,7 +160,7 @@ public class MethodSpec implements Compa
return BEFORE_OTHER;
}
//both have method interfaces
- int intfOrder = methodIntf.compareTo(other.methodIntf);
+ final int intfOrder = methodIntf.compareTo(other.methodIntf);
if (intfOrder != 0) {
return intfOrder;
}
@@ -192,7 +192,7 @@ public class MethodSpec implements Compa
return BEFORE_OTHER;
}
//both explicit method intf. sort by intf, then methodName
- int intfOrder = methodIntf.compareTo(other.methodIntf);
+ final int intfOrder = methodIntf.compareTo(other.methodIntf);
if (intfOrder != 0) {
return intfOrder;
}
@@ -225,8 +225,8 @@ public class MethodSpec implements Compa
throw new IllegalStateException("Cannot compare " + this + " and " + other);
}
- private int compareMethod(MethodSpec other) {
- int methodOrder = methodName.compareTo(other.methodName);
+ private int compareMethod(final MethodSpec other) {
+ final int methodOrder = methodName.compareTo(other.methodName);
if (methodOrder != 0) {
return methodOrder;
}
@@ -236,7 +236,7 @@ public class MethodSpec implements Compa
//the other list is shorter, they are first
return AFTER_OTHER;
}
- int paramOrder = parameterTypes[i].compareTo(other.parameterTypes[i]);
+ final int paramOrder = parameterTypes[i].compareTo(other.parameterTypes[i]);
if (paramOrder != 0) {
return paramOrder;
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/ModuleContext.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/ModuleContext.java?rev=1569795&r1=1569794&r2=1569795&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/ModuleContext.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/ModuleContext.java Wed Feb 19 15:47:58 2014
@@ -29,7 +29,7 @@ public class ModuleContext extends Deplo
private final URI moduleURI;
private final ClassLoader loader;
- public ModuleContext(String id, URI moduleURI, String uniqueId, AppContext appContext, Context moduleJndiContext, ClassLoader classLoader) {
+ public ModuleContext(final String id, final URI moduleURI, final String uniqueId, final AppContext appContext, final Context moduleJndiContext, final ClassLoader classLoader) {
super(id, appContext.getOptions());
this.moduleURI = moduleURI;
this.appContext = appContext;
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/NoSuchApplicationException.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/NoSuchApplicationException.java?rev=1569795&r1=1569794&r2=1569795&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/NoSuchApplicationException.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/NoSuchApplicationException.java Wed Feb 19 15:47:58 2014
@@ -23,15 +23,15 @@ public class NoSuchApplicationException
public NoSuchApplicationException() {
}
- public NoSuchApplicationException(String message) {
+ public NoSuchApplicationException(final String message) {
super(message);
}
- public NoSuchApplicationException(String message, Throwable rootCause) {
+ public NoSuchApplicationException(final String message, final Throwable rootCause) {
super(message, rootCause);
}
- public NoSuchApplicationException(Throwable rootCause) {
+ public NoSuchApplicationException(final Throwable rootCause) {
super(rootCause);
}
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/OpenEJB.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/OpenEJB.java?rev=1569795&r1=1569794&r2=1569795&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/OpenEJB.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/OpenEJB.java Wed Feb 19 15:47:58 2014
@@ -82,7 +82,7 @@ public final class OpenEJB {
Logger.configure();
OptionsLog.install();
- } catch (Exception e) {
+ } catch (final Exception e) {
throw new OpenEJBException(e);
}
final SystemInstance system = SystemInstance.get();
@@ -125,10 +125,10 @@ public final class OpenEJB {
final Assembler assembler;
try {
assembler = (Assembler) SafeToolkit.getToolkit("OpenEJB").newInstance(className);
- } catch (OpenEJBException oe) {
+ } catch (final OpenEJBException oe) {
logger.fatal("startup.assemblerCannotBeInstantiated", oe);
throw oe;
- } catch (Throwable t) {
+ } catch (final Throwable t) {
final String msg = messages.message("startup.openejbEncounteredUnexpectedError");
logger.fatal(msg, t);
throw new OpenEJBException(msg, t);
@@ -136,10 +136,10 @@ public final class OpenEJB {
try {
assembler.init(system.getProperties());
- } catch (OpenEJBException oe) {
+ } catch (final OpenEJBException oe) {
logger.fatal("startup.assemblerFailedToInitialize", oe);
throw oe;
- } catch (Throwable t) {
+ } catch (final Throwable t) {
final String msg = messages.message("startup.assemblerEncounteredUnexpectedError");
logger.fatal(msg, t);
throw new OpenEJBException(msg, t);
@@ -147,10 +147,10 @@ public final class OpenEJB {
try {
assembler.build();
- } catch (OpenEJBException oe) {
+ } catch (final OpenEJBException oe) {
logger.fatal("startup.assemblerFailedToBuild", oe);
throw oe;
- } catch (Throwable t) {
+ } catch (final Throwable t) {
final String msg = messages.message("startup.assemblerEncounterUnexpectedBuildError");
logger.fatal(msg, t);
throw new OpenEJBException(msg, t);
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/OpenEJBException.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/OpenEJBException.java?rev=1569795&r1=1569794&r2=1569795&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/OpenEJBException.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/OpenEJBException.java Wed Feb 19 15:47:58 2014
@@ -71,20 +71,20 @@ public class OpenEJBException extends Ex
super();
}
- public OpenEJBException(String message) {
+ public OpenEJBException(final String message) {
super(message);
}
- public OpenEJBException(Throwable rootCause) {
+ public OpenEJBException(final Throwable rootCause) {
super(rootCause);
}
- public OpenEJBException(String message, Throwable rootCause) {
+ public OpenEJBException(final String message, final Throwable rootCause) {
super(message, rootCause);
}
public String getMessage() {
- Throwable rootCause = getCause();
+ final Throwable rootCause = getCause();
if (rootCause != null) {
return super.getMessage() + ": " + rootCause.getMessage();
} else {
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/OpenEjbContainer.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/OpenEjbContainer.java?rev=1569795&r1=1569794&r2=1569795&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/OpenEjbContainer.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/OpenEjbContainer.java Wed Feb 19 15:47:58 2014
@@ -123,7 +123,7 @@ public final class OpenEjbContainer exte
private ServletContext servletContext;
private HttpSession session;
- private OpenEjbContainer(Map<?, ?> map, AppContext appContext) {
+ private OpenEjbContainer(final Map<?, ?> map, final AppContext appContext) {
webBeanContext = appContext.getWebBeansContext();
globalJndiContext = new GlobalContext(appContext.getGlobalJndiContext());
@@ -150,16 +150,16 @@ public final class OpenEjbContainer exte
}
try {
globalJndiContext.close();
- } catch (NamingException e) {
+ } catch (final NamingException e) {
throw new IllegalStateException(e);
}
final Assembler assembler = SystemInstance.get().getComponent(Assembler.class);
if (assembler != null) {
- for (AppInfo info : assembler.getDeployedApplications()) {
+ for (final AppInfo info : assembler.getDeployedApplications()) {
try {
assembler.destroyApplication(info);
- } catch (UndeployException e) {
+ } catch (final UndeployException e) {
logger().error(e.getMessage(), e);
}
}
@@ -167,7 +167,7 @@ public final class OpenEjbContainer exte
try {
stopContexts(webBeanContext.getContextsService(), servletContext, session);
- } catch (Exception e) {
+ } catch (final Exception e) {
logger().warning("can't stop all CDI contexts", e);
}
@@ -181,7 +181,7 @@ public final class OpenEjbContainer exte
return globalJndiContext;
}
- public <T> T inject(T object) {
+ public <T> T inject(final T object) {
assert object != null;
@@ -194,7 +194,7 @@ public final class OpenEjbContainer exte
cdiInjections(context, object);
try {
return (T) processor.createInstance();
- } catch (OpenEJBException e) {
+ } catch (final OpenEJBException e) {
throw new InjectionException(clazz.getName(), e);
}
} else if (!isAnnotatedLocalClient(clazz)) { // nothing to do
@@ -206,7 +206,7 @@ public final class OpenEjbContainer exte
final InjectionProcessor<?> processor = ClientInjections.clientInjector(object);
cdiInjections(null, object);
return (T) processor.createInstance();
- } catch (OpenEJBException e) {
+ } catch (final OpenEJBException e) {
throw new NoInjectionMetaDataException("Injection failed", e);
}
}
@@ -219,7 +219,7 @@ public final class OpenEjbContainer exte
}
try {
OWBInjector.inject(webBeanContext.getBeanManagerImpl(), object, null);
- } catch (Throwable t) {
+ } catch (final Throwable t) {
logger().warning("an error occured while injecting the class '" + object.getClass().getName() + "': " + t.getMessage());
} finally {
if (context != null) {
@@ -251,7 +251,7 @@ public final class OpenEjbContainer exte
if (context != null) return context;
}
- for (BeanContext context : containerSystem.deployments()) {
+ for (final BeanContext context : containerSystem.deployments()) {
if (clazz == context.getBeanClass()) return context;
@@ -272,7 +272,7 @@ public final class OpenEjbContainer exte
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);
}
}
@@ -296,7 +296,7 @@ public final class OpenEjbContainer exte
}
public static class InjectionException extends IllegalStateException {
- public InjectionException(String message, Throwable cause) {
+ public InjectionException(final String message, final Throwable cause) {
super(message, cause);
}
}
@@ -324,7 +324,7 @@ public final class OpenEjbContainer exte
System.getProperties().remove(Context.URL_PKG_PREFIXES);
}
- Properties properties = new Properties();
+ final Properties properties = new Properties();
properties.putAll(map);
SystemInstance.reset();
@@ -364,7 +364,7 @@ public final class OpenEjbContainer exte
final EjbJar ejbJar = new EjbJar();
final OpenejbJar openejbJar = new OpenejbJar();
- for (String caller : callers) {
+ for (final String caller : callers) {
if (!isValid(caller)) continue;
@@ -393,13 +393,13 @@ public final class OpenEjbContainer exte
appInfo = configurationFactory.configureApplication(appModule);
- } catch (ValidationFailedException e) {
+ } catch (final ValidationFailedException e) {
logger().warning("configureApplication.loadFailed", appModule.getModuleId(), e.getMessage()); // DO not include the stacktrace in the message
throw new InvalidApplicationException(e);
- } catch (OpenEJBException e) {
+ } catch (final OpenEJBException e) {
// DO NOT REMOVE THE EXCEPTION FROM THIS LOG MESSAGE
// removing this message causes NO messages to be printed when embedded
logger().warning("configureApplication.loadFailed", e, appModule.getModuleId(), e.getMessage());
@@ -413,26 +413,26 @@ public final class OpenEjbContainer exte
try {
appContext = assembler.createApplication(appInfo, appModule.getClassLoader());
- } catch (ValidationException ve) {
+ } catch (final ValidationException ve) {
throw ve;
- } catch (Exception e) {
+ } catch (final Exception e) {
throw new AssembleApplicationException(e);
}
return instance = new OpenEjbContainer(map, appContext);
- } catch (OpenEJBException e) {
+ } catch (final OpenEJBException e) {
throw new EJBException(e);
- } catch (MalformedURLException e) {
+ } catch (final MalformedURLException e) {
throw new EJBException(e);
- } catch (ValidationException ve) {
+ } catch (final ValidationException ve) {
throw ve;
- } catch (Exception e) {
+ } catch (final Exception e) {
if (e instanceof EJBException) {
@@ -444,29 +444,29 @@ public final class OpenEjbContainer exte
if (instance == null && OpenEJB.isInitialized()) {
try {
OpenEJB.destroy();
- } catch (Exception e) {
+ } catch (final Exception e) {
// no-op
}
}
}
}
- private boolean isValid(String caller) {
+ private boolean isValid(final String caller) {
try {
final ClassLoader loader = Thread.currentThread().getContextClassLoader();
final Class<?> clazz = loader.loadClass(caller);
return !clazz.isEnum() && !clazz.isInterface() && !Modifier.isAbstract(clazz.getModifiers());
- } catch (ClassNotFoundException e) {
+ } catch (final ClassNotFoundException e) {
return false;
}
}
- private AppModule load(Map<?, ?> map, ConfigurationFactory configurationFactory) throws MalformedURLException, OpenEJBException {
+ private AppModule load(final Map<?, ?> map, final ConfigurationFactory configurationFactory) throws MalformedURLException, OpenEJBException {
final List<File> moduleLocations;
- String appId = (String) map.get(EJBContainer.APP_NAME);
+ final String appId = (String) map.get(EJBContainer.APP_NAME);
final Object modules = map.get(EJBContainer.MODULES);
@@ -479,8 +479,8 @@ public final class OpenEjbContainer exte
if (modules instanceof String) {
moduleLocations = configurationFactory.getModulesFromClassPath(null, classLoader);
- for (Iterator<File> i = moduleLocations.iterator(); i.hasNext(); ) {
- File file = i.next();
+ for (final Iterator<File> i = moduleLocations.iterator(); i.hasNext(); ) {
+ final File file = i.next();
if (!match((String) modules, file)) {
i.remove();
}
@@ -493,10 +493,10 @@ public final class OpenEjbContainer exte
int matched = 0;
- for (Iterator<File> i = moduleLocations.iterator(); i.hasNext(); ) {
- File file = i.next();
+ for (final Iterator<File> i = moduleLocations.iterator(); i.hasNext(); ) {
+ final File file = i.next();
boolean remove = true;
- for (String s : (String[]) modules) {
+ for (final String s : (String[]) modules) {
if (match(s, file)) {
remove = false;
matched++;
@@ -516,14 +516,14 @@ public final class OpenEjbContainer exte
} else if (modules instanceof File) {
- URL url = ((File) modules).toURI().toURL();
+ final URL url = ((File) modules).toURI().toURL();
classLoader = new URLClassLoader(new URL[]{url}, classLoader);
moduleLocations = Collections.singletonList((File) modules);
} else if (modules instanceof File[]) {
- File[] files = (File[]) modules;
- URL[] urls = new URL[files.length];
+ final File[] files = (File[]) modules;
+ final URL[] urls = new URL[files.length];
for (int i = 0; i < urls.length; i++) {
urls[i] = files[i].toURI().toURL();
}
@@ -536,7 +536,7 @@ public final class OpenEjbContainer exte
} else {
- AppModule appModule = load(map);
+ final AppModule appModule = load(map);
if (appModule != null) return appModule;
@@ -554,15 +554,15 @@ public final class OpenEjbContainer exte
return configurationFactory.loadApplication(classLoader, appId, moduleLocations);
}
- private AppModule load(Map<?, ?> map) {
+ private AppModule load(final Map<?, ?> map) {
- String appId = (String) map.get(EJBContainer.APP_NAME);
+ final String appId = (String) map.get(EJBContainer.APP_NAME);
final Object modules = map.get(EJBContainer.MODULES);
map.size();
- AppModule m;
+ final AppModule m;
{
Application application = null;
@@ -630,24 +630,24 @@ public final class OpenEjbContainer exte
return new NoSuchModuleException("some modules not matched on classpath");
}
- private InvalidModulesPropertyException invalidModulesValue(Object value) {
- String[] spec = {"java.lang.String", "java.lang.String[]", "java.io.File", "java.io.File[]"};
+ private InvalidModulesPropertyException invalidModulesValue(final Object value) {
+ final String[] spec = {"java.lang.String", "java.lang.String[]", "java.io.File", "java.io.File[]"};
// TODO
// String[] vendor = {"java.lang.Class","java.lang.Class[]", "java.net.URL", "java.io.URL[]"};
- String type = value == null ? null : value.getClass().getName();
+ final String type = value == null ? null : value.getClass().getName();
return new InvalidModulesPropertyException(String.format("Invalid '%s' value '%s'. Valid values are: %s", EJBContainer.MODULES, type, Join.join(", ", spec)));
}
- private static boolean isOtherProvider(Map<?, ?> properties) {
+ private static boolean isOtherProvider(final Map<?, ?> properties) {
final Object provider = properties.get(EJBContainer.PROVIDER);
return provider != null && !provider.equals(OpenEjbContainer.class) && !provider.equals(OpenEjbContainer.class.getName())
&& !"openejb".equals(provider);
}
- private boolean match(String s, File file) {
+ private boolean match(final String s, final File file) {
final String s2 = file.getName();
final String s3 = file.getAbsolutePath();
- boolean matches;
+ final boolean matches;
if (file.isDirectory()) {
matches = s2.equals(s) || s2.equals(s + ".jar") || s3.equals(s);
} else {
@@ -661,7 +661,7 @@ public final class OpenEjbContainer exte
private class GlobalContext extends ContextFlyweight {
private final Context globalJndiContext;
- public GlobalContext(Context globalJndiContext) {
+ public GlobalContext(final Context globalJndiContext) {
this.globalJndiContext = globalJndiContext;
}
@@ -680,33 +680,33 @@ public final class OpenEjbContainer exte
}
@Override
- protected String getName(String name) throws NamingException {
+ protected String getName(final String name) throws NamingException {
if ("inject".equals(name)) return name;
if (!name.startsWith("java:")) throw new NameNotFoundException("Name must be in java: namespace");
return name.substring("java:".length());
}
@Override
- public void bind(Name name, Object obj) throws NamingException {
+ public void bind(final Name name, final Object obj) throws NamingException {
if (name.size() == 1 && "inject".equals(name.get(0))) inject(obj);
else super.bind(name, obj);
}
@Override
- public void bind(String name, Object obj) throws NamingException {
+ public void bind(final String name, final Object obj) throws NamingException {
if (name != null && "inject".equals(name)) inject(obj);
else super.bind(name, obj);
}
@Override
- public void unbind(Name name) throws NamingException {
+ public void unbind(final Name name) throws NamingException {
if (!(name.size() == 1 && "inject".equals(name.get(0)))) {
super.unbind(name);
}
}
@Override
- public void unbind(String name) throws NamingException {
+ public void unbind(final String name) throws NamingException {
if (!(name != null && "inject".equals(name))) {
super.unbind(name);
}
@@ -715,47 +715,47 @@ public final class OpenEjbContainer exte
public static class InitializationException extends EJBException {
- public InitializationException(String s) {
+ public InitializationException(final String s) {
super(s);
}
- public InitializationException(Exception cause) {
+ public InitializationException(final Exception cause) {
super(cause);
}
}
public static class InvalidModulesPropertyException extends InitializationException {
- public InvalidModulesPropertyException(String s) {
+ public InvalidModulesPropertyException(final String s) {
super(s);
}
}
public static class NoSuchModuleException extends InitializationException {
- public NoSuchModuleException(String s) {
+ public NoSuchModuleException(final String s) {
super(s);
}
}
public static class NoModulesFoundException extends InitializationException {
- public NoModulesFoundException(String s) {
+ public NoModulesFoundException(final String s) {
super(s);
}
}
public static class ConfigureApplicationException extends InitializationException {
- public ConfigureApplicationException(Exception cause) {
+ public ConfigureApplicationException(final Exception cause) {
super(cause);
}
}
public static class AssembleApplicationException extends InitializationException {
- public AssembleApplicationException(Exception cause) {
+ public AssembleApplicationException(final Exception cause) {
super(cause);
}
}
public static class InvalidApplicationException extends InitializationException {
- public InvalidApplicationException(Exception cause) {
+ public InvalidApplicationException(final Exception cause) {
super(cause);
}
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/ProxyInfo.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/ProxyInfo.java?rev=1569795&r1=1569794&r2=1569795&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/ProxyInfo.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/ProxyInfo.java Wed Feb 19 15:47:58 2014
@@ -31,7 +31,7 @@ public class ProxyInfo {
protected ProxyInfo() {
}
- public ProxyInfo(BeanContext beanContext, Object primaryKey, List<Class> interfaces, InterfaceType proxyType, Class mainInterface) {
+ public ProxyInfo(final BeanContext beanContext, final Object primaryKey, final List<Class> interfaces, final InterfaceType proxyType, final Class mainInterface) {
this.beanContext = beanContext;
this.primaryKey = primaryKey;
this.proxyInterfaces = interfaces;
@@ -49,7 +49,7 @@ public class ProxyInfo {
* @param depInfo
* @param pk
*/
- public ProxyInfo(BeanContext depInfo, Object pk) {
+ public ProxyInfo(final BeanContext depInfo, final Object pk) {
this(depInfo, pk, new ArrayList<Class>(), InterfaceType.UNKNOWN, null);
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/SystemException.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/SystemException.java?rev=1569795&r1=1569794&r2=1569795&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/SystemException.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/SystemException.java Wed Feb 19 15:47:58 2014
@@ -43,15 +43,15 @@ public class SystemException extends Ope
super();
}
- public SystemException(String message) {
+ public SystemException(final String message) {
super(message);
}
- public SystemException(Throwable rootCause) {
+ public SystemException(final Throwable rootCause) {
super(rootCause);
}
- public SystemException(String message, Throwable rootCause) {
+ public SystemException(final String message, final Throwable rootCause) {
super(message, rootCause);
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/UndeployException.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/UndeployException.java?rev=1569795&r1=1569794&r2=1569795&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/UndeployException.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/UndeployException.java Wed Feb 19 15:47:58 2014
@@ -31,15 +31,15 @@ public class UndeployException extends O
public UndeployException() {
}
- public UndeployException(String message) {
+ public UndeployException(final String message) {
super(message);
}
- public UndeployException(String message, Throwable rootCause) {
+ public UndeployException(final String message, final Throwable rootCause) {
super(message, rootCause);
}
- public UndeployException(Throwable rootCause) {
+ public UndeployException(final Throwable rootCause) {
super(rootCause);
}
@@ -47,19 +47,19 @@ public class UndeployException extends O
return causes;
}
- public void printStackTrace(PrintStream s) {
+ public void printStackTrace(final PrintStream s) {
super.printStackTrace(s);
- for (Throwable throwable : causes) {
+ for (final Throwable throwable : causes) {
s.print("Nested caused by: ");
throwable.printStackTrace(s);
}
}
- public void printStackTrace(PrintWriter s) {
+ public void printStackTrace(final PrintWriter s) {
super.printStackTrace(s);
- for (Throwable throwable : causes) {
+ for (final Throwable throwable : causes) {
s.print("Nested caused by: ");
throwable.printStackTrace(s);
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/DeployerEjb.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/DeployerEjb.java?rev=1569795&r1=1569794&r2=1569795&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/DeployerEjb.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/DeployerEjb.java Wed Feb 19 15:47:58 2014
@@ -89,7 +89,7 @@ public class DeployerEjb implements Depl
if (!unique.createNewFile()) {
throw new IOException("Failed to create file in temp: " + unique);
}
- } catch (IOException e) {
+ } catch (final IOException e) {
// same trying in work directory
unique = new File(SystemInstance.get().getBase().getDirectory(), "work");
if (unique.exists()) {
@@ -98,7 +98,7 @@ public class DeployerEjb implements Depl
if (!unique.createNewFile()) {
throw new IOException("Failed to create file in work: " + unique);
}
- } catch (IOException e1) {
+ } catch (final IOException e1) {
throw new OpenEJBRuntimeException(e);
}
} else {
@@ -239,7 +239,7 @@ public class DeployerEjb implements Depl
return appInfo;
- } catch (Throwable e) {
+ } catch (final Throwable e) {
// destroy the class loader for the failed application
if (appModule != null) {
ClassLoaderUtil.destroyClassLoader(appModule.getJarLocation());
@@ -296,7 +296,7 @@ public class DeployerEjb implements Depl
File config;
try {
config = SystemInstance.get().getBase().getFile(ADDITIONAL_DEPLOYMENTS, false);
- } catch (IOException e) {
+ } catch (final IOException e) {
config = null;
}
if (config == null || !config.getParentFile().exists()) {
@@ -344,7 +344,7 @@ public class DeployerEjb implements Depl
}
os = IO.write(config);
JaxbOpenejb.marshal(AdditionalDeployments.class, additionalDeployments, os);
- } catch (Exception e) {
+ } catch (final Exception e) {
LOGGER.error("can't save the added app, will not be present next time you'll start", e);
} finally {
IO.close(os);
@@ -355,16 +355,16 @@ public class DeployerEjb implements Depl
public void undeploy(final String moduleId) throws UndeployException, NoSuchApplicationException {
try {
assembler.destroyApplication(moduleId);
- } catch (NoSuchApplicationException nsae) {
+ } catch (final NoSuchApplicationException nsae) {
try {
assembler.destroyApplication(realLocation(moduleId));
- } catch (Exception e) {
+ } catch (final Exception e) {
try {
assembler.destroyApplication(new File(moduleId).getAbsolutePath());
- } catch (Exception e2) {
+ } catch (final Exception e2) {
try {
assembler.destroyApplication(new File(realLocation(moduleId)).getAbsolutePath());
- } catch (Exception e3) {
+ } catch (final Exception e3) {
throw nsae;
}
}
@@ -394,7 +394,7 @@ public class DeployerEjb implements Depl
try {
assembler.destroyApplication(info);
assembler.createApplication(info);
- } catch (Exception e) {
+ } catch (final Exception e) {
throw new OpenEJBRuntimeException(e);
}
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/AssemblerTool.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/AssemblerTool.java?rev=1569795&r1=1569794&r2=1569795&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/AssemblerTool.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/AssemblerTool.java Wed Feb 19 15:47:58 2014
@@ -53,7 +53,7 @@ public class AssemblerTool {
System.setProperty("noBanner", "true");
}
- protected static void checkImplementation(Class intrfce, Class factory, String serviceType, String serviceName) throws OpenEJBException {
+ protected static void checkImplementation(final Class intrfce, final Class factory, final String serviceType, final String serviceName) throws OpenEJBException {
if (!intrfce.isAssignableFrom(factory)) {
throw new OpenEJBException(messages.format("init.0100", serviceType, serviceName, factory.getName(), intrfce.getName()));
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/CmpJarBuilder.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/CmpJarBuilder.java?rev=1569795&r1=1569794&r2=1569795&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/CmpJarBuilder.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/CmpJarBuilder.java Wed Feb 19 15:47:58 2014
@@ -93,7 +93,7 @@ public class CmpJarBuilder {
// System.out.println(appInfo.cmpMappingsXml);
addJarEntry(jarOutputStream, "META-INF/openejb-cmp-generated-orm.xml", appInfo.cmpMappingsXml.getBytes());
}
- } catch (Throwable e) {
+ } catch (final Throwable e) {
if (null != jarFile && !jarFile.delete()) {
jarFile.deleteOnExit();
@@ -151,7 +151,7 @@ public class CmpJarBuilder {
Class<?> beanClass = null;
try {
beanClass = tempClassLoader.loadClass(entityBeanInfo.ejbClass);
- } catch (ClassNotFoundException e) {
+ } catch (final ClassNotFoundException e) {
throw (IOException) new IOException("Could not find entity bean class " + beanClass).initCause(e);
}
@@ -160,7 +160,7 @@ public class CmpJarBuilder {
if (entityBeanInfo.primKeyClass != null) {
try {
primKeyClass = tempClassLoader.loadClass(entityBeanInfo.primKeyClass);
- } catch (ClassNotFoundException e) {
+ } catch (final ClassNotFoundException e) {
throw (IOException) new IOException("Could not find entity primary key class " + entityBeanInfo.primKeyClass).initCause(e);
}
}
@@ -216,7 +216,7 @@ public class CmpJarBuilder {
// add all missing directory entries
fileName = fileName.replace('\\', '/');
String path = "";
- for (StringTokenizer tokenizer = new StringTokenizer(fileName, "/"); tokenizer.hasMoreTokens(); ) {
+ for (final StringTokenizer tokenizer = new StringTokenizer(fileName, "/"); tokenizer.hasMoreTokens(); ) {
final String part = tokenizer.nextToken();
if (tokenizer.hasMoreTokens()) {
path += part + "/";
@@ -253,14 +253,14 @@ public class CmpJarBuilder {
// if url caching is enabled, generate the file directly in the cache dir, so it doesn't have to be recoppied
try {
instance.jarFile = File.createTempFile("OpenEJBGenerated.", ".jar", dir).getAbsoluteFile();
- } catch (Throwable e) {
+ } catch (final Throwable e) {
Logger.getInstance(LogCategory.OPENEJB_STARTUP, CmpJarBuilder.class).warning("Failed to create temp jar file in: " + dir, e);
//Try
try {
Thread.sleep(50);
- } catch (InterruptedException ie) {
+ } catch (final InterruptedException ie) {
//Ignore
}
@@ -280,7 +280,7 @@ public class CmpJarBuilder {
if (jarOutputStream != null) {
try {
jarOutputStream.close();
- } catch (Throwable ignored) {
+ } catch (final Throwable ignored) {
// no-op
}
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/DelegatePermissionCollection.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/DelegatePermissionCollection.java?rev=1569795&r1=1569794&r2=1569795&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/DelegatePermissionCollection.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/DelegatePermissionCollection.java Wed Feb 19 15:47:58 2014
@@ -33,12 +33,12 @@ public class DelegatePermissionCollectio
private PermissionCollection pc = getPermissionCollection();
@Override
- public void add(Permission permission) {
+ public void add(final Permission permission) {
pc.add(permission);
}
@Override
- public boolean implies(Permission permission) {
+ public boolean implies(final Permission permission) {
return pc.implies(permission);
}
@@ -54,7 +54,7 @@ public class DelegatePermissionCollectio
SystemInstance.get().getOptions().get(PERMISSION_COLLECTION_CLASS,
FastPermissionCollection.class.getName()))
.newInstance();
- } catch (Exception cnfe) {
+ } catch (final Exception cnfe) {
// return new Permissions(); // the jdk implementation, it seems slow at least for startup up
return new FastPermissionCollection();
}
@@ -66,12 +66,12 @@ public class DelegatePermissionCollectio
private final Map<Permission, Boolean> alreadyEvaluatedPermissions = new ConcurrentHashMap<Permission, Boolean>();
@Override
- public synchronized void add(Permission permission) {
+ public synchronized void add(final Permission permission) {
permissions.add(permission);
}
@Override
- public synchronized boolean implies(Permission permission) {
+ public synchronized boolean implies(final Permission permission) {
if (alreadyEvaluatedPermissions.containsKey(permission)) {
return alreadyEvaluatedPermissions.get(permission);
}
@@ -82,7 +82,7 @@ public class DelegatePermissionCollectio
alreadyEvaluatedPermissions.clear();
}
- for (Permission perm : permissions) {
+ for (final Permission perm : permissions) {
if (perm.implies(permission)) {
alreadyEvaluatedPermissions.put(permission, true);
return true;
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/DeployTimeEnhancer.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/DeployTimeEnhancer.java?rev=1569795&r1=1569794&r2=1569795&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/DeployTimeEnhancer.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/DeployTimeEnhancer.java Wed Feb 19 15:47:58 2014
@@ -71,7 +71,7 @@ public class DeployTimeEnhancer {
final Class<?> arg2 = cl.loadClass("org.apache.openjpa.lib.util.Options");
cstr = arg2.getConstructor(Properties.class);
mtd = enhancerClass.getMethod("run", String[].class, arg2);
- } catch (Exception e) {
+ } catch (final Exception e) {
LOGGER.warning("openjpa enhancer can't be found in the container, will be skipped");
mtd = null;
cstr = null;
@@ -89,7 +89,7 @@ public class DeployTimeEnhancer {
// find persistence.xml
final Map<String, List<String>> classesByPXml = new HashMap<String, List<String>>();
final List<URL> usedUrls = new ArrayList<URL>(); // for fake classloader
- for (URL url : event.getUrls()) {
+ for (final URL url : event.getUrls()) {
final File file = URLs.toFile(url);
if (file.isDirectory()) {
final String pXmls = getWarPersistenceXml(url);
@@ -101,7 +101,7 @@ public class DeployTimeEnhancer {
} else if (file.getName().endsWith(".jar")) {
try {
final JarFile jar = new JarFile(file);
- ZipEntry entry = jar.getEntry(META_INF_PERSISTENCE_XML);
+ final ZipEntry entry = jar.getEntry(META_INF_PERSISTENCE_XML);
if (entry != null) {
final String path = file.getAbsolutePath();
final File unpacked = new File(path.substring(0, path.length() - 4) + TMP_ENHANCEMENT_SUFFIX);
@@ -112,7 +112,7 @@ public class DeployTimeEnhancer {
feed(classesByPXml, new File(unpacked, META_INF_PERSISTENCE_XML).getAbsolutePath());
}
- } catch (IOException e) {
+ } catch (final IOException e) {
// ignored
}
} else {
@@ -127,14 +127,14 @@ public class DeployTimeEnhancer {
Thread.currentThread().setContextClassLoader(fakeClassLoader);
try {
- for (Map.Entry<String, List<String>> entry : classesByPXml.entrySet()) {
+ for (final Map.Entry<String, List<String>> entry : classesByPXml.entrySet()) {
final Properties opts = new Properties();
opts.setProperty(PROPERTIES_FILE_PROP, entry.getKey());
final Object optsArg;
try {
optsArg = optionsConstructor.newInstance(opts);
- } catch (Exception e) {
+ } catch (final Exception e) {
LOGGER.debug("can't create options for enhancing");
return;
}
@@ -142,7 +142,7 @@ public class DeployTimeEnhancer {
LOGGER.info("enhancing url(s): " + Arrays.asList(event.getUrls()));
try {
enhancerMethod.invoke(null, toFilePaths(entry.getValue()), optsArg);
- } catch (Exception e) {
+ } catch (final Exception e) {
LOGGER.warning("can't enhanced at deploy-time entities", e);
}
}
@@ -152,9 +152,9 @@ public class DeployTimeEnhancer {
}
// clean up extracted jars and replace jar to keep consistent classloading
- for (Map.Entry<String, List<String>> entry : classesByPXml.entrySet()) {
+ for (final Map.Entry<String, List<String>> entry : classesByPXml.entrySet()) {
final List<String> values = entry.getValue();
- for (String rawPath : values) {
+ for (final String rawPath : values) {
if (rawPath.endsWith(TMP_ENHANCEMENT_SUFFIX + "/") || rawPath.endsWith(TMP_ENHANCEMENT_SUFFIX)) {
final File dir = new File(rawPath);
final File file = new File(rawPath.substring(0, rawPath.length() - TMP_ENHANCEMENT_SUFFIX.length() - 1) + ".jar");
@@ -194,10 +194,10 @@ public class DeployTimeEnhancer {
final SAXParser parser = Saxs.factory().newSAXParser();
final JarFileParser handler = new JarFileParser();
parser.parse(new File(pXml), handler);
- for (String path : handler.getPaths()) {
+ for (final String path : handler.getPaths()) {
paths.add(relative(paths.iterator().next(), path));
}
- } catch (Exception e) {
+ } catch (final Exception e) {
LOGGER.error("can't parse '" + pXml + "'", e);
}
@@ -227,13 +227,13 @@ public class DeployTimeEnhancer {
private String[] toFilePaths(final List<String> urls) {
final List<String> files = new ArrayList<String>();
- for (String url : urls) {
+ for (final String url : urls) {
final File dir = new File(url);
if (!dir.isDirectory()) {
continue;
}
- for (File f : Files.collect(dir, new ClassFilter())) {
+ for (final File f : Files.collect(dir, new ClassFilter())) {
files.add(f.getAbsolutePath());
}
}
@@ -248,7 +248,7 @@ public class DeployTimeEnhancer {
@Override
public boolean accept(final File file) {
- boolean isClass = file.getName().endsWith(CLASS_EXT);
+ final boolean isClass = file.getName().endsWith(CLASS_EXT);
if (DEFAULT_EXCLUDE.equals(EXCLUDE_PATTERN.pattern()) && DEFAULT_INCLUDE.equals(INCLUDE_PATTERN.pattern())) {
return isClass;
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/DeploymentExceptionManager.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/DeploymentExceptionManager.java?rev=1569795&r1=1569794&r2=1569795&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/DeploymentExceptionManager.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/DeploymentExceptionManager.java Wed Feb 19 15:47:58 2014
@@ -32,7 +32,7 @@ public class DeploymentExceptionManager
private static final int MAX_SIZE = SystemInstance.get().getOptions().get("tomee.deployement-exception-max-size", 10);
private final Map<AppInfo, Exception> deploymentException = new LinkedHashMap<AppInfo, Exception>() {
@Override // just to avoid potential memory leak
- protected boolean removeEldestEntry(Map.Entry<AppInfo, Exception> eldest) {
+ protected boolean removeEldestEntry(final Map.Entry<AppInfo, Exception> eldest) {
return size() > MAX_SIZE;
}
};
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EjbJarBuilder.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EjbJarBuilder.java?rev=1569795&r1=1569794&r2=1569795&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EjbJarBuilder.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EjbJarBuilder.java Wed Feb 19 15:47:58 2014
@@ -39,32 +39,32 @@ public class EjbJarBuilder {
private final Properties props;
private AppContext context;
- public EjbJarBuilder(Properties props, AppContext context) {
+ public EjbJarBuilder(final Properties props, final AppContext context) {
this.props = props;
this.context = context;
}
public HashMap<String, BeanContext> build(final EjbJarInfo ejbJar, final Collection<Injection> appInjections, final ClassLoader classLoader) throws OpenEJBException {
- InjectionBuilder injectionBuilder = new InjectionBuilder(classLoader);
- List<Injection> moduleInjections = injectionBuilder.buildInjections(ejbJar.moduleJndiEnc);
+ final InjectionBuilder injectionBuilder = new InjectionBuilder(classLoader);
+ final List<Injection> moduleInjections = injectionBuilder.buildInjections(ejbJar.moduleJndiEnc);
moduleInjections.addAll(appInjections);
- Context moduleJndiContext = new JndiEncBuilder(ejbJar.moduleJndiEnc, moduleInjections, null, ejbJar.moduleName, ejbJar.moduleUri, ejbJar.uniqueId, classLoader)
+ final Context moduleJndiContext = new JndiEncBuilder(ejbJar.moduleJndiEnc, moduleInjections, null, ejbJar.moduleName, ejbJar.moduleUri, ejbJar.uniqueId, classLoader)
.build(JndiEncBuilder.JndiScope.module);
- HashMap<String, BeanContext> deployments = new HashMap<String, BeanContext>();
+ final HashMap<String, BeanContext> deployments = new HashMap<String, BeanContext>();
- ModuleContext moduleContext = new ModuleContext(ejbJar.moduleName, ejbJar.moduleUri, ejbJar.uniqueId, context, moduleJndiContext, classLoader);
+ final ModuleContext moduleContext = new ModuleContext(ejbJar.moduleName, ejbJar.moduleUri, ejbJar.uniqueId, context, moduleJndiContext, classLoader);
moduleContext.getProperties().putAll(ejbJar.properties);
- InterceptorBindingBuilder interceptorBindingBuilder = new InterceptorBindingBuilder(classLoader, ejbJar);
+ final InterceptorBindingBuilder interceptorBindingBuilder = new InterceptorBindingBuilder(classLoader, ejbJar);
- MethodScheduleBuilder methodScheduleBuilder = new MethodScheduleBuilder();
+ final MethodScheduleBuilder methodScheduleBuilder = new MethodScheduleBuilder();
- for (EnterpriseBeanInfo ejbInfo : ejbJar.enterpriseBeans) {
+ for (final EnterpriseBeanInfo ejbInfo : ejbJar.enterpriseBeans) {
final ClassLoader loader = Thread.currentThread().getContextClassLoader();
Thread.currentThread().setContextClassLoader(moduleContext.getClassLoader());
try {
- EnterpriseBeanBuilder deploymentBuilder = new EnterpriseBeanBuilder(ejbInfo, moduleContext, moduleInjections);
- BeanContext bean = deploymentBuilder.build();
+ final EnterpriseBeanBuilder deploymentBuilder = new EnterpriseBeanBuilder(ejbInfo, moduleContext, moduleInjections);
+ final BeanContext bean = deploymentBuilder.build();
interceptorBindingBuilder.build(bean, ejbInfo);
@@ -73,12 +73,12 @@ public class EjbJarBuilder {
deployments.put(ejbInfo.ejbDeploymentId, bean);
// TODO: replace with get() on application context or parent
- Container container = (Container) props.get(ejbInfo.containerId);
+ final Container container = (Container) props.get(ejbInfo.containerId);
if (container == null) throw new IllegalStateException("Container does not exist: " + ejbInfo.containerId + ". Referenced by deployment: " + bean.getDeploymentID());
// Don't deploy to the container, yet. That will be done by deploy() once Assembler as finished configuring the DeploymentInfo
bean.setContainer(container);
- } catch (Throwable e) {
+ } catch (final Throwable e) {
throw new OpenEJBException("Error building bean '" + ejbInfo.ejbName + "'. Exception: " + e.getClass() + ": " + e.getMessage(), e);
} finally {
Thread.currentThread().setContextClassLoader(loader);
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EjbResolver.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EjbResolver.java?rev=1569795&r1=1569794&r2=1569795&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EjbResolver.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EjbResolver.java Wed Feb 19 15:47:58 2014
@@ -61,15 +61,15 @@ public class EjbResolver {
private final Scope scope;
- public EjbResolver(EjbResolver parent, Scope scope, EjbJarInfo... ejbJars) {
+ public EjbResolver(final EjbResolver parent, final Scope scope, final EjbJarInfo... ejbJars) {
this(parent, scope, Arrays.asList(ejbJars));
}
- public EjbResolver(EjbResolver parent, Scope scope, List<EjbJarInfo> ejbJars) {
+ public EjbResolver(final EjbResolver parent, final Scope scope, final List<EjbJarInfo> ejbJars) {
this.scope = scope;
this.parent = parent;
- for (EjbJarInfo ejbJarInfo : ejbJars) {
+ for (final EjbJarInfo ejbJarInfo : ejbJars) {
add(ejbJarInfo);
}
}
@@ -77,19 +77,19 @@ public class EjbResolver {
/**
* Possible syncronization issue here
*/
- public void addAll(List<EjbJarInfo> ejbJars) {
- for (EjbJarInfo ejbJarInfo : ejbJars) {
+ public void addAll(final List<EjbJarInfo> ejbJars) {
+ for (final EjbJarInfo ejbJarInfo : ejbJars) {
add(ejbJarInfo);
}
}
- public void add(EjbJarInfo ejbJarInfo) {
- for (EnterpriseBeanInfo bean : ejbJarInfo.enterpriseBeans) {
+ public void add(final EjbJarInfo ejbJarInfo) {
+ for (final EnterpriseBeanInfo bean : ejbJarInfo.enterpriseBeans) {
index(ejbJarInfo.moduleUri, bean);
}
}
- private void index(URI moduleURI, EnterpriseBeanInfo bean) {
+ private void index(final URI moduleURI, final EnterpriseBeanInfo bean) {
// All deployments: deploymentId -> bean
deployments.put(bean.ejbDeploymentId, bean);
@@ -102,7 +102,7 @@ public class EjbResolver {
addInterfaces(new Interfaces(bean.home, bean.remote, Type.REMOTE, bean.ejbDeploymentId));
addInterfaces(new Interfaces(bean.remote, Type.REMOTE, bean.ejbDeploymentId));
}
- for (String businessRemote : bean.businessRemote) {
+ for (final String businessRemote : bean.businessRemote) {
addInterfaces(new Interfaces(businessRemote, Type.REMOTE, bean.ejbDeploymentId));
}
@@ -111,19 +111,19 @@ public class EjbResolver {
addInterfaces(new Interfaces(bean.localHome, bean.local, Type.LOCAL, bean.ejbDeploymentId));
addInterfaces(new Interfaces(bean.local, Type.LOCAL, bean.ejbDeploymentId));
}
- for (String businessLocal : bean.businessLocal) {
+ for (final String businessLocal : bean.businessLocal) {
addInterfaces(new Interfaces(businessLocal, Type.LOCAL, bean.ejbDeploymentId));
}
if (bean.localbean) {
addInterfaces(new Interfaces(bean.ejbClass, Type.LOCAL, bean.ejbDeploymentId));
- for (String parent : bean.parents) {
+ for (final String parent : bean.parents) {
addInterfaces(new Interfaces(parent, Type.LOCAL, bean.ejbDeploymentId));
}
}
}
- private void addInterfaces(Interfaces interfaces) {
+ private void addInterfaces(final Interfaces interfaces) {
List<Interfaces> similar = this.interfaces.get(interfaces);
if (similar == null) {
similar = new ArrayList<Interfaces>();
@@ -132,7 +132,7 @@ public class EjbResolver {
similar.add(interfaces);
}
- private String resolveLink(String link, URI moduleUri) {
+ private String resolveLink(final String link, final URI moduleUri) {
if (link == null || link.length() == 0) return null;
String id = resolver.resolveLink(link, moduleUri);
@@ -142,7 +142,7 @@ public class EjbResolver {
return id;
}
- private String resolveInterface(Reference ref) {
+ private String resolveInterface(final Reference ref) {
String id = null;
if (ref.getInterface() == null) {
@@ -152,10 +152,10 @@ public class EjbResolver {
return null;
}
- List<Interfaces> matches = this.interfaces.get(new Interfaces(ref.getHome(), ref.getInterface()));
+ final List<Interfaces> matches = this.interfaces.get(new Interfaces(ref.getHome(), ref.getInterface()));
if (matches != null && matches.size() > 0){
- List<Interfaces> nameMatches = filter(matches, ref.getName());
+ final List<Interfaces> nameMatches = filter(matches, ref.getName());
// Imply by name and type (local/remote)
id = first(filter(nameMatches, ref.getRefType()));
if (id == null){
@@ -179,15 +179,15 @@ public class EjbResolver {
return id;
}
- private String first(List<Interfaces> list) {
+ private String first(final List<Interfaces> list) {
if (list.size() == 0) return null;
return list.get(0).getId();
}
- private List<Interfaces> filter(List<Interfaces> list, String name) {
- String shortName = name.replaceAll(".*/", "");
- List<Interfaces> matches = new ArrayList();
- for (Interfaces entry : list) {
+ private List<Interfaces> filter(final List<Interfaces> list, final String name) {
+ final String shortName = name.replaceAll(".*/", "");
+ final List<Interfaces> matches = new ArrayList();
+ for (final Interfaces entry : list) {
if (name.equalsIgnoreCase(entry.getId())){
matches.add(entry);
} else if (shortName.equalsIgnoreCase(entry.getId())){
@@ -197,9 +197,9 @@ public class EjbResolver {
return matches;
}
- private List<Interfaces> filter(List<Interfaces> list, Type type) {
- List<Interfaces> matches = new ArrayList();
- for (Interfaces entry : list) {
+ private List<Interfaces> filter(final List<Interfaces> list, final Type type) {
+ final List<Interfaces> matches = new ArrayList();
+ for (final Interfaces entry : list) {
if (type == Type.UNKNOWN || type == entry.type){
matches.add(entry);
}
@@ -207,7 +207,7 @@ public class EjbResolver {
return matches;
}
- public Scope getScope(String deploymentId) {
+ public Scope getScope(final String deploymentId) {
if (deployments.containsKey(deploymentId)) return scope;
if (parent != null) return parent.getScope(deploymentId);
@@ -215,7 +215,7 @@ public class EjbResolver {
return null;
}
- public EnterpriseBeanInfo getEnterpriseBeanInfo(String deploymentId) {
+ public EnterpriseBeanInfo getEnterpriseBeanInfo(final String deploymentId) {
EnterpriseBeanInfo info = deployments.get(deploymentId);
if (info == null && parent != null) {
info = parent.getEnterpriseBeanInfo(deploymentId);
@@ -223,7 +223,7 @@ public class EjbResolver {
return info;
}
- public String resolve(Reference ref, URI moduleUri) {
+ public String resolve(final Reference ref, final URI moduleUri) {
if (ref.getMappedName() != null && !ref.getMappedName().equals("")) {
return ref.getMappedName();
@@ -244,7 +244,7 @@ public class EjbResolver {
private final String homeInterface;
private final String objectInterface;
- public Interfaces(String objectInterface, Type type, String id) {
+ public Interfaces(final String objectInterface, final Type type, final String id) {
if (objectInterface == null) throw new NullPointerException("objectInterface is null");
this.homeInterface = "<none>";
this.objectInterface = objectInterface;
@@ -252,7 +252,7 @@ public class EjbResolver {
this.id = id;
}
- public Interfaces(String homeInterface, String objectInterface, Type type, String id) {
+ public Interfaces(String homeInterface, final String objectInterface, final Type type, final String id) {
if (homeInterface == null) homeInterface = "<none>";
if (objectInterface == null) throw new NullPointerException("objectInterface is null");
this.homeInterface = homeInterface;
@@ -261,7 +261,7 @@ public class EjbResolver {
this.id = id;
}
- public Interfaces(String homeInterface, String objectInterface) {
+ public Interfaces(String homeInterface, final String objectInterface) {
if (homeInterface == null) homeInterface = "<none>";
if (objectInterface == null) throw new NullPointerException("objectInterface is null");
this.homeInterface = homeInterface;
@@ -278,11 +278,11 @@ public class EjbResolver {
return type;
}
- public boolean equals(Object o) {
+ public boolean equals(final Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
- Interfaces that = (Interfaces) o;
+ final Interfaces that = (Interfaces) o;
return homeInterface.equals(that.homeInterface) && objectInterface.equals(that.objectInterface);
}
@@ -294,10 +294,10 @@ public class EjbResolver {
return result;
}
- public int compareTo(Object o) {
+ public int compareTo(final Object o) {
if (this == o) return 0;
- Interfaces that = (Interfaces) o;
+ final Interfaces that = (Interfaces) o;
return toString().compareTo(that.toString());
}