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 [14/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/ValidationContext.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ValidationContext.java?rev=1569795&r1=1569794&r2=1569795&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ValidationContext.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ValidationContext.java Wed Feb 19 15:47:58 2014
@@ -31,13 +31,13 @@ public class ValidationContext implement
private final String name;
private final DeploymentModule module;
- public ValidationContext(Class<? extends DeploymentModule> moduleType, String name) {
+ public ValidationContext(final Class<? extends DeploymentModule> moduleType, final String name) {
this.moduleType = moduleType.getSimpleName();
this.name = name;
this.module = null;
}
- public ValidationContext(DeploymentModule module) {
+ public ValidationContext(final DeploymentModule module) {
this.moduleType = module.getClass().getSimpleName();
this.module = module;
this.name = null;
@@ -47,39 +47,39 @@ public class ValidationContext implement
return module;
}
- public void fail(String component, String key, Object... details) {
- ValidationFailure failure = new ValidationFailure(key);
+ public void fail(final String component, final String key, final Object... details) {
+ final ValidationFailure failure = new ValidationFailure(key);
failure.setDetails(details);
failure.setComponentName(component);
addFailure(failure);
}
- public void warn(String component, String key, Object... details) {
- ValidationWarning warning = new ValidationWarning(key);
+ public void warn(final String component, final String key, final Object... details) {
+ final ValidationWarning warning = new ValidationWarning(key);
warning.setDetails(details);
warning.setComponentName(component);
addWarning(warning);
}
- public void error(String component, String key, Object... details) {
- ValidationError error = new ValidationError(key);
+ public void error(final String component, final String key, final Object... details) {
+ final ValidationError error = new ValidationError(key);
error.setDetails(details);
error.setComponentName(component);
addError(error);
}
- public void addWarning(ValidationWarning warning) {
+ public void addWarning(final ValidationWarning warning) {
warnings.add(warning);
}
- public void addFailure(ValidationFailure failure) {
+ public void addFailure(final ValidationFailure failure) {
failures.add(failure);
}
- public void addError(ValidationError error) {
+ public void addError(final ValidationError error) {
errors.add(error);
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ValidationError.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ValidationError.java?rev=1569795&r1=1569794&r2=1569795&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ValidationError.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ValidationError.java Wed Feb 19 15:47:58 2014
@@ -20,7 +20,7 @@ public class ValidationError extends Val
private Throwable cause;
- public ValidationError(String message) {
+ public ValidationError(final String message) {
super(message);
}
@@ -36,7 +36,7 @@ public class ValidationError extends Val
return cause;
}
- public void setCause(Throwable cause) {
+ public void setCause(final Throwable cause) {
this.cause = cause;
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ValidationException.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ValidationException.java?rev=1569795&r1=1569794&r2=1569795&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ValidationException.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ValidationException.java Wed Feb 19 15:47:58 2014
@@ -25,7 +25,7 @@ public class ValidationException extends
protected String prefix;
protected String componentName;
- public ValidationException(String message) {
+ public ValidationException(final String message) {
this.message = message;
}
@@ -52,7 +52,7 @@ public class ValidationException extends
return getMessage(2);
}
- public String getMessage(int level) {
+ public String getMessage(final int level) {
return messages.format(level + "." + message, details);
}
@@ -60,7 +60,7 @@ public class ValidationException extends
return componentName;
}
- public void setComponentName(String componentName) {
+ public void setComponentName(final String componentName) {
this.componentName = componentName;
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ValidationFailedException.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ValidationFailedException.java?rev=1569795&r1=1569794&r2=1569795&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ValidationFailedException.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ValidationFailedException.java Wed Feb 19 15:47:58 2014
@@ -28,11 +28,11 @@ public class ValidationFailedException e
private final String name;
private final String moduleType;
- public ValidationFailedException(String message, ValidationResults set) {
+ public ValidationFailedException(final String message, final ValidationResults set) {
this(message, set, null);
}
- public ValidationFailedException(String message, ValidationResults set, ValidationFailedException e) {
+ public ValidationFailedException(final String message, final ValidationResults set, final ValidationFailedException e) {
super(message, e);
name = set.getName();
errors = set.getErrors();
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ValidationFailure.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ValidationFailure.java?rev=1569795&r1=1569794&r2=1569795&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ValidationFailure.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ValidationFailure.java Wed Feb 19 15:47:58 2014
@@ -18,7 +18,7 @@ package org.apache.openejb.config;
public class ValidationFailure extends ValidationException {
- public ValidationFailure(String message) {
+ public ValidationFailure(final String message) {
super(message);
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ValidationWarning.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ValidationWarning.java?rev=1569795&r1=1569794&r2=1569795&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ValidationWarning.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ValidationWarning.java Wed Feb 19 15:47:58 2014
@@ -18,7 +18,7 @@ package org.apache.openejb.config;
public class ValidationWarning extends ValidationException {
- public ValidationWarning(String message) {
+ public ValidationWarning(final String message) {
super(message);
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/VmDeploymentFactory.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/VmDeploymentFactory.java?rev=1569795&r1=1569794&r2=1569795&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/VmDeploymentFactory.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/VmDeploymentFactory.java Wed Feb 19 15:47:58 2014
@@ -37,22 +37,22 @@ public class VmDeploymentFactory impleme
return "3.1.1";
}
- public boolean handlesURI(String uri) {
- URI fullUri = URLs.uri(uri);
+ public boolean handlesURI(final String uri) {
+ final URI fullUri = URLs.uri(uri);
return URI_SCHEME.equals(fullUri.getScheme());
}
- public DeploymentManager getDisconnectedDeploymentManager(String uri) throws DeploymentManagerCreationException {
+ public DeploymentManager getDisconnectedDeploymentManager(final String uri) throws DeploymentManagerCreationException {
if (!handlesURI(uri)) {
throw new DeploymentManagerCreationException("Invalid URI: " + uri);
}
- VmDeploymentManager deploymentManager = new VmDeploymentManager();
+ final VmDeploymentManager deploymentManager = new VmDeploymentManager();
deploymentManager.release();
return deploymentManager;
}
- public DeploymentManager getDeploymentManager(String uri, String username, String password) throws DeploymentManagerCreationException {
+ public DeploymentManager getDeploymentManager(final String uri, final String username, final String password) throws DeploymentManagerCreationException {
return new VmDeploymentManager();
}
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/VmDeploymentManager.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/VmDeploymentManager.java?rev=1569795&r1=1569794&r2=1569795&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/VmDeploymentManager.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/VmDeploymentManager.java Wed Feb 19 15:47:58 2014
@@ -83,8 +83,8 @@ public class VmDeploymentManager impleme
private boolean deployerLocal;
public VmDeploymentManager() {
- String openejbHome = System.getProperty("openejb.home");
- File openejbHomeDir = new File(openejbHome);
+ final String openejbHome = System.getProperty("openejb.home");
+ final File openejbHomeDir = new File(openejbHome);
if (!openejbHomeDir.exists()) {
throw new IllegalArgumentException("OpenEJB home dir does not exist: " + openejbHomeDir);
}
@@ -96,7 +96,7 @@ public class VmDeploymentManager impleme
if (openejbUri == null) {
try {
openejbUri = new URI("ejbd", null, "localhost", 4201, null, null, null).toString();
- } catch (URISyntaxException e) {
+ } catch (final URISyntaxException e) {
throw new OpenEJBRuntimeException(e);
}
}
@@ -105,17 +105,17 @@ public class VmDeploymentManager impleme
}
private Deployer getDeployer() {
- String deployerJndi = System.getProperty("openejb.deployer.jndiname", "openejb/DeployerBusinessRemote");
+ final String deployerJndi = System.getProperty("openejb.deployer.jndiname", "openejb/DeployerBusinessRemote");
if (deployer == null) {
try {
- Properties p = new Properties();
+ final Properties p = new Properties();
p.put("java.naming.factory.initial", "org.apache.openejb.client.RemoteInitialContextFactory");
p.put("java.naming.provider.url", openejbUri);
- InitialContext ctx = new InitialContext(p);
+ final InitialContext ctx = new InitialContext(p);
deployer = (Deployer) ctx.lookup(deployerJndi);
- } catch (Exception e) {
+ } catch (final Exception e) {
throw new OpenEJBRuntimeException(e);
}
}
@@ -143,21 +143,21 @@ public class VmDeploymentManager impleme
@Override
- public TargetModuleID[] getAvailableModules(ModuleType moduleType, Target[] targetList) throws TargetException {
+ public TargetModuleID[] getAvailableModules(final ModuleType moduleType, final Target[] targetList) throws TargetException {
if (!connected) throw new IllegalStateException("Deployment manager is disconnected");
if (!containsDefaultTarget(targetList)) {
return null;
}
- Set<TargetModuleID> targetModuleIds = toTargetModuleIds(getDeployer().getDeployedApps(), moduleType);
+ final Set<TargetModuleID> targetModuleIds = toTargetModuleIds(getDeployer().getDeployedApps(), moduleType);
return targetModuleIds.toArray(new TargetModuleID[targetModuleIds.size()]);
}
- private static Set<TargetModuleID> toTargetModuleIds(Collection<AppInfo> deployedApps, ModuleType allowedModuleType) {
- Set<TargetModuleID> targetModuleIds = new HashSet<TargetModuleID>(deployedApps.size());
- for (AppInfo deployedApp : deployedApps) {
- TargetModuleID moduleId = toTargetModuleId(deployedApp, allowedModuleType);
+ private static Set<TargetModuleID> toTargetModuleIds(final Collection<AppInfo> deployedApps, final ModuleType allowedModuleType) {
+ final Set<TargetModuleID> targetModuleIds = new HashSet<TargetModuleID>(deployedApps.size());
+ for (final AppInfo deployedApp : deployedApps) {
+ final TargetModuleID moduleId = toTargetModuleId(deployedApp, allowedModuleType);
// moduleID will be null if the module was filtered
if (moduleId != null) {
targetModuleIds.add(moduleId);
@@ -166,8 +166,8 @@ public class VmDeploymentManager impleme
return targetModuleIds;
}
- private static TargetModuleID toTargetModuleId(AppInfo appInfo, ModuleType allowedModuleType) {
- List<InfoObject> infos = new ArrayList<InfoObject>();
+ private static TargetModuleID toTargetModuleId(final AppInfo appInfo, final ModuleType allowedModuleType) {
+ final List<InfoObject> infos = new ArrayList<InfoObject>();
infos.addAll(appInfo.clients);
infos.addAll(appInfo.ejbJars);
infos.addAll(appInfo.webApps);
@@ -175,9 +175,9 @@ public class VmDeploymentManager impleme
// if the module id is the same as the appInfo, then it is a standalone module
if (infos.size() == 1) {
- InfoObject infoObject = infos.get(0);
+ final InfoObject infoObject = infos.get(0);
if (infoObject instanceof ClientInfo) {
- ClientInfo clientInfo = (ClientInfo) infoObject;
+ final ClientInfo clientInfo = (ClientInfo) infoObject;
if (null != appInfo.path && appInfo.path.equals(clientInfo.path)) {
// are client modules allowed
if (allowedModuleType != null && !allowedModuleType.equals(ModuleType.CAR)) {
@@ -189,7 +189,7 @@ public class VmDeploymentManager impleme
}
}
if (infoObject instanceof EjbJarInfo) {
- EjbJarInfo ejbJarInfo = (EjbJarInfo) infoObject;
+ final EjbJarInfo ejbJarInfo = (EjbJarInfo) infoObject;
if (null != appInfo.path && appInfo.path.equals(ejbJarInfo.path)) {
// are ejb modules allowed
if (allowedModuleType != null && !allowedModuleType.equals(ModuleType.EJB)) {
@@ -201,7 +201,7 @@ public class VmDeploymentManager impleme
}
}
if (infoObject instanceof ConnectorInfo) {
- ConnectorInfo connectorInfo = (ConnectorInfo) infoObject;
+ final ConnectorInfo connectorInfo = (ConnectorInfo) infoObject;
if (null != appInfo.path&&appInfo.path.equals(connectorInfo.path)) {
// are connector modules allowed
if (allowedModuleType != null && !allowedModuleType.equals(ModuleType.RAR)) {
@@ -213,7 +213,7 @@ public class VmDeploymentManager impleme
}
}
if (infoObject instanceof WebAppInfo) {
- WebAppInfo webAppInfo = (WebAppInfo) infoObject;
+ final WebAppInfo webAppInfo = (WebAppInfo) infoObject;
if (null !=appInfo.path&&appInfo.path.equals(webAppInfo.path)) {
// are web app modules allowed
if (allowedModuleType != null && !allowedModuleType.equals(ModuleType.WAR)) {
@@ -233,21 +233,21 @@ public class VmDeploymentManager impleme
return null;
}
- TargetModuleIDImpl earModuleId = new TargetModuleIDImpl(DEFAULT_TARGET, appInfo.path);
- for (ClientInfo clientInfo : appInfo.clients) {
- TargetModuleIDImpl clientModuleId = new TargetModuleIDImpl(DEFAULT_TARGET, clientInfo.moduleId);
+ final TargetModuleIDImpl earModuleId = new TargetModuleIDImpl(DEFAULT_TARGET, appInfo.path);
+ for (final ClientInfo clientInfo : appInfo.clients) {
+ final TargetModuleIDImpl clientModuleId = new TargetModuleIDImpl(DEFAULT_TARGET, clientInfo.moduleId);
clientModuleId.setParentTargetModuleID(earModuleId);
}
- for (EjbJarInfo ejbJarInfo : appInfo.ejbJars) {
- TargetModuleIDImpl ejbJarModuleId = new TargetModuleIDImpl(DEFAULT_TARGET, ejbJarInfo.moduleName);
+ for (final EjbJarInfo ejbJarInfo : appInfo.ejbJars) {
+ final TargetModuleIDImpl ejbJarModuleId = new TargetModuleIDImpl(DEFAULT_TARGET, ejbJarInfo.moduleName);
ejbJarModuleId.setParentTargetModuleID(earModuleId);
}
- for (ConnectorInfo connectorInfo : appInfo.connectors) {
- TargetModuleIDImpl clientModuleId = new TargetModuleIDImpl(DEFAULT_TARGET, connectorInfo.moduleId);
+ for (final ConnectorInfo connectorInfo : appInfo.connectors) {
+ final TargetModuleIDImpl clientModuleId = new TargetModuleIDImpl(DEFAULT_TARGET, connectorInfo.moduleId);
clientModuleId.setParentTargetModuleID(earModuleId);
}
- for (WebAppInfo webAppInfo : appInfo.webApps) {
- TargetModuleIDImpl clientModuleId = new TargetModuleIDImpl(DEFAULT_TARGET, webAppInfo.moduleId, webAppInfo.contextRoot);
+ for (final WebAppInfo webAppInfo : appInfo.webApps) {
+ final TargetModuleIDImpl clientModuleId = new TargetModuleIDImpl(DEFAULT_TARGET, webAppInfo.moduleId, webAppInfo.contextRoot);
clientModuleId.setParentTargetModuleID(earModuleId);
}
@@ -255,7 +255,7 @@ public class VmDeploymentManager impleme
}
@Override
- public TargetModuleID[] getNonRunningModules(ModuleType moduleType, Target[] targetList) throws TargetException {
+ public TargetModuleID[] getNonRunningModules(final ModuleType moduleType, final Target[] targetList) throws TargetException {
if (!connected) throw new IllegalStateException("Deployment manager is disconnected");
if (!containsDefaultTarget(targetList)) {
@@ -266,19 +266,19 @@ public class VmDeploymentManager impleme
}
@Override
- public TargetModuleID[] getRunningModules(ModuleType moduleType, Target[] targetList) throws TargetException {
+ public TargetModuleID[] getRunningModules(final ModuleType moduleType, final Target[] targetList) throws TargetException {
if (!connected) throw new IllegalStateException("Deployment manager is disconnected");
if (!containsDefaultTarget(targetList)) {
return null;
}
- Set<TargetModuleID> targetModuleIds = toTargetModuleIds(getDeployer().getDeployedApps(), moduleType);
+ final Set<TargetModuleID> targetModuleIds = toTargetModuleIds(getDeployer().getDeployedApps(), moduleType);
return targetModuleIds.toArray(new TargetModuleID[targetModuleIds.size()]);
}
@Override
- public ProgressObject distribute(Target[] targetList, File moduleFile, File planFile) {
+ public ProgressObject distribute(final Target[] targetList, final File moduleFile, final File planFile) {
if (!connected) throw new IllegalStateException("Deployment manager is disconnected");
if (!isDeployerLocal()) {
@@ -287,11 +287,11 @@ public class VmDeploymentManager impleme
}
// load properties
- Properties properties = new Properties();
+ final Properties properties = new Properties();
if (planFile != null) {
try {
IO.readProperties(planFile, properties);
- } catch (IOException ignored) {
+ } catch (final IOException ignored) {
// no-op
}
}
@@ -300,7 +300,7 @@ public class VmDeploymentManager impleme
}
@Override
- public ProgressObject distribute(Target[] targetList, InputStream moduleStream, InputStream planStream) {
+ public ProgressObject distribute(final Target[] targetList, final InputStream moduleStream, final InputStream planStream) {
if (!connected) throw new IllegalStateException("Deployment manager is disconnected");
// consume module stream
@@ -312,11 +312,11 @@ public class VmDeploymentManager impleme
}
// load properties
- Properties properties = new Properties();
+ final Properties properties = new Properties();
if (planStream != null) {
try {
properties.load(planStream);
- } catch (IOException ignored) {
+ } catch (final IOException ignored) {
// no-op
} finally {
close(planStream);
@@ -326,7 +326,7 @@ public class VmDeploymentManager impleme
return deploy(targetList, properties);
}
- private ProgressObject deploy(Target[] targetList, Properties properties) {
+ private ProgressObject deploy(final Target[] targetList, final Properties properties) {
if (targetList == null) return new ProgressObjectImpl(CommandType.DISTRIBUTE, new NullPointerException("targetList is null"));
if (!containsDefaultTarget(targetList)) {
@@ -334,16 +334,16 @@ public class VmDeploymentManager impleme
}
try {
- AppInfo appInfo = getDeployer().deploy(properties);
- TargetModuleID targetModuleId = toTargetModuleId(appInfo, null);
+ final AppInfo appInfo = getDeployer().deploy(properties);
+ final TargetModuleID targetModuleId = toTargetModuleId(appInfo, null);
return new ProgressObjectImpl(CommandType.DISTRIBUTE, Collections.singleton(targetModuleId));
} catch (ValidationFailedException e) {
- String s = System.getProperty(ReportValidationResults.VALIDATION_LEVEL, "3");
- int level = Integer.parseInt(s);
+ final String s = System.getProperty(ReportValidationResults.VALIDATION_LEVEL, "3");
+ final int level = Integer.parseInt(s);
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- PrintStream out = new PrintStream(baos);
+ final ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ final PrintStream out = new PrintStream(baos);
out.println(e.getMessage());
print(e.getErrors(), out, level);
print(e.getFailures(), out, level);
@@ -351,12 +351,12 @@ public class VmDeploymentManager impleme
out.close();
e = new ValidationFailedException(new String(baos.toByteArray()), e);
return new ProgressObjectImpl(CommandType.DISTRIBUTE, e);
- } catch (OpenEJBException e) {
+ } catch (final OpenEJBException e) {
return new ProgressObjectImpl(CommandType.DISTRIBUTE, e);
}
}
- protected void print(ValidationException[] exceptions, PrintStream out, int level) {
+ protected void print(final ValidationException[] exceptions, final PrintStream out, final int level) {
for (final ValidationException exception : exceptions) {
out.print(" ");
@@ -371,46 +371,46 @@ public class VmDeploymentManager impleme
}
- private boolean containsDefaultTarget(Target[] targetList) {
- for (Target target : targetList) {
+ private boolean containsDefaultTarget(final Target[] targetList) {
+ for (final Target target : targetList) {
if (DEFAULT_TARGET.equals(target)) return true;
}
return false;
}
@Override
- public ProgressObject start(TargetModuleID[] moduleIdList) {
+ public ProgressObject start(final TargetModuleID[] moduleIdList) {
if (!connected) throw new IllegalStateException("Deployment manager is disconnected");
- Set<TargetModuleID> deployedModules = toTargetModuleIds(getDeployer().getDeployedApps(), null);
- Set<TargetModuleID> targetModuleIds = new HashSet<TargetModuleID>(Arrays.asList(moduleIdList));
+ final Set<TargetModuleID> deployedModules = toTargetModuleIds(getDeployer().getDeployedApps(), null);
+ final Set<TargetModuleID> targetModuleIds = new HashSet<TargetModuleID>(Arrays.asList(moduleIdList));
targetModuleIds.retainAll(deployedModules);
return new ProgressObjectImpl(CommandType.START, targetModuleIds);
}
@Override
- public ProgressObject stop(TargetModuleID[] moduleIdList) {
+ public ProgressObject stop(final TargetModuleID[] moduleIdList) {
if (!connected) throw new IllegalStateException("Deployment manager is disconnected");
return new ProgressObjectImpl(CommandType.START, Collections.<TargetModuleID>emptySet());
}
@Override
- public ProgressObject undeploy(TargetModuleID[] moduleIdList) {
+ public ProgressObject undeploy(final TargetModuleID[] moduleIdList) {
if (!connected) throw new IllegalStateException("Deployment manager is disconnected");
UndeployException undeployException = null;
- Set<TargetModuleID> results = new TreeSet<TargetModuleID>();
- for (TargetModuleID targetModuleId : moduleIdList) {
+ final Set<TargetModuleID> results = new TreeSet<TargetModuleID>();
+ for (final TargetModuleID targetModuleId : moduleIdList) {
try {
getDeployer().undeploy(targetModuleId.getModuleID());
results.add(targetModuleId);
- } catch (UndeployException e) {
+ } catch (final UndeployException e) {
if (undeployException == null) {
undeployException = e;
}
- } catch (NoSuchApplicationException e) {
+ } catch (final NoSuchApplicationException e) {
// app was not deployed... this should be ignored by jsr88
}
}
@@ -428,12 +428,12 @@ public class VmDeploymentManager impleme
}
@Override
- public ProgressObject redeploy(TargetModuleID[] moduleIDList, File moduleArchive, File deploymentPlan) {
+ public ProgressObject redeploy(final TargetModuleID[] moduleIDList, final File moduleArchive, final File deploymentPlan) {
throw new UnsupportedOperationException("redeploy is not supported");
}
@Override
- public ProgressObject redeploy(TargetModuleID[] moduleIDList, InputStream moduleArchive, InputStream deploymentPlan) {
+ public ProgressObject redeploy(final TargetModuleID[] moduleIDList, final InputStream moduleArchive, final InputStream deploymentPlan) {
throw new UnsupportedOperationException("redeploy is not supported");
}
@@ -453,12 +453,12 @@ public class VmDeploymentManager impleme
}
@Override
- public boolean isLocaleSupported(Locale locale) {
+ public boolean isLocaleSupported(final Locale locale) {
return getDefaultLocale().equals(locale);
}
@Override
- public void setLocale(Locale locale) {
+ public void setLocale(final Locale locale) {
if (!isLocaleSupported(locale)) {
throw new UnsupportedOperationException("Unsupported locale");
}
@@ -470,19 +470,19 @@ public class VmDeploymentManager impleme
}
@Override
- public boolean isDConfigBeanVersionSupported(DConfigBeanVersionType version) {
+ public boolean isDConfigBeanVersionSupported(final DConfigBeanVersionType version) {
return DCONFIG_BEAN_VERSION.equals(version);
}
@Override
- public void setDConfigBeanVersion(DConfigBeanVersionType version) throws DConfigBeanVersionUnsupportedException {
+ public void setDConfigBeanVersion(final DConfigBeanVersionType version) throws DConfigBeanVersionUnsupportedException {
if (!isDConfigBeanVersionSupported(version)) {
throw new DConfigBeanVersionUnsupportedException("Version not supported " + version);
}
}
@Override
- public DeploymentConfiguration createConfiguration(DeployableObject deployableObject) throws InvalidModuleException {
+ public DeploymentConfiguration createConfiguration(final DeployableObject deployableObject) throws InvalidModuleException {
throw new InvalidModuleException("Not supported: " + deployableObject.getType());
}
@@ -500,11 +500,11 @@ public class VmDeploymentManager impleme
private final String name;
private final String description;
- public TargetImpl(String name) {
+ public TargetImpl(final String name) {
this(name, null);
}
- public TargetImpl(String name, String description) {
+ public TargetImpl(final String name, final String description) {
if (name == null) throw new NullPointerException("name is null");
this.name = name;
this.description = description;
@@ -524,11 +524,11 @@ public class VmDeploymentManager impleme
return name;
}
- public boolean equals(Object o) {
+ public boolean equals(final Object o) {
if (this == o) return true;
if (!(o instanceof TargetImpl)) return false;
- TargetImpl target = (TargetImpl) o;
+ final TargetImpl target = (TargetImpl) o;
return name.equals(target.name);
}
@@ -537,8 +537,8 @@ public class VmDeploymentManager impleme
}
@Override
- public int compareTo(Object o) {
- TargetImpl target = (TargetImpl) o;
+ public int compareTo(final Object o) {
+ final TargetImpl target = (TargetImpl) o;
return name.compareTo(target.name);
}
}
@@ -552,11 +552,11 @@ public class VmDeploymentManager impleme
private TargetModuleID parentTargetModuleId;
private Set<TargetModuleID> children = new TreeSet<TargetModuleID>();
- public TargetModuleIDImpl(Target target, String moduleId) {
+ public TargetModuleIDImpl(final Target target, final String moduleId) {
this(target, moduleId, null);
}
- public TargetModuleIDImpl(Target target, String moduleId, String webUrl) {
+ public TargetModuleIDImpl(final Target target, final String moduleId, String webUrl) {
if (target == null) throw new NullPointerException("target is null");
if (moduleId == null) throw new NullPointerException("moduleId is null");
this.target = target;
@@ -580,7 +580,7 @@ public class VmDeploymentManager impleme
return parentTargetModuleId;
}
- public void setParentTargetModuleID(TargetModuleIDImpl parentTargetModuleId) {
+ public void setParentTargetModuleID(final TargetModuleIDImpl parentTargetModuleId) {
this.parentTargetModuleId = parentTargetModuleId;
parentTargetModuleId.children.add(this);
}
@@ -599,11 +599,11 @@ public class VmDeploymentManager impleme
return target + "/" + moduleId + (webUrl == null ? " " : webUrl);
}
- public boolean equals(Object o) {
+ public boolean equals(final Object o) {
if (this == o) return true;
if (!(o instanceof TargetModuleIDImpl)) return false;
- TargetModuleIDImpl targetModuleID = (TargetModuleIDImpl) o;
+ final TargetModuleIDImpl targetModuleID = (TargetModuleIDImpl) o;
return target.equals(targetModuleID.target) &&
moduleId.equals(targetModuleID.moduleId);
}
@@ -616,11 +616,11 @@ public class VmDeploymentManager impleme
}
@Override
- public int compareTo(Object o) {
- TargetModuleIDImpl targetModuleID = (TargetModuleIDImpl) o;
+ public int compareTo(final Object o) {
+ final TargetModuleIDImpl targetModuleID = (TargetModuleIDImpl) o;
// compare target name
- int val = target.getName().compareTo(targetModuleID.target.getName());
+ final int val = target.getName().compareTo(targetModuleID.target.getName());
if (val != 0) return val;
// compare moduleId
@@ -633,13 +633,13 @@ public class VmDeploymentManager impleme
private final ProgressEvent event;
private final DeploymentStatus deploymentStatus;
- public ProgressObjectImpl(CommandType command, Set<TargetModuleID> targetModuleIds) {
+ public ProgressObjectImpl(final CommandType command, final Set<TargetModuleID> targetModuleIds) {
this.targetModuleIds = targetModuleIds;
deploymentStatus = new DeploymentStatusImpl(command);
event = new ProgressEvent(this, null, deploymentStatus);
}
- public ProgressObjectImpl(CommandType command, Exception exception) {
+ public ProgressObjectImpl(final CommandType command, final Exception exception) {
this.targetModuleIds = null;
deploymentStatus = new DeploymentStatusImpl(command, exception);
event = new ProgressEvent(this, null, deploymentStatus);
@@ -657,7 +657,7 @@ public class VmDeploymentManager impleme
}
@Override
- public ClientConfiguration getClientConfiguration(TargetModuleID id) {
+ public ClientConfiguration getClientConfiguration(final TargetModuleID id) {
return null;
}
@@ -682,12 +682,12 @@ public class VmDeploymentManager impleme
}
@Override
- public void addProgressListener(ProgressListener pol) {
+ public void addProgressListener(final ProgressListener pol) {
pol.handleProgressEvent(event);
}
@Override
- public void removeProgressListener(ProgressListener pol) {
+ public void removeProgressListener(final ProgressListener pol) {
}
}
@@ -697,17 +697,17 @@ public class VmDeploymentManager impleme
private final StateType state;
private final String message;
- public DeploymentStatusImpl(CommandType command) {
+ public DeploymentStatusImpl(final CommandType command) {
this.command = command;
this.state = StateType.COMPLETED;
this.message = null;
}
- public DeploymentStatusImpl(CommandType command, Exception exception) {
+ public DeploymentStatusImpl(final CommandType command, final Exception exception) {
this.command = command;
this.state = StateType.FAILED;
- StringWriter writer = new StringWriter();
+ final StringWriter writer = new StringWriter();
exception.printStackTrace(new PrintWriter(writer, true));
this.message = writer.toString();
}
@@ -748,7 +748,7 @@ public class VmDeploymentManager impleme
}
public String toString() {
- StringBuilder buf = new StringBuilder();
+ final StringBuilder buf = new StringBuilder();
buf.append("DeploymentStatus[").append(command).append(',');
buf.append(state);
if (message != null) {
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/WebappAggregatedArchive.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/WebappAggregatedArchive.java?rev=1569795&r1=1569794&r2=1569795&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/WebappAggregatedArchive.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/WebappAggregatedArchive.java Wed Feb 19 15:47:58 2014
@@ -46,12 +46,12 @@ public class WebappAggregatedArchive imp
try {
handler = ScanUtil.read(scanXml);
scanXmlExists = true;
- } catch (IOException e) {
+ } catch (final IOException e) {
// ignored, will not use filtering with scan.xml
}
}
- for (URL url : urls) {
+ for (final URL url : urls) {
final List<String> classes = new ArrayList<String>();
final Archive archive = new FilteredArchive(new ConfigurableClasspathArchive(module.getClassLoader(), Arrays.asList(url)), new ScanXmlSaverFilter(scanXmlExists, handler, classes));
map.put(url, classes);
@@ -61,7 +61,7 @@ public class WebappAggregatedArchive imp
archive = new CompositeArchive(archives);
}
- public WebappAggregatedArchive(final ClassLoader classLoader, final Map<String, Object> altDDs, Collection<URL> xmls) {
+ public WebappAggregatedArchive(final ClassLoader classLoader, final Map<String, Object> altDDs, final Collection<URL> xmls) {
this(new ConfigurableClasspathArchive.FakeModule(classLoader, altDDs), xmls);
}
@@ -70,12 +70,12 @@ public class WebappAggregatedArchive imp
}
@Override
- public InputStream getBytecode(String className) throws IOException, ClassNotFoundException {
+ public InputStream getBytecode(final String className) throws IOException, ClassNotFoundException {
return archive.getBytecode(className);
}
@Override
- public Class<?> loadClass(String className) throws ClassNotFoundException {
+ public Class<?> loadClass(final String className) throws ClassNotFoundException {
return archive.loadClass(className);
}
@@ -89,22 +89,22 @@ public class WebappAggregatedArchive imp
private final ScanUtil.ScanHandler handler;
private final List<String> classes;
- public ScanXmlSaverFilter(boolean scanXmlExists, ScanUtil.ScanHandler handler, List<String> classes) {
+ public ScanXmlSaverFilter(final boolean scanXmlExists, final ScanUtil.ScanHandler handler, final List<String> classes) {
this.scanXmlExists = scanXmlExists;
this.handler = handler;
this.classes = classes;
}
@Override
- public boolean accept(String name) {
+ public boolean accept(final String name) {
if (scanXmlExists) {
- for (String packageName : handler.getPackages()) {
+ for (final String packageName : handler.getPackages()) {
if (name.startsWith(packageName)) {
classes.add(name);
return true;
}
}
- for (String className : handler.getClasses()) {
+ for (final String className : handler.getClasses()) {
if (className.equals(name)) {
classes.add(name);
return true;
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/WlsConversion.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/WlsConversion.java?rev=1569795&r1=1569794&r2=1569795&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/WlsConversion.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/WlsConversion.java Wed Feb 19 15:47:58 2014
@@ -30,56 +30,56 @@ import java.io.ByteArrayInputStream;
import java.net.URL;
public class WlsConversion implements DynamicDeployer {
- public AppModule deploy(AppModule appModule) {
- for (EjbModule ejbModule : appModule.getEjbModules()) {
+ public AppModule deploy(final AppModule appModule) {
+ for (final EjbModule ejbModule : appModule.getEjbModules()) {
convertModule(ejbModule, appModule.getCmpMappings());
}
return appModule;
}
- private <T> T getDescriptor(EjbModule ejbModule, String descriptor, Class<T> type) {
+ private <T> T getDescriptor(final EjbModule ejbModule, final String descriptor, final Class<T> type) {
Object altDD = ejbModule.getAltDDs().get(descriptor);
if (altDD instanceof String) {
try {
altDD = JaxbWls.unmarshal(type, new ByteArrayInputStream(((String)altDD).getBytes()));
- } catch (Exception e) {
+ } catch (final Exception e) {
// todo warn about not being able to parse sun descriptor
}
}
if (altDD instanceof URL) {
try {
altDD = JaxbWls.unmarshal(type, IO.read((URL)altDD));
- } catch (Exception e) {
+ } catch (final Exception e) {
e.printStackTrace();
// todo warn about not being able to parse sun descriptor
}
}
if (altDD == null) return null;
if (altDD instanceof JAXBElement) {
- JAXBElement jaxbElement = (JAXBElement) altDD;
+ final JAXBElement jaxbElement = (JAXBElement) altDD;
altDD = jaxbElement.getValue();
}
return (T) altDD;
}
- public void convertModule(EjbModule ejbModule, EntityMappings entityMappings) {
+ public void convertModule(final EjbModule ejbModule, final EntityMappings entityMappings) {
// merge data from weblogic-ejb-jar.xml file
- WeblogicEjbJar weblogicEjbJar = getDescriptor(ejbModule, "weblogic-ejb-jar.xml", WeblogicEjbJar.class);
+ final WeblogicEjbJar weblogicEjbJar = getDescriptor(ejbModule, "weblogic-ejb-jar.xml", WeblogicEjbJar.class);
mergeEjbConfig(ejbModule, weblogicEjbJar);
}
- private void mergeEjbConfig(EjbModule ejbModule, WeblogicEjbJar weblogicEjbJar) {
- OpenejbJar openejbJar = ejbModule.getOpenejbJar();
+ private void mergeEjbConfig(final EjbModule ejbModule, final WeblogicEjbJar weblogicEjbJar) {
+ final OpenejbJar openejbJar = ejbModule.getOpenejbJar();
if (openejbJar == null) return;
if (weblogicEjbJar == null) return;
if (weblogicEjbJar.getWeblogicEnterpriseBean().size() == 0) return;
- for (WeblogicEnterpriseBean ejb : weblogicEjbJar.getWeblogicEnterpriseBean()) {
+ for (final WeblogicEnterpriseBean ejb : weblogicEjbJar.getWeblogicEnterpriseBean()) {
- EjbDeployment deployment = openejbJar.getDeploymentsByEjbName().get(ejb.getEjbName());
+ final EjbDeployment deployment = openejbJar.getDeploymentsByEjbName().get(ejb.getEjbName());
if (deployment == null) {
// warn no matching deployment
continue;
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/WsDeployer.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/WsDeployer.java?rev=1569795&r1=1569794&r2=1569795&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/WsDeployer.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/WsDeployer.java Wed Feb 19 15:47:58 2014
@@ -61,63 +61,63 @@ import java.util.TreeMap;
public class WsDeployer implements DynamicDeployer {
public static final Logger logger = Logger.getInstance(LogCategory.OPENEJB_STARTUP, WsDeployer.class.getPackage().getName());
- public AppModule deploy(AppModule appModule) throws OpenEJBException {
+ public AppModule deploy(final AppModule appModule) throws OpenEJBException {
// process all webservice port
- for (EjbModule ejbModule : appModule.getEjbModules()) {
+ for (final EjbModule ejbModule : appModule.getEjbModules()) {
processPorts(ejbModule);
}
- for (WebModule webModule : appModule.getWebModules()) {
+ for (final WebModule webModule : appModule.getWebModules()) {
processPorts(webModule);
}
// Resolve service-refs
- for (EjbModule ejbModule : appModule.getEjbModules()) {
- for (EnterpriseBean enterpriseBean : ejbModule.getEjbJar().getEnterpriseBeans()) {
+ for (final EjbModule ejbModule : appModule.getEjbModules()) {
+ for (final EnterpriseBean enterpriseBean : ejbModule.getEjbJar().getEnterpriseBeans()) {
resolveServiceRefs(ejbModule, enterpriseBean);
}
}
- for (WebModule webModule : appModule.getWebModules()) {
+ for (final WebModule webModule : appModule.getWebModules()) {
resolveServiceRefs(webModule, webModule.getWebApp());
}
- for (ClientModule clientModule : appModule.getClientModules()) {
+ for (final ClientModule clientModule : appModule.getClientModules()) {
resolveServiceRefs(clientModule, clientModule.getApplicationClient());
}
return appModule;
}
- private void resolveServiceRefs(DeploymentModule module, JndiConsumer jndiConsumer) {
- for (ServiceRef serviceRef : jndiConsumer.getServiceRef()) {
+ private void resolveServiceRefs(final DeploymentModule module, final JndiConsumer jndiConsumer) {
+ for (final ServiceRef serviceRef : jndiConsumer.getServiceRef()) {
if (serviceRef.getServiceQname() == null && serviceRef.getWsdlFile() != null) {
// parse the wsdl and get the serviceQname
try {
- String wsdlFile = serviceRef.getWsdlFile();
- Definition definition = getWsdl(module, wsdlFile);
+ final String wsdlFile = serviceRef.getWsdlFile();
+ final Definition definition = getWsdl(module, wsdlFile);
- Set serviceQNames = definition.getServices().keySet();
+ final Set serviceQNames = definition.getServices().keySet();
if (serviceQNames.size() == 1) {
- QName serviceQName = (QName) serviceQNames.iterator().next();
+ final QName serviceQName = (QName) serviceQNames.iterator().next();
serviceRef.setServiceQname(serviceQName);
} else if (serviceQNames.isEmpty()) {
logger.error("The service-ref " + serviceRef.getName() + " must define service-qname because the wsdl-file " + serviceRef.getWsdlFile() + " does not constain any service definitions ");
} else {
logger.error("The service-ref " + serviceRef.getName() + " must define service-qname because the wsdl-file " + serviceRef.getWsdlFile() + " constain more then one service definitions " + serviceQNames);
}
- } catch(Exception e) {
+ } catch(final Exception e) {
logger.error("Unable to read wsdl file " + serviceRef.getWsdlFile());
}
}
}
}
- private void processPorts(WebModule webModule) throws OpenEJBException {
+ private void processPorts(final WebModule webModule) throws OpenEJBException {
// map existing webservice port declarations by servlet link
Webservices webservices = webModule.getWebservices();
- Map<String, PortComponent> portMap = new TreeMap<String, PortComponent>();
+ final Map<String, PortComponent> portMap = new TreeMap<String, PortComponent>();
if (webservices != null) {
- for (WebserviceDescription webserviceDescription : webservices.getWebserviceDescription()) {
- for (PortComponent portComponent : webserviceDescription.getPortComponent()) {
- ServiceImplBean serviceImplBean = portComponent.getServiceImplBean();
+ for (final WebserviceDescription webserviceDescription : webservices.getWebserviceDescription()) {
+ for (final PortComponent portComponent : webserviceDescription.getPortComponent()) {
+ final ServiceImplBean serviceImplBean = portComponent.getServiceImplBean();
if (serviceImplBean != null && serviceImplBean.getServletLink() != null) {
portMap.put(serviceImplBean.getServletLink(), portComponent);
}
@@ -127,32 +127,32 @@ public class WsDeployer implements Dynam
// map existing servlet-mapping declarations
- WebApp webApp = webModule.getWebApp();
- Map<String, ServletMapping> servletMappings = new TreeMap<String, ServletMapping>();
- for (ServletMapping servletMapping : webApp.getServletMapping()) {
+ final WebApp webApp = webModule.getWebApp();
+ final Map<String, ServletMapping> servletMappings = new TreeMap<String, ServletMapping>();
+ for (final ServletMapping servletMapping : webApp.getServletMapping()) {
servletMappings.put(servletMapping.getServletName(), servletMapping);
}
// add port declarations for Pojo webservices
WebserviceDescription webserviceDescription;
- for (Servlet servlet : webApp.getServlet()) {
+ for (final Servlet servlet : webApp.getServlet()) {
// the implementation class will be replaced by the WsServlet in the WsRegistry
- String className = servlet.getServletClass();
+ final String className = servlet.getServletClass();
// Skip JSPs
if (className == null) continue;
try {
- Class<?> clazz = webModule.getClassLoader().loadClass(className);
+ final Class<?> clazz = webModule.getClassLoader().loadClass(className);
if (JaxWsUtils.isWebService(clazz)) {
// add servlet mapping if not already declared
ServletMapping servletMapping = servletMappings.get(servlet.getServletName());
- String serviceName = JaxWsUtils.getServiceName(clazz);
+ final String serviceName = JaxWsUtils.getServiceName(clazz);
if (servletMapping == null) {
servletMapping = new ServletMapping();
servletMapping.setServletName(servlet.getServletName());
- String location = "/" + serviceName;
+ final String location = "/" + serviceName;
servletMapping.getUrlPattern().add(location);
webApp.getServletMapping().add(servletMapping);
}
@@ -176,7 +176,7 @@ public class WsDeployer implements Dynam
if (portComponent == null) {
portComponent = new PortComponent();
portComponent.setPortComponentName(clazz.getSimpleName());
- ServiceImplBean serviceImplBean = new ServiceImplBean();
+ final ServiceImplBean serviceImplBean = new ServiceImplBean();
serviceImplBean.setServletLink(servlet.getServletName());
portComponent.setServiceImplBean(serviceImplBean);
@@ -202,9 +202,9 @@ public class WsDeployer implements Dynam
webserviceDescription.setWsdlFile(JaxWsUtils.getServiceWsdlLocation(clazz, webModule.getClassLoader()));
}
if (portComponent.getWsdlService() == null) {
- Definition definition = getWsdl(webModule, webserviceDescription.getWsdlFile());
+ final Definition definition = getWsdl(webModule, webserviceDescription.getWsdlFile());
if (definition != null && definition.getServices().size() == 1) {
- QName serviceQName = (QName) definition.getServices().keySet().iterator().next();
+ final QName serviceQName = (QName) definition.getServices().keySet().iterator().next();
portComponent.setWsdlService(serviceQName);
} else {
portComponent.setWsdlService(JaxWsUtils.getServiceQName(clazz));
@@ -220,25 +220,25 @@ public class WsDeployer implements Dynam
// handlers
if (portComponent.getHandlerChains() == null) {
- HandlerChains handlerChains = getHandlerChains(clazz, portComponent.getServiceEndpointInterface(), webModule.getClassLoader());
+ final HandlerChains handlerChains = getHandlerChains(clazz, portComponent.getServiceEndpointInterface(), webModule.getClassLoader());
portComponent.setHandlerChains(handlerChains);
}
}
- } catch (Exception e) {
+ } catch (final Exception e) {
throw new OpenEJBException("Unable to load servlet class: " + className, e);
}
}
}
- private void processPorts(EjbModule ejbModule) throws OpenEJBException {
+ private void processPorts(final EjbModule ejbModule) throws OpenEJBException {
// map existing webservice port declarations by servlet link
Webservices webservices = ejbModule.getWebservices();
- Map<String, PortComponent> portMap = new TreeMap<String, PortComponent>();
+ final Map<String, PortComponent> portMap = new TreeMap<String, PortComponent>();
if (webservices != null) {
- for (WebserviceDescription webserviceDescription : webservices.getWebserviceDescription()) {
- for (PortComponent portComponent : webserviceDescription.getPortComponent()) {
- ServiceImplBean serviceImplBean = portComponent.getServiceImplBean();
+ for (final WebserviceDescription webserviceDescription : webservices.getWebserviceDescription()) {
+ for (final PortComponent portComponent : webserviceDescription.getPortComponent()) {
+ final ServiceImplBean serviceImplBean = portComponent.getServiceImplBean();
if (serviceImplBean != null && serviceImplBean.getEjbLink() != null) {
portMap.put(serviceImplBean.getEjbLink(), portComponent);
}
@@ -246,25 +246,25 @@ public class WsDeployer implements Dynam
}
}
- Map<String, EjbDeployment> deploymentsByEjbName = ejbModule.getOpenejbJar().getDeploymentsByEjbName();
+ final Map<String, EjbDeployment> deploymentsByEjbName = ejbModule.getOpenejbJar().getDeploymentsByEjbName();
WebserviceDescription webserviceDescription = null;
- for (EnterpriseBean enterpriseBean : ejbModule.getEjbJar().getEnterpriseBeans()) {
+ for (final EnterpriseBean enterpriseBean : ejbModule.getEjbJar().getEnterpriseBeans()) {
// skip if this is not a webservices endpoint
if (!(enterpriseBean instanceof SessionBean)) continue;
- SessionBean sessionBean = (SessionBean) enterpriseBean;
+ final SessionBean sessionBean = (SessionBean) enterpriseBean;
if (sessionBean.getSessionType() == SessionType.STATEFUL) continue;
if (sessionBean.getSessionType() == SessionType.MANAGED) continue;
if (sessionBean.getServiceEndpoint() == null) continue;
- EjbDeployment deployment = deploymentsByEjbName.get(sessionBean.getEjbName());
+ final EjbDeployment deployment = deploymentsByEjbName.get(sessionBean.getEjbName());
if (deployment == null) continue;
- Class<?> ejbClass;
+ final Class<?> ejbClass;
try {
ejbClass = ejbModule.getClassLoader().loadClass(sessionBean.getEjbClass());
- } catch (ClassNotFoundException e) {
+ } catch (final ClassNotFoundException e) {
throw new OpenEJBException("Unable to load ejb class: " + sessionBean.getEjbClass(), e);
}
@@ -302,7 +302,7 @@ public class WsDeployer implements Dynam
}
webserviceDescription.getPortComponent().add(portComponent);
- ServiceImplBean serviceImplBean = new ServiceImplBean();
+ final ServiceImplBean serviceImplBean = new ServiceImplBean();
serviceImplBean.setEjbLink(sessionBean.getEjbName());
portComponent.setServiceImplBean(serviceImplBean);
@@ -336,9 +336,9 @@ public class WsDeployer implements Dynam
webserviceDescription.setWsdlFile(JaxWsUtils.getServiceWsdlLocation(ejbClass, ejbModule.getClassLoader()));
}
if (portComponent.getWsdlService() == null) {
- Definition definition = getWsdl(ejbModule, webserviceDescription.getWsdlFile());
+ final Definition definition = getWsdl(ejbModule, webserviceDescription.getWsdlFile());
if (definition != null && definition.getServices().size() == 1) {
- QName serviceQName = (QName) definition.getServices().keySet().iterator().next();
+ final QName serviceQName = (QName) definition.getServices().keySet().iterator().next();
portComponent.setWsdlService(serviceQName);
} else {
portComponent.setWsdlService(JaxWsUtils.getServiceQName(ejbClass));
@@ -346,8 +346,8 @@ public class WsDeployer implements Dynam
}
if (portComponent.getLocation() == null && webserviceDescription.getWsdlFile() != null) {
// set location based on wsdl port
- Definition definition = getWsdl(ejbModule, webserviceDescription.getWsdlFile());
- String locationURI = getLocationFromWsdl(definition, portComponent);
+ final Definition definition = getWsdl(ejbModule, webserviceDescription.getWsdlFile());
+ final String locationURI = getLocationFromWsdl(definition, portComponent);
portComponent.setLocation(locationURI);
}
if (portComponent.getProtocolBinding() == null) {
@@ -356,7 +356,7 @@ public class WsDeployer implements Dynam
// handlers
if (portComponent.getHandlerChains() == null) {
- HandlerChains handlerChains = getHandlerChains(ejbClass, sessionBean.getServiceEndpoint(), ejbModule.getClassLoader());
+ final HandlerChains handlerChains = getHandlerChains(ejbClass, sessionBean.getServiceEndpoint(), ejbModule.getClassLoader());
portComponent.setHandlerChains(handlerChains);
}
@@ -365,28 +365,28 @@ public class WsDeployer implements Dynam
}
}
- private Definition getWsdl(DeploymentModule module, String wsdlFile) {
+ private Definition getWsdl(final DeploymentModule module, final String wsdlFile) {
if (wsdlFile == null) return null;
- Object object = module.getAltDDs().get(wsdlFile);
+ final Object object = module.getAltDDs().get(wsdlFile);
if (object instanceof Definition) {
- Definition definition = (Definition) object;
+ final Definition definition = (Definition) object;
return definition;
}
try {
- URL wsdlUrl;
+ final URL wsdlUrl;
if (object instanceof URL) {
wsdlUrl = (URL) object;
} else {
- URL baseUrl = getBaseUrl(module);
+ final URL baseUrl = getBaseUrl(module);
wsdlUrl = new URL(baseUrl, wsdlFile);
}
- Definition definition = readWsdl(wsdlUrl);
+ final Definition definition = readWsdl(wsdlUrl);
module.getAltDDs().put(wsdlFile, definition);
return definition;
- } catch (Exception e) {
+ } catch (final Exception e) {
logger.error("Unable to read wsdl file " + wsdlFile);
}
@@ -403,16 +403,16 @@ public class WsDeployer implements Dynam
reader.setFeature("javax.wsdl.importDocuments", true);
final WsdlResolver wsdlResolver = new WsdlResolver(new URL(url, ".").toExternalForm(), new InputSource(IO.read(url)));
definition = reader.readWSDL(wsdlResolver);
- } catch (IOException e) {
+ } catch (final IOException e) {
throw new OpenEJBException("Cannot read the wsdl file: " + url.toExternalForm(), e);
- } catch (Exception e) {
+ } catch (final Exception e) {
throw new OpenEJBException("Encountered unknown error parsing the wsdl file: " + url.toExternalForm(), e);
}
return definition;
}
- private URL getBaseUrl(DeploymentModule module) throws MalformedURLException {
- File file = new File(module.getJarLocation());
+ private URL getBaseUrl(final DeploymentModule module) throws MalformedURLException {
+ final File file = new File(module.getJarLocation());
if (!file.exists()) {
return new URL(module.getJarLocation());
}
@@ -424,49 +424,49 @@ public class WsDeployer implements Dynam
return baseUrl;
}
- private String getLocationFromWsdl(Definition definition, PortComponent portComponent) {
+ private String getLocationFromWsdl(final Definition definition, final PortComponent portComponent) {
if (definition == null) return null;
try {
- Service service = definition.getService(portComponent.getWsdlService());
+ final Service service = definition.getService(portComponent.getWsdlService());
if (service == null) return null;
- Port port = service.getPort(portComponent.getWsdlPort().getLocalPart());
+ final Port port = service.getPort(portComponent.getWsdlPort().getLocalPart());
if (port == null) return null;
- for (Object element : port.getExtensibilityElements()) {
+ for (final Object element : port.getExtensibilityElements()) {
if (element instanceof SOAPAddress) {
- SOAPAddress soapAddress = (SOAPAddress) element;
- URI uri = URLs.uri(soapAddress.getLocationURI());
+ final SOAPAddress soapAddress = (SOAPAddress) element;
+ final URI uri = URLs.uri(soapAddress.getLocationURI());
return uri.getPath();
} else if (element instanceof HTTPAddress) {
- HTTPAddress httpAddress = (HTTPAddress) element;
- URI uri = URLs.uri(httpAddress.getLocationURI());
+ final HTTPAddress httpAddress = (HTTPAddress) element;
+ final URI uri = URLs.uri(httpAddress.getLocationURI());
return uri.getPath();
}
}
- } catch (Exception e) {
+ } catch (final Exception e) {
// no-op
}
return null;
}
- public static HandlerChains getHandlerChains(Class<?> declaringClass, String serviceEndpoint, ClassLoader classLoader) throws OpenEJBException {
+ public static HandlerChains getHandlerChains(Class<?> declaringClass, final String serviceEndpoint, final ClassLoader classLoader) throws OpenEJBException {
HandlerChain handlerChain = declaringClass.getAnnotation(HandlerChain.class);
if (handlerChain == null && serviceEndpoint != null) {
try {
declaringClass = classLoader.loadClass(serviceEndpoint);
handlerChain = declaringClass.getAnnotation(HandlerChain.class);
- } catch (ClassNotFoundException ignored) {
+ } catch (final ClassNotFoundException ignored) {
// no-op
}
}
HandlerChains handlerChains = null;
if (handlerChain != null) {
try {
- URL handlerFileURL = declaringClass.getResource(handlerChain.file());
+ final URL handlerFileURL = declaringClass.getResource(handlerChain.file());
handlerChains = ReadDescriptors.readHandlerChains(handlerFileURL);
- } catch (Throwable e) {
+ } catch (final Throwable e) {
throw new OpenEJBException("Unable to load handler chain file: " + handlerChain.file(), e);
}
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/provider/ID.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/provider/ID.java?rev=1569795&r1=1569794&r2=1569795&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/provider/ID.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/provider/ID.java Wed Feb 19 15:47:58 2014
@@ -24,7 +24,7 @@ public class ID {
private final String namespace;
private final String name;
- public ID(String namespace, String name) {
+ public ID(final String namespace, final String name) {
if (name == null) throw new IllegalArgumentException("name cannot be null");
this.namespace = namespace != null ? namespace.toLowerCase() : null;
this.name = name.toLowerCase();
@@ -42,15 +42,15 @@ public class ID {
if (namespace == null) throw new IllegalArgumentException("namespace cannot be null");
if (name == null) throw new IllegalArgumentException("name cannot be null");
}
- public static ID parse(String raw) {
+ public static ID parse(final String raw) {
return parse(raw, (String) null);
}
- public static ID parse(String raw, final ID id) {
+ public static ID parse(final String raw, final ID id) {
return parse(raw, id.getNamespace());
}
- public static ID parse(String raw, final String namespace) {
+ public static ID parse(final String raw, final String namespace) {
if (raw == null) throw new NullPointerException("provider id cannot be null");
final String[] parts = raw.split("[#:]");
@@ -68,11 +68,11 @@ public class ID {
}
@Override
- public boolean equals(Object o) {
+ public boolean equals(final Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
- ID id = (ID) o;
+ final ID id = (ID) o;
if (!name.equals(id.name)) return false;
if (namespace != null ? !namespace.equals(id.namespace) : id.namespace != null) return false;
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/provider/InvalidProviderDeclarationException.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/provider/InvalidProviderDeclarationException.java?rev=1569795&r1=1569794&r2=1569795&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/provider/InvalidProviderDeclarationException.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/provider/InvalidProviderDeclarationException.java Wed Feb 19 15:47:58 2014
@@ -26,7 +26,7 @@ public class InvalidProviderDeclarationE
private final ID id;
private final ServiceProvider provider;
- public InvalidProviderDeclarationException(String s, ID id, ServiceProvider provider) {
+ public InvalidProviderDeclarationException(final String s, final ID id, final ServiceProvider provider) {
super(String.format("%s - %s", id, s));
this.id = id;
this.provider = provider;
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/provider/MalformedProviderNameException.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/provider/MalformedProviderNameException.java?rev=1569795&r1=1569794&r2=1569795&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/provider/MalformedProviderNameException.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/provider/MalformedProviderNameException.java Wed Feb 19 15:47:58 2014
@@ -20,7 +20,7 @@ package org.apache.openejb.config.provid
* @version $Rev$ $Date$
*/
public class MalformedProviderNameException extends IllegalArgumentException {
- public MalformedProviderNameException(String s) {
+ public MalformedProviderNameException(final String s) {
super(s);
}
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/provider/NoSuchParentProviderException.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/provider/NoSuchParentProviderException.java?rev=1569795&r1=1569794&r2=1569795&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/provider/NoSuchParentProviderException.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/provider/NoSuchParentProviderException.java Wed Feb 19 15:47:58 2014
@@ -25,7 +25,7 @@ public class NoSuchParentProviderExcepti
private final ServiceProvider provider;
private final ID id;
- public NoSuchParentProviderException(ServiceProvider provider, ID id) {
+ public NoSuchParentProviderException(final ServiceProvider provider, final ID id) {
super(String.format("ServiceProvider{id='%s', parent='%s:%s'}", provider.getId(), id.getNamespace(), id.getName()));
this.provider = provider;
this.id = id;
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/provider/ProviderCircularReferenceException.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/provider/ProviderCircularReferenceException.java?rev=1569795&r1=1569794&r2=1569795&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/provider/ProviderCircularReferenceException.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/provider/ProviderCircularReferenceException.java Wed Feb 19 15:47:58 2014
@@ -27,7 +27,7 @@ public class ProviderCircularReferenceEx
private final Set<ID> ids;
- public ProviderCircularReferenceException(Set<ID> ids) {
+ public ProviderCircularReferenceException(final Set<ID> ids) {
super(String.format("Circular reference: %s -> %s", Join.join(" -> ", ids), ids.iterator().next()));
this.ids = ids;
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/provider/ProviderManager.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/provider/ProviderManager.java?rev=1569795&r1=1569794&r2=1569795&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/provider/ProviderManager.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/provider/ProviderManager.java Wed Feb 19 15:47:58 2014
@@ -47,11 +47,11 @@ public class ProviderManager {
private final Map<ID, ServiceProvider> providers = new LinkedHashMap<ID, ServiceProvider>();
private final ProviderLoader loader;
- public ProviderManager(ProviderLoader loader) {
+ public ProviderManager(final ProviderLoader loader) {
this.loader = loader;
}
- public ServiceProvider get(String namespace, String name) {
+ public ServiceProvider get(final String namespace, final String name) {
final ID id = new ID(namespace, name);
return getProvider(id, new LinkedHashSet<ID>());
}
@@ -60,7 +60,7 @@ public class ProviderManager {
return new ArrayList<ServiceProvider>(providers.values());
}
- public void register(String namespace, ServiceProvider provider) {
+ public void register(final String namespace, final ServiceProvider provider) {
if (provider == null) throw new IllegalArgumentException("provider cannot be null");
final ID id = new ID(namespace, provider.getId());
@@ -78,14 +78,14 @@ public class ProviderManager {
{ // load
final ArrayList<ServiceProvider> list = new ArrayList<ServiceProvider>(loader.load(namespace));
- for (ServiceProvider provider : list) {
+ for (final ServiceProvider provider : list) {
register(namespace, provider);
}
}
}
final List<ServiceProvider> providers = new ArrayList<ServiceProvider>();
- for (Map.Entry<ID, ServiceProvider> entry : this.providers.entrySet()) {
+ for (final Map.Entry<ID, ServiceProvider> entry : this.providers.entrySet()) {
if (entry.getKey().getNamespace().equals(namespace)) {
providers.add(entry.getValue());
}
@@ -94,7 +94,7 @@ public class ProviderManager {
return providers;
}
- private void register(ID id, ServiceProvider provider, Set<ID> seen) {
+ private void register(final ID id, final ServiceProvider provider, final Set<ID> seen) {
if (providers.containsKey(id)) return;
if (provider.getParent() != null) {
@@ -116,7 +116,7 @@ public class ProviderManager {
providers.put(id, provider);
}
- private void inherit(ServiceProvider child, ServiceProvider parent) {
+ private void inherit(final ServiceProvider child, final ServiceProvider parent) {
if (n(child.getClassName())) child.setClassName(parent.getClassName());
if (n(child.getConstructor())) child.setConstructor(parent.getConstructor());
@@ -144,11 +144,11 @@ public class ProviderManager {
}
}
- private boolean n(String s) {
+ private boolean n(final String s) {
return s == null || s.length() == 0;
}
- private ServiceProvider getProvider(ID id, final Set<ID> seen) {
+ private ServiceProvider getProvider(final ID id, final Set<ID> seen) {
if (seen.contains(id)) throw new ProviderCircularReferenceException(seen);
seen.add(id);
@@ -169,7 +169,7 @@ public class ProviderManager {
return null;
}
- private void validate(ID id, ServiceProvider provider) {
+ private void validate(final ID id, final ServiceProvider provider) {
id.validate();
if (provider.getService() == null) {
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/provider/ServiceJarXmlLoader.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/provider/ServiceJarXmlLoader.java?rev=1569795&r1=1569794&r2=1569795&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/provider/ServiceJarXmlLoader.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/provider/ServiceJarXmlLoader.java Wed Feb 19 15:47:58 2014
@@ -36,7 +36,7 @@ public class ServiceJarXmlLoader impleme
private final List<String> namespaces = new LinkedList<String>();
@Override
- public ServiceProvider load(ID id) {
+ public ServiceProvider load(final ID id) {
id.validate();
{ // Already loaded and waiting?
@@ -54,21 +54,21 @@ public class ServiceJarXmlLoader impleme
return load(id);
}
- private void parse(String namespace) {
+ private void parse(final String namespace) {
try {// Load and try again
final ServicesJar servicesJar = JaxbOpenejb.readServicesJar(namespace);
- for (ServiceProvider provider : servicesJar.getServiceProvider()) {
+ for (final ServiceProvider provider : servicesJar.getServiceProvider()) {
final ID found = new ID(namespace, provider.getId());
loaded.put(found, provider);
}
- } catch (OpenEJBException e) {
+ } catch (final OpenEJBException e) {
throw new IllegalStateException(e);
}
}
@Override
- public List<ServiceProvider> load(String namespace) {
+ public List<ServiceProvider> load(final String namespace) {
if (!namespaces.contains(namespace)) {
namespaces.add(namespace);
@@ -77,7 +77,7 @@ public class ServiceJarXmlLoader impleme
}
final List<ServiceProvider> list = new ArrayList<ServiceProvider>();
- for (Map.Entry<ID, ServiceProvider> entry : loaded.entrySet()) {
+ for (final Map.Entry<ID, ServiceProvider> entry : loaded.entrySet()) {
if (entry.getKey().getNamespace().equals(namespace)) {
list.add(entry.getValue());
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckAnnotations.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckAnnotations.java?rev=1569795&r1=1569794&r2=1569795&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckAnnotations.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckAnnotations.java Wed Feb 19 15:47:58 2014
@@ -33,46 +33,46 @@ public class CheckAnnotations extends Va
Logger logger = Logger.getInstance(LogCategory.OPENEJB_STARTUP_VALIDATION, CheckAnnotations.class);
@Override
- public void validate(AppModule appModule) {
+ public void validate(final AppModule appModule) {
try {
- for (EjbModule ejbModule : appModule.getEjbModules()) {
+ for (final EjbModule ejbModule : appModule.getEjbModules()) {
module = ejbModule;
findClassesAnnotatedWithWebService(ejbModule);
}
- for (WebModule webModule : appModule.getWebModules()) {
+ for (final WebModule webModule : appModule.getWebModules()) {
module = webModule;
findClassesAnnotatedWithWebService(webModule);
}
- } catch (Exception e) {
+ } catch (final Exception e) {
logger.error("Error while validating @WebService annotation", e);
}
}
- private void findClassesAnnotatedWithWebService(EjbModule ejbModule) {
+ private void findClassesAnnotatedWithWebService(final EjbModule ejbModule) {
- IAnnotationFinder finder = ejbModule.getFinder();
+ final IAnnotationFinder finder = ejbModule.getFinder();
if (finder != null) {findIncorrectAnnotationAndWarn(finder,ejbModule.toString());}
}
- private void findClassesAnnotatedWithWebService(WebModule webModule) {
- IAnnotationFinder finder = webModule.getFinder();
+ private void findClassesAnnotatedWithWebService(final WebModule webModule) {
+ final IAnnotationFinder finder = webModule.getFinder();
if (finder != null) {findIncorrectAnnotationAndWarn(finder,webModule.toString());}
}
- private void findIncorrectAnnotationAndWarn(IAnnotationFinder finder, String component) {
- List<Class<?>> webserviceAnnotatedClasses = finder.findAnnotatedClasses(WebService.class);
- for (Class clazz : webserviceAnnotatedClasses) {
- Annotation[] annotations = clazz.getDeclaredAnnotations();
+ private void findIncorrectAnnotationAndWarn(final IAnnotationFinder finder, final String component) {
+ final List<Class<?>> webserviceAnnotatedClasses = finder.findAnnotatedClasses(WebService.class);
+ for (final Class clazz : webserviceAnnotatedClasses) {
+ final Annotation[] annotations = clazz.getDeclaredAnnotations();
- List<Annotation> declaredAnnotations = Arrays.asList(annotations);
- for (Annotation declaredAnn : declaredAnnotations) {
+ final List<Annotation> declaredAnnotations = Arrays.asList(annotations);
+ for (final Annotation declaredAnn : declaredAnnotations) {
if (declaredAnn.annotationType().getName().equals("javax.ejb.Stateful")) {
warn(component, "annotation.invalid.stateful.webservice", clazz.getName());
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckAssemblyBindings.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckAssemblyBindings.java?rev=1569795&r1=1569794&r2=1569795&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckAssemblyBindings.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckAssemblyBindings.java Wed Feb 19 15:47:58 2014
@@ -37,16 +37,16 @@ import static org.apache.openejb.util.Jo
* @version $Rev$ $Date$
*/
public class CheckAssemblyBindings extends ValidationBase {
- public void validate(EjbModule ejbModule) {
+ public void validate(final EjbModule ejbModule) {
checkUnusedInterceptors(ejbModule);
- Map<String, EnterpriseBean> ejbsByName = ejbModule.getEjbJar().getEnterpriseBeansByEjbName();
+ final Map<String, EnterpriseBean> ejbsByName = ejbModule.getEjbJar().getEnterpriseBeansByEjbName();
- AssemblyDescriptor assembly = ejbModule.getEjbJar().getAssemblyDescriptor();
+ final AssemblyDescriptor assembly = ejbModule.getEjbJar().getAssemblyDescriptor();
if (assembly == null) return;
- for (InterceptorBinding binding : assembly.getInterceptorBinding()) {
- List<String> interceptorClasses = binding.getInterceptorClass();
+ for (final InterceptorBinding binding : assembly.getInterceptorBinding()) {
+ final List<String> interceptorClasses = binding.getInterceptorClass();
if (binding.getInterceptorOrder() != null){
interceptorClasses.addAll(binding.getInterceptorOrder().getInterceptorClass());
}
@@ -62,8 +62,8 @@ public class CheckAssemblyBindings exten
}
}
- for (MethodPermission permission : assembly.getMethodPermission()) {
- for (Method method : permission.getMethod()) {
+ for (final MethodPermission permission : assembly.getMethodPermission()) {
+ for (final Method method : permission.getMethod()) {
if (method.getEjbName() == null) {
fail("MethodPermission", "methodPermission.ejbNameRequired", method.getMethodName(), join(",", permission.getRoleName()));
} else if (method.getEjbName().equals("*")) { //NOPMD
@@ -74,8 +74,8 @@ public class CheckAssemblyBindings exten
}
}
- for (ContainerTransaction transaction : assembly.getContainerTransaction()) {
- for (Method method : transaction.getMethod()) {
+ for (final ContainerTransaction transaction : assembly.getContainerTransaction()) {
+ for (final Method method : transaction.getMethod()) {
if (method.getEjbName() == null) {
fail("ContainerTransaction", "containerTransaction.ejbNameRequired", method.getMethodName(), transaction.getTransAttribute());
} else if (method.getEjbName().equals("*")) { //NOPMD
@@ -86,26 +86,26 @@ public class CheckAssemblyBindings exten
}
}
}
- private void checkUnusedInterceptors(EjbModule ejbModule) {
- AssemblyDescriptor assembly = ejbModule.getEjbJar().getAssemblyDescriptor();
- Interceptor[] interceptorsArray = ejbModule.getEjbJar().getInterceptors();
- List<Interceptor> interceptors = Arrays.asList(interceptorsArray);
- Set<String> interceptorClassNames = new HashSet<String>(interceptors.size());
- for (Interceptor interceptor : interceptors) {
+ private void checkUnusedInterceptors(final EjbModule ejbModule) {
+ final AssemblyDescriptor assembly = ejbModule.getEjbJar().getAssemblyDescriptor();
+ final Interceptor[] interceptorsArray = ejbModule.getEjbJar().getInterceptors();
+ final List<Interceptor> interceptors = Arrays.asList(interceptorsArray);
+ final Set<String> interceptorClassNames = new HashSet<String>(interceptors.size());
+ for (final Interceptor interceptor : interceptors) {
interceptorClassNames.add(interceptor.getInterceptorClass());
}
- Set<String> interceptorClassNamesUsedInBindings = new HashSet<String>();
- for (InterceptorBinding binding : assembly.getInterceptorBinding()) {
- List<String> interceptorClass = binding.getInterceptorClass();
+ final Set<String> interceptorClassNamesUsedInBindings = new HashSet<String>();
+ for (final InterceptorBinding binding : assembly.getInterceptorBinding()) {
+ final List<String> interceptorClass = binding.getInterceptorClass();
interceptorClassNamesUsedInBindings.addAll(interceptorClass);
}
- Set<String> unusedInterceptors = new HashSet<String>();
- for (String clazz : interceptorClassNames) {
+ final Set<String> unusedInterceptors = new HashSet<String>();
+ for (final String clazz : interceptorClassNames) {
if (!interceptorClassNamesUsedInBindings.contains(clazz)) {
unusedInterceptors.add(clazz);
}
}
- for (String clazz : unusedInterceptors) {
+ for (final String clazz : unusedInterceptors) {
warn("Interceptors", "interceptor.unused", clazz);
}
}