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 [16/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/config/rules/CheckRestMethodArePublic.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckRestMethodArePublic.java?rev=1569795&r1=1569794&r2=1569795&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckRestMethodArePublic.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckRestMethodArePublic.java Wed Feb 19 15:47:58 2014
@@ -40,10 +40,10 @@ public class CheckRestMethodArePublic im
final ClassLoader loader = Thread.currentThread().getContextClassLoader();
try {
- for (EjbModule ejb : appModule.getEjbModules()) {
+ for (final EjbModule ejb : appModule.getEjbModules()) {
Thread.currentThread().setContextClassLoader(ejb.getClassLoader());
- for (EnterpriseBean bean : ejb.getEjbJar().getEnterpriseBeans()) {
+ for (final EnterpriseBean bean : ejb.getEjbJar().getEnterpriseBeans()) {
if (bean instanceof SessionBean && ((SessionBean) bean).isRestService()) {
standAloneClasses.add(bean.getEjbClass());
valid(ejb.getValidation(), ejb.getClassLoader(), bean.getEjbClass());
@@ -51,7 +51,7 @@ public class CheckRestMethodArePublic im
}
}
- for (WebModule web : appModule.getWebModules()) {
+ for (final WebModule web : appModule.getWebModules()) {
Thread.currentThread().setContextClassLoader(web.getClassLoader());
// build the list of classes to validate
@@ -59,29 +59,29 @@ public class CheckRestMethodArePublic im
classes.addAll(web.getRestClasses());
classes.addAll(web.getEjbRestServices());
- for (String app : web.getRestApplications()) {
- Class<?> clazz;
+ for (final String app : web.getRestApplications()) {
+ final Class<?> clazz;
try {
clazz = web.getClassLoader().loadClass(app);
- } catch (ClassNotFoundException e) {
+ } catch (final ClassNotFoundException e) {
continue; // managed elsewhere, here we just check methods
}
final Application appInstance;
try {
appInstance = (Application) clazz.newInstance();
- } catch (Exception e) {
+ } catch (final Exception e) {
continue; // managed elsewhere
}
try {
- for (Class<?> rsClass : appInstance.getClasses()) {
+ for (final Class<?> rsClass : appInstance.getClasses()) {
classes.add(rsClass.getName());
}
- for (Object rsSingleton : appInstance.getSingletons()) {
+ for (final Object rsSingleton : appInstance.getSingletons()) {
classes.add(rsSingleton.getClass().getName());
}
- } catch (RuntimeException npe) {
+ } catch (final RuntimeException npe) {
if (appInstance == null) {
throw npe;
}
@@ -99,7 +99,7 @@ public class CheckRestMethodArePublic im
}
// valid
- for (String classname : classes) {
+ for (final String classname : classes) {
valid(web.getValidation(), web.getClassLoader(), classname);
}
@@ -116,15 +116,15 @@ public class CheckRestMethodArePublic im
Class<?> clazz;
try {
clazz = classLoader.loadClass(classname);
- } catch (ClassNotFoundException e) {
+ } catch (final ClassNotFoundException e) {
return; // managed elsewhere
}
int publicMethodNumber = 0;
int nonPublicMethods = 0;
while (!Object.class.equals(clazz) && clazz != null) {
- for (Method mtd : clazz.getDeclaredMethods()) {
- boolean isPublic = Modifier.isPublic(mtd.getModifiers());
+ for (final Method mtd : clazz.getDeclaredMethods()) {
+ final boolean isPublic = Modifier.isPublic(mtd.getModifiers());
if (mtd.getAnnotation(Path.class) != null && !isPublic) {
final String name = mtd.toGenericString();
validation.warn(name, "rest.method.visibility", name);
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckUserTransactionRefs.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckUserTransactionRefs.java?rev=1569795&r1=1569794&r2=1569795&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckUserTransactionRefs.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckUserTransactionRefs.java Wed Feb 19 15:47:58 2014
@@ -36,11 +36,11 @@ import static org.apache.openejb.jee.Tra
*/
public class CheckUserTransactionRefs extends ValidationBase {
- public void validate(EjbModule ejbModule) {
- for (EnterpriseBean bean : ejbModule.getEjbJar().getEnterpriseBeans()) {
+ public void validate(final EjbModule ejbModule) {
+ for (final EnterpriseBean bean : ejbModule.getEjbJar().getEnterpriseBeans()) {
if (bean.getTransactionType() == CONTAINER) {
- Collection<ResourceEnvRef> resRefs = bean.getResourceEnvRef();
- for (ResourceEnvRef resRef : resRefs) {
+ final Collection<ResourceEnvRef> resRefs = bean.getResourceEnvRef();
+ for (final ResourceEnvRef resRef : resRefs) {
if ("javax.transaction.UserTransaction".equals(resRef.getResourceEnvRefType())) {
fail(bean, "userTransactionRef.forbiddenForCmtdBeans", resRef.getName());
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/rules/ValidationBase.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/rules/ValidationBase.java?rev=1569795&r1=1569794&r2=1569795&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/rules/ValidationBase.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/rules/ValidationBase.java Wed Feb 19 15:47:58 2014
@@ -39,16 +39,16 @@ import java.lang.reflect.Method;
public abstract class ValidationBase implements ValidationRule {
DeploymentModule module;
- public void validate(AppModule appModule) {
+ public void validate(final AppModule appModule) {
final ClassLoader loader = Thread.currentThread().getContextClassLoader();
try {
- for (EjbModule ejbModule : appModule.getEjbModules()) {
+ for (final EjbModule ejbModule : appModule.getEjbModules()) {
Thread.currentThread().setContextClassLoader(ejbModule.getClassLoader());
module = ejbModule;
validate(ejbModule);
}
- for (ClientModule clientModule : appModule.getClientModules()) {
+ for (final ClientModule clientModule : appModule.getClientModules()) {
Thread.currentThread().setContextClassLoader(clientModule.getClassLoader());
module = clientModule;
@@ -59,68 +59,68 @@ public abstract class ValidationBase imp
}
}
- public void validate(ClientModule appModule) {
+ public void validate(final ClientModule appModule) {
}
- public void validate(EjbModule appModule) {
+ public void validate(final EjbModule appModule) {
}
- public void error(EnterpriseBean bean, String key, Object... details) {
+ public void error(final EnterpriseBean bean, final String key, final Object... details) {
error(bean.getEjbName(), key, details);
}
- private void error(String componentName, String key, Object... details) {
+ private void error(final String componentName, final String key, final Object... details) {
module.getValidation().error(componentName, key, details);
}
- public void fail(EnterpriseBean bean, String key, Object... details) {
+ public void fail(final EnterpriseBean bean, final String key, final Object... details) {
fail(bean.getEjbName(), key, details);
}
- public void fail(String component, String key, Object... details) {
+ public void fail(final String component, final String key, final Object... details) {
module.getValidation().fail(component, key, details);
}
- public void warn(EnterpriseBean bean, String key, Object... details) {
+ public void warn(final EnterpriseBean bean, final String key, final Object... details) {
warn(bean.getEjbName(), key, details);
}
- protected void warn(String componentName, String key, Object... details) {
+ protected void warn(final String componentName, final String key, final Object... details) {
module.getValidation().warn(componentName, key, details);
}
- public void missingMethod(ValidationContext set, EnterpriseBean bean, String key, String methodName, Class returnType, Class... paramTypes){
+ public void missingMethod(final ValidationContext set, final EnterpriseBean bean, final String key, final String methodName, final Class returnType, final Class... paramTypes){
fail(bean, key, methodName, returnType.getName(), getParameters(paramTypes));
}
- public void ignoredMethodAnnotation(String annotationType, EnterpriseBean bean, String className, String methodName, String beanType) {
+ public void ignoredMethodAnnotation(final String annotationType, final EnterpriseBean bean, final String className, final String methodName, final String beanType) {
warn(bean, "ignoredMethodAnnotation", annotationType, beanType, className, methodName);
}
- public void ignoredClassAnnotation(String annotationType, EnterpriseBean bean, String className, String beanType) {
+ public void ignoredClassAnnotation(final String annotationType, final EnterpriseBean bean, final String className, final String beanType) {
warn(bean, "ignoredClassAnnotation", annotationType, beanType, className);
}
- public static boolean paramsMatch(Method methodA, Method methodB) {
+ public static boolean paramsMatch(final Method methodA, final Method methodB) {
if (methodA.getParameterTypes().length != methodB.getParameterTypes().length){
return false;
}
for (int i = 0; i < methodA.getParameterTypes().length; i++) {
- Class<?> a = methodA.getParameterTypes()[i];
- Class<?> b = methodB.getParameterTypes()[i];
+ final Class<?> a = methodA.getParameterTypes()[i];
+ final Class<?> b = methodB.getParameterTypes()[i];
if (!a.equals(b)) return false;
}
return true;
}
- public String getParameters(Method method) {
- Class[] params = method.getParameterTypes();
+ public String getParameters(final Method method) {
+ final Class[] params = method.getParameterTypes();
return getParameters(params);
}
- public String getParameters(Class... params) {
- StringBuilder paramString = new StringBuilder(512);
+ public String getParameters(final Class... params) {
+ final StringBuilder paramString = new StringBuilder(512);
if (params.length > 0) {
paramString.append(params[0].getName());
@@ -134,7 +134,7 @@ public abstract class ValidationBase imp
return paramString.toString();
}
- public String getParameters(MethodParams methodParams) {
+ public String getParameters(final MethodParams methodParams) {
if(methodParams == null) {
return "";
} else {
@@ -142,20 +142,20 @@ public abstract class ValidationBase imp
}
}
- protected Class loadClass(String clazz) throws OpenEJBException {
- ClassLoader cl = module.getClassLoader();
+ protected Class loadClass(final String clazz) throws OpenEJBException {
+ final ClassLoader cl = module.getClassLoader();
try {
return Classes.forName(clazz, cl);
- } catch (ClassNotFoundException cnfe) {
+ } catch (final ClassNotFoundException cnfe) {
throw new OpenEJBException(SafeToolkit.messages.format("cl0007", clazz, module.getJarLocation()), cnfe);
}
}
- public boolean isCmp(EnterpriseBean b) {
+ public boolean isCmp(final EnterpriseBean b) {
if (b instanceof EntityBean) {
- EntityBean entityBean = (EntityBean) b;
- PersistenceType persistenceType = entityBean.getPersistenceType();
+ final EntityBean entityBean = (EntityBean) b;
+ final PersistenceType persistenceType = entityBean.getPersistenceType();
return persistenceType == PersistenceType.CONTAINER;
}
return false;
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/AbstractService.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/AbstractService.java?rev=1569795&r1=1569794&r2=1569795&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/AbstractService.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/AbstractService.java Wed Feb 19 15:47:58 2014
@@ -78,16 +78,16 @@ public abstract class AbstractService im
protected String factoryName;
- protected AbstractService(String id) {
+ protected AbstractService(final String id) {
this(id, null, null);
}
- protected AbstractService(String id, String type) {
+ protected AbstractService(final String id, final String type) {
this.id = id;
this.type = type;
}
- protected AbstractService(String id, String type, String provider) {
+ protected AbstractService(final String id, final String type, final String provider) {
this.id = id;
this.provider = provider;
this.type = type;
@@ -137,7 +137,7 @@ public abstract class AbstractService im
* @param value allowed object is
* {@link String }
*/
- public void setId(String value) {
+ public void setId(final String value) {
this.id = value;
}
@@ -157,7 +157,7 @@ public abstract class AbstractService im
* @param value allowed object is
* {@link String }
*/
- public void setJar(String value) {
+ public void setJar(final String value) {
this.jar = value;
}
@@ -177,7 +177,7 @@ public abstract class AbstractService im
* @param value allowed object is
* {@link String }
*/
- public void setProvider(String value) {
+ public void setProvider(final String value) {
this.provider = value;
}
@@ -185,7 +185,7 @@ public abstract class AbstractService im
return type;
}
- public void setType(String type) {
+ public void setType(final String type) {
this.type = type;
}
@@ -193,7 +193,7 @@ public abstract class AbstractService im
return className;
}
- public void setClassName(String className) {
+ public void setClassName(final String className) {
this.className = className;
}
@@ -201,7 +201,7 @@ public abstract class AbstractService im
return constructor;
}
- public void setConstructor(String constructor) {
+ public void setConstructor(final String constructor) {
this.constructor = constructor;
}
@@ -209,16 +209,16 @@ public abstract class AbstractService im
return factoryName;
}
- public void setFactoryName(String factoryName) {
+ public void setFactoryName(final String factoryName) {
this.factoryName = factoryName;
}
@Override
- public boolean equals(Object o) {
+ public boolean equals(final Object o) {
if (this == o) return true;
if (!(o instanceof AbstractService)) return false;
- AbstractService that = (AbstractService) o;
+ final AbstractService that = (AbstractService) o;
if (id != null ? !id.equals(that.id) : that.id != null) return false;
if (jar != null ? !jar.equals(that.jar) : that.jar != null) return false;
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/ConnectionManager.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/ConnectionManager.java?rev=1569795&r1=1569794&r2=1569795&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/ConnectionManager.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/ConnectionManager.java Wed Feb 19 15:47:58 2014
@@ -43,11 +43,11 @@ import javax.xml.bind.annotation.XmlType
@XmlRootElement(name = "ConnectionManager")
public class ConnectionManager extends AbstractService {
- public ConnectionManager(String id) {
+ public ConnectionManager(final String id) {
super(id);
}
- public ConnectionManager(String id, String type, String provider) {
+ public ConnectionManager(final String id, final String type, final String provider) {
super(id, type, provider);
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/Connector.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/Connector.java?rev=1569795&r1=1569794&r2=1569795&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/Connector.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/Connector.java Wed Feb 19 15:47:58 2014
@@ -43,11 +43,11 @@ import javax.xml.bind.annotation.XmlType
@XmlType(name = "")
@XmlRootElement(name = "Connector")
public class Connector extends AbstractService {
- public Connector(String id) {
+ public Connector(final String id) {
super(id);
}
- public Connector(String id, String type, String provider) {
+ public Connector(final String id, final String type, final String provider) {
super(id, type, provider);
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/Container.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/Container.java?rev=1569795&r1=1569794&r2=1569795&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/Container.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/Container.java Wed Feb 19 15:47:58 2014
@@ -46,11 +46,11 @@ import javax.xml.bind.annotation.XmlType
@XmlRootElement(name = "Container")
public class Container extends AbstractService {
- public Container(String id) {
+ public Container(final String id) {
super(id);
}
- public Container(String id, String type, String provider) {
+ public Container(final String id, final String type, final String provider) {
super(id, type, provider);
}
@@ -75,7 +75,7 @@ public class Container extends AbstractS
* {@link String }
*/
@XmlAttribute
- public void setCtype(String value) {
+ public void setCtype(final String value) {
setType(value);
}
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/Deployments.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/Deployments.java?rev=1569795&r1=1569794&r2=1569795&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/Deployments.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/Deployments.java Wed Feb 19 15:47:58 2014
@@ -59,7 +59,7 @@ public class Deployments {
return autoDeploy;
}
- public void setAutoDeploy(boolean autoDeploy) {
+ public void setAutoDeploy(final boolean autoDeploy) {
this.autoDeploy = autoDeploy;
}
@@ -79,12 +79,12 @@ public class Deployments {
* @param value allowed object is
* {@link String }
*/
- public void setDir(String value) {
+ public void setDir(final String value) {
this.dir = value;
}
- public Deployments dir(String name) {
+ public Deployments dir(final String name) {
setDir(name);
return this;
}
@@ -105,11 +105,11 @@ public class Deployments {
* @param value allowed object is
* {@link String }
*/
- public void setFile(String value) {
+ public void setFile(final String value) {
this.file = value;
}
- public Deployments file(String name) {
+ public Deployments file(final String name) {
setFile(name);
return this;
}
@@ -119,7 +119,7 @@ public class Deployments {
return classpath;
}
- public void setClasspath(ClassLoader classpath) {
+ public void setClasspath(final ClassLoader classpath) {
this.classpath = classpath;
}
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/JaxbOpenejb.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/JaxbOpenejb.java?rev=1569795&r1=1569794&r2=1569795&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/JaxbOpenejb.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/JaxbOpenejb.java Wed Feb 19 15:47:58 2014
@@ -60,7 +60,7 @@ import java.util.TreeSet;
public abstract class JaxbOpenejb {
@SuppressWarnings({"unchecked"})
- public static <T> T create(Class<T> type) {
+ public static <T> T create(final Class<T> type) {
if (type == null) throw new NullPointerException("type is null");
if (type == ConnectionManager.class) {
@@ -93,7 +93,7 @@ public abstract class JaxbOpenejb {
throw new IllegalArgumentException("Unknown type " + type.getName());
}
- public static <T> T create(String type) {
+ public static <T> T create(final String type) {
if (type == null) throw new NullPointerException("type is null");
if (type.equals("ConnectionManager")) {
@@ -139,13 +139,13 @@ public abstract class JaxbOpenejb {
final String path2 = providerPath.replace('.', '/') + "/service-jar.xml";
final List<String> paths = Arrays.asList(path1, path2);
- for (String p : paths) {
+ for (final String p : paths) {
try {
final Enumeration<URL> resources = loader.getResources(p);
if (resources != null){
sources.addAll(Collections.list(resources));
}
- } catch (IOException e) {
+ } catch (final IOException e) {
throw new OpenEJBException(String.format("Unable to scan for service-jar.xml file: getResource('%s')", p), e);
}
}
@@ -158,18 +158,18 @@ public abstract class JaxbOpenejb {
final ServicesJar servicesJar = new ServicesJar();
{
- for (URL url : sources) {
+ for (final URL url : sources) {
try {
final InputStream read = IO.read(url);
try {
final ServicesJar jar = parseServicesJar(read);
servicesJar.getServiceProvider().addAll(jar.getServiceProvider());
- } catch (Exception e) {
+ } catch (final Exception e) {
throw new OpenEJBException("Unable to parse service-jar.xml file for provider " + providerPath + " at " + url, e);
} finally {
IO.close(read);
}
- } catch (IOException e) {
+ } catch (final IOException e) {
throw new OpenEJBException("Unable to read service-jar.xml file for provider " + providerPath + " at " + url, e);
}
}
@@ -178,26 +178,26 @@ public abstract class JaxbOpenejb {
return servicesJar;
}
- public static ServicesJar parseServicesJar(InputStream in) throws ParserConfigurationException, SAXException, IOException {
- InputSource inputSource = new InputSource(in);
+ public static ServicesJar parseServicesJar(final InputStream in) throws ParserConfigurationException, SAXException, IOException {
+ final InputSource inputSource = new InputSource(in);
- SAXParser parser = Saxs.namespaceAwareFactory().newSAXParser();
+ final SAXParser parser = Saxs.namespaceAwareFactory().newSAXParser();
final ServicesJar servicesJar1 = new ServicesJar();
parser.parse(inputSource, new OpenEJBHandler(servicesJar1));
- ServicesJar servicesJar = servicesJar1;
+ final ServicesJar servicesJar = servicesJar1;
return servicesJar;
}
- public static Openejb readConfig(String configFile) throws OpenEJBException {
+ public static Openejb readConfig(final String configFile) throws OpenEJBException {
InputStream in = null;
try {
if (configFile.startsWith("jar:")) {
- URL url = new URL(configFile);
+ final URL url = new URL(configFile);
in = IO.read(url);
} else if (configFile.startsWith("file:")) {
- URL url = new URL(configFile);
+ final URL url = new URL(configFile);
in = IO.read(url);
} else {
in = IO.read(new File(configFile));
@@ -208,9 +208,9 @@ public abstract class JaxbOpenejb {
}
return readConfig(new InputSource(in));
- } catch (MalformedURLException e) {
+ } catch (final MalformedURLException e) {
throw new OpenEJBException("Unable to resolve location " + configFile, e);
- } catch (Exception e) {
+ } catch (final Exception e) {
throw new OpenEJBException("Unable to read OpenEJB configuration file at " + configFile, e);
} finally {
IO.close(in);
@@ -221,21 +221,21 @@ public abstract class JaxbOpenejb {
return SaxOpenejb.parse(in);
}
- public static void writeConfig(String configFile, Openejb openejb) throws OpenEJBException {
+ public static void writeConfig(final String configFile, final Openejb openejb) throws OpenEJBException {
OutputStream out = null;
try {
- File file = new File(configFile);
+ final File file = new File(configFile);
out = IO.write(file);
marshal(Openejb.class, openejb, out);
- } catch (IOException e) {
+ } catch (final IOException e) {
throw new OpenEJBException(ConfigUtils.messages.format("conf.1040", configFile, e.getLocalizedMessage()), e);
- } catch (MarshalException e) {
+ } catch (final MarshalException e) {
if (e.getCause() instanceof IOException) {
throw new OpenEJBException(ConfigUtils.messages.format("conf.1040", configFile, e.getLocalizedMessage()), e);
} else {
throw new OpenEJBException(ConfigUtils.messages.format("conf.1050", configFile, e.getLocalizedMessage()), e);
}
- } catch (ValidationException e) {
+ } catch (final ValidationException e) {
/* TODO: Implement informative error handling here.
The exception will say "X doesn't match the regular
expression Y"
@@ -248,13 +248,13 @@ public abstract class JaxbOpenejb {
* would think.
*/
throw new OpenEJBException(ConfigUtils.messages.format("conf.1060", configFile, e.getLocalizedMessage()), e);
- } catch (JAXBException e) {
+ } catch (final JAXBException e) {
throw new OpenEJBException(e);
} finally {
if (out != null) {
try {
out.close();
- } catch (Exception e) {
+ } catch (final Exception e) {
// no-op
}
}
@@ -265,24 +265,24 @@ public abstract class JaxbOpenejb {
private static Map<Class, JAXBContext> jaxbContexts = new HashMap<Class, JAXBContext>();
- public static <T> String marshal(Class<T> type, Object object) throws JAXBException {
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ public static <T> String marshal(final Class<T> type, final Object object) throws JAXBException {
+ final ByteArrayOutputStream baos = new ByteArrayOutputStream();
marshal(type, object, baos);
return new String(baos.toByteArray());
}
- public static <T> void marshal(Class<T> type, Object object, OutputStream out) throws JAXBException {
- JAXBContext jaxbContext = getContext(type);
- Marshaller marshaller = jaxbContext.createMarshaller();
+ public static <T> void marshal(final Class<T> type, final Object object, final OutputStream out) throws JAXBException {
+ final JAXBContext jaxbContext = getContext(type);
+ final Marshaller marshaller = jaxbContext.createMarshaller();
marshaller.setProperty("jaxb.formatted.output", true);
marshaller.marshal(object, out);
}
- public static <T> JAXBContext getContext(Class<T> type) throws JAXBException {
+ public static <T> JAXBContext getContext(final Class<T> type) throws JAXBException {
JAXBContext jaxbContext = jaxbContexts.get(type);
if (jaxbContext == null) {
jaxbContext = JAXBContextFactory.newInstance(type);
@@ -291,23 +291,23 @@ public abstract class JaxbOpenejb {
return jaxbContext;
}
- public static <T> T unmarshal(Class<T> type, InputStream in, boolean filter) throws ParserConfigurationException, SAXException, JAXBException {
- InputSource inputSource = new InputSource(in);
+ public static <T> T unmarshal(final Class<T> type, final InputStream in, final boolean filter) throws ParserConfigurationException, SAXException, JAXBException {
+ final InputSource inputSource = new InputSource(in);
- SAXParser parser = Saxs.namespaceAwareFactory().newSAXParser();
+ final SAXParser parser = Saxs.namespaceAwareFactory().newSAXParser();
- JAXBContext ctx = getContext(type);
- Unmarshaller unmarshaller = ctx.createUnmarshaller();
+ final JAXBContext ctx = getContext(type);
+ final Unmarshaller unmarshaller = ctx.createUnmarshaller();
unmarshaller.setEventHandler(new ValidationEventHandler() {
- public boolean handleEvent(ValidationEvent validationEvent) {
+ public boolean handleEvent(final ValidationEvent validationEvent) {
System.out.println(validationEvent);
return false;
}
});
- SAXSource source;
+ final SAXSource source;
if (filter) {
- NamespaceFilter xmlFilter = new NamespaceFilter(parser.getXMLReader());
+ final NamespaceFilter xmlFilter = new NamespaceFilter(parser.getXMLReader());
xmlFilter.setContentHandler(unmarshaller.getUnmarshallerHandler());
source = new SAXSource(xmlFilter, inputSource);
} else {
@@ -323,25 +323,25 @@ public abstract class JaxbOpenejb {
}
@SuppressWarnings({"unchecked"})
- public static <T> T unmarshal(Class<T> type, InputStream in) throws ParserConfigurationException, SAXException, JAXBException {
+ public static <T> T unmarshal(final Class<T> type, final InputStream in) throws ParserConfigurationException, SAXException, JAXBException {
return unmarshal(type, in, true);
}
public static class NamespaceFilter extends XMLFilterImpl {
- public NamespaceFilter(XMLReader xmlReader) {
+ public NamespaceFilter(final XMLReader xmlReader) {
super(xmlReader);
}
- public InputSource resolveEntity(String publicId, String systemId) throws SAXException, IOException {
- Set<String> publicIds = currentPublicId.get();
+ public InputSource resolveEntity(final String publicId, final String systemId) throws SAXException, IOException {
+ final Set<String> publicIds = currentPublicId.get();
if (publicIds != null) {
publicIds.add(publicId);
}
return super.resolveEntity(publicId, systemId);
}
- public void startElement(String uri, String localName, String qname, Attributes atts) throws SAXException {
+ public void startElement(final String uri, final String localName, final String qname, final Attributes atts) throws SAXException {
super.startElement("http://www.openejb.org/System/Configuration", localName, qname, atts);
}
}
@@ -417,7 +417,7 @@ public abstract class JaxbOpenejb {
public void startDocument() throws SAXException {
}
- public void startElement(String uri, String localName, String qName, Attributes att) throws SAXException {
+ public void startElement(final String uri, final String localName, final String qName, final Attributes att) throws SAXException {
if (!localName.equals("ServiceProvider")) return;
provider = new ServiceProvider();
@@ -427,7 +427,7 @@ public abstract class JaxbOpenejb {
provider.setConstructor(att.getValue("", "constructor"));
provider.setClassName(att.getValue("", "class-name"));
provider.setParent(att.getValue("", "parent"));
- String typesString = att.getValue("", "types");
+ final String typesString = att.getValue("", "types");
if (typesString != null){
final ListAdapter listAdapter = new ListAdapter();
final List<String> types = listAdapter.unmarshal(typesString);
@@ -436,17 +436,17 @@ public abstract class JaxbOpenejb {
servicesJar.getServiceProvider().add(provider);
}
- public void characters(char[] ch, int start, int length) throws SAXException {
+ public void characters(final char[] ch, final int start, final int length) throws SAXException {
if (content == null) content = new StringBuilder();
content.append(ch, start, length);
}
- public void endElement(String uri, String localName, String qName) throws SAXException {
+ public void endElement(final String uri, final String localName, final String qName) throws SAXException {
if (provider == null || content == null) return;
try {
provider.getProperties().putAll(propertiesAdapter.unmarshal(content.toString()));
- } catch (Exception e) {
+ } catch (final Exception e) {
throw new SAXException(e);
}
provider = null;
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/JndiProvider.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/JndiProvider.java?rev=1569795&r1=1569794&r2=1569795&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/JndiProvider.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/JndiProvider.java Wed Feb 19 15:47:58 2014
@@ -49,11 +49,11 @@ public class JndiProvider extends Abstra
type = InitialContext.class.getName();
}
- public JndiProvider(String id) {
+ public JndiProvider(final String id) {
super(id);
}
- public JndiProvider(String id, String type, String provider) {
+ public JndiProvider(final String id, final String type, final String provider) {
super(id, type, provider);
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/ListAdapter.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/ListAdapter.java?rev=1569795&r1=1569794&r2=1569795&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/ListAdapter.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/ListAdapter.java Wed Feb 19 15:47:58 2014
@@ -27,12 +27,12 @@ import java.util.List;
* @version $Rev$ $Date$
*/
public class ListAdapter extends XmlAdapter<String, List<String>> {
- public List<String> unmarshal(String s) {
- String[] strings = s.split(", *");
+ public List<String> unmarshal(final String s) {
+ final String[] strings = s.split(", *");
return new ArrayList<String>(Arrays.asList(strings));
}
- public String marshal(List<String> list) {
+ public String marshal(final List<String> list) {
return Join.join(", ", list);
}
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/Openejb.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/Openejb.java?rev=1569795&r1=1569794&r2=1569795&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/Openejb.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/Openejb.java Wed Feb 19 15:47:58 2014
@@ -146,7 +146,7 @@ public class Openejb {
* @param value allowed object is
* {@link SecurityService }
*/
- public void setSecurityService(SecurityService value) {
+ public void setSecurityService(final SecurityService value) {
this.securityService = value;
}
@@ -166,7 +166,7 @@ public class Openejb {
* @param value allowed object is
* {@link TransactionManager }
*/
- public void setTransactionManager(TransactionManager value) {
+ public void setTransactionManager(final TransactionManager value) {
this.transactionManager = value;
}
@@ -186,7 +186,7 @@ public class Openejb {
* @param value allowed object is
* {@link ConnectionManager }
*/
- public void setConnectionManager(ConnectionManager value) {
+ public void setConnectionManager(final ConnectionManager value) {
this.connectionManager = value;
}
@@ -206,7 +206,7 @@ public class Openejb {
* @param value allowed object is
* {@link ProxyFactory }
*/
- public void setProxyFactory(ProxyFactory value) {
+ public void setProxyFactory(final ProxyFactory value) {
this.proxyFactory = value;
}
@@ -262,10 +262,10 @@ public class Openejb {
resource = new ArrayList<Resource>();
}
- List<Connector> connectors = getConnector();
+ final List<Connector> connectors = getConnector();
if (connectors.size() > 0){
- for (Connector connector : connectors) {
- Resource resource = new Resource();
+ for (final Connector connector : connectors) {
+ final Resource resource = new Resource();
resource.setJar(connector.getJar());
resource.setId(connector.getId());
resource.setType(connector.getType());
@@ -312,7 +312,7 @@ public class Openejb {
return this.services;
}
- public void add(Object service) {
+ public void add(final Object service) {
if (service instanceof Container) {
getContainer().add((Container) service);
} else if (service instanceof Connector) {
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/PropertiesAdapter.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/PropertiesAdapter.java?rev=1569795&r1=1569794&r2=1569795&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/PropertiesAdapter.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/PropertiesAdapter.java Wed Feb 19 15:47:58 2014
@@ -27,14 +27,14 @@ import java.util.Properties;
* Converts a java.util.Properties object to a String in the XML file.
*/
public class PropertiesAdapter extends XmlAdapter<String, Properties> {
- public Properties unmarshal(String s) throws Exception {
+ public Properties unmarshal(final String s) throws Exception {
return IO.readProperties(IO.read(s), new SuperProperties());
}
- public String marshal(Properties properties) throws Exception {
+ public String marshal(final Properties properties) throws Exception {
if (properties == null) return null;
- ByteArrayOutputStream out = new ByteArrayOutputStream();
+ final ByteArrayOutputStream out = new ByteArrayOutputStream();
properties.store(out, null);
String string = new String(out.toByteArray());
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/ProxyFactory.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/ProxyFactory.java?rev=1569795&r1=1569794&r2=1569795&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/ProxyFactory.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/ProxyFactory.java Wed Feb 19 15:47:58 2014
@@ -43,11 +43,11 @@ import javax.xml.bind.annotation.XmlType
@XmlType(name = "")
@XmlRootElement(name = "ProxyFactory")
public class ProxyFactory extends AbstractService {
- public ProxyFactory(String id) {
+ public ProxyFactory(final String id) {
super(id);
}
- public ProxyFactory(String id, String type, String provider) {
+ public ProxyFactory(final String id, final String type, final String provider) {
super(id, type, provider);
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/Resource.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/Resource.java?rev=1569795&r1=1569794&r2=1569795&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/Resource.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/Resource.java Wed Feb 19 15:47:58 2014
@@ -54,15 +54,15 @@ public class Resource extends AbstractSe
@XmlElement(name = "aliases")
protected List<String> aliases = new ArrayList<String>();
- public Resource(String id) {
+ public Resource(final String id) {
super(id);
}
- public Resource(String id, String type) {
+ public Resource(final String id, final String type) {
super(id, type);
}
- public Resource(String id, String type, String provider) {
+ public Resource(final String id, final String type, final String provider) {
super(id, type, provider);
}
@@ -85,7 +85,7 @@ public class Resource extends AbstractSe
* @param value allowed object is
* {@link String }
*/
- public void setJndi(String value) {
+ public void setJndi(final String value) {
this.jndi = value;
}
@@ -94,12 +94,12 @@ public class Resource extends AbstractSe
}
@Override
- public boolean equals(Object o) {
+ public boolean equals(final Object o) {
if (this == o) return true;
if (!(o instanceof Resource)) return false;
if (!super.equals(o)) return false;
- Resource resource = (Resource) o;
+ final Resource resource = (Resource) o;
if (jndi != null ? !jndi.equals(resource.jndi) : resource.jndi != null) return false;
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/Resources.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/Resources.java?rev=1569795&r1=1569794&r2=1569795&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/Resources.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/Resources.java Wed Feb 19 15:47:58 2014
@@ -101,7 +101,7 @@ public class Resources {
return this.jndiProvider;
}
- public void add(Object service) {
+ public void add(final Object service) {
if (service instanceof Resource) {
getResource().add((Resource) service);
} else if (service instanceof Service) {
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/SaxAppCtxConfig.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/SaxAppCtxConfig.java?rev=1569795&r1=1569794&r2=1569795&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/SaxAppCtxConfig.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/SaxAppCtxConfig.java Wed Feb 19 15:47:58 2014
@@ -130,9 +130,9 @@ public class SaxAppCtxConfig {
if (file.exists()) {
try {
parse(module, new InputSource(new FileInputStream(file)), envEntriesDeployer, beanPropertiesDeployer);
- } catch (ParserConfigurationException e) {
+ } catch (final ParserConfigurationException e) {
throw new SAXException(e);
- } catch (IOException e) {
+ } catch (final IOException e) {
throw new SAXException(e);
}
} else { // try in the classpath
@@ -142,9 +142,9 @@ public class SaxAppCtxConfig {
if (is != null) {
try {
parse(module, new InputSource(is), envEntriesDeployer, beanPropertiesDeployer);
- } catch (ParserConfigurationException e) {
+ } catch (final ParserConfigurationException e) {
throw new SAXException(e);
- } catch (IOException e) {
+ } catch (final IOException e) {
throw new SAXException(e);
}
} else {
@@ -179,10 +179,10 @@ public class SaxAppCtxConfig {
}
try {
- for (Map.Entry<Object, Object> entry : new PropertiesAdapter().unmarshal(text).entrySet()) {
+ for (final Map.Entry<Object, Object> entry : new PropertiesAdapter().unmarshal(text).entrySet()) {
properties.put(prefix + entry.getKey(), entry.getValue());
}
- } catch (Exception e) {
+ } catch (final Exception e) {
throw new RuntimeException(e);
}
}
@@ -210,12 +210,12 @@ public class SaxAppCtxConfig {
}
try {
- for (Properties p : properties) {
- for (Map.Entry<Object, Object> entry : new PropertiesAdapter().unmarshal(text).entrySet()) {
+ for (final Properties p : properties) {
+ for (final Map.Entry<Object, Object> entry : new PropertiesAdapter().unmarshal(text).entrySet()) {
p.put(prefix + entry.getKey(), entry.getValue());
}
}
- } catch (Exception e) {
+ } catch (final Exception e) {
throw new RuntimeException(e);
}
}
@@ -258,9 +258,9 @@ public class SaxAppCtxConfig {
@Override
public void endElement(final String uri, final String localName, final String qName) throws SAXException {
- for (PojoConfig generic : genericConfigs) {
- for (PojoConfiguration config : module.getPojoConfigurations().values()) {
- for (String key : generic.getProperties().stringPropertyNames()) {
+ for (final PojoConfig generic : genericConfigs) {
+ for (final PojoConfiguration config : module.getPojoConfigurations().values()) {
+ for (final String key : generic.getProperties().stringPropertyNames()) {
if (!config.getProperties().containsKey(key)) {
config.getProperties().put(key, generic.getProperties().get(key));
}
@@ -293,7 +293,7 @@ public class SaxAppCtxConfig {
protected Collection<Properties> propertiesForModule(final String id) {
final Collection<Properties> props = new ArrayList<Properties>();
- for (DeploymentModule m : module.getDeploymentModule()) {
+ for (final DeploymentModule m : module.getDeploymentModule()) {
if (acceptModule(id, m)) {
props.add(m.getProperties());
}
@@ -310,7 +310,7 @@ public class SaxAppCtxConfig {
@Override
protected Collection<Properties> propertiesForModule(final String id) {
final Collection<Properties> props = new ArrayList<Properties>();
- for (WebModule m : module.getWebModules()) {
+ for (final WebModule m : module.getWebModules()) {
if (acceptModule(id, m)) {
props.add(m.getProperties());
}
@@ -339,7 +339,7 @@ public class SaxAppCtxConfig {
@Override
public void endElement(final String uri, final String localName, final String qName) throws SAXException {
- for (PojoConfig generic : genericConfigs) { // BeanContextConfig
+ for (final PojoConfig generic : genericConfigs) { // BeanContextConfig
if (generic.hasProperties()) {
beanPropertiesDeployer.addGlobalProperties(id, generic.getProperties());
}
@@ -381,7 +381,7 @@ public class SaxAppCtxConfig {
@Override
public void endElement(final String uri, final String localName, final String qName) throws SAXException {
- for (EjbModule ejbModule : module.getEjbModules()) {
+ for (final EjbModule ejbModule : module.getEjbModules()) {
if (!acceptModule(moduleId, ejbModule)) {
continue;
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/SaxOpenejb.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/SaxOpenejb.java?rev=1569795&r1=1569794&r2=1569795&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/SaxOpenejb.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/SaxOpenejb.java Wed Feb 19 15:47:58 2014
@@ -47,7 +47,7 @@ class SaxOpenejb extends StackHandler {
private final Openejb openejb = new Openejb();
public static Openejb parse(final InputSource source) throws SAXException, ParserConfigurationException, IOException {
- SAXParser parser = Saxs.factory().newSAXParser();
+ final SAXParser parser = Saxs.factory().newSAXParser();
final SaxOpenejb sax = new SaxOpenejb();
parser.parse(source, sax);
return sax.openejb;
@@ -65,7 +65,7 @@ class SaxOpenejb extends StackHandler {
public class Root extends DefaultHandler {
@Override
- public void startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException {
+ public void startElement(final String uri, final String localName, final String qName, final Attributes attributes) throws SAXException {
if (localName.equals("Container")) push(new ContainerElement());
else if (localName.equals("JndiProvider")) push(new JndiProviderElement());
else if (localName.equals("SecurityService")) push(new SecurityServiceElement());
@@ -86,7 +86,7 @@ class SaxOpenejb extends StackHandler {
private class Document extends DefaultHandler {
@Override
- public void startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException {
+ public void startElement(final String uri, final String localName, final String qName, final Attributes attributes) throws SAXException {
if (localName.equals("openejb")) push(new Root());
else if (localName.equals("tomee")) push(new Root());
else throw new SAXException("Unsupported Element: " + localName);
@@ -99,7 +99,7 @@ class SaxOpenejb extends StackHandler {
private final Deployments deployments = new Deployments();
@Override
- public void startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException {
+ public void startElement(final String uri, final String localName, final String qName, final Attributes attributes) throws SAXException {
deployments.setDir(attributes.getValue("dir"));
deployments.setFile(attributes.getValue("jar"));
deployments.setFile(attributes.getValue("file"));
@@ -108,7 +108,7 @@ class SaxOpenejb extends StackHandler {
}
@Override
- public void endElement(String uri, String localName, String qName) throws SAXException {
+ public void endElement(final String uri, final String localName, final String qName) throws SAXException {
openejb.getDeployments().add(deployments);
}
}
@@ -120,14 +120,14 @@ class SaxOpenejb extends StackHandler {
}
@Override
- public void startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException {
+ public void startElement(final String uri, final String localName, final String qName, final Attributes attributes) throws SAXException {
super.startElement(uri, localName, qName, attributes);
final String ctype = attributes.getValue("ctype");
if (ctype != null) service.setType(ctype);
}
@Override
- public void endElement(String uri, String localName, String qName) {
+ public void endElement(final String uri, final String localName, final String qName) {
openejb.getContainer().add(service);
super.endElement(uri, localName, qName);
}
@@ -147,7 +147,7 @@ class SaxOpenejb extends StackHandler {
}
@Override
- public void endElement(String uri, String localName, String qName) {
+ public void endElement(final String uri, final String localName, final String qName) {
openejb.setSecurityService(service);
super.endElement(uri, localName, qName);
}
@@ -160,7 +160,7 @@ class SaxOpenejb extends StackHandler {
}
@Override
- public void endElement(String uri, String localName, String qName) {
+ public void endElement(final String uri, final String localName, final String qName) {
openejb.setConnectionManager(service);
super.endElement(uri, localName, qName);
}
@@ -173,7 +173,7 @@ class SaxOpenejb extends StackHandler {
}
@Override
- public void endElement(String uri, String localName, String qName) {
+ public void endElement(final String uri, final String localName, final String qName) {
openejb.setProxyFactory(service);
super.endElement(uri, localName, qName);
}
@@ -186,7 +186,7 @@ class SaxOpenejb extends StackHandler {
}
@Override
- public void endElement(String uri, String localName, String qName) {
+ public void endElement(final String uri, final String localName, final String qName) {
openejb.setTransactionManager(service);
super.endElement(uri, localName, qName);
}
@@ -199,7 +199,7 @@ class SaxOpenejb extends StackHandler {
}
@Override
- public void endElement(String uri, String localName, String qName) {
+ public void endElement(final String uri, final String localName, final String qName) {
openejb.getJndiProvider().add(service);
super.endElement(uri, localName, qName);
}
@@ -209,13 +209,13 @@ class SaxOpenejb extends StackHandler {
private String path = null;
@Override
- public void startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException {
+ public void startElement(final String uri, final String localName, final String qName, final Attributes attributes) throws SAXException {
path = attributes.getValue("path");
checkAttributes(attributes, "path");
}
@Override
- public void endElement(String uri, String localName, String qName) throws SAXException {
+ public void endElement(final String uri, final String localName, final String qName) throws SAXException {
if (path != null) {
updatePath();
@@ -223,23 +223,23 @@ class SaxOpenejb extends StackHandler {
try {
final URL url = new URL(path);
is = url.openStream();
- } catch (MalformedURLException e) {
+ } catch (final MalformedURLException e) {
final File file = new File(path);
try {
is = new FileInputStream(file);
- } catch (FileNotFoundException e1) {
+ } catch (final FileNotFoundException e1) {
throw new SAXException("specified path '" + path + "' is neither an url nor a file path", e);
}
- } catch (IOException e) {
+ } catch (final IOException e) {
throw new SAXException(e);
}
try {
final Openejb importedOpenEJB = parse(new InputSource(is));
merge(openejb, importedOpenEJB);
- } catch (ParserConfigurationException e) {
+ } catch (final ParserConfigurationException e) {
throw new SAXException(e);
- } catch (IOException e) {
+ } catch (final IOException e) {
throw new SAXException(e);
}
}
@@ -253,12 +253,12 @@ class SaxOpenejb extends StackHandler {
private void merge(final Openejb openejb, final Openejb importedOpenEJB) {
if (importedOpenEJB.container != null) {
- for (Container container : importedOpenEJB.container) {
+ for (final Container container : importedOpenEJB.container) {
openejb.add(container);
}
}
if (importedOpenEJB.jndiProvider != null) {
- for (JndiProvider jndiProvider : importedOpenEJB.jndiProvider) {
+ for (final JndiProvider jndiProvider : importedOpenEJB.jndiProvider) {
openejb.add(jndiProvider);
}
}
@@ -269,17 +269,17 @@ class SaxOpenejb extends StackHandler {
// do nothing, these are unique so i don't think importing it is a good idea
}
if (importedOpenEJB.connector != null) {
- for (Connector connector : importedOpenEJB.connector) {
+ for (final Connector connector : importedOpenEJB.connector) {
openejb.add(connector);
}
}
if (importedOpenEJB.resource != null) {
- for (Resource resource : importedOpenEJB.resource) {
+ for (final Resource resource : importedOpenEJB.resource) {
openejb.add(resource);
}
}
if (importedOpenEJB.deployments != null) {
- for (Deployments deployment : importedOpenEJB.deployments) {
+ for (final Deployments deployment : importedOpenEJB.deployments) {
openejb.add(deployment);
}
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/SecurityService.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/SecurityService.java?rev=1569795&r1=1569794&r2=1569795&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/SecurityService.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/SecurityService.java Wed Feb 19 15:47:58 2014
@@ -44,11 +44,11 @@ import javax.xml.bind.annotation.XmlType
@XmlRootElement(name = "SecurityService")
public class SecurityService extends AbstractService {
- public SecurityService(String id) {
+ public SecurityService(final String id) {
super(id);
}
- public SecurityService(String id, String type, String provider) {
+ public SecurityService(final String id, final String type, final String provider) {
super(id, type, provider);
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/Service.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/Service.java?rev=1569795&r1=1569794&r2=1569795&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/Service.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/Service.java Wed Feb 19 15:47:58 2014
@@ -33,22 +33,22 @@ public class Service extends AbstractSer
public Service() {
}
- public Service(String id, String clazz) {
+ public Service(final String id, final String clazz) {
super(id);
this.clazz = clazz;
}
- public Service(String id, String type, String clazz) {
+ public Service(final String id, final String type, final String clazz) {
super(id, type);
this.clazz = clazz;
}
- public Service(String id, String type, String provider, String clazz) {
+ public Service(final String id, final String type, final String provider, final String clazz) {
super(id, type, provider);
this.clazz = clazz;
}
- public Service(String clazz) {
+ public Service(final String clazz) {
this.clazz = clazz;
}
@@ -56,7 +56,7 @@ public class Service extends AbstractSer
return clazz;
}
- public void setClazz(String clazz) {
+ public void setClazz(final String clazz) {
this.clazz = clazz;
}
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/ServiceProvider.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/ServiceProvider.java?rev=1569795&r1=1569794&r2=1569795&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/ServiceProvider.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/ServiceProvider.java Wed Feb 19 15:47:58 2014
@@ -84,11 +84,11 @@ public class ServiceProvider {
public ServiceProvider() {
}
- public ServiceProvider(Class clazz, String id, String service) {
+ public ServiceProvider(final Class clazz, final String id, final String service) {
this(clazz.getName(), id, service);
}
- public ServiceProvider(String className, String id, String service) {
+ public ServiceProvider(final String className, final String id, final String service) {
this.className = className;
this.id = id;
this.service = service;
@@ -137,7 +137,7 @@ public class ServiceProvider {
* @param value allowed object is
* {@link String }
*/
- public void setClassName(String value) {
+ public void setClassName(final String value) {
this.className = value;
}
@@ -157,7 +157,7 @@ public class ServiceProvider {
* @param value allowed object is
* {@link String }
*/
- public void setConstructor(String value) {
+ public void setConstructor(final String value) {
this.constructor = value;
}
@@ -177,7 +177,7 @@ public class ServiceProvider {
* @param value allowed object is
* {@link String }
*/
- public void setDescription(String value) {
+ public void setDescription(final String value) {
this.description = value;
}
@@ -197,7 +197,7 @@ public class ServiceProvider {
* @param value allowed object is
* {@link String }
*/
- public void setDisplayName(String value) {
+ public void setDisplayName(final String value) {
this.displayName = value;
}
@@ -217,7 +217,7 @@ public class ServiceProvider {
* @param value allowed object is
* {@link String }
*/
- public void setFactoryName(String value) {
+ public void setFactoryName(final String value) {
this.factoryName = value;
}
@@ -237,7 +237,7 @@ public class ServiceProvider {
* @param value allowed object is
* {@link String }
*/
- public void setId(String value) {
+ public void setId(final String value) {
this.id = value;
}
@@ -257,7 +257,7 @@ public class ServiceProvider {
* @param value allowed object is
* {@link String }
*/
- public void setService(String value) {
+ public void setService(final String value) {
this.service = value;
}
@@ -273,7 +273,7 @@ public class ServiceProvider {
return parent;
}
- public void setParent(String parent) {
+ public void setParent(final String parent) {
this.parent = parent;
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/StackHandler.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/StackHandler.java?rev=1569795&r1=1569794&r2=1569795&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/StackHandler.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/StackHandler.java Wed Feb 19 15:47:58 2014
@@ -41,11 +41,11 @@ public class StackHandler extends Defaul
return handlers.remove(0);
}
- protected void checkAttributes(Attributes attributes, String... allowed) throws SAXException {
+ protected void checkAttributes(final Attributes attributes, final String... allowed) throws SAXException {
checkAttributes(attributes, Arrays.asList(allowed));
}
- protected void checkAttributes(Attributes attributes, List<String> allowed) throws SAXException {
+ protected void checkAttributes(final Attributes attributes, final List<String> allowed) throws SAXException {
final List<String> invalid = new ArrayList<String>();
@@ -61,7 +61,7 @@ public class StackHandler extends Defaul
}
- protected void push(DefaultHandler handler) {
+ protected void push(final DefaultHandler handler) {
if (DEBUG) {
for (int i = 0; i < handlers.size(); i++) {
System.out.print(" ");
@@ -72,7 +72,7 @@ public class StackHandler extends Defaul
}
@Override
- public void startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException {
+ public void startElement(final String uri, final String localName, final String qName, final Attributes attributes) throws SAXException {
if (DEBUG) {
for (int i = 0; i < handlers.size(); i++) {
System.out.print(" ");
@@ -83,7 +83,7 @@ public class StackHandler extends Defaul
}
@Override
- public void endElement(String uri, String localName, String qName) throws SAXException {
+ public void endElement(final String uri, final String localName, final String qName) throws SAXException {
get().endElement(uri, localName, qName);
if (!DEBUG) {
pop();
@@ -96,7 +96,7 @@ public class StackHandler extends Defaul
}
@Override
- public void characters(char[] ch, int start, int length) throws SAXException {
+ public void characters(final char[] ch, final int start, final int length) throws SAXException {
get().characters(ch, start, length);
}
@@ -104,19 +104,19 @@ public class StackHandler extends Defaul
private StringBuilder characters = new StringBuilder();
- public void startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException {
+ public void startElement(final String uri, final String localName, final String qName, final Attributes attributes) throws SAXException {
characters = new StringBuilder();
}
- public void characters(char[] ch, int start, int length) {
+ public void characters(final char[] ch, final int start, final int length) {
characters.append(new String(ch, start, length));
}
- public void endElement(String uri, String localName, String qName) {
+ public void endElement(final String uri, final String localName, final String qName) {
setValue(characters.toString());
}
- public void setValue(String text) {
+ public void setValue(final String text) {
}
}
@@ -124,12 +124,12 @@ public class StackHandler extends Defaul
final S service;
- protected ServiceElement(S service) {
+ protected ServiceElement(final S service) {
this.service = service;
}
@Override
- public void startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException{
+ public void startElement(final String uri, final String localName, final String qName, final Attributes attributes) throws SAXException{
if (attributes.getValue("type") != null) service.setType(attributes.getValue("type"));
if (attributes.getValue("jar") != null) service.setJar(attributes.getValue("jar"));
if (attributes.getValue("provider") != null) service.setProvider(attributes.getValue("provider"));
@@ -141,7 +141,7 @@ public class StackHandler extends Defaul
}
protected List<String> getAttributes() {
- List<String> attributes = new ArrayList<String>();
+ final List<String> attributes = new ArrayList<String>();
attributes.add("type");
attributes.add("jar");
attributes.add("provider");
@@ -153,10 +153,10 @@ public class StackHandler extends Defaul
}
@Override
- public void setValue(String text) {
+ public void setValue(final String text) {
try {
service.getProperties().putAll(new PropertiesAdapter().unmarshal(text));
- } catch (Exception e) {
+ } catch (final Exception e) {
throw new RuntimeException(e);
}
}
@@ -171,7 +171,7 @@ public class StackHandler extends Defaul
}
@Override
- public void startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException {
+ public void startElement(final String uri, final String localName, final String qName, final Attributes attributes) throws SAXException {
super.startElement(uri, localName, qName, attributes);
service.setJndi(attributes.getValue("jndi"));
@@ -182,7 +182,7 @@ public class StackHandler extends Defaul
}
@Override
- public void endElement(String uri, String localName, String qName) {
+ public void endElement(final String uri, final String localName, final String qName) {
resources.add(service);
super.endElement(uri, localName, qName);
}
@@ -205,13 +205,13 @@ public class StackHandler extends Defaul
}
@Override
- public void startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException {
+ public void startElement(final String uri, final String localName, final String qName, final Attributes attributes) throws SAXException {
super.startElement(uri, localName, qName, attributes);
service.setClazz(attributes.getValue("class"));
}
@Override
- public void endElement(String uri, String localName, String qName) {
+ public void endElement(final String uri, final String localName, final String qName) {
services.add(service); // TODO: add it only once
super.endElement(uri, localName, qName);
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/TransactionManager.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/TransactionManager.java?rev=1569795&r1=1569794&r2=1569795&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/TransactionManager.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/TransactionManager.java Wed Feb 19 15:47:58 2014
@@ -43,11 +43,11 @@ import javax.xml.bind.annotation.XmlType
@XmlType(name = "")
@XmlRootElement(name = "TransactionManager")
public class TransactionManager extends AbstractService {
- public TransactionManager(String id) {
+ public TransactionManager(final String id) {
super(id);
}
- public TransactionManager(String id, String type, String provider) {
+ public TransactionManager(final String id, final String type, final String provider) {
super(id, type, provider);
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/WikiGenerator.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/WikiGenerator.java?rev=1569795&r1=1569794&r2=1569795&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/WikiGenerator.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/WikiGenerator.java Wed Feb 19 15:47:58 2014
@@ -31,7 +31,7 @@ public class WikiGenerator {
private PrintWriter out;
- public static void main(String[] args) throws Exception {
+ public static void main(final String[] args) throws Exception {
System.out.println();
System.out.println();
System.out.println();
@@ -46,11 +46,11 @@ public class WikiGenerator {
protected ServicesJar servicesJar;
- public WikiGenerator(String providerName, PrintWriter printWriter) throws OpenEJBException {
+ public WikiGenerator(final String providerName, final PrintWriter printWriter) throws OpenEJBException {
this(JaxbOpenejb.readServicesJar(providerName), printWriter);
}
- public WikiGenerator(ServicesJar servicesJar, PrintWriter out) {
+ public WikiGenerator(final ServicesJar servicesJar, final PrintWriter out) {
this.servicesJar = servicesJar;
this.out = out;
}
@@ -58,15 +58,15 @@ public class WikiGenerator {
public void generate() throws Exception {
// generate containers
- List<ServiceProvider> serviceProvider = servicesJar.getServiceProvider();
+ final List<ServiceProvider> serviceProvider = servicesJar.getServiceProvider();
Collections.sort(serviceProvider, new Comparator<ServiceProvider>() {
@Override
- public int compare(ServiceProvider o1, ServiceProvider o2) {
+ public int compare(final ServiceProvider o1, final ServiceProvider o2) {
return grade(o2) - grade(o1);
}
- private int grade(ServiceProvider i) {
- String name = i.getClassName();
+ private int grade(final ServiceProvider i) {
+ final String name = i.getClassName();
if (name.contains("stateless")) return 10;
if (name.contains("stateful")) return 9;
if (name.contains("singleton")) return 8;
@@ -76,15 +76,15 @@ public class WikiGenerator {
}
});
- for (ServiceProvider provider : serviceProvider) {
+ for (final ServiceProvider provider : serviceProvider) {
if ("Container".equals(provider.getService())) {
generateService(provider, "Container");
}
}
out.println();
- ArrayList<String> seen = new ArrayList<String>();
- for (ServiceProvider provider : servicesJar.getServiceProvider()) {
+ final ArrayList<String> seen = new ArrayList<String>();
+ for (final ServiceProvider provider : servicesJar.getServiceProvider()) {
if ("Resource".equals(provider.getService())) {
if (seen.containsAll(provider.getTypes())) continue;
@@ -98,8 +98,8 @@ public class WikiGenerator {
out.flush();
}
- private void generateService(ServiceProvider provider, String serviceType) {
- String type = provider.getTypes().get(0);
+ private void generateService(final ServiceProvider provider, final String serviceType) {
+ final String type = provider.getTypes().get(0);
out.println("# " + type + " <small>" + serviceType + " </small>");
out.println();
out.println("Declarable in openejb.xml via");
@@ -111,14 +111,14 @@ public class WikiGenerator {
out.println();
out.println(" Foo = new://" + provider.getService() + "?type=" + type + "");
out.println();
- SuperProperties properties = (SuperProperties) provider.getProperties();
+ final SuperProperties properties = (SuperProperties) provider.getProperties();
- Map<String, String> defaults = new LinkedHashMap<String, String>();
+ final Map<String, String> defaults = new LinkedHashMap<String, String>();
if (properties.size() > 0) {
out.println("## Properties");
out.println();
- for (Object key : properties.keySet()) {
+ for (final Object key : properties.keySet()) {
if (key instanceof String) {
final String name = (String) key;
@@ -147,7 +147,7 @@ public class WikiGenerator {
out.println("## Default declaration");
out.println(" <" + provider.getService() + " id=\"" + provider.getId() + "\" type=\"" + type + "\">");
- for (Map.Entry<String, String> entry : defaults.entrySet()) {
+ for (final Map.Entry<String, String> entry : defaults.entrySet()) {
out.print(" ");
out.print(entry.getKey());
out.print(" = ");
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/typed/ActiveMQResourceAdapterBuilder.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/typed/ActiveMQResourceAdapterBuilder.java?rev=1569795&r1=1569794&r2=1569795&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/typed/ActiveMQResourceAdapterBuilder.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/typed/ActiveMQResourceAdapterBuilder.java Wed Feb 19 15:47:58 2014
@@ -51,17 +51,17 @@ public class ActiveMQResourceAdapterBuil
}
- public ActiveMQResourceAdapterBuilder id(String id) {
+ public ActiveMQResourceAdapterBuilder id(final String id) {
setId(id);
return this;
}
- public ActiveMQResourceAdapterBuilder withBrokerXmlConfig(String brokerXmlConfig) {
+ public ActiveMQResourceAdapterBuilder withBrokerXmlConfig(final String brokerXmlConfig) {
this.brokerXmlConfig = brokerXmlConfig;
return this;
}
- public void setBrokerXmlConfig(String brokerXmlConfig) {
+ public void setBrokerXmlConfig(final String brokerXmlConfig) {
this.brokerXmlConfig = brokerXmlConfig;
}
@@ -69,12 +69,12 @@ public class ActiveMQResourceAdapterBuil
return brokerXmlConfig;
}
- public ActiveMQResourceAdapterBuilder withServerUrl(URI serverUrl) {
+ public ActiveMQResourceAdapterBuilder withServerUrl(final URI serverUrl) {
this.serverUrl = serverUrl;
return this;
}
- public void setServerUrl(URI serverUrl) {
+ public void setServerUrl(final URI serverUrl) {
this.serverUrl = serverUrl;
}
@@ -82,12 +82,12 @@ public class ActiveMQResourceAdapterBuil
return serverUrl;
}
- public ActiveMQResourceAdapterBuilder withDataSource(String dataSource) {
+ public ActiveMQResourceAdapterBuilder withDataSource(final String dataSource) {
this.dataSource = dataSource;
return this;
}
- public void setDataSource(String dataSource) {
+ public void setDataSource(final String dataSource) {
this.dataSource = dataSource;
}
@@ -95,12 +95,12 @@ public class ActiveMQResourceAdapterBuil
return dataSource;
}
- public ActiveMQResourceAdapterBuilder withStartupTimeout(Duration startupTimeout) {
+ public ActiveMQResourceAdapterBuilder withStartupTimeout(final Duration startupTimeout) {
this.startupTimeout = startupTimeout;
return this;
}
- public void setStartupTimeout(Duration startupTimeout) {
+ public void setStartupTimeout(final Duration startupTimeout) {
this.startupTimeout = startupTimeout;
}
@@ -108,11 +108,11 @@ public class ActiveMQResourceAdapterBuil
return startupTimeout;
}
- public ActiveMQResourceAdapterBuilder withStartupTimeout(long time, TimeUnit unit) {
+ public ActiveMQResourceAdapterBuilder withStartupTimeout(final long time, final TimeUnit unit) {
return withStartupTimeout(new Duration(time, unit));
}
- public void setStartupTimeout(long time, TimeUnit unit) {
+ public void setStartupTimeout(final long time, final TimeUnit unit) {
setStartupTimeout(new Duration(time, unit));
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/typed/BmpEntityContainerBuilder.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/typed/BmpEntityContainerBuilder.java?rev=1569795&r1=1569794&r2=1569795&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/typed/BmpEntityContainerBuilder.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/typed/BmpEntityContainerBuilder.java Wed Feb 19 15:47:58 2014
@@ -41,17 +41,17 @@ public class BmpEntityContainerBuilder e
}
- public BmpEntityContainerBuilder id(String id) {
+ public BmpEntityContainerBuilder id(final String id) {
setId(id);
return this;
}
- public BmpEntityContainerBuilder withPoolSize(int poolSize) {
+ public BmpEntityContainerBuilder withPoolSize(final int poolSize) {
this.poolSize = poolSize;
return this;
}
- public void setPoolSize(int poolSize) {
+ public void setPoolSize(final int poolSize) {
this.poolSize = poolSize;
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/typed/CmpEntityContainerBuilder.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/typed/CmpEntityContainerBuilder.java?rev=1569795&r1=1569794&r2=1569795&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/typed/CmpEntityContainerBuilder.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/typed/CmpEntityContainerBuilder.java Wed Feb 19 15:47:58 2014
@@ -41,17 +41,17 @@ public class CmpEntityContainerBuilder e
}
- public CmpEntityContainerBuilder id(String id) {
+ public CmpEntityContainerBuilder id(final String id) {
setId(id);
return this;
}
- public CmpEntityContainerBuilder withCmpEngineFactory(String cmpEngineFactory) {
+ public CmpEntityContainerBuilder withCmpEngineFactory(final String cmpEngineFactory) {
this.cmpEngineFactory = cmpEngineFactory;
return this;
}
- public void setCmpEngineFactory(String cmpEngineFactory) {
+ public void setCmpEngineFactory(final String cmpEngineFactory) {
this.cmpEngineFactory = cmpEngineFactory;
}